X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FMeta%2FRole%2FApplication%2FToRole.pm;h=c1f91c7a2ba322dca14e36e0f2a69010cdff8b02;hb=baf46b9edc7dc3665c7eaf9d1684b157efb09e1a;hp=29a7eb7910a4d908293e62020050b54661c22cba;hpb=fb4fcfee39263ca3983e28f840f38185282d4327;p=gitmo%2FMoose.git

diff --git a/lib/Moose/Meta/Role/Application/ToRole.pm b/lib/Moose/Meta/Role/Application/ToRole.pm
index 29a7eb7..c1f91c7 100644
--- a/lib/Moose/Meta/Role/Application/ToRole.pm
+++ b/lib/Moose/Meta/Role/Application/ToRole.pm
@@ -4,10 +4,9 @@ use strict;
 use warnings;
 use metaclass;
 
-use Carp            'confess';
 use Scalar::Util    'blessed';
 
-our $VERSION   = '0.57';
+our $VERSION   = '0.72_01';
 $VERSION = eval $VERSION;
 our $AUTHORITY = 'cpan:STEVAN';
 
@@ -21,11 +20,15 @@ sub apply {
 
 sub check_role_exclusions {
     my ($self, $role1, $role2) = @_;
-    confess "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) {
-        confess "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);
     }
 }
@@ -52,8 +55,10 @@ 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.";
+
+            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(
@@ -67,8 +72,6 @@ sub apply_attributes {
 sub apply_methods {
     my ($self, $role1, $role2) = @_;
     foreach my $method_name ($role1->get_method_list) {
-        
-        next if $self->is_method_excluded($method_name);        
 
         if ($self->is_method_aliased($method_name)) {
             my $aliased_method_name = $self->get_method_aliases->{$method_name};
@@ -76,20 +79,25 @@ sub apply_methods {
             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";
+
+                require Moose;
+                Moose->throw_error("Cannot create a method alias if a local method of the same name exists");
             }
 
-            $role2->alias_method(
+            $role2->add_method(
                 $aliased_method_name,
                 $role1->get_method($method_name)
             );
 
             if (!$role2->has_method($method_name)) {
-                $role2->add_required_methods($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) &&
@@ -100,8 +108,8 @@ sub apply_methods {
             $role2->add_required_methods($method_name);
         }
         else {
-            # add it, although it could be overriden
-            $role2->alias_method(
+            # add it, although it could be overridden
+            $role2->add_method(
                 $method_name,
                 $role1->get_method($method_name)
             );
@@ -118,11 +126,12 @@ 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
-            confess "Role '" . $role1->name . "' has encountered an 'override' method conflict " .
+            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.";
+                    "is fatal error.");
         }
         else {
             # if we are a role, we need to make sure
@@ -130,9 +139,11 @@ 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 " .
+
+                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.";
+                        "This is fatal error.");
             }
             else {
                 # if there is no conflict,
@@ -209,7 +220,7 @@ Stevan Little E<lt>stevan@iinteractive.comE<gt>
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright 2006-2008 by Infinity Interactive, Inc.
+Copyright 2006-2009 by Infinity Interactive, Inc.
 
 L<http://www.iinteractive.com>