X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMouse%2FMeta%2FRole.pm;h=0e1d667a242a7833ab4fc6a9fbd9dd0f4344ef92;hb=8dcbf65da69b42871e448d45e23f25ef9e91d364;hp=ebb929fe0a7c68a51ee0b81fcdf8bca1166db943;hpb=59089ec36675c7df1998945b1446c37794f88306;p=gitmo%2FMouse.git

diff --git a/lib/Mouse/Meta/Role.pm b/lib/Mouse/Meta/Role.pm
index ebb929f..0e1d667 100644
--- a/lib/Mouse/Meta/Role.pm
+++ b/lib/Mouse/Meta/Role.pm
@@ -53,22 +53,66 @@ sub has_attribute { exists $_[0]->{attributes}->{$_[1]}  }
 sub get_attribute_list { keys %{ $_[0]->{attributes} } }
 sub get_attribute { $_[0]->{attributes}->{$_[1]} }
 
+# copied from Class::Inspector
+sub get_method_list {
+    my $self = shift;
+    my $name = $self->name;
+
+    no strict 'refs';
+    # Get all the CODE symbol table entries
+    my @functions = grep !/^meta$/,
+      grep { /\A[^\W\d]\w*\z/o }
+      grep { defined &{"${name}::$_"} }
+      keys %{"${name}::"};
+    wantarray ? @functions : \@functions;
+}
+
 sub apply {
     my $self  = shift;
+    my $selfname = $self->name;
     my $class = shift;
+    my $classname = $class->name;
+    my %args  = @_;
 
-    for my $name (@{$self->{required_methods}}) {
-        unless ($class->name->can($name)) {
-            confess "'@{[ $self->name ]}' requires the method '$name' to be implemented by '@{[ $class->name ]}'";
+    if ($class->isa('Mouse::Meta::Class')) {
+        for my $name (@{$self->{required_methods}}) {
+            unless ($classname->can($name)) {
+                confess "'$selfname' requires the method '$name' to be implemented by '$classname'";
+            }
         }
     }
 
-    for my $name ($self->get_attribute_list) {
-        next if $class->has_attribute($name);
-        my $spec = $self->get_attribute($name);
-        Mouse::Meta::Attribute->create($class, $name, %$spec);
+    {
+        no strict 'refs';
+        for my $name ($self->get_method_list) {
+            next if $name eq 'has' || $name eq 'requires' || $name eq 'meta' || $name eq 'with' || $name eq 'around' || $name eq 'before' || $name eq 'after' || $name eq 'blessed' || $name eq 'extends' || $name eq 'confess' || $name eq 'excludes';
+            my $dstname = $args{alias} ? ($args{alias}->{$name}||$name) : $name;
+            if ($classname->can($dstname)) {
+                # XXX what's Moose's behavior?
+                next;
+            }
+            *{"${classname}::${dstname}"} = *{"${selfname}::${name}"};
+        }
+    }
+
+    if ($class->isa('Mouse::Meta::Class')) {
+        # apply role to class
+        for my $name ($self->get_attribute_list) {
+            next if $class->has_attribute($name);
+            my $spec = $self->get_attribute($name);
+            Mouse::Meta::Attribute->create($class, $name, %$spec);
+        }
+    } else {
+        # apply role to role
+        # XXX Room for speed improvement
+        for my $name ($self->get_attribute_list) {
+            next if $class->has_attribute($name);
+            my $spec = $self->get_attribute($name);
+            $class->add_attribute($name, $spec);
+        }
     }
 
+    # XXX Room for speed improvement in role to role
     for my $modifier_type (qw/before after around/) {
         my $add_method = "add_${modifier_type}_method_modifier";
         my $modified = $self->{"${modifier_type}_method_modifiers"};