When applying roles, don't apply the exact same role object more than once.

[gitmo/Moose.git] / lib / Moose / Meta / Role / Application / ToClass.pm

diff --git a/lib/Moose/Meta/Role/Application/ToClass.pm b/lib/Moose/Meta/Role/Application/ToClass.pm
index c6d4dd8..3a5a650 100644 (file)
--- a/lib/Moose/Meta/Role/Application/ToClass.pm
+++ b/lib/Moose/Meta/Role/Application/ToClass.pm
@@ -4,26 +4,29 @@ use strict;
 use warnings;
 use metaclass;
 
+use List::MoreUtils 'firstval';
 use Moose::Util  'english_list';
 use Scalar::Util 'weaken', 'blessed';
 
-our $VERSION   = '0.95';
-$VERSION = eval $VERSION;
-our $AUTHORITY = 'cpan:STEVAN';
-
 use base 'Moose::Meta::Role::Application';
 
 __PACKAGE__->meta->add_attribute('role' => (
     reader => 'role',
+    Class::MOP::_definition_context(),
 ));
 
 __PACKAGE__->meta->add_attribute('class' => (
-    reader => 'class',
+    accessor => 'class',
+    Class::MOP::_definition_context(),
 ));
 
 sub apply {
     my ($self, $role, $class) = @_;
 
+    # We're not checking for role names to support multiple instances of the
+    # same Parameterized role.
+    return if grep { $role == $_ } @{ $class->roles() };
+
     # We need weak_ref in CMOP :(
     weaken($self->{role}  = $role);
     weaken($self->{class} = $class);
@@ -118,6 +121,12 @@ sub check_required_methods {
             . "' requires the $noun $list "
             . "to be implemented by '"
             . $class->name . q{'};
+
+        if (my $meth = firstval { $class->name->can($_) } @missing) {
+            $error .= ". If you imported functions intending to use them as "
+                    . "methods, you need to explicitly mark them as such, via "
+                    . $class->name . "->meta->add_method($meth => \\\&$meth)";
+        }
     }
 
     $class->throw_error($error);
@@ -129,7 +138,6 @@ sub check_required_attributes {
 
 sub apply_attributes {
     my ($self, $role, $class) = @_;
-    my $attr_metaclass = $class->attribute_metaclass;
 
     foreach my $attribute_name ($role->get_attribute_list) {
         # it if it has one already
@@ -140,47 +148,50 @@ sub apply_attributes {
         }
         else {
             $class->add_attribute(
-                $role->get_attribute($attribute_name)->attribute_for_class($attr_metaclass)
+                $role->get_attribute($attribute_name)->attribute_for_class
             );
         }
     }
 }
 
 sub apply_methods {
-    my ($self, $role, $class) = @_;
-    foreach my $method_name ($role->get_method_list) {
-        next if $method_name eq 'meta';
-
-        unless ($self->is_method_excluded($method_name)) {
-            # it if it has one already
-            if ($class->has_method($method_name) &&
-                # and if they are not the same thing ...
-                $class->get_method($method_name)->body != $role->get_method($method_name)->body) {
-                next;
-            }
-            else {
-                # add it, although it could be overridden
-                $class->add_method(
-                    $method_name,
-                    $role->get_method($method_name)
-                );
-            }
-        }
+    my ( $self, $role, $class ) = @_;
+
+    foreach my $method ( $role->_get_local_methods ) {
+        my $method_name = $method->name;
+
+        next if $method->isa('Class::MOP::Method::Meta');
+
+        unless ( $self->is_method_excluded($method_name) ) {
+
+            my $class_method = $class->get_method($method_name);
+
+            next if $class_method && $class_method->body != $method->body;
 
-        if ($self->is_method_aliased($method_name)) {
-            my $aliased_method_name = $self->get_method_aliases->{$method_name};
-            # it if it has one already
-            if ($class->has_method($aliased_method_name) &&
-                # 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)
+                $method_name,
+                $method,
+            );
+        }
+
+        next unless $self->is_method_aliased($method_name);
+
+        my $aliased_method_name = $self->get_method_aliases->{$method_name};
+
+        my $class_method = $class->get_method($aliased_method_name);
+
+        if ( $class_method && $class_method->body != $method->body ) {
+            $class->throw_error(
+                "Cannot create a method alias if a local method of the same name exists"
             );
         }
+
+        $class->add_method(
+            $aliased_method_name,
+            $method,
+        );
     }
+
     # we must reset the cache here since
     # we are just aliasing methods, otherwise
     # the modifiers go wonky.
@@ -221,14 +232,12 @@ sub apply_method_modifiers {
 
 1;
 
+# ABSTRACT: Compose a role into a class
+
 __END__
 
 =pod
 
-=head1 NAME
-
-Moose::Meta::Role::Application::ToClass - Compose a role into a class
-
 =head1 DESCRIPTION
 
 =head2 METHODS
@@ -261,18 +270,5 @@ Moose::Meta::Role::Application::ToClass - Compose a role into a class
 
 See L<Moose/BUGS> for details on reporting bugs.
 
-=head1 AUTHOR
-
-Stevan Little E<lt>stevan@iinteractive.comE<gt>
-
-=head1 COPYRIGHT AND LICENSE
-
-Copyright 2006-2010 by Infinity Interactive, Inc.
-
-L<http://www.iinteractive.com>
-
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself.
-
 =cut