bump the version to 0.55_03

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

diff --git a/lib/Moose/Meta/Role/Application/ToClass.pm b/lib/Moose/Meta/Role/Application/ToClass.pm
index ffb4673..f6c4545 100644 (file)
--- a/lib/Moose/Meta/Role/Application/ToClass.pm
+++ b/lib/Moose/Meta/Role/Application/ToClass.pm
@@ -9,7 +9,8 @@ use Scalar::Util    'blessed';
 
 use Data::Dumper;
 
-our $VERSION   = '0.01';
+our $VERSION   = '0.55_03';
+$VERSION = eval $VERSION;
 our $AUTHORITY = 'cpan:STEVAN';
 
 use base 'Moose::Meta::Role::Application';
@@ -42,7 +43,10 @@ sub check_required_methods {
     # the require methods stuff.
     foreach my $required_method_name ($role->get_required_method_list) {
 
-        unless ($class->find_method_by_name($required_method_name)) {
+        if (!$class->find_method_by_name($required_method_name)) {
+            
+            next if $self->is_aliased_method($required_method_name);
+            
             confess "'" . $role->name . "' requires the method '$required_method_name' " .
                     "to be implemented by '" . $class->name . "'";
         }
@@ -87,20 +91,10 @@ sub apply_attributes {
             next;
         }
         else {
-            # NOTE:
-            # this is kinda ugly ...
-            if ($class->isa('Moose::Meta::Class')) {
-                $class->_process_attribute(
-                    $attribute_name,
-                    %{$role->get_attribute($attribute_name)}
-                );
-            }
-            else {
-                $class->add_attribute(
-                    $attribute_name,
-                    $role->get_attribute($attribute_name)
-                );
-            }
+            $class->add_attribute(
+                $attribute_name,
+                $role->get_attribute($attribute_name)
+            );
         }
     }
 }
@@ -122,8 +116,22 @@ sub apply_methods {
             $class->alias_method(
                 $method_name,
                 $role->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 ($class->has_method($aliased_method_name) &&
+                # and if they are not the same thing ...
+                $class->get_method($aliased_method_name)->body != $role->get_method($method_name)->body) {
+                confess "Cannot create a method alias if a local method of the same name exists";
+            }            
+            $class->alias_method(
+                $aliased_method_name,
+                $role->get_method($method_name)
+            );                
+        }        
     }
     # we must reset the cache here since
     # we are just aliasing methods, otherwise
@@ -171,7 +179,7 @@ __END__
 
 =head1 NAME
 
-Moose::Meta::Role::Application::ToClass
+Moose::Meta::Role::Application::ToClass - Compose a role into a class
 
 =head1 DESCRIPTION