X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FMeta%2FRole%2FApplication%2FToClass.pm;h=48e4658e1406eeeb055d341c820b1a721bee0a68;hb=0f8380b0cdbda1e13ed7c456edd3f0d1c0315ec9;hp=f61cf03f0094dc59cb63aedd9115c37e949a57e8;hpb=59f5bbde66d61d15b684be88d138fd798ba851d0;p=gitmo%2FMoose.git

diff --git a/lib/Moose/Meta/Role/Application/ToClass.pm b/lib/Moose/Meta/Role/Application/ToClass.pm
index f61cf03..48e4658 100644
--- a/lib/Moose/Meta/Role/Application/ToClass.pm
+++ b/lib/Moose/Meta/Role/Application/ToClass.pm
@@ -5,18 +5,33 @@ use warnings;
 use metaclass;
 
 use Moose::Util  'english_list';
-use Scalar::Util 'blessed';
+use Scalar::Util 'weaken', 'blessed';
 
-our $VERSION   = '0.64';
+our $VERSION   = '0.86';
 $VERSION = eval $VERSION;
 our $AUTHORITY = 'cpan:STEVAN';
 
 use base 'Moose::Meta::Role::Application';
 
+__PACKAGE__->meta->add_attribute('role' => (
+    reader => 'role',
+));
+
+__PACKAGE__->meta->add_attribute('class' => (
+    reader => 'class',
+));
+
 sub apply {
-    my ($self, $role, $class) = @_;    
+    my ($self, $role, $class) = @_;
+
+    # We need weak_ref in CMOP :(
+    weaken($self->{role}  = $role);
+    weaken($self->{class} = $class);
+
     $self->SUPER::apply($role, $class);
-    $class->add_role($role);        
+
+    $class->add_role($role);
+    $class->add_role_application($self);
 }
 
 sub check_role_exclusions {
@@ -43,79 +58,55 @@ sub check_required_methods {
     # attribute accessors. However I am thinking
     # that maybe those are somehow exempt from
     # the require methods stuff.
-    foreach my $required_method_name ($role->get_required_method_list) {
+    foreach my $required_method ($role->get_required_method_list) {
+        my $required_method_name = $required_method->name;
 
         if (!$class->find_method_by_name($required_method_name)) {
-            
+
             next if $self->is_aliased_method($required_method_name);
 
-            push @missing, $required_method_name;
-        }
-        else {
-            # NOTE:
-            # we need to make sure that the method is
-            # not a method modifier, because those do
-            # not satisfy the requirements ...
-            my $method = $class->find_method_by_name($required_method_name);
-
-            # check if it is a generated accessor ...
-            push @is_attr, $required_method_name,
-                if $method->isa('Class::MOP::Method::Accessor');
-
-            # NOTE:
-            # All other tests here have been removed, they were tests
-            # for overriden methods and before/after/around modifiers.
-            # But we realized that for classes any overriden or modified
-            # methods would be backed by a real method of that name
-            # (and therefore meet the requirement). And for roles, the
-            # overriden and modified methods are "in statis" and so would
-            # not show up in this test anyway (and as a side-effect they
-            # would not fufill the requirement, which is exactly what we
-            # want them to do anyway).
-            # - SL
+            push @missing, $required_method;
         }
     }
 
-    return unless @missing || @is_attr;
+    return unless @missing;
 
     my $error = '';
 
-    if (@missing) {
-        my $noun = @missing == 1 ? 'method' : 'methods';
+    my @conflicts = grep { $_->isa('Moose::Meta::Role::Method::Conflicting') } @missing;
 
-        my $list
-            = Moose::Util::english_list( map { q{'} . $_ . q{'} } @missing );
+    if (@conflicts) {
+        my $conflict = $conflicts[0];
+        my $roles = Moose::Util::english_list( map { q{'} . $_ . q{'} } @{ $conflict->roles } );
 
         $error
-            .= q{'}
-            . $role->name
-            . "' requires the $noun $list "
-            . "to be implemented by '"
-            . $class->name . q{'};
+            .= "Due to a method name conflict in roles "
+            .  $roles
+            . ", the method '"
+            . $conflict->name
+            . "' must be implemented or excluded by '"
+            . $class->name
+            . q{'};
     }
-
-    if (@is_attr) {
-        my $noun = @is_attr == 1 ? 'method' : 'methods';
+    elsif (@missing) {
+        my $noun = @missing == 1 ? 'method' : 'methods';
 
         my $list
-            = Moose::Util::english_list( map { q{'} . $_ . q{'} } @is_attr );
-
-        $error .= "\n" if length $error;
+            = Moose::Util::english_list( map { q{'} . $_ . q{'} } @missing );
 
         $error
             .= q{'}
             . $role->name
             . "' requires the $noun $list "
             . "to be implemented by '"
-            . $class->name
-            . "' but the method is only an attribute accessor";
+            . $class->name . q{'};
     }
 
     $class->throw_error($error);
 }
 
 sub check_required_attributes {
-    
+
 }
 
 sub apply_attributes {
@@ -139,7 +130,7 @@ sub apply_attributes {
 sub apply_methods {
     my ($self, $role, $class) = @_;
     foreach my $method_name ($role->get_method_list) {
-        
+
         unless ($self->is_method_excluded($method_name)) {
             # it if it has one already
             if ($class->has_method($method_name) &&
@@ -148,14 +139,14 @@ sub apply_methods {
                 next;
             }
             else {
-                # add it, although it could be overriden
+                # add it, although it could be overridden
                 $class->add_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
@@ -163,17 +154,17 @@ sub apply_methods {
                 # and if they are not the same thing ...
                 $class->get_method($aliased_method_name)->body != $role->get_method($method_name)->body) {
                 $class->throw_error("Cannot create a method alias if a local method of the same name exists");
-            }            
+            }
             $class->add_method(
                 $aliased_method_name,
                 $role->get_method($method_name)
-            );                
-        }        
+            );
+        }
     }
     # we must reset the cache here since
     # we are just aliasing methods, otherwise
     # the modifiers go wonky.
-    $class->reset_package_cache_flag;        
+    $class->reset_package_cache_flag;
 }
 
 sub apply_override_method_modifiers {
@@ -258,7 +249,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>