X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=gitmo%2FMouse.git;a=blobdiff_plain;f=lib%2FMouse%2FMeta%2FRole%2FComposite.pm;h=58496c369ffcba50b1ff9c0f4759c90827faa6b3;hp=7b205b8e8dd89313881f0aaa2b7f7dbbdaa5869a;hb=45f22b92d1140ad101f7c3112bc565890ea5a1ad;hpb=267711f78bd79835875f805447d3ab802a18f0c4

diff --git a/lib/Mouse/Meta/Role/Composite.pm b/lib/Mouse/Meta/Role/Composite.pm
index 7b205b8..58496c3 100644
--- a/lib/Mouse/Meta/Role/Composite.pm
+++ b/lib/Mouse/Meta/Role/Composite.pm
@@ -50,7 +50,9 @@ sub has_override_method_modifier{
 }
 
 sub add_attribute{
-    my($self, $attr_name, $spec) = @_;
+    my $self      = shift;
+    my $attr_name = shift;
+    my $spec      = (@_ == 1 ? $_[0] : {@_});
 
     my $existing = $self->{attributes}{$attr_name};
     if($existing && $existing != $spec){
@@ -77,19 +79,19 @@ sub add_override_method_modifier{
 # components of apply()
 
 sub _apply_methods{
-    my($self, $applicant, $args) = @_;
+    my($self, $consumer, $args) = @_;
 
     if(exists $self->{conflicting_methods}){
-        my $applicant_class_name = $applicant->name;
+        my $consumer_class_name = $consumer->name;
 
-        my @conflicting = sort grep{ !$applicant_class_name->can($_) } keys %{ $self->{conflicting_methods} };
+        my @conflicting = sort grep{ !$consumer_class_name->can($_) } keys %{ $self->{conflicting_methods} };
 
         if(@conflicting == 1){
             my $method_name = $conflicting[0];
             my @roles       = sort @{ $self->{composed_roles_by_method}{$method_name} };
             $self->throw_error(
                sprintf q{Due to a method name conflict in roles %s, the method '%s' must be implemented or excluded by '%s'},
-                   english_list(map{ sprintf q{'%s'}, $_->name } @roles), $method_name, $applicant->name
+                   english_list(map{ sprintf q{'%s'}, $_->name } @roles), $method_name, $consumer->name
             );
         }
         elsif(@conflicting > 1){
@@ -103,12 +105,12 @@ sub _apply_methods{
 
             $self->throw_error(
                sprintf q{Due to method name conflicts in roles %s, the methods %s must be implemented or excluded by '%s'},
-                   $roles, $methods, $applicant->name
+                   $roles, $methods, $consumer->name
             );
         }
     }
 
-    $self->SUPER::_apply_methods($applicant, $args);
+    $self->SUPER::_apply_methods($consumer, $args);
     return;
 }
 1;
@@ -120,7 +122,7 @@ Mouse::Meta::Role::Composite - An object to represent the set of roles
 
 =head1 VERSION
 
-This document describes Mouse version 0.4501
+This document describes Mouse version 0.49
 
 =head1 SEE ALSO