X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FMeta%2FRole%2FApplication%2FToRole.pm;h=23c634c192558eb12942eed00618f7f156e49c2c;hb=b6cca0d5690feec99436fe952315d5d4feeb9473;hp=936f852a1576168b7793a7228668595e65dc7a0e;hpb=4b2189ce8dae168787b635b71a918bd64461ed7a;p=gitmo%2FMoose.git

diff --git a/lib/Moose/Meta/Role/Application/ToRole.pm b/lib/Moose/Meta/Role/Application/ToRole.pm
index 936f852..23c634c 100644
--- a/lib/Moose/Meta/Role/Application/ToRole.pm
+++ b/lib/Moose/Meta/Role/Application/ToRole.pm
@@ -6,16 +6,16 @@ use metaclass;
 
 use Scalar::Util    'blessed';
 
-our $VERSION   = '0.72';
+our $VERSION   = '1.14';
 $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 {
@@ -35,17 +35,18 @@ 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);
     }
 }
 
 sub check_required_attributes {
-    
+
 }
 
 sub apply_attributes {
@@ -56,66 +57,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_name eq '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;
-        }     
-        
-        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);
+                # 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,
+                );
+            }
         }
-        else {
-            # add it, although it could be overridden
-            $role2->add_method(
-                $method_name,
-                $role1->get_method($method_name)
+
+        next unless $self->is_method_aliased($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);
+        }
     }
 }
 
@@ -210,9 +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.
+See L<Moose/BUGS> for details on reporting bugs.
 
 =head1 AUTHOR
 
@@ -220,7 +230,7 @@ Stevan Little E<lt>stevan@iinteractive.comE<gt>
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright 2006-2009 by Infinity Interactive, Inc.
+Copyright 2006-2010 by Infinity Interactive, Inc.
 
 L<http://www.iinteractive.com>