X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FMeta%2FRole%2FApplication%2FToRole.pm;h=831a19b2cbfaea4186746b91b96613021dd700ad;hb=e462f6f3d260687b8f7372b112a50c5c2a2c431c;hp=ee7bc833d385147d8016b17c6a1bba16a8d3ef8b;hpb=59f5bbde66d61d15b684be88d138fd798ba851d0;p=gitmo%2FMoose.git diff --git a/lib/Moose/Meta/Role/Application/ToRole.pm b/lib/Moose/Meta/Role/Application/ToRole.pm index ee7bc83..831a19b 100644 --- a/lib/Moose/Meta/Role/Application/ToRole.pm +++ b/lib/Moose/Meta/Role/Application/ToRole.pm @@ -6,42 +6,47 @@ use metaclass; use Scalar::Util 'blessed'; -our $VERSION = '0.64'; +our $VERSION = '1.05'; $VERSION = eval $VERSION; our $AUTHORITY = 'cpan:STEVAN'; use base 'Moose::Meta::Role::Application'; sub apply { - my ($self, $role1, $role2) = @_; - $self->SUPER::apply($role1, $role2); - $role2->add_role($role1); + my ($self, $role1, $role2) = @_; + $self->SUPER::apply($role1, $role2); + $role2->add_role($role1); } sub check_role_exclusions { my ($self, $role1, $role2) = @_; - Moose->throw_error("Conflict detected: " . $role2->name . " excludes role '" . $role1->name . "'") - if $role2->excludes_role($role1->name); + if ( $role2->excludes_role($role1->name) ) { + require Moose; + Moose->throw_error("Conflict detected: " . $role2->name . " excludes role '" . $role1->name . "'"); + } foreach my $excluded_role_name ($role1->get_excluded_roles_list) { - Moose->throw_error("The class " . $role2->name . " does the excluded role '$excluded_role_name'") - if $role2->does_role($excluded_role_name); + if ( $role2->does_role($excluded_role_name) ) { + require Moose; + Moose->throw_error("The class " . $role2->name . " does the excluded role '$excluded_role_name'"); + } $role2->add_excluded_roles($excluded_role_name); } } 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); } } sub check_required_attributes { - + } sub apply_attributes { @@ -51,13 +56,14 @@ sub apply_attributes { if ($role2->has_attribute($attribute_name) && # make sure we haven't seen this one already too $role2->get_attribute($attribute_name) != $role1->get_attribute($attribute_name)) { + + require Moose; Moose->throw_error("Role '" . $role1->name . "' has encountered an attribute conflict " . "during composition. This is fatal error and cannot be disambiguated."); } else { $role2->add_attribute( - $attribute_name, - $role1->get_attribute($attribute_name) + $role1->get_attribute($attribute_name)->clone ); } } @@ -66,13 +72,35 @@ sub apply_attributes { sub apply_methods { my ($self, $role1, $role2) = @_; foreach my $method_name ($role1->get_method_list) { + next if $method_name eq 'meta'; + + unless ( $self->is_method_excluded($method_name) ) { + if ( $role2->has_method($method_name) + && $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_conflicting_method( + name => $method_name, + roles => [ $role1->name, $role2->name ], + ); + } + else { + $role2->add_method( + $method_name, + $role1->get_method($method_name) + ); + } + } 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) { + + require Moose; Moose->throw_error("Cannot create a method alias if a local method of the same name exists"); } @@ -85,29 +113,7 @@ sub apply_methods { $role2->add_required_methods($method_name) unless $self->is_method_excluded($method_name); } - - next; - } - - next if $self->is_method_excluded($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 overriden - $role2->add_method( - $method_name, - $role1->get_method($method_name) - ); - - } - } } @@ -118,8 +124,9 @@ sub apply_override_method_modifiers { if ($role2->has_method($method_name)) { # if it is being composed into another role # we have a conflict here, because you cannot - # combine an overriden method with a locally + # combine an overridden method with a locally # defined one + require Moose; Moose->throw_error("Role '" . $role1->name . "' has encountered an 'override' method conflict " . "during composition (A local method of the same name as been found). This " . "is fatal error."); @@ -130,6 +137,8 @@ sub apply_override_method_modifiers { # we are composing into if ($role2->has_override_method_modifier($method_name) && $role2->get_override_method_modifier($method_name) != $role2->get_override_method_modifier($method_name)) { + + require Moose; Moose->throw_error("Role '" . $role1->name . "' has encountered an 'override' method conflict " . "during composition (Two 'override' methods of the same name encountered). " . "This is fatal error."); @@ -199,9 +208,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. +See L for details on reporting bugs. =head1 AUTHOR @@ -209,7 +216,7 @@ Stevan Little Estevan@iinteractive.comE =head1 COPYRIGHT AND LICENSE -Copyright 2006-2008 by Infinity Interactive, Inc. +Copyright 2006-2010 by Infinity Interactive, Inc. L