X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FMeta%2FRole.pm;h=c8ebf15784364047dcf8077bd486a2f0cdc94013;hb=7e0492d32ce0338c6feba7710d00cb8b72e794a8;hp=18d549672fd1b24b52f80416e2b693335d6e3831;hpb=2dda1d28fae57516ba225f5760bbe73d271e9124;p=gitmo%2FMoose.git diff --git a/lib/Moose/Meta/Role.pm b/lib/Moose/Meta/Role.pm index 18d5496..c8ebf15 100644 --- a/lib/Moose/Meta/Role.pm +++ b/lib/Moose/Meta/Role.pm @@ -7,18 +7,20 @@ use metaclass; use Scalar::Util 'blessed'; use Carp 'confess'; -use Sub::Name 'subname'; use Devel::GlobalDestruction 'in_global_destruction'; -our $VERSION = '0.79'; +our $VERSION = '0.93'; $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::Util qw( ensure_all_roles ); -use base 'Class::MOP::Module'; +use base 'Class::MOP::Module', 'Class::MOP::Mixin::HasAttributes'; ## ------------------------------------------------------------------ ## NOTE: @@ -57,7 +59,7 @@ foreach my $action ( attr_reader => 'get_excluded_roles_map' , methods => { add => 'add_excluded_roles', - get_list => 'get_excluded_roles_list', + get_keys => 'get_excluded_roles_list', existence => 'excludes_role', } }, @@ -65,21 +67,11 @@ foreach my $action ( name => 'required_methods', attr_reader => 'get_required_methods_map', methods => { - remove => 'remove_required_methods', - get_list => 'get_required_method_list', - existence => 'requires_method', + remove => 'remove_required_methods', + get_values => 'get_required_method_list', + existence => 'requires_method', } }, - { - name => 'attribute_map', - attr_reader => 'get_attribute_map', - methods => { - get => 'get_attribute', - get_list => 'get_attribute_list', - existence => 'has_attribute', - remove => 'remove_attribute', - } - } ) { my $attr_reader = $action->{attr_reader}; @@ -97,10 +89,15 @@ foreach my $action ( $self->$attr_reader->{$_} = undef foreach @values; }) if exists $methods->{add}; - $META->add_method($methods->{get_list} => sub { + $META->add_method($methods->{get_keys} => sub { my ($self) = @_; keys %{$self->$attr_reader}; - }) if exists $methods->{get_list}; + }) if exists $methods->{get_keys}; + + $META->add_method($methods->{get_values} => sub { + my ($self) = @_; + values %{$self->$attr_reader}; + }) if exists $methods->{get_values}; $META->add_method($methods->{get} => sub { my ($self, $name) = @_; @@ -130,23 +127,84 @@ $META->add_attribute( default => 'Moose::Meta::Role::Method::Required', ); -## some things don't always fit, so they go here ... +$META->add_attribute( + 'conflicting_method_metaclass', + reader => 'conflicting_method_metaclass', + default => 'Moose::Meta::Role::Method::Conflicting', +); -sub add_attribute { +$META->add_attribute( + 'application_to_class_class', + reader => 'application_to_class_class', + default => 'Moose::Meta::Role::Application::ToClass', +); + +$META->add_attribute( + 'application_to_role_class', + reader => 'application_to_role_class', + default => 'Moose::Meta::Role::Application::ToRole', +); + +$META->add_attribute( + 'application_to_instance_class', + reader => 'application_to_instance_class', + default => 'Moose::Meta::Role::Application::ToInstance', +); + +# More or less copied from Moose::Meta::Class +sub initialize { + my $class = shift; + my $pkg = shift; + return Class::MOP::get_metaclass_by_name($pkg) + || $class->SUPER::initialize( + $pkg, + 'attribute_metaclass' => 'Moose::Meta::Role::Attribute', + @_ + ); +} + +sub reinitialize { my $self = shift; - my $name = shift; - unless ( defined $name && $name ) { - require Moose; - Moose->throw_error("You must provide a name for the attribute"); - } - my $attr_desc; - if (scalar @_ == 1 && ref($_[0]) eq 'HASH') { - $attr_desc = $_[0]; + 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 + ); } - else { - $attr_desc = { @_ }; + + return $self->SUPER::reinitialize( + $pkg, + %existing_classes, + @_, + ); +} + +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" ); } - $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 { @@ -163,6 +221,20 @@ sub add_required_methods { } } +sub add_conflicting_method { + my $self = shift; + + my $method; + if (@_ == 1 && blessed($_[0])) { + $method = shift; + } + else { + $method = $self->conflicting_method_metaclass->new(@_); + } + + $self->add_required_methods($method); +} + ## ------------------------------------------------------------------ ## method modifiers @@ -188,7 +260,8 @@ foreach my $modifier_type (qw[ before around after ]) { $META->add_method("get_${modifier_type}_method_modifiers" => sub { my ($self, $method_name) = @_; #return () unless exists $self->$attr_reader->{$method_name}; - @{$self->$attr_reader->{$method_name}}; + my $mm = $self->$attr_reader->{$method_name}; + $mm ? @$mm : (); }); $META->add_method("has_${modifier_type}_method_modifiers" => sub { @@ -310,129 +383,8 @@ 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"); @@ -451,24 +403,26 @@ sub apply { (blessed($other)) || Moose->throw_error("You must pass in an blessed instance"); + my $application_class; if ($other->isa('Moose::Meta::Role')) { - require Moose::Meta::Role::Application::ToRole; - return Moose::Meta::Role::Application::ToRole->new(@args)->apply($self, $other); + $application_class = $self->application_to_role_class; } elsif ($other->isa('Moose::Meta::Class')) { - require Moose::Meta::Role::Application::ToClass; - return Moose::Meta::Role::Application::ToClass->new(@args)->apply($self, $other); + $application_class = $self->application_to_class_class; } else { - require Moose::Meta::Role::Application::ToInstance; - return Moose::Meta::Role::Application::ToInstance->new(@args)->apply($self, $other); + $application_class = $self->application_to_instance_class; } + + Class::MOP::load_class($application_class); + return $application_class->new(@args)->apply($self, $other); } +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); @@ -484,11 +438,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 { @@ -530,7 +480,8 @@ sub create { 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} ); } } @@ -618,7 +569,7 @@ sub create { ##################################################################### # # has 'roles' => ( -# metaclass => 'Collection::Array', +# metaclass => 'Array', # reader => 'get_roles', # isa => 'ArrayRef[Moose::Meta::Role]', # default => sub { [] }, @@ -628,7 +579,7 @@ sub create { # ); # # has 'excluded_roles_map' => ( -# metaclass => 'Collection::Hash', +# metaclass => 'Hash', # reader => 'get_excluded_roles_map', # isa => 'HashRef[Str]', # provides => { @@ -639,22 +590,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 => { @@ -671,7 +608,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 => { @@ -685,7 +622,7 @@ sub create { # ); # # has 'after_method_modifiers' => ( -# metaclass => 'Collection::Hash', +# metaclass => 'Hash', # reader =>'get_after_method_modifiers_map', # isa => 'HashRef[ArrayRef[CodeRef]]', # provides => { @@ -699,7 +636,7 @@ sub create { # ); # # has 'around_method_modifiers' => ( -# metaclass => 'Collection::Hash', +# metaclass => 'Hash', # reader =>'get_around_method_modifiers_map', # isa => 'HashRef[ArrayRef[CodeRef]]', # provides => { @@ -717,7 +654,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 => { @@ -766,12 +703,20 @@ This method creates a new role object with the provided name. This method accepts a list of array references. Each array reference should contain a role name as its first element. The second element is -an optional hash reference. The hash reference can contain C -and C keys to control how methods are composed from the role. +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 @@ -867,12 +812,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 @@ -895,8 +838,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) >> @@ -925,6 +866,11 @@ Adds the named methods to the role's list of required methods. Removes the named methods from the role's list of required methods. +=item B<< $metarole->add_conflicting_method(%params) >> + +Instantiate the parameters as a L +object, then add it to the required method list. + =back =head2 Method modifiers @@ -996,7 +942,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