X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FMeta%2FRole.pm;h=0fcfc40cf3f53927a6f7c617ffbca0c393a676d4;hb=436d7a280efd1a65df197acefcc61b590a171f5d;hp=7738207078584068fc0a8b65bc0bf36b3de8b0a1;hpb=56d7c7453888ed2c684bcdb1d905841d8d03aeb1;p=gitmo%2FMoose.git diff --git a/lib/Moose/Meta/Role.pm b/lib/Moose/Meta/Role.pm index 7738207..0fcfc40 100644 --- a/lib/Moose/Meta/Role.pm +++ b/lib/Moose/Meta/Role.pm @@ -7,8 +7,10 @@ use metaclass; use Scalar::Util 'blessed'; use Carp 'confess'; +use Sub::Name 'subname'; +use Devel::GlobalDestruction 'in_global_destruction'; -our $VERSION = '0.73'; +our $VERSION = '0.77'; $VERSION = eval $VERSION; our $AUTHORITY = 'cpan:STEVAN'; @@ -23,8 +25,8 @@ use base 'Class::MOP::Module'; ## I normally don't do this, but I am doing ## a whole bunch of meta-programmin in this ## module, so it just makes sense. For a clearer -## picture of what is going on in the next -## several lines of code, look at the really +## picture of what is going on in the next +## several lines of code, look at the really ## big comment at the end of this file (right ## before the POD). ## - SL @@ -41,7 +43,7 @@ my $META = __PACKAGE__->meta; # time when it is applied to a class. This means # keeping a lot of things in hash maps, so we are # using a little of that meta-programmin' magic -# here an saving lots of extra typin. And since +# here an saving lots of extra typin. And since # many of these attributes above require similar # functionality to support them, so we again use # the wonders of meta-programmin' to deliver a @@ -68,7 +70,7 @@ foreach my $action ( get_list => 'get_required_method_list', existence => 'requires_method', } - }, + }, { name => 'attribute_map', attr_reader => 'get_attribute_map', @@ -117,6 +119,12 @@ foreach my $action ( }) if exists $methods->{remove}; } +$META->add_attribute( + 'method_metaclass', + reader => 'method_metaclass', + default => 'Moose::Meta::Role::Method', +); + ## some things don't always fit, so they go here ... sub add_attribute { @@ -136,15 +144,6 @@ sub add_attribute { $self->get_attribute_map->{$name} = $attr_desc; } -# DEPRECATED -# sub _clean_up_required_methods { -# my $self = shift; -# foreach my $method ($self->get_required_method_list) { -# $self->remove_required_methods($method) -# if $self->has_method($method); -# } -# } - ## ------------------------------------------------------------------ ## method modifiers @@ -159,12 +158,12 @@ sub add_attribute { foreach my $modifier_type (qw[ before around after ]) { my $attr_reader = "get_${modifier_type}_method_modifiers_map"; - + # create the attribute ... $META->add_attribute("${modifier_type}_method_modifiers" => ( reader => $attr_reader, default => sub { {} } - )); + )); # and some helper methods ... $META->add_method("get_${modifier_type}_method_modifiers" => sub { @@ -256,7 +255,7 @@ sub update_package_cache_flag { ## ------------------------------------------------------------------ ## subroles -__PACKAGE__->meta->add_attribute('roles' => ( +$META->add_attribute('roles' => ( reader => 'get_roles', default => sub { [] } )); @@ -295,8 +294,6 @@ sub does_role { ## ------------------------------------------------------------------ ## methods -sub method_metaclass { 'Moose::Meta::Role::Method' } - sub get_method_map { my $self = shift; @@ -323,45 +320,37 @@ sub get_method_map { $map->{$symbol}->body == $code; my ($pkg, $name) = Class::MOP::get_code_info($code); + my $meta = Class::MOP::class_of($pkg); - 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) } # FIXME calls meta - && $pkg->meta->isa('Moose::Meta::Role')) { - my $role = $pkg->meta->name; + if ($meta && $meta->isa('Moose::Meta::Role')) { + my $role = $meta->name; next unless $self->does_role($role); } else { # NOTE: - # in 5.10 constant.pm the constants show up + # 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 + # 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 $role_name || (($name || '') ne '__ANON__' && ($pkg || '') ne $role_name); - } + } } - + $map->{$symbol} = $method_metaclass->wrap( $code, package_name => $role_name, - name => $name + name => $name ); } - return $map; + return $map; } -sub get_method { +sub get_method { my ($self, $name) = @_; $self->get_method_map->{$name}; } @@ -396,7 +385,7 @@ sub add_method { if ($method->package_name ne $self->name) { $method = $method->clone( package_name => $self->name, - name => $method_name + name => $method_name ) if $method->can('clone'); } } @@ -412,7 +401,7 @@ sub add_method { my $full_method_name = ($self->name . '::' . $method_name); $self->add_package_symbol( { sigil => '&', type => 'CODE', name => $method_name }, - Class::MOP::subname($full_method_name => $body) + subname($full_method_name => $body) ); $self->update_package_cache_flag; # still valid, since we just added the method to the map, and if it was invalid before that then get_method_map updated it @@ -426,6 +415,8 @@ sub get_method_list { } sub alias_method { + Carp::cluck("The alias_method method is deprecated. Use add_method instead.\n"); + my $self = shift; $self->add_method(@_); @@ -440,7 +431,7 @@ sub apply { (blessed($other)) || Moose->throw_error("You must pass in an blessed instance"); - + if ($other->isa('Moose::Meta::Role')) { require Moose::Meta::Role::Application::ToRole; return Moose::Meta::Role::Application::ToRole->new(@args)->apply($self, $other); @@ -448,35 +439,44 @@ sub apply { elsif ($other->isa('Moose::Meta::Class')) { require Moose::Meta::Role::Application::ToClass; return Moose::Meta::Role::Application::ToClass->new(@args)->apply($self, $other); - } + } else { require Moose::Meta::Role::Application::ToInstance; - return Moose::Meta::Role::Application::ToInstance->new(@args)->apply($self, $other); - } + return Moose::Meta::Role::Application::ToInstance->new(@args)->apply($self, $other); + } } sub combine { my ($class, @role_specs) = @_; - + require Moose::Meta::Role::Application::RoleSummation; - require Moose::Meta::Role::Composite; - + require Moose::Meta::Role::Composite; + my (@roles, %role_params); while (@role_specs) { - my ($role, $params) = @{ splice @role_specs, 0, 1 }; - push @roles => $role->meta; + my ($role_name, $params) = @{ splice @role_specs, 0, 1 }; + my $requested_role = Class::MOP::class_of($role_name); + + my $actual_role = $requested_role->role_for_combination($params); + push @roles => $actual_role; + next unless defined $params; - $role_params{$role} = $params; + $role_params{$actual_role->name} = $params; } - + my $c = Moose::Meta::Role::Composite->new(roles => \@roles); Moose::Meta::Role::Application::RoleSummation->new( role_params => \%role_params )->apply($c); - + return $c; } +sub role_for_combination { + my ($self, $params) = @_; + return $self; +} + sub create { my ( $role, $package_name, %options ) = @_; @@ -490,8 +490,6 @@ sub create { || confess "You must pass a HASH ref of methods" if exists $options{methods}; - $role->SUPER::create(%options); - my (%initialize_options) = %options; delete @initialize_options{qw( package @@ -503,6 +501,8 @@ sub create { my $meta = $role->initialize( $package_name => %initialize_options ); + $meta->_instantiate_module( $options{version}, $options{authority} ); + # FIXME totally lame $meta->add_method('meta' => sub { $role->initialize(ref($_[0]) || $_[0]); @@ -565,7 +565,7 @@ sub create { sub DESTROY { my $self = shift; - return if Class::MOP::in_global_destruction(); # it'll happen soon anyway and this just makes things more complicated + return if in_global_destruction(); # it'll happen soon anyway and this just makes things more complicated no warnings 'uninitialized'; return unless $self->name =~ /^$ANON_ROLE_PREFIX/; @@ -592,8 +592,8 @@ sub create { ##################################################################### ## NOTE: -## This is Moose::Meta::Role as defined by Moose (plus the use of -## MooseX::AttributeHelpers module). It is here as a reference to +## This is Moose::Meta::Role as defined by Moose (plus the use of +## MooseX::AttributeHelpers module). It is here as a reference to ## make it easier to see what is happening above with all the meta ## programming. - SL ##################################################################### @@ -607,7 +607,7 @@ sub create { # 'push' => 'add_role', # } # ); -# +# # has 'excluded_roles_map' => ( # metaclass => 'Collection::Hash', # reader => 'get_excluded_roles_map', @@ -619,95 +619,95 @@ sub create { # 'exists' => 'excludes_role', # } # ); -# +# # has 'attribute_map' => ( # metaclass => 'Collection::Hash', # reader => 'get_attribute_map', -# isa => 'HashRef[Str]', +# isa => 'HashRef[Str]', # provides => { # # 'set' => 'add_attribute' # has some special crap in it # 'get' => 'get_attribute', # 'keys' => 'get_attribute_list', # 'exists' => 'has_attribute', # # Not exactly delete, cause it sets multiple -# 'delete' => 'remove_attribute', +# 'delete' => 'remove_attribute', # } # ); -# +# # has 'required_methods' => ( # metaclass => 'Collection::Hash', # reader => 'get_required_methods_map', # isa => 'HashRef[Str]', -# provides => { -# # not exactly set, or delete since it works for multiple +# provides => { +# # not exactly set, or delete since it works for multiple # 'set' => 'add_required_methods', # 'delete' => 'remove_required_methods', # 'keys' => 'get_required_method_list', -# 'exists' => 'requires_method', +# 'exists' => 'requires_method', # } # ); -# -# # the before, around and after modifiers are -# # HASH keyed by method-name, with ARRAY of +# +# # the before, around and after modifiers are +# # HASH keyed by method-name, with ARRAY of # # CODE refs to apply in that order -# +# # has 'before_method_modifiers' => ( -# metaclass => 'Collection::Hash', +# metaclass => 'Collection::Hash', # reader => 'get_before_method_modifiers_map', # isa => 'HashRef[ArrayRef[CodeRef]]', # provides => { # 'keys' => 'get_before_method_modifiers', -# 'exists' => 'has_before_method_modifiers', -# # This actually makes sure there is an +# 'exists' => 'has_before_method_modifiers', +# # This actually makes sure there is an # # ARRAY at the given key, and pushed onto # # it. It also checks for duplicates as well -# # 'add' => 'add_before_method_modifier' -# } +# # 'add' => 'add_before_method_modifier' +# } # ); -# +# # has 'after_method_modifiers' => ( -# metaclass => 'Collection::Hash', +# metaclass => 'Collection::Hash', # reader =>'get_after_method_modifiers_map', # isa => 'HashRef[ArrayRef[CodeRef]]', # provides => { # 'keys' => 'get_after_method_modifiers', -# 'exists' => 'has_after_method_modifiers', -# # This actually makes sure there is an +# 'exists' => 'has_after_method_modifiers', +# # This actually makes sure there is an # # ARRAY at the given key, and pushed onto -# # it. It also checks for duplicates as well -# # 'add' => 'add_after_method_modifier' -# } +# # it. It also checks for duplicates as well +# # 'add' => 'add_after_method_modifier' +# } # ); -# +# # has 'around_method_modifiers' => ( -# metaclass => 'Collection::Hash', +# metaclass => 'Collection::Hash', # reader =>'get_around_method_modifiers_map', # isa => 'HashRef[ArrayRef[CodeRef]]', # provides => { # 'keys' => 'get_around_method_modifiers', -# 'exists' => 'has_around_method_modifiers', -# # This actually makes sure there is an +# 'exists' => 'has_around_method_modifiers', +# # This actually makes sure there is an # # ARRAY at the given key, and pushed onto -# # it. It also checks for duplicates as well -# # 'add' => 'add_around_method_modifier' -# } +# # it. It also checks for duplicates as well +# # 'add' => 'add_around_method_modifier' +# } # ); -# +# # # override is similar to the other modifiers # # except that it is not an ARRAY of code refs # # but instead just a single name->code mapping -# +# # has 'override_method_modifiers' => ( -# metaclass => 'Collection::Hash', +# metaclass => 'Collection::Hash', # reader =>'get_override_method_modifiers_map', -# isa => 'HashRef[CodeRef]', +# isa => 'HashRef[CodeRef]', # provides => { # 'keys' => 'get_override_method_modifier', -# 'exists' => 'has_override_method_modifier', -# 'add' => 'add_override_method_modifier', # checks for local method .. +# 'exists' => 'has_override_method_modifier', +# 'add' => 'add_override_method_modifier', # checks for local method .. # } # ); -# +# ##################################################################### @@ -753,6 +753,12 @@ and C keys to control how methods are composed from the role. The return value is a new L that represents the combined roles. +=item B<< Moose::Meta::Role->role_for_combination($options) >> + +This is a hook for incorporating role-combination parameters. This +method returns a role meta-object (by default the invocant role) to be +used for the combination. + =item B<< Moose::Meta::Role->create($name, %options) >> This method is identical to the L C @@ -782,6 +788,10 @@ L, object, a L object, or a The options are passed directly to the constructor for the appropriate L subclass. +Note that this will apply the role even if the C<$thing> in question already +C this role. L is a convenient wrapper for +finding out if role application is necessary. + =back =head2 Roles and other roles