X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FMeta%2FRole.pm;h=693a8ac74e79040e4f4b1a9f44aed2403ed925cd;hb=1aefb2640d9e0e6d93a32a4df388321fec990b9e;hp=480f76719f0c6fa013ece26357abf90e28d5f6ba;hpb=2e7576bdd6c4a179beadc2d21623c6cad1d66469;p=gitmo%2FMoose.git diff --git a/lib/Moose/Meta/Role.pm b/lib/Moose/Meta/Role.pm index 480f767..693a8ac 100644 --- a/lib/Moose/Meta/Role.pm +++ b/lib/Moose/Meta/Role.pm @@ -9,7 +9,7 @@ use Scalar::Util 'blessed'; use Carp 'confess'; use Devel::GlobalDestruction 'in_global_destruction'; -our $VERSION = '0.96'; +our $VERSION = '1.17'; $VERSION = eval $VERSION; our $AUTHORITY = 'cpan:STEVAN'; @@ -18,9 +18,15 @@ 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'; +use base 'Class::MOP::Module', + 'Class::MOP::Mixin::HasAttributes', + 'Class::MOP::Mixin::HasMethods'; + +Class::MOP::MiniTrait::apply(__PACKAGE__, 'Moose::Meta::Object::Trait'); ## ------------------------------------------------------------------ ## NOTE: @@ -155,12 +161,22 @@ $META->add_attribute( sub initialize { my $class = shift; my $pkg = shift; - return Class::MOP::get_metaclass_by_name($pkg) - || $class->SUPER::initialize( + + 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 { @@ -183,11 +199,31 @@ sub reinitialize { ); } - return $self->SUPER::reinitialize( + 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 { @@ -197,6 +233,9 @@ sub add_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" ); + } return $self->SUPER::add_attribute(@_); } @@ -343,6 +382,7 @@ sub update_package_cache_flag { } +sub _meta_method_class { 'Moose::Meta::Method::Meta' } ## ------------------------------------------------------------------ ## subroles @@ -386,20 +426,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"); @@ -416,7 +448,39 @@ 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}?)" + ); + } + + 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 { } @@ -463,11 +527,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 )}; @@ -476,10 +544,8 @@ 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}}) { @@ -495,12 +561,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 @@ -526,6 +602,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); } @@ -735,6 +812,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 @@ -879,7 +960,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