X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FMeta%2FRole%2FApplication%2FRoleSummation.pm;h=d5b5e7219dd0a01fa54cdbce8e2cd4598fba3c23;hb=c8b8d92f366e6d9c09c0bb2a54b4f1942fc665ef;hp=021da907f941f9a1702330fc4f2e589beea600ad;hpb=3fd4bc55c678e4a3e8e01248ef865440a802b177;p=gitmo%2FMoose.git

diff --git a/lib/Moose/Meta/Role/Application/RoleSummation.pm b/lib/Moose/Meta/Role/Application/RoleSummation.pm
index 021da90..d5b5e72 100644
--- a/lib/Moose/Meta/Role/Application/RoleSummation.pm
+++ b/lib/Moose/Meta/Role/Application/RoleSummation.pm
@@ -4,12 +4,11 @@ use strict;
 use warnings;
 use metaclass;
 
-use Carp            'confess';
-use Scalar::Util    'blessed';
+use Scalar::Util 'blessed';
 
 use Moose::Meta::Role::Composite;
 
-our $VERSION   = '0.55_03';
+our $VERSION   = '0.89';
 $VERSION = eval $VERSION;
 our $AUTHORITY = 'cpan:STEVAN';
 
@@ -23,11 +22,13 @@ __PACKAGE__->meta->add_attribute('role_params' => (
 sub get_exclusions_for_role {
     my ($self, $role) = @_;
     $role = $role->name if blessed $role;
-    if ($self->role_params->{$role} && defined $self->role_params->{$role}->{excludes}) {
-        if (ref $self->role_params->{$role}->{excludes} eq 'ARRAY') {
-            return $self->role_params->{$role}->{excludes};
+    my $excludes_key = exists $self->role_params->{$role}->{'-excludes'} ?
+                           '-excludes' : 'excludes';
+    if ($self->role_params->{$role} && defined $self->role_params->{$role}->{$excludes_key}) {
+        if (ref $self->role_params->{$role}->{$excludes_key} eq 'ARRAY') {
+            return $self->role_params->{$role}->{$excludes_key};
         }
-        return [ $self->role_params->{$role}->{excludes} ];
+        return [ $self->role_params->{$role}->{$excludes_key} ];
     }
     return [];
 }
@@ -35,10 +36,12 @@ sub get_exclusions_for_role {
 sub get_method_aliases_for_role {
     my ($self, $role) = @_;
     $role = $role->name if blessed $role;
-    if ($self->role_params->{$role} && defined $self->role_params->{$role}->{alias}) {
-        return $self->role_params->{$role}->{alias};
+    my $alias_key = exists $self->role_params->{$role}->{'-alias'} ?
+                        '-alias' : 'alias';
+    if ($self->role_params->{$role} && defined $self->role_params->{$role}->{$alias_key}) {
+        return $self->role_params->{$role}->{$alias_key};
     }
-    return {};    
+    return {};
 }
 
 sub is_method_excluded {
@@ -56,156 +59,175 @@ sub is_method_aliased {
 
 sub is_aliased_method {
     my ($self, $role, $method_name) = @_;
-    my %aliased_names = reverse %{$self->get_method_aliases_for_role($role->name)};    
+    my %aliased_names = reverse %{$self->get_method_aliases_for_role($role->name)};
     exists $aliased_names{$method_name} ? 1 : 0;
 }
 
-# stolen from List::MoreUtils ...
-my $uniq = sub { my %h; map { $h{$_}++ == 0 ? $_ : () } @_ };
-
 sub check_role_exclusions {
     my ($self, $c) = @_;
 
-    my @all_excluded_roles = $uniq->(map {
-        $_->get_excluded_roles_list
-    } @{$c->get_roles});
+    my %excluded_roles;
+    for my $role (@{ $c->get_roles }) {
+        my $name = $role->name;
+
+        for my $excluded ($role->get_excluded_roles_list) {
+            push @{ $excluded_roles{$excluded} }, $name;
+        }
+    }
 
     foreach my $role (@{$c->get_roles}) {
-        foreach my $excluded (@all_excluded_roles) {
-            confess "Conflict detected: " . $role->name . " excludes role '" . $excluded . "'"
-                if $role->does_role($excluded);
+        foreach my $excluded (keys %excluded_roles) {
+            next unless $role->does_role($excluded);
+
+            my @excluding = @{ $excluded_roles{$excluded} };
+
+            require Moose;
+            Moose->throw_error(sprintf "Conflict detected: Role%s %s exclude%s role '%s'", (@excluding == 1 ? '' : 's'), join(', ', @excluding), (@excluding == 1 ? 's' : ''), $excluded);
         }
     }
 
-    $c->add_excluded_roles(@all_excluded_roles);
+    $c->add_excluded_roles(keys %excluded_roles);
 }
 
 sub check_required_methods {
     my ($self, $c) = @_;
 
-    my %all_required_methods = map { $_ => undef } $uniq->(map {
-        $_->get_required_method_list
-    } @{$c->get_roles});
+    my %all_required_methods =
+        map { $_->name => $_ }
+        map { $_->get_required_method_list }
+        @{$c->get_roles};
 
     foreach my $role (@{$c->get_roles}) {
         foreach my $required (keys %all_required_methods) {
-            
+
             delete $all_required_methods{$required}
                 if $role->has_method($required)
                 || $self->is_aliased_method($role, $required);
         }
     }
 
-    $c->add_required_methods(keys %all_required_methods);
+    $c->add_required_methods(values %all_required_methods);
 }
 
 sub check_required_attributes {
-    
+
 }
 
 sub apply_attributes {
     my ($self, $c) = @_;
-    
+
     my @all_attributes = map {
         my $role = $_;
-        map { 
-            +{ 
+        map {
+            +{
                 name => $_,
                 attr => $role->get_attribute($_),
             }
         } $role->get_attribute_list
     } @{$c->get_roles};
-    
+
     my %seen;
     foreach my $attr (@all_attributes) {
         if (exists $seen{$attr->{name}}) {
-            confess "We have encountered an attribute conflict with '" . $attr->{name} . "' " 
-                  . "during composition. This is fatal error and cannot be disambiguated."
-                if $seen{$attr->{name}} != $attr->{attr};           
+            if ( $seen{$attr->{name}} != $attr->{attr} ) {
+                require Moose;
+                Moose->throw_error("We have encountered an attribute conflict with '" . $attr->{name} . "' "
+                                   . "during composition. This is fatal error and cannot be disambiguated.")
+            }
         }
         $seen{$attr->{name}} = $attr->{attr};
     }
 
-    foreach my $attr (@all_attributes) {    
+    foreach my $attr (@all_attributes) {
         $c->add_attribute($attr->{name}, $attr->{attr});
     }
 }
 
 sub apply_methods {
     my ($self, $c) = @_;
-    
+
     my @all_methods = map {
         my $role     = $_;
         my $aliases  = $self->get_method_aliases_for_role($role);
         my %excludes = map { $_ => undef } @{ $self->get_exclusions_for_role($role) };
         (
-            (map { 
+            (map {
                 exists $excludes{$_} ? () :
-                +{ 
+                +{
                     role   => $role,
                     name   => $_,
                     method => $role->get_method($_),
                 }
             } $role->get_method_list),
-            (map { 
-                +{ 
+            (map {
+                +{
                     role   => $role,
                     name   => $aliases->{$_},
                     method => $role->get_method($_),
-                }            
+                }
             } keys %$aliases)
         );
     } @{$c->get_roles};
-    
+
     my (%seen, %method_map);
     foreach my $method (@all_methods) {
-        if (exists $seen{$method->{name}}) {
-            if ($seen{$method->{name}}->body != $method->{method}->body) {
-                $c->add_required_methods($method->{name});
+        my $seen = $seen{$method->{name}};
+
+        if ($seen) {
+            if ($seen->{method}->body != $method->{method}->body) {
+                $c->add_conflicting_method(
+                    name  => $method->{name},
+                    roles => [$method->{role}->name, $seen->{role}->name],
+                );
+
                 delete $method_map{$method->{name}};
                 next;
-            }           
-        }       
-        
-        $seen{$method->{name}}       = $method->{method};
+            }
+        }
+
+        $seen{$method->{name}}       = $method;
         $method_map{$method->{name}} = $method->{method};
     }
 
-    $c->alias_method($_ => $method_map{$_}) for keys %method_map;
+    $c->add_method($_ => $method_map{$_}) for keys %method_map;
 }
 
 sub apply_override_method_modifiers {
     my ($self, $c) = @_;
-    
+
     my @all_overrides = map {
         my $role = $_;
-        map { 
-            +{ 
+        map {
+            +{
                 name   => $_,
                 method => $role->get_override_method_modifier($_),
             }
         } $role->get_method_modifier_list('override');
     } @{$c->get_roles};
-    
+
     my %seen;
     foreach my $override (@all_overrides) {
-        confess "Role '" . $c->name . "' has encountered an 'override' method conflict " .
-                "during composition (A local method of the same name as been found). This " .
-                "is fatal error."
-            if $c->has_method($override->{name});        
+        if ( $c->has_method($override->{name}) ){
+            require Moose;
+            Moose->throw_error( "Role '" . $c->name . "' has encountered an 'override' method conflict " .
+                                "during composition (A local method of the same name as been found). This " .
+                                "is fatal error." )
+        }
         if (exists $seen{$override->{name}}) {
-            confess "We have encountered an 'override' method conflict during " .
-                    "composition (Two 'override' methods of the same name encountered). " .
-                    "This is fatal error."
-                if $seen{$override->{name}} != $override->{method};                
+            if ( $seen{$override->{name}} != $override->{method} ) {
+                require Moose;
+                Moose->throw_error( "We have encountered an 'override' method conflict during " .
+                                    "composition (Two 'override' methods of the same name encountered). " .
+                                    "This is fatal error.")
+            }
         }
         $seen{$override->{name}} = $override->{method};
     }
-        
+
     $c->add_override_method_modifier(
         $_->{name}, $_->{method}
     ) for @all_overrides;
-            
+
 }
 
 sub apply_method_modifiers {
@@ -234,7 +256,7 @@ Moose::Meta::Role::Application::RoleSummation - Combine two or more roles
 
 =head1 DESCRIPTION
 
-Summation composes two traits, forming the union of non-conflicting 
+Summation composes two traits, forming the union of non-conflicting
 bindings and 'disabling' the conflicting bindings
 
 =head2 METHODS
@@ -287,7 +309,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>