X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FMeta%2FClass.pm;h=fe3e1980b44e2af545b01f3c1ed3083e9da502d1;hb=baf46b9edc7dc3665c7eaf9d1684b157efb09e1a;hp=4d07d55cec838747785f40b122a680f17f6e800f;hpb=e000133868ec074e6b60baef47269c2d345adffc;p=gitmo%2FMoose.git diff --git a/lib/Moose/Meta/Class.pm b/lib/Moose/Meta/Class.pm index 4d07d55..fe3e198 100644 --- a/lib/Moose/Meta/Class.pm +++ b/lib/Moose/Meta/Class.pm @@ -8,14 +8,14 @@ use Class::MOP; use Carp (); use List::Util qw( first ); -use List::MoreUtils qw( any all ); +use List::MoreUtils qw( any all uniq ); use Scalar::Util 'weaken', 'blessed'; -our $VERSION = '0.57'; +our $VERSION = '0.72_01'; $VERSION = eval $VERSION; our $AUTHORITY = 'cpan:STEVAN'; -use Moose::Meta::Method::Overriden; +use Moose::Meta::Method::Overridden; use Moose::Meta::Method::Augmented; use Moose::Error::Default; @@ -60,11 +60,12 @@ sub create { (ref $options{roles} eq 'ARRAY') || $self->throw_error("You must pass an ARRAY ref of roles", data => $options{roles}) if exists $options{roles}; + my $roles = delete $options{roles}; my $class = $self->SUPER::create($package_name, %options); - if (exists $options{roles}) { - Moose::Util::apply_all_roles($class, @{$options{roles}}); + if ($roles) { + Moose::Util::apply_all_roles( $class, @$roles ); } return $class; @@ -89,8 +90,8 @@ sub create_anon_class { # something like Super::Class|Super::Class::2=Role|Role::1 my $cache_key = join '=' => ( - join('|', sort @{$options{superclasses} || []}), - join('|', sort @{$options{roles} || []}), + join('|', @{$options{superclasses} || []}), + join('|', sort @{$options{roles} || []}), ); if ($cache_ok && defined $ANON_CLASSES{$cache_key}) { @@ -151,33 +152,31 @@ sub excludes_role { } sub new_object { - my $class = shift; + my $class = shift; my $params = @_ == 1 ? $_[0] : {@_}; - my $self = $class->SUPER::new_object($params); - foreach my $attr ($class->compute_all_applicable_attributes()) { - # if we have a trigger, then ... - if ($attr->can('has_trigger') && $attr->has_trigger) { - # make sure we have an init-arg ... - if (defined(my $init_arg = $attr->init_arg)) { - # now make sure an init-arg was passes ... - if (exists $params->{$init_arg}) { - # and if get here, fire the trigger - $attr->trigger->( - $self, - # check if there is a coercion - ($attr->should_coerce - # and if so, we need to grab the - # value that is actually been stored - ? $attr->get_read_method_ref->($self) - # otherwise, just get the value from - # the constructor params - : $params->{$init_arg}), - $attr - ); - } - } - } + my $self = $class->SUPER::new_object($params); + + foreach my $attr ( $class->compute_all_applicable_attributes() ) { + + next unless $attr->can('has_trigger') && $attr->has_trigger; + + my $init_arg = $attr->init_arg; + + next unless defined $init_arg; + + next unless exists $params->{$init_arg}; + + $attr->trigger->( + $self, + ( + $attr->should_coerce + ? $attr->get_read_method_ref->($self) + : $params->{$init_arg} + ), + $attr + ); } + return $self; } @@ -187,7 +186,7 @@ sub construct_instance { my $meta_instance = $class->get_meta_instance; # FIXME: # the code below is almost certainly incorrect - # but this is foreign inheritence, so we might + # but this is foreign inheritance, so we might # have to kludge it in the end. my $instance = $params->{'__INSTANCE__'} || $meta_instance->create_instance(); foreach my $attr ($class->compute_all_applicable_attributes()) { @@ -196,74 +195,6 @@ sub construct_instance { return $instance; } -# FIXME: -# This is ugly -sub get_method_map { - my $self = shift; - - my $current = Class::MOP::check_package_cache_flag($self->name); - - if (defined $self->{'_package_cache_flag'} && $self->{'_package_cache_flag'} == $current) { - return $self->{'methods'}; - } - - $self->{_package_cache_flag} = $current; - - my $map = $self->{'methods'}; - - my $class_name = $self->name; - my $method_metaclass = $self->method_metaclass; - - my %all_code = $self->get_all_package_symbols('CODE'); - - foreach my $symbol (keys %all_code) { - my $code = $all_code{$symbol}; - - next if exists $map->{$symbol} && - defined $map->{$symbol} && - $map->{$symbol}->body == $code; - - my ($pkg, $name) = Class::MOP::get_code_info($code); - - if ($pkg->can('meta') - # NOTE: - # we don't know what ->meta we are calling - # here, so we need to be careful cause it - # just might blow up at us, or just complain - # loudly (in the case of Curses.pm) so we - # just be a little overly cautious here. - # - SL - && eval { no warnings; blessed($pkg->meta) } - && $pkg->meta->isa('Moose::Meta::Role')) { - #my $role = $pkg->meta->name; - #next unless $self->does_role($role); - } - else { - - # NOTE: - # in 5.10 constant.pm the constants show up - # as being in the right package, but in pre-5.10 - # they show up as constant::__ANON__ so we - # make an exception here to be sure that things - # work as expected in both. - # - SL - unless ($pkg eq 'constant' && $name eq '__ANON__') { - next if ($pkg || '') ne $class_name || - (($name || '') ne '__ANON__' && ($pkg || '') ne $class_name); - } - - } - - $map->{$symbol} = $method_metaclass->wrap( - $code, - package_name => $class_name, - name => $symbol - ); - } - - return $map; -} - ### --------------------------------------------- sub add_attribute { @@ -281,7 +212,7 @@ sub add_override_method_modifier { (!$self->has_method($name)) || $self->throw_error("Cannot add an override method if a local method is already present"); - $self->add_method($name => Moose::Meta::Method::Overriden->new( + $self->add_method($name => Moose::Meta::Method::Overridden->new( method => $method, class => $self, package => $_super_package, # need this for roles @@ -307,7 +238,7 @@ sub _find_next_method_by_name_which_is_not_overridden { my ($self, $name) = @_; foreach my $method ($self->find_all_methods_by_name($name)) { return $method->{code} - if blessed($method->{code}) && !$method->{code}->isa('Moose::Meta::Method::Overriden'); + if blessed($method->{code}) && !$method->{code}->isa('Moose::Meta::Method::Overridden'); } return undef; } @@ -350,7 +281,8 @@ sub _superclass_meta_is_compatible { # I don't want to have to type this >1 time my @MetaClassTypes = - qw( attribute_metaclass method_metaclass instance_metaclass constructor_class destructor_class ); + qw( attribute_metaclass method_metaclass instance_metaclass + constructor_class destructor_class error_class ); sub _reconcile_with_superclass_meta { my ($self, $super) = @_; @@ -385,7 +317,8 @@ sub _reinitialize_with { instance_metaclass => $new_meta->instance_metaclass, ); - $new_self->$_( $new_meta->$_ ) for qw( constructor_class destructor_class ); + $new_self->$_( $new_meta->$_ ) + for qw( constructor_class destructor_class error_class ); %$self = %$new_self; @@ -446,7 +379,7 @@ sub _find_common_ancestor { # FIXME? This doesn't account for multiple inheritance (not sure # if it needs to though). For example, is somewhere in $meta1's - # history it inherits from both ClassA and ClassB, and $meta + # history it inherits from both ClassA and ClassB, and $meta2 # inherits from ClassB & ClassA, does it matter? And what crazy # fool would do that anyway? @@ -515,7 +448,7 @@ sub _all_roles_until { push @roles, $meta->calculate_all_roles; } - return @roles; + return uniq @roles; } sub _reconcile_role_differences { @@ -563,7 +496,7 @@ sub _process_attribute { @args = %{$args[0]} if scalar @args == 1 && ref($args[0]) eq 'HASH'; - if ($name =~ /^\+(.*)/) { + if (($name || '') =~ /^\+(.*)/) { return $self->_process_inherited_attribute($1, @args); } else { @@ -581,7 +514,7 @@ sub _process_inherited_attribute { my ($self, $attr_name, %options) = @_; my $inherited_attr = $self->find_attribute_by_name($attr_name); (defined $inherited_attr) - || $self->throw_error("Could not find an attribute by the name of '$attr_name' to inherit from", data => $attr_name); + || $self->throw_error("Could not find an attribute by the name of '$attr_name' to inherit from in ${\$self->name}", data => $attr_name); if ($inherited_attr->isa('Moose::Meta::Attribute')) { return $inherited_attr->clone_and_inherit_options(%options); } @@ -597,60 +530,31 @@ sub _process_inherited_attribute { use Moose::Meta::Method::Constructor; use Moose::Meta::Method::Destructor; -# This could be done by using SUPER and altering ->options -# I am keeping it this way to make it more explicit. -sub create_immutable_transformer { - my $self = shift; - my $class = Class::MOP::Immutable->new($self, { - read_only => [qw/superclasses/], - cannot_call => [qw/ - add_method - alias_method - remove_method - add_attribute - remove_attribute - remove_package_symbol - add_role - /], - memoize => { - class_precedence_list => 'ARRAY', - linearized_isa => 'ARRAY', # FIXME perl 5.10 memoizes this on its own, no need? - get_all_methods => 'ARRAY', - #get_all_attributes => 'ARRAY', # it's an alias, no need, but maybe in the future - compute_all_applicable_attributes => 'ARRAY', - get_meta_instance => 'SCALAR', - get_method_map => 'SCALAR', - calculate_all_roles => 'ARRAY', - }, - # NOTE: - # this is ugly, but so are typeglobs, - # so whattayahgonnadoboutit - # - SL - wrapped => { - add_package_symbol => sub { - my $original = shift; - $self->throw_error("Cannot add package symbols to an immutable metaclass") - unless (caller(2))[3] eq 'Class::MOP::Package::get_package_symbol'; - goto $original->body; - }, - }, - }); - return $class; -} -sub make_immutable { +sub _default_immutable_transformer_options { my $self = shift; - $self->SUPER::make_immutable - ( - constructor_class => $self->constructor_class, - destructor_class => $self->destructor_class, - inline_destructor => 1, - # NOTE: - # no need to do this, - # Moose always does it - inline_accessors => 0, - @_, - ); + + my %options = $self->SUPER::_default_immutable_transformer_options; + + # We need to copy the references as we do not want to alter the + # superclass's references. + $options{cannot_call} = [ @{ $options{cannot_call} }, 'add_role' ]; + $options{memoize} = { + %{ $options{memoize} }, + calculate_all_roles => 'ARRAY', + }; + + %options = ( + %options, + constructor_class => $self->constructor_class, + destructor_class => $self->destructor_class, + inline_destructor => 1, + + # Moose always does this when an attribute is created + inline_accessors => 0, + ); + + return %options } our $error_level; @@ -703,157 +607,120 @@ Moose::Meta::Class - The Moose metaclass =head1 DESCRIPTION -This is a subclass of L with Moose specific -extensions. - -For the most part, the only time you will ever encounter an -instance of this class is if you are doing some serious deep -introspection. To really understand this class, you need to refer -to the L documentation. - -=head1 METHODS +This class is a subclass of L that provides +additional Moose-specific functionality. -=over 4 +To really understand this class, you will need to start with the +L documentation. This class can be understood as a +set of additional features on top of the basic feature provided by +that parent class. -=item B +=head1 INHERITANCE -=item B +C is a subclass of L. -Overrides original to accept a list of roles to apply to -the created class. +=head1 METHODS - my $metaclass = Moose::Meta::Class->create( 'New::Class', roles => [...] ); +=over 4 -=item B +=item B<< Moose::Meta::Class->initialize($package_name, %options) >> -Overrides original to support roles and caching. +This overrides the parent's method in order to provide its own +defaults for the C, C, and +C options. - my $metaclass = Moose::Meta::Class->create_anon_class( - superclasses => ['Foo'], - roles => [qw/Some Roles Go Here/], - cache => 1, - ); +These all default to the appropriate Moose class. -=item B +=item B<< Moose::Meta::Class->create($package_name, %options) >> -Override original to add default options for inlining destructor -and altering the Constructor metaclass. +This overrides the parent's method in order to accept a C +option. This should be an array reference containing one more roles +that the class does. -=item B + my $metaclass = Moose::Meta::Class->create( 'New::Class', roles => [...] ); -Override original to lock C and memoize C +=item B<< Moose::Meta::Class->create_anon_class >> -=item B +This overrides the parent's method to accept a C option, just +as C does. -We override this method to support the C attribute option. +It also accepts a C option. If this is true, then the anonymous +class will be cached based on its superclasses and roles. If an +existing anonymous class in the cache has the same superclasses and +roles, it will be reused. -=item B + my $metaclass = Moose::Meta::Class->create_anon_class( + superclasses => ['Foo'], + roles => [qw/Some Roles Go Here/], + cache => 1, + ); -This provides some Moose specific extensions to this method, you -almost never call this method directly unless you really know what -you are doing. +=item B<< $metaclass->make_immutable(%options) >> -This method makes sure to handle the moose weak-ref, type-constraint -and type coercion features. +This overrides the parent's method to add a few options. Specifically, +it uses the Moose-specific constructor and destructor classes, and +enables inlining the destructor. -=item B +Also, since Moose always inlines attributes, it sets the +C option to false. -This accommodates Moose::Meta::Role::Method instances, which are -aliased, instead of added, but still need to be counted as valid -methods. +=item B<< $metaclass->new_object(%params) >> -=item B +This overrides the parent's method in order to add support for +attribute triggers. -This will create an C method modifier for you, and install -it in the package. +=item B<< $metaclass->add_override_method_modifier($name, $sub) >> -=item B +This adds an C method modifier to the package. -This will create an C method modifier for you, and install -it in the package. +=item B<< $metaclass->add_augment_method_modifier($name, $sub) >> -=item B +This adds an C method modifier to the package. -=item B +=item B<< $metaclass->calculate_all_roles >> -This will return an array of C instances which are -attached to this class. +This will return a unique array of C instances +which are attached to this class. -=item B +=item B<< $metaclass->add_role($role) >> -This takes an instance of C in C<$role>, and adds it -to the list of associated roles. +This takes a L object, and adds it to the class's +list of roles. This I actually apply the role to the class. -=item B +=item B<< $metaclass->does_role($role_name) >> -This will test if this class C a given C<$role_name>. It will -not only check it's local roles, but ask them as well in order to -cascade down the role hierarchy. +This returns a boolean indicating whether or not the class does the +specified role. This tests both the class and its parents. -=item B +=item B<< $metaclass->excludes_role($role_name) >> -This will test if this class C a given C<$role_name>. It will -not only check it's local roles, but ask them as well in order to -cascade down the role hierarchy. +A class excludes a role if it has already composed a role which +excludes the named role. This tests both the class and its parents. -=item B +=item B<< $metaclass->add_attribute($attr_name, %params|$params) >> -This method does the same thing as L, but adds -support for taking the C<$params> as a HASH ref. +This overrides the parent's method in order to allow the parameters to +be provided as a hash reference. -=item B +=item B<< $metaclass->constructor_class ($class_name) >> -=item B +=item B<< $metaclass->destructor_class ($class_name) >> These are the names of classes used when making a class immutable. These default to L and L respectively. These accessors are read-write, so you can use them to change the class name. -=item B +=item B<< $metaclass->error_class($class_name) >> -Moose overrides this method from C and attempts to -fix some incompatibilities before doing the check. +The name of the class used to throw errors. This defaults to +L, which generates an error with a stacktrace +just like C. -=item B +=item B<< $metaclass->throw_error($message, %extra) >> Throws the error created by C using C -=item B - -Creates an error message or object. - -The default behavior is C. - -If C is set uses C. Otherwise uses -C (a code reference or variant name), and calls the appropriate -C method. - -=item B - -Get or set the error builder. Defaults to C. - -=item B - -Get or set the error class. Has no default. - -=item B - -Creates an error using L - -=item B - -Creates an error using L - -=item B - -Calls C on the C parameter in C<%args>. Usable with C -to support custom error objects for your meta class. - -=item B - -Dies with an error object or string. - =back =head1 BUGS @@ -868,7 +735,7 @@ Stevan Little Estevan@iinteractive.comE =head1 COPYRIGHT AND LICENSE -Copyright 2006-2008 by Infinity Interactive, Inc. +Copyright 2006-2009 by Infinity Interactive, Inc. L