X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FMeta%2FRole.pm;h=3a459f47234d65dc7c4620f3fd63f861f858b47e;hb=6f73c55516ec2357f17bc19f8a8afbf08ee485ea;hp=a01a8dba57cfc4ab0f1ccf73db8a10fa4b5968ea;hpb=c8b8d92f366e6d9c09c0bb2a54b4f1942fc665ef;p=gitmo%2FMoose.git diff --git a/lib/Moose/Meta/Role.pm b/lib/Moose/Meta/Role.pm index a01a8db..3a459f4 100644 --- a/lib/Moose/Meta/Role.pm +++ b/lib/Moose/Meta/Role.pm @@ -7,19 +7,26 @@ use metaclass; use Scalar::Util 'blessed'; use Carp 'confess'; -use Sub::Name 'subname'; use Devel::GlobalDestruction 'in_global_destruction'; -our $VERSION = '0.89'; +our $VERSION = '1.15'; $VERSION = eval $VERSION; our $AUTHORITY = 'cpan:STEVAN'; use Moose::Meta::Class; +use Moose::Meta::Role::Attribute; use Moose::Meta::Role::Method; use Moose::Meta::Role::Method::Required; use Moose::Meta::Role::Method::Conflicting; +use Moose::Meta::Method::Meta; +use Moose::Util qw( ensure_all_roles ); +use Class::MOP::MiniTrait; -use base 'Class::MOP::Module'; +use base 'Class::MOP::Module', + 'Class::MOP::Mixin::HasAttributes', + 'Class::MOP::Mixin::HasMethods'; + +Class::MOP::MiniTrait::apply(__PACKAGE__, 'Moose::Meta::Object::Trait'); ## ------------------------------------------------------------------ ## NOTE: @@ -71,16 +78,6 @@ foreach my $action ( existence => 'requires_method', } }, - { - name => 'attribute_map', - attr_reader => 'get_attribute_map', - methods => { - get => 'get_attribute', - get_keys => 'get_attribute_list', - existence => 'has_attribute', - remove => 'remove_attribute', - } - } ) { my $attr_reader = $action->{attr_reader}; @@ -160,23 +157,93 @@ $META->add_attribute( default => 'Moose::Meta::Role::Application::ToInstance', ); -## some things don't always fit, so they go here ... +# More or less copied from Moose::Meta::Class +sub initialize { + my $class = shift; + my $pkg = shift; -sub add_attribute { + if (defined(my $meta = Class::MOP::get_metaclass_by_name($pkg))) { + return $meta; + } + + my %options = @_; + + my $meta = $class->SUPER::initialize( + $pkg, + 'attribute_metaclass' => 'Moose::Meta::Role::Attribute', + %options, + ); + + Class::MOP::weaken_metaclass($pkg) if $options{weaken}; + + return $meta; +} + +sub reinitialize { my $self = shift; - my $name = shift; - unless ( defined $name ) { - require Moose; - Moose->throw_error("You must provide a name for the attribute"); + my $pkg = shift; + + my $meta = blessed $pkg ? $pkg : Class::MOP::class_of($pkg); + + my %existing_classes; + if ($meta) { + %existing_classes = map { $_ => $meta->$_() } qw( + attribute_metaclass + method_metaclass + wrapped_method_metaclass + required_method_metaclass + conflicting_method_metaclass + application_to_class_class + application_to_role_class + application_to_instance_class + ); } - my $attr_desc; - if (scalar @_ == 1 && ref($_[0]) eq 'HASH') { - $attr_desc = $_[0]; + + my %options = @_; + $options{weaken} = Class::MOP::metaclass_is_weak($meta->name) + if !exists $options{weaken} + && blessed($meta) + && $meta->isa('Moose::Meta::Role'); + + # don't need to remove generated metaobjects here yet, since we don't + # yet generate anything in roles. this may change in the future though... + # keep an eye on that + my $new_meta = $self->SUPER::reinitialize( + $pkg, + %existing_classes, + %options, + ); + $new_meta->_restore_metaobjects_from($meta) + if $meta && $meta->isa('Moose::Meta::Role'); + return $new_meta; +} + +sub _restore_metaobjects_from { + my $self = shift; + my ($old_meta) = @_; + + $self->_restore_metamethods_from($old_meta); + $self->_restore_metaattributes_from($old_meta); +} + +sub add_attribute { + my $self = shift; + + if (blessed $_[0] && ! $_[0]->isa('Moose::Meta::Role::Attribute') ) { + my $class = ref $_[0]; + Moose->throw_error( "Cannot add a $class as an attribute to a role" ); } - else { - $attr_desc = { @_ }; + elsif (!blessed($_[0]) && defined($_[0]) && $_[0] =~ /^\+(.*)/) { + Moose->throw_error( "has '+attr' is not supported in roles" ); } - $self->get_attribute_map->{$name} = $attr_desc; + + return $self->SUPER::add_attribute(@_); +} + +sub _attach_attribute { + my ( $self, $attribute ) = @_; + + $attribute->attach_to_role($self); } sub add_required_methods { @@ -315,6 +382,7 @@ sub update_package_cache_flag { } +sub _meta_method_class { 'Moose::Meta::Method::Meta' } ## ------------------------------------------------------------------ ## subroles @@ -343,9 +411,10 @@ sub calculate_all_roles { } sub does_role { - my ($self, $role_name) = @_; - (defined $role_name) + my ($self, $role) = @_; + (defined $role) || Moose->throw_error("You must supply a role name to look for"); + my $role_name = blessed $role ? $role->name : $role; # if we are it,.. then return true return 1 if $role_name eq $self->name; # otherwise.. check our children @@ -355,143 +424,14 @@ sub does_role { return 0; } -## ------------------------------------------------------------------ -## methods - -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 $role_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); - my $meta = Class::MOP::class_of($pkg); - - 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 - # 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 $role_name || - (($name || '') ne '__ANON__' && ($pkg || '') ne $role_name); - } - } - - $map->{$symbol} = $method_metaclass->wrap( - $code, - package_name => $role_name, - name => $name - ); - } - - return $map; -} - -sub get_method { - my ($self, $name) = @_; - $self->get_method_map->{$name}; -} - -sub has_method { - my ($self, $name) = @_; - exists $self->get_method_map->{$name} ? 1 : 0 -} - -# FIXME this is copy-pasted from Class::MOP::Class -# refactor to inherit from some common base -sub wrap_method_body { - my ( $self, %args ) = @_; - - ('CODE' eq ref $args{body}) - || Moose->throw_error("Your code block must be a CODE reference"); - - $self->method_metaclass->wrap( - package_name => $self->name, - %args, - ); -} - -sub add_method { - my ($self, $method_name, $method) = @_; - (defined $method_name && $method_name) - || Moose->throw_error("You must define a method name"); - - my $body; - if (blessed($method)) { - $body = $method->body; - if ($method->package_name ne $self->name) { - $method = $method->clone( - package_name => $self->name, - name => $method_name - ) if $method->can('clone'); - } - } - else { - $body = $method; - $method = $self->wrap_method_body( body => $body, name => $method_name ); - } - - $method->attach_to_class($self); - - $self->get_method_map->{$method_name} = $method; - - my $full_method_name = ($self->name . '::' . $method_name); - $self->add_package_symbol( - { sigil => '&', type => 'CODE', name => $method_name }, - 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 -} - sub find_method_by_name { (shift)->get_method(@_) } -sub get_method_list { - my $self = shift; - grep { !/^meta$/ } keys %{$self->get_method_map}; -} - -sub alias_method { - Carp::cluck("The alias_method method is deprecated. Use add_method instead.\n"); - - my $self = shift; - - $self->add_method(@_); -} - ## ------------------------------------------------------------------ ## role construction ## ------------------------------------------------------------------ sub apply { - my ($self, $other, @args) = @_; + my ($self, $other, %args) = @_; (blessed($other)) || Moose->throw_error("You must pass in an blessed instance"); @@ -508,19 +448,23 @@ sub apply { } Class::MOP::load_class($application_class); - return $application_class->new(@args)->apply($self, $other); + return $application_class->new(%args)->apply($self, $other, \%args); } +sub composition_class_roles { } + sub combine { my ($class, @role_specs) = @_; - require Moose::Meta::Role::Application::RoleSummation; require Moose::Meta::Role::Composite; my (@roles, %role_params); while (@role_specs) { - my ($role_name, $params) = @{ splice @role_specs, 0, 1 }; - my $requested_role = Class::MOP::class_of($role_name); + my ($role, $params) = @{ splice @role_specs, 0, 1 }; + my $requested_role + = blessed $role + ? $role + : Class::MOP::class_of($role); my $actual_role = $requested_role->_role_for_combination($params); push @roles => $actual_role; @@ -530,11 +474,7 @@ sub combine { } my $c = Moose::Meta::Role::Composite->new(roles => \@roles); - Moose::Meta::Role::Application::RoleSummation->new( - role_params => \%role_params - )->apply($c); - - return $c; + return $c->apply_params(\%role_params); } sub _role_for_combination { @@ -555,11 +495,15 @@ sub create { || confess "You must pass a HASH ref of methods" if exists $options{methods}; + $options{meta_name} = 'meta' + unless exists $options{meta_name}; + my (%initialize_options) = %options; delete @initialize_options{qw( package attributes methods + meta_name version authority )}; @@ -568,15 +512,14 @@ sub create { $meta->_instantiate_module( $options{version}, $options{authority} ); - # FIXME totally lame - $meta->add_method('meta' => sub { - $role->initialize(ref($_[0]) || $_[0]); - }); + $meta->_add_meta_method($options{meta_name}) + if defined $options{meta_name}; if (exists $options{attributes}) { foreach my $attribute_name (keys %{$options{attributes}}) { my $attr = $options{attributes}->{$attribute_name}; - $meta->add_attribute($attribute_name => $attr); + $meta->add_attribute( + $attribute_name => blessed $attr ? $attr : %{$attr} ); } } @@ -586,12 +529,22 @@ sub create { } } - Class::MOP::weaken_metaclass($meta->name) - if $meta->is_anon_role; - return $meta; } +sub consumers { + my $self = shift; + my @consumers; + for my $meta (Class::MOP::get_all_metaclass_instances) { + next if $meta->name eq $self->name; + next unless $meta->isa('Moose::Meta::Class') + || $meta->isa('Moose::Meta::Role'); + push @consumers, $meta->name + if $meta->does_role($self->name); + } + return @consumers; +} + # anonymous roles. most of it is copied straight out of Class::MOP::Class. # an intrepid hacker might find great riches if he unifies this code with that # code in Class::MOP::Module or Class::MOP::Package @@ -617,6 +570,7 @@ sub create { sub create_anon_role { my ($role, %options) = @_; + $options{weaken} = 1 unless exists $options{weaken}; my $package_name = $ANON_ROLE_PREFIX . ++$ANON_ROLE_SERIAL; return $role->create($package_name, %options); } @@ -664,7 +618,7 @@ sub create { ##################################################################### # # has 'roles' => ( -# metaclass => 'Collection::Array', +# metaclass => 'Array', # reader => 'get_roles', # isa => 'ArrayRef[Moose::Meta::Role]', # default => sub { [] }, @@ -674,7 +628,7 @@ sub create { # ); # # has 'excluded_roles_map' => ( -# metaclass => 'Collection::Hash', +# metaclass => 'Hash', # reader => 'get_excluded_roles_map', # isa => 'HashRef[Str]', # provides => { @@ -685,22 +639,8 @@ sub create { # } # ); # -# has 'attribute_map' => ( -# metaclass => 'Collection::Hash', -# reader => 'get_attribute_map', -# 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', -# } -# ); -# # has 'required_methods' => ( -# metaclass => 'Collection::Hash', +# metaclass => 'Hash', # reader => 'get_required_methods_map', # isa => 'HashRef[Moose::Meta::Role::Method::Required]', # provides => { @@ -717,7 +657,7 @@ sub create { # # CODE refs to apply in that order # # has 'before_method_modifiers' => ( -# metaclass => 'Collection::Hash', +# metaclass => 'Hash', # reader => 'get_before_method_modifiers_map', # isa => 'HashRef[ArrayRef[CodeRef]]', # provides => { @@ -731,7 +671,7 @@ sub create { # ); # # has 'after_method_modifiers' => ( -# metaclass => 'Collection::Hash', +# metaclass => 'Hash', # reader =>'get_after_method_modifiers_map', # isa => 'HashRef[ArrayRef[CodeRef]]', # provides => { @@ -745,7 +685,7 @@ sub create { # ); # # has 'around_method_modifiers' => ( -# metaclass => 'Collection::Hash', +# metaclass => 'Hash', # reader =>'get_around_method_modifiers_map', # isa => 'HashRef[ArrayRef[CodeRef]]', # provides => { @@ -763,7 +703,7 @@ sub create { # # but instead just a single name->code mapping # # has 'override_method_modifiers' => ( -# metaclass => 'Collection::Hash', +# metaclass => 'Hash', # reader =>'get_override_method_modifiers_map', # isa => 'HashRef[CodeRef]', # provides => { @@ -811,13 +751,21 @@ This method creates a new role object with the provided name. =item B<< Moose::Meta::Role->combine( [ $role => { ... } ], [ $role ], ... ) >> This method accepts a list of array references. Each array reference -should contain a role name as its first element. The second element is +should contain a role name or L object as its first element. The second element is an optional hash reference. The hash reference can contain C<-excludes> and C<-alias> keys to control how methods are composed from the role. The return value is a new L that represents the combined roles. +=item B<< $metarole->composition_class_roles >> + +When combining multiple roles using C, this method is used to obtain a +list of role names to be applied to the L +instance returned by C. The default implementation returns an empty +list. Extensions that need to hook into role combination may wrap this method +to return additional role names. + =item B<< Moose::Meta::Role->create($name, %options) >> This method is identical to the L C @@ -832,6 +780,10 @@ C method. Returns true if the role is an anonymous role. +=item B<< $metarole->consumers >> + +Returns a list of names of classes and roles which consume this role. + =back =head2 Role application @@ -867,10 +819,10 @@ list may include duplicates. This returns a I list of all roles that this role does, and all the roles that its roles do. -=item B<< $metarole->does_role($role_name) >> +=item B<< $metarole->does_role($role) >> -Given a role I, returns true if this role does the given -role. +Given a role I or L object, returns true if this role +does the given role. =item B<< $metarole->add_role($role) >> @@ -913,12 +865,10 @@ L. =item B<< $metarole->get_method_list >> -=item B<< $metarole->get_method_map >> - =item B<< $metarole->find_method_by_name($name) >> These methods are all identical to the methods of the same name in -L +L =back @@ -941,8 +891,6 @@ This is quite likely to change in the future. =item B<< $metarole->has_attribute($attribute_name) >> -=item B<< $metarole->get_attribute_map >> - =item B<< $metarole->get_attribute_list >> =item B<< $metarole->add_attribute($name, %options) >> @@ -980,7 +928,7 @@ object, then add it to the required method list. =head2 Method modifiers -These methods act like their counterparts in L and +These methods act like their counterparts in L and L. However, method modifiers are simply stored internally, and are not @@ -1037,9 +985,7 @@ This will return a L instance for this class. =head1 BUGS -All complex software has bugs lurking in it, and this module is no -exception. If you find a bug please either email me, or add the bug -to cpan-RT. +See L for details on reporting bugs. =head1 AUTHOR @@ -1047,7 +993,7 @@ Stevan Little Estevan@iinteractive.comE =head1 COPYRIGHT AND LICENSE -Copyright 2006-2009 by Infinity Interactive, Inc. +Copyright 2006-2010 by Infinity Interactive, Inc. L