X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FMeta%2FRole.pm;h=a01a8dba57cfc4ab0f1ccf73db8a10fa4b5968ea;hb=c8b8d92f366e6d9c09c0bb2a54b4f1942fc665ef;hp=18d549672fd1b24b52f80416e2b693335d6e3831;hpb=2dda1d28fae57516ba225f5760bbe73d271e9124;p=gitmo%2FMoose.git diff --git a/lib/Moose/Meta/Role.pm b/lib/Moose/Meta/Role.pm index 18d5496..a01a8db 100644 --- a/lib/Moose/Meta/Role.pm +++ b/lib/Moose/Meta/Role.pm @@ -10,13 +10,14 @@ use Carp 'confess'; use Sub::Name 'subname'; use Devel::GlobalDestruction 'in_global_destruction'; -our $VERSION = '0.79'; +our $VERSION = '0.89'; $VERSION = eval $VERSION; our $AUTHORITY = 'cpan:STEVAN'; use Moose::Meta::Class; use Moose::Meta::Role::Method; use Moose::Meta::Role::Method::Required; +use Moose::Meta::Role::Method::Conflicting; use base 'Class::MOP::Module'; @@ -57,7 +58,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,9 +66,9 @@ 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', } }, { @@ -75,7 +76,7 @@ foreach my $action ( attr_reader => 'get_attribute_map', methods => { get => 'get_attribute', - get_list => 'get_attribute_list', + get_keys => 'get_attribute_list', existence => 'has_attribute', remove => 'remove_attribute', } @@ -97,10 +98,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,12 +136,36 @@ $META->add_attribute( default => 'Moose::Meta::Role::Method::Required', ); +$META->add_attribute( + 'conflicting_method_metaclass', + reader => 'conflicting_method_metaclass', + default => 'Moose::Meta::Role::Method::Conflicting', +); + +$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', +); + ## some things don't always fit, so they go here ... sub add_attribute { my $self = shift; my $name = shift; - unless ( defined $name && $name ) { + unless ( defined $name ) { require Moose; Moose->throw_error("You must provide a name for the attribute"); } @@ -163,6 +193,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 +232,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 { @@ -451,18 +496,19 @@ 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 combine { @@ -766,8 +812,8 @@ 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. @@ -925,6 +971,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