bump version to 0.65

[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 399bc72..dfb9093 100644 (file)
--- a/lib/Moose/Meta/Role/Application/ToRole.pm
+++ b/lib/Moose/Meta/Role/Application/ToRole.pm
@@ -4,28 +4,26 @@ use strict;
 use warnings;
 use metaclass;
 
-use Carp            'confess';
 use Scalar::Util    'blessed';
 
-use Data::Dumper;
-
-our $VERSION   = '0.01';
+our $VERSION   = '0.65';
+$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) = @_;
-    confess "Conflict detected: " . $role2->name . " excludes role '" . $role1->name . "'"
+    Moose->throw_error("Conflict detected: " . $role2->name . " excludes role '" . $role1->name . "'")
         if $role2->excludes_role($role1->name);
     foreach my $excluded_role_name ($role1->get_excluded_roles_list) {
-        confess "The class " . $role2->name . " does the excluded role '$excluded_role_name'"
+        Moose->throw_error("The class " . $role2->name . " does the excluded role '$excluded_role_name'")
             if $role2->does_role($excluded_role_name);
         $role2->add_excluded_roles($excluded_role_name);
     }
@@ -34,11 +32,18 @@ sub check_role_exclusions {
 sub check_required_methods {
     my ($self, $role1, $role2) = @_;
     foreach my $required_method_name ($role1->get_required_method_list) {
+            
+        next if $self->is_aliased_method($required_method_name);
+                    
         $role2->add_required_methods($required_method_name)
             unless $role2->find_method_by_name($required_method_name);
     }
 }
 
+sub check_required_attributes {
+    
+}
+
 sub apply_attributes {
     my ($self, $role1, $role2) = @_;
     foreach my $attribute_name ($role1->get_attribute_list) {
@@ -46,8 +51,8 @@ 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)) {
-            confess "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 " .
+                    "during composition. This is fatal error and cannot be disambiguated.");
         }
         else {
             $role2->add_attribute(
@@ -61,6 +66,31 @@ sub apply_attributes {
 sub apply_methods {
     my ($self, $role1, $role2) = @_;
     foreach my $method_name ($role1->get_method_list) {
+
+        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) {
+                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);
+            }
+
+            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 ...
@@ -71,11 +101,13 @@ sub apply_methods {
         }
         else {
             # add it, although it could be overriden
-            $role2->alias_method(
+            $role2->add_method(
                 $method_name,
                 $role1->get_method($method_name)
             );
+                        
         }
+        
     }
 }
 
@@ -88,9 +120,9 @@ sub apply_override_method_modifiers {
             # we have a conflict here, because you cannot
             # combine an overriden method with a locally
             # defined one
-            confess "Role '" . $role1->name . "' has encountered an 'override' method conflict " .
+            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.";
+                    "is fatal error.");
         }
         else {
             # if we are a role, we need to make sure
@@ -98,9 +130,9 @@ 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)) {
-                confess "Role '" . $role1->name . "' has encountered an 'override' method conflict " .
+                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.";
+                        "This is fatal error.");
             }
             else {
                 # if there is no conflict,
@@ -126,10 +158,6 @@ sub apply_method_modifiers {
     }
 }
 
-sub apply_before_method_modifiers { (shift)->apply_method_modifiers('before' => @_) }
-sub apply_around_method_modifiers { (shift)->apply_method_modifiers('around' => @_) }
-sub apply_after_method_modifiers  { (shift)->apply_method_modifiers('after'  => @_) }
-
 
 1;
 
@@ -139,7 +167,7 @@ __END__
 
 =head1 NAME
 
-Moose::Meta::Role::Application::ToRole
+Moose::Meta::Role::Application::ToRole - Compose a role into another role
 
 =head1 DESCRIPTION
 
@@ -153,9 +181,11 @@ Moose::Meta::Role::Application::ToRole
 
 =item B<apply>
 
+=item B<check_role_exclusions>
+
 =item B<check_required_methods>
 
-=item B<check_role_exclusions>
+=item B<check_required_attributes>
 
 =item B<apply_attributes>
 
@@ -163,12 +193,6 @@ Moose::Meta::Role::Application::ToRole
 
 =item B<apply_method_modifiers>
 
-=item B<apply_before_method_modifiers>
-
-=item B<apply_after_method_modifiers>
-
-=item B<apply_around_method_modifiers>
-
 =item B<apply_override_method_modifiers>
 
 =back
@@ -185,7 +209,7 @@ Stevan Little E<lt>stevan@iinteractive.comE<gt>
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright 2006, 2007 by Infinity Interactive, Inc.
+Copyright 2006-2008 by Infinity Interactive, Inc.
 
 L<http://www.iinteractive.com>