X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FMeta%2FRole%2FApplication%2FToClass.pm;h=8573cc65de72c153ad40e68dd3103cb54023bcaa;hb=f4b86ac0e1fd7ff8a180f2f8332821170db5371e;hp=862090720d36eea2f0edad6d8bc8d43d56defd55;hpb=bb3655457b64d4829b693da95f06409f84ba3f80;p=gitmo%2FMoose.git

diff --git a/lib/Moose/Meta/Role/Application/ToClass.pm b/lib/Moose/Meta/Role/Application/ToClass.pm
index 8620907..8573cc6 100644
--- a/lib/Moose/Meta/Role/Application/ToClass.pm
+++ b/lib/Moose/Meta/Role/Application/ToClass.pm
@@ -7,7 +7,7 @@ use metaclass;
 use Moose::Util  'english_list';
 use Scalar::Util 'weaken', 'blessed';
 
-our $VERSION   = '0.89_01';
+our $VERSION   = '1.16';
 $VERSION = eval $VERSION;
 our $AUTHORITY = 'cpan:STEVAN';
 
@@ -129,6 +129,8 @@ 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
         if ($class->has_attribute($attribute_name) &&
@@ -138,47 +140,50 @@ sub apply_attributes {
         }
         else {
             $class->add_attribute(
-                $attribute_name,
-                $role->get_attribute($attribute_name)
+                $role->get_attribute($attribute_name)->attribute_for_class($attr_metaclass)
             );
         }
     }
 }
 
 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) &&
-                # 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.
@@ -257,9 +262,7 @@ Moose::Meta::Role::Application::ToClass - Compose a role into a class
 
 =head1 BUGS
 
-All complex software has bugs lurking in it, and this module is no
-exception. If you find a bug please either email me, or add the bug
-to cpan-RT.
+See L<Moose/BUGS> for details on reporting bugs.
 
 =head1 AUTHOR
 
@@ -267,7 +270,7 @@ Stevan Little E<lt>stevan@iinteractive.comE<gt>
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright 2006-2009 by Infinity Interactive, Inc.
+Copyright 2006-2010 by Infinity Interactive, Inc.
 
 L<http://www.iinteractive.com>