X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FMeta%2FRole.pm;h=4aa0b4be3db1c69be9675b4ef61dd316338ec209;hb=24aab1abaa65d987539fb040c8362ba72cdb361b;hp=d739132673760b08adc2f57e71cb8151905a86fa;hpb=8de5717850eb1f406e5f71d2ccfac33c72cc490b;p=gitmo%2FMoose.git diff --git a/lib/Moose/Meta/Role.pm b/lib/Moose/Meta/Role.pm index d739132..4aa0b4b 100644 --- a/lib/Moose/Meta/Role.pm +++ b/lib/Moose/Meta/Role.pm @@ -7,19 +7,22 @@ use metaclass; use Scalar::Util 'blessed'; use Carp 'confess'; -use Sub::Name 'subname'; use Devel::GlobalDestruction 'in_global_destruction'; -our $VERSION = '0.92'; -$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', + 'Class::MOP::Mixin::HasAttributes', + 'Class::MOP::Mixin::HasMethods'; -use base 'Class::MOP::Module'; +Class::MOP::MiniTrait::apply(__PACKAGE__, 'Moose::Meta::Object::Trait'); ## ------------------------------------------------------------------ ## NOTE: @@ -71,16 +74,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}; @@ -161,28 +154,95 @@ $META->add_attribute( ); $META->add_attribute( - 'composition_class_roles', - reader => 'composition_class_roles', - predicate => 'has_composition_class_roles', + 'applied_attribute_metaclass', + reader => 'applied_attribute_metaclass', + default => 'Moose::Meta::Attribute', ); -## some things don't always fit, so they go here ... +# More or less copied from Moose::Meta::Class +sub initialize { + my $class = shift; + my @args = @_; + unshift @args, 'package' if @args % 2; + my %opts = @args; + my $package = delete $opts{package}; + return Class::MOP::get_metaclass_by_name($package) + || $class->SUPER::initialize($package, + 'attribute_metaclass' => 'Moose::Meta::Role::Attribute', + %opts, + ); +} -sub add_attribute { +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 + applied_attribute_metaclass + ); } - 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); + + for my $role ( @{ $old_meta->get_roles } ) { + $self->add_role($role); } - else { - $attr_desc = { @_ }; +} + +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" ); + } + 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 { @@ -314,13 +374,7 @@ sub get_method_modifier_list { keys %{$self->$accessor}; } -sub reset_package_cache_flag { (shift)->{'_package_cache_flag'} = undef } -sub update_package_cache_flag { - my $self = shift; - $self->{'_package_cache_flag'} = Class::MOP::check_package_cache_flag($self->name); -} - - +sub _meta_method_class { 'Moose::Meta::Method::Meta' } ## ------------------------------------------------------------------ ## subroles @@ -349,9 +403,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 @@ -363,20 +418,12 @@ sub does_role { sub find_method_by_name { (shift)->get_method(@_) } -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"); @@ -393,9 +440,44 @@ sub apply { } Class::MOP::load_class($application_class); - return $application_class->new(@args)->apply($self, $other); + + my $deprecation_check = 0; + + if ( exists $args{excludes} && !exists $args{'-excludes'} ) { + $args{'-excludes'} = delete $args{excludes}; + $deprecation_check = 1; + } + if ( exists $args{alias} && !exists $args{'-alias'} ) { + $args{'-alias'} = delete $args{alias}; + $deprecation_check = 1; + } + + if ( $deprecation_check ) { + Moose::Deprecated::deprecated( + feature => 'alias or excludes', + message => + 'The alias and excludes options for role application'. + ' have been renamed -alias and -excludes'. + " (${\$other->name} is consuming ${\$self->name}". + " - do you need to upgrade ${\$other->name}?).". + ' This will be an error in Moose 2.0200.' + ); + } + + if ( exists $args{'-excludes'} ) { + # I wish we had coercion here :) + $args{'-excludes'} = ( + ref $args{'-excludes'} eq 'ARRAY' + ? $args{'-excludes'} + : [ $args{'-excludes'} ] + ); + } + + return $application_class->new(%args)->apply($self, $other, \%args); } +sub composition_class_roles { } + sub combine { my ($class, @role_specs) = @_; @@ -403,8 +485,11 @@ sub combine { 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; @@ -423,9 +508,11 @@ sub _role_for_combination { } sub create { - my ( $role, $package_name, %options ) = @_; + my $class = shift; + my @args = @_; - $options{package} = $package_name; + unshift @args, 'package' if @args % 2 == 1; + my %options = @args; (ref $options{attributes} eq 'HASH') || confess "You must pass a HASH ref of attributes" @@ -435,104 +522,70 @@ sub create { || confess "You must pass a HASH ref of methods" if exists $options{methods}; - my (%initialize_options) = %options; - delete @initialize_options{qw( - package - attributes - methods - version - authority - )}; + (ref $options{roles} eq 'ARRAY') + || confess "You must pass an ARRAY ref of roles" + if exists $options{roles}; - my $meta = $role->initialize( $package_name => %initialize_options ); + my $package = delete $options{package}; + my $roles = delete $options{roles}; + my $attributes = delete $options{attributes}; + my $methods = delete $options{methods}; + my $meta_name = exists $options{meta_name} + ? delete $options{meta_name} + : 'meta'; - $meta->_instantiate_module( $options{version}, $options{authority} ); + my $meta = $class->SUPER::create($package => %options); - # FIXME totally lame - $meta->add_method('meta' => sub { - $role->initialize(ref($_[0]) || $_[0]); - }); + $meta->_add_meta_method($meta_name) + if defined $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); + if (defined $attributes) { + foreach my $attribute_name (keys %{$attributes}) { + my $attr = $attributes->{$attribute_name}; + $meta->add_attribute( + $attribute_name => blessed $attr ? $attr : %{$attr} ); } } - if (exists $options{methods}) { - foreach my $method_name (keys %{$options{methods}}) { - $meta->add_method($method_name, $options{methods}->{$method_name}); + if (defined $methods) { + foreach my $method_name (keys %{$methods}) { + $meta->add_method($method_name, $methods->{$method_name}); } } - Class::MOP::weaken_metaclass($meta->name) - if $meta->is_anon_role; + if ($roles) { + Moose::Util::apply_all_roles($meta, @$roles); + } return $meta; } -# 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 -{ - # NOTE: - # this should be sufficient, if you have a - # use case where it is not, write a test and - # I will change it. - my $ANON_ROLE_SERIAL = 0; - - # NOTE: - # we need a sufficiently annoying prefix - # this should suffice for now, this is - # used in a couple of places below, so - # need to put it up here for now. - my $ANON_ROLE_PREFIX = 'Moose::Meta::Role::__ANON__::SERIAL::'; - - sub is_anon_role { - my $self = shift; - no warnings 'uninitialized'; - $self->name =~ /^$ANON_ROLE_PREFIX/; +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; +} - sub create_anon_role { - my ($role, %options) = @_; - my $package_name = $ANON_ROLE_PREFIX . ++$ANON_ROLE_SERIAL; - return $role->create($package_name, %options); - } +# XXX: something more intelligent here? +sub _anon_package_prefix { 'Moose::Meta::Role::__ANON__::SERIAL::' } - # NOTE: - # this will only get called for - # anon-roles, all other calls - # are assumed to occur during - # global destruction and so don't - # really need to be handled explicitly - sub DESTROY { - my $self = shift; - - 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/; - - # XXX: is this necessary for us? I don't understand what it's doing - # -sartak - - # Moose does a weird thing where it replaces the metaclass for - # class when fixing metaclass incompatibility. In that case, - # we don't want to clean out the namespace now. We can detect - # that because Moose will explicitly update the singleton - # cache in Class::MOP. - #my $current_meta = Class::MOP::get_metaclass_by_name($self->name); - #return if $current_meta ne $self; - - my ($serial_id) = ($self->name =~ /^$ANON_ROLE_PREFIX(\d+)/); - no strict 'refs'; - foreach my $key (keys %{$ANON_ROLE_PREFIX . $serial_id}) { - delete ${$ANON_ROLE_PREFIX . $serial_id}{$key}; - } - delete ${'main::' . $ANON_ROLE_PREFIX}{$serial_id . '::'}; - } +sub create_anon_role { shift->create_anon(@_) } +sub is_anon_role { shift->is_anon(@_) } + +sub _anon_cache_key { + my $class = shift; + my %options = @_; + # Makes something like Role|Role::1 + return join '=' => ( + join( '|', sort @{ $options{roles} || [] } ), + ); } ##################################################################### @@ -565,20 +618,6 @@ sub create { # } # ); # -# has 'attribute_map' => ( -# metaclass => '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 => 'Hash', # reader => 'get_required_methods_map', @@ -658,14 +697,12 @@ sub create { 1; +# ABSTRACT: The Moose Role metaclass + __END__ =pod -=head1 NAME - -Moose::Meta::Role - The Moose Role metaclass - =head1 DESCRIPTION This class is a subclass of L that provides @@ -691,13 +728,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 @@ -712,6 +757,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 @@ -747,10 +796,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) >> @@ -819,8 +868,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) >> @@ -858,7 +905,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 @@ -915,21 +962,6 @@ 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. - -=head1 AUTHOR - -Stevan Little Estevan@iinteractive.comE - -=head1 COPYRIGHT AND LICENSE - -Copyright 2006-2009 by Infinity Interactive, Inc. - -L - -This library is free software; you can redistribute it and/or modify -it under the same terms as Perl itself. +See L for details on reporting bugs. =cut