X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose.pm;h=f38cac6a5459ffc6a50d2f38aee91eb73b6fb4c8;hb=38bf2a2585e26a47c919fd4c286b7716acb51c00;hp=089a9fd79530439b25199a8b6198c7e63c745122;hpb=72825dcd9c9d72f70c6c8d5e1c7910f8cfd6f302;p=gitmo%2FMoose.git diff --git a/lib/Moose.pm b/lib/Moose.pm index 089a9fd..f38cac6 100644 --- a/lib/Moose.pm +++ b/lib/Moose.pm @@ -4,8 +4,6 @@ use warnings; use 5.008; -our $VERSION = '1.10'; -$VERSION = eval $VERSION; our $AUTHORITY = 'cpan:STEVAN'; use Scalar::Util 'blessed'; @@ -14,7 +12,7 @@ use Carp 'confess'; use Moose::Deprecated; use Moose::Exporter; -use Class::MOP 1.05; +use Class::MOP; use Moose::Meta::Class; use Moose::Meta::TypeConstraint; @@ -153,6 +151,7 @@ sub init_meta { or Moose->throw_error("Cannot call init_meta without specifying a for_class"); my $base_class = $args{base_class} || 'Moose::Object'; my $metaclass = $args{metaclass} || 'Moose::Meta::Class'; + my $meta_name = exists $args{meta_name} ? $args{meta_name} : 'meta'; Moose->throw_error("The Metaclass $metaclass must be a subclass of Moose::Meta::Class.") unless $metaclass->isa('Moose::Meta::Class'); @@ -173,7 +172,7 @@ sub init_meta { } } } else { - # no metaclass, no 'meta' method + # no metaclass # now we check whether our ancestors have metaclass, and if so borrow that my ( undef, @isa ) = @{ mro::get_linear_isa($class) }; @@ -181,9 +180,7 @@ sub init_meta { foreach my $ancestor ( @isa ) { my $ancestor_meta = Class::MOP::get_metaclass_by_name($ancestor) || next; - my $ancestor_meta_class = ($ancestor_meta->is_immutable - ? $ancestor_meta->_get_mutable_metaclass_name - : ref($ancestor_meta)); + my $ancestor_meta_class = $ancestor_meta->_real_ref_name; # if we have an ancestor metaclass that inherits $metaclass, we use # that. This is like _fix_metaclass_incompatibility, but we can do it now. @@ -200,32 +197,19 @@ sub init_meta { $meta = $metaclass->initialize($class); } - if ( $class->can('meta') ) { - # check 'meta' method - - # it may be inherited - - # NOTE: - # this is the case where the metaclass pragma - # was used before the 'use Moose' statement to - # override a specific class - my $method_meta = $class->meta; - - ( blessed($method_meta) && $method_meta->isa('Moose::Meta::Class') ) - || Moose->throw_error("$class already has a &meta function, but it does not return a Moose::Meta::Class ($method_meta)"); - - $meta = $method_meta; - } - - unless ( $meta->has_method("meta") ) { # don't overwrite + if (defined $meta_name) { # also check for inherited non moose 'meta' method? - # FIXME also skip this if the user requested by passing an option - $meta->add_method( - 'meta' => sub { - # re-initialize so it inherits properly - $metaclass->initialize( ref($_[0]) || $_[0] ); - } - ); + my $existing = $meta->get_method($meta_name); + if ($existing && !$existing->isa('Class::MOP::Method::Meta')) { + Carp::cluck "Moose is overwriting an existing method named " + . "$meta_name in class $class with a method " + . "which returns the class's metaclass. If this is " + . "actually what you want, you should remove the " + . "existing method, otherwise, you should rename or " + . "disable this generated method using the " + . "'-meta_name' option to 'use Moose'."; + } + $meta->_add_meta_method($meta_name); } # make sure they inherit from Moose::Object @@ -286,14 +270,12 @@ Moose::Meta::Mixin::AttributeCore->meta->make_immutable( 1; +# ABSTRACT: A postmodern object system for Perl 5 + __END__ =pod -=head1 NAME - -Moose - A postmodern object system for Perl 5 - =head1 SYNOPSIS package Point; @@ -325,7 +307,7 @@ Moose - A postmodern object system for Perl 5 Moose is an extension of the Perl 5 object system. The main goal of Moose is to make Perl 5 Object Oriented programming -easier, more consistent and less tedious. With Moose you can to think +easier, more consistent, and less tedious. With Moose you can think more about what you want to do and less about the mechanics of OOP. Additionally, Moose is built on top of L, which is a @@ -373,8 +355,10 @@ Moose makes every attempt to provide as much convenience as possible during class construction/definition, but still stay out of your way if you want it to. Here are a few items to note when building classes with Moose. -Unless specified with C, any class which uses Moose will -inherit from L. +When you C, Moose will set the class's parent class to +L, I the class using Moose already has a parent +class. In addition, specifying a parent with C will change the parent +class. Moose will also manage all attributes (including inherited ones) that are defined with C. And (assuming you call C, which is inherited from @@ -472,9 +456,9 @@ for information on how to define a new type, and how to retrieve type meta-data) =item I (1|0)> This will attempt to use coercion with the supplied type constraint to change -the value passed into any accessors or constructors. You B have supplied -a type constraint in order for this to work. See L -for an example. +the value passed into any accessors or constructors. You B supply a type +constraint, and that type constraint B define a coercion. See +L for an example. =item I $role_name> @@ -513,7 +497,7 @@ either C or C. The I option is a CODE reference which will be called after the value of the attribute is set. The CODE ref is passed the -instance itself, the updated value, and the original value if the +instance itself, the updated value, and the original value if the attribute was already set. You B have a trigger on a read-only attribute. @@ -585,7 +569,7 @@ quick example (soon to be expanded into a Moose::Cookbook recipe): has 'parent' => ( is => 'rw', isa => 'Tree', - weak_ref => 1, + weak_ref => 1, handles => { parent_node => 'node', siblings => 'children', @@ -630,7 +614,7 @@ is consistent with role composition). =item C With the duck type option, you pass a duck type object whose "interface" then -becomes the list of methods to handle. The "interface" can be defined as; the +becomes the list of methods to handle. The "interface" can be defined as the list of methods passed to C to create a duck type object. For more information on C please check L. @@ -653,7 +637,7 @@ a HASH ref) of the methods you want mapped. This tells the class to use a custom attribute metaclass for this particular attribute. Custom attribute metaclasses are useful for extending the capabilities of the I keyword: they are the simplest way to extend the MOP, -but they are still a fairly advanced topic and too much to cover here, see +but they are still a fairly advanced topic and too much to cover here. See L for more information. See L for details on how a metaclass name @@ -676,7 +660,7 @@ example. The value of this key is the name of the method that will be called to obtain the value used to initialize the attribute. See the L - and/or L for more information. +and/or L for more information. =item I => SCALAR | CODE @@ -691,14 +675,14 @@ information. =item I => Str -Creates a method allowing you to clear the value, see the L for more information. =item I => Str Creates a method to perform a basic test to see if a value has been set in the -attribute, see the L for more information. =item I => (0|1) @@ -879,7 +863,7 @@ all the time. =item B -This is the C function, it is exported here because I +This is the C function. It is exported here because I use it all the time. It is highly recommended that this is used instead of C anywhere you need to test for an object's class name. @@ -979,7 +963,7 @@ for you. =head2 B -An alias for C, used by internally by Moose. +An alias for C, used internally by Moose. =head2 The MooseX:: namespace @@ -1010,7 +994,7 @@ modules, many of which apply roles to the metaclass. If the parent and child do differ by roles, Moose replaces the metaclass in the child with a newly created metaclass. This metaclass -is a subclass of the parent's metaclass, does all of the roles that +is a subclass of the parent's metaclass which does all of the roles that the child's metaclass did before being replaced. Effectively, this means the new metaclass does all of the roles done by both the parent's and child's original metaclasses. @@ -1103,7 +1087,7 @@ See L for extensions. =item The Art of the MetaObject Protocol -I mention this in the L docs too, this book was critical in +I mention this in the L docs too, as this book was critical in the development of both modules and is highly recommended. =back @@ -1145,17 +1129,11 @@ L to discuss. The L has more detail about how and when you can contribute. -=head1 AUTHOR +=head1 CABAL -Moose is an open project, there are at this point dozens of people who have -contributed, and can contribute. If you have added anything to the Moose -project you have a commit bit on this file and can add your name to the list. - -=head2 CABAL - -However there are only a few people with the rights to release a new version +There are only a few people with the rights to release a new version of Moose. The Moose Cabal are the people to go to with questions regarding -the wider purview of Moose, and help out maintaining not just the code +the wider purview of Moose. They help maintain not just the code but the community as well. Stevan (stevan) Little Estevan@iinteractive.comE @@ -1174,7 +1152,7 @@ Florian Ragwitz Erafl@debian.orgE Dave (autarch) Rolsky Eautarch@urth.orgE -=head2 OTHER CONTRIBUTORS +=head1 CONTRIBUTORS Aankhen @@ -1182,47 +1160,56 @@ Adam (Alias) Kennedy Anders (Debolaz) Nor Berle -Nathan (kolibrie) Gray +Chris (perigrin) Prather Christian (chansen) Hansen +Cory (gphat) Watson + +Dylan Hardison (doc fixes) + Eric (ewilhelm) Wilhelm +Evan Carroll + +Florian (rafl) Ragwitz + Guillermo (groditi) Roditi +Jason May + +Jay Hannah + Jess (castaway) Robinson -Matt (mst) Trout +Jonathan (jrockway) Rockway -Robert (phaylon) Sedlacek +Matt (mst) Trout -Robert (rlb3) Boone +Nathan (kolibrie) Gray -Scott (konobi) McWhirter +Paul (frodwith) Driver -Shlomi (rindolf) Fish +Piotr (dexter) Roszatycki -Wallace (wreis) Reis +Robert Buels -Jonathan (jrockway) Rockway +Robert (phaylon) Sedlacek -Piotr (dexter) Roszatycki +Robert (rlb3) Boone Sam (mugwump) Vilain -Cory (gphat) Watson - -Dylan Hardison (doc fixes) +Scott (konobi) McWhirter -... and many other #moose folks +Shawn (Sartak) Moore -=head1 COPYRIGHT AND LICENSE +Shlomi (rindolf) Fish -Copyright 2006-2010 by Infinity Interactive, Inc. +Tom (dec) Lanyon -L +Wallace (wreis) Reis -This library is free software; you can redistribute it and/or modify -it under the same terms as Perl itself. +... and many other #moose folks =cut