X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FMeta%2FRole%2FApplication%2FToRole.pm;h=54979f533d11fbfa052c153048cf42dcab1f519e;hb=bf46ee52709c38edc600f24ceb3a334d2c90965e;hp=d3247023efbcb5e1584caf511f71c1ab4ac5af9a;hpb=d03bd989b97597428b460d7f9a021e2931893fa0;p=gitmo%2FMoose.git diff --git a/lib/Moose/Meta/Role/Application/ToRole.pm b/lib/Moose/Meta/Role/Application/ToRole.pm index d324702..54979f5 100644 --- a/lib/Moose/Meta/Role/Application/ToRole.pm +++ b/lib/Moose/Meta/Role/Application/ToRole.pm @@ -6,15 +6,17 @@ use metaclass; use Scalar::Util 'blessed'; -our $VERSION = '0.75_01'; -$VERSION = eval $VERSION; -our $AUTHORITY = 'cpan:STEVAN'; - use base 'Moose::Meta::Role::Application'; sub apply { my ($self, $role1, $role2) = @_; + + # We're not checking for role names to support multiple instances of the + # same Parameterized role. + return if grep { $role1 == $_ } @{ $role2->get_roles() }; + $self->SUPER::apply($role1, $role2); + $role2->add_role($role1); } @@ -27,7 +29,7 @@ sub check_role_exclusions { foreach my $excluded_role_name ($role1->get_excluded_roles_list) { if ( $role2->does_role($excluded_role_name) ) { require Moose; - Moose->throw_error("The class " . $role2->name . " does the excluded role '$excluded_role_name'"); + Moose->throw_error("The role " . $role2->name . " does the excluded role '$excluded_role_name'"); } $role2->add_excluded_roles($excluded_role_name); } @@ -35,11 +37,12 @@ sub check_role_exclusions { sub check_required_methods { my ($self, $role1, $role2) = @_; - foreach my $required_method_name ($role1->get_required_method_list) { + foreach my $required_method ($role1->get_required_method_list) { + my $required_method_name = $required_method->name; next if $self->is_aliased_method($required_method_name); - $role2->add_required_methods($required_method_name) + $role2->add_required_methods($required_method) unless $role2->find_method_by_name($required_method_name); } } @@ -56,66 +59,77 @@ sub apply_attributes { # make sure we haven't seen this one already too $role2->get_attribute($attribute_name) != $role1->get_attribute($attribute_name)) { + my $role2_name = $role2->name; + require Moose; - Moose->throw_error("Role '" . $role1->name . "' has encountered an attribute conflict " . - "during composition. This is fatal error and cannot be disambiguated."); + Moose->throw_error( "Role '" + . $role1->name + . "' has encountered an attribute conflict" + . " while being composed into '$role2_name'." + . " This is a fatal error and cannot be disambiguated." + . " The conflicting attribute is named '$attribute_name'." ); } else { $role2->add_attribute( - $attribute_name, - $role1->get_attribute($attribute_name) + $role1->get_attribute($attribute_name)->clone ); } } } sub apply_methods { - my ($self, $role1, $role2) = @_; - foreach my $method_name ($role1->get_method_list) { + my ( $self, $role1, $role2 ) = @_; + foreach my $method ( $role1->_get_local_methods ) { - if ($self->is_method_aliased($method_name)) { - my $aliased_method_name = $self->get_method_aliases->{$method_name}; - # it if it has one already - if ($role2->has_method($aliased_method_name) && - # and if they are not the same thing ... - $role2->get_method($aliased_method_name)->body != $role1->get_method($method_name)->body) { + my $method_name = $method->name; - require Moose; - Moose->throw_error("Cannot create a method alias if a local method of the same name exists"); - } + next if $method->isa('Class::MOP::Method::Meta'); - $role2->add_method( - $aliased_method_name, - $role1->get_method($method_name) - ); + unless ( $self->is_method_excluded($method_name) ) { - if (!$role2->has_method($method_name)) { - $role2->add_required_methods($method_name) - unless $self->is_method_excluded($method_name); - } + my $role2_method = $role2->get_method($method_name); + if ( $role2_method + && $role2_method->body != $method->body ) { - next; + # method conflicts between roles result in the method becoming + # a requirement + $role2->add_conflicting_method( + name => $method_name, + roles => [ $role1->name, $role2->name ], + ); + } + else { + $role2->add_method( + $method_name, + $method, + ); + } } - next if $self->is_method_excluded($method_name); + next unless $self->is_method_aliased($method_name); - # it if it has one already - if ($role2->has_method($method_name) && - # and if they are not the same thing ... - $role2->get_method($method_name)->body != $role1->get_method($method_name)->body) { - # method conflicts between roles result - # in the method becoming a requirement - $role2->add_required_methods($method_name); - } - else { - # add it, although it could be overridden - $role2->add_method( - $method_name, - $role1->get_method($method_name) - ); + my $aliased_method_name = $self->get_method_aliases->{$method_name}; + + my $role2_method = $role2->get_method($aliased_method_name); + if ( $role2_method + && $role2_method->body != $method->body ) { + + require Moose; + Moose->throw_error( + "Cannot create a method alias if a local method of the same name exists" + ); } + $role2->add_method( + $aliased_method_name, + $role1->get_method($method_name) + ); + + if ( !$role2->has_method($method_name) ) { + $role2->add_required_methods($method_name) + unless $self->is_method_excluded($method_name); + } } } @@ -172,14 +186,12 @@ sub apply_method_modifiers { 1; +# ABSTRACT: Compose a role into another role + __END__ =pod -=head1 NAME - -Moose::Meta::Role::Application::ToRole - Compose a role into another role - =head1 DESCRIPTION =head2 METHODS @@ -210,22 +222,7 @@ Moose::Meta::Role::Application::ToRole - Compose a role into another role =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