don't use compute_all_applicable_methods anymore

[gitmo/Moose.git] / lib / Moose / Meta / Role / Application / ToRole.pm

diff --git a/lib/Moose/Meta/Role/Application/ToRole.pm b/lib/Moose/Meta/Role/Application/ToRole.pm
index afd1a44..559d301 100644 (file)
--- a/lib/Moose/Meta/Role/Application/ToRole.pm
+++ b/lib/Moose/Meta/Role/Application/ToRole.pm
@@ -9,7 +9,7 @@ use Scalar::Util    'blessed';
 
 use Data::Dumper;
 
-our $VERSION   = '0.01';
+our $VERSION   = '0.56';
 our $AUTHORITY = 'cpan:STEVAN';
 
 use base 'Moose::Meta::Role::Application';
@@ -69,12 +69,27 @@ sub apply_methods {
     my ($self, $role1, $role2) = @_;
     foreach my $method_name ($role1->get_method_list) {
         
-        next if $self->is_method_excluded($method_name);
-        
-        my $orig_method_name = $method_name;
-        
+        next if $self->is_method_excluded($method_name);        
+
         if ($self->is_method_aliased($method_name)) {
-            $method_name = $self->get_method_aliases->{$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) {
+                confess "Cannot create a method alias if a local method of the same name exists";
+            }
+
+            $role2->alias_method(
+                $aliased_method_name,
+                $role1->get_method($method_name)
+            );
+
+            if (!$role2->has_method($method_name)) {
+                $role2->add_required_methods($method_name);
+            }
+
+            next;
         }        
         
         # it if it has one already
@@ -89,9 +104,11 @@ sub apply_methods {
             # add it, although it could be overriden
             $role2->alias_method(
                 $method_name,
-                $role1->get_method($orig_method_name)
+                $role1->get_method($method_name)
             );
+                        
         }
+        
     }
 }
 
@@ -151,7 +168,7 @@ __END__
 
 =head1 NAME
 
-Moose::Meta::Role::Application::ToRole
+Moose::Meta::Role::Application::ToRole - Compose a role into another role
 
 =head1 DESCRIPTION