X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=gitmo%2FMouse.git;a=blobdiff_plain;f=lib%2FMouse%2FMeta%2FRole.pm;h=f7ebd21a2d521e74e56a8009cd241e14e36f8ba3;hp=95bdca80506de5774678f1d939cd7415b817a515;hb=6719984210754e8d012ae678536f194c35000823;hpb=949ee85c1ccebed118189ac321fd4dbfbb95b769

diff --git a/lib/Mouse/Meta/Role.pm b/lib/Mouse/Meta/Role.pm
index 95bdca8..f7ebd21 100644
--- a/lib/Mouse/Meta/Role.pm
+++ b/lib/Mouse/Meta/Role.pm
@@ -2,6 +2,7 @@ package Mouse::Meta::Role;
 use strict;
 use warnings;
 use Carp 'confess';
+use Mouse::Util qw(version authority identifier);
 
 do {
     my %METACLASS_CACHE;
@@ -42,6 +43,8 @@ sub add_required_methods {
     push @{$self->{required_methods}}, @methods;
 }
 
+
+
 sub add_attribute {
     my $self = shift;
     my $name = shift;
@@ -87,16 +90,18 @@ sub apply {
         for my $name ($self->get_method_list) {
             next if $name eq 'meta';
 
-            if ($classname->can($name)) {
+            my $class_function = "${classname}::${name}";
+            my $role_function = "${selfname}::${name}";
+            if (defined &$class_function) {
                 # XXX what's Moose's behavior?
                 #next;
             } else {
-                *{"${classname}::${name}"} = *{"${selfname}::${name}"};
+                *$class_function = *$role_function;
             }
             if ($args{alias} && $args{alias}->{$name}) {
                 my $dstname = $args{alias}->{$name};
                 unless ($classname->can($dstname)) {
-                    *{"${classname}::${dstname}"} = *{"${selfname}::${name}"};
+                    *{"${classname}::${dstname}"} = *$role_function;
                 }
             }
         }
@@ -107,7 +112,19 @@ sub apply {
         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);
+
+            my $metaclass = 'Mouse::Meta::Attribute';
+            if ( my $metaclass_name = $spec->{metaclass} ) {
+                my $new_class = Mouse::Util::resolve_metaclass_alias(
+                    'Attribute',
+                    $metaclass_name
+                );
+                if ( $metaclass ne $new_class ) {
+                    $metaclass = $new_class;
+                }
+            }
+
+            $metaclass->create($class, $name, %$spec);
         }
     } else {
         # apply role to role
@@ -120,7 +137,7 @@ sub apply {
     }
 
     # XXX Room for speed improvement in role to role
-    for my $modifier_type (qw/before after around/) {
+    for my $modifier_type (qw/before after around override/) {
         my $add_method = "add_${modifier_type}_method_modifier";
         my $modified = $self->{"${modifier_type}_method_modifiers"};
 
@@ -164,16 +181,18 @@ sub combine_apply {
             for my $name ($self->get_method_list) {
                 next if $name eq 'meta';
 
-                if ($classname->can($name)) {
+                my $class_function = "${classname}::${name}";
+                my $role_function = "${selfname}::${name}";
+                if (defined &$class_function) {
                     # XXX what's Moose's behavior?
                     #next;
                 } else {
-                    *{"${classname}::${name}"} = *{"${selfname}::${name}"};
+                    *$class_function = *$role_function;
                 }
                 if ($args{alias} && $args{alias}->{$name}) {
                     my $dstname = $args{alias}->{$name};
                     unless ($classname->can($dstname)) {
-                        *{"${classname}::${dstname}"} = *{"${selfname}::${name}"};
+                        *{"${classname}::${dstname}"} = *$role_function;
                     }
                 }
             }
@@ -188,7 +207,19 @@ sub combine_apply {
             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);
+
+                my $metaclass = 'Mouse::Meta::Attribute';
+                if ( my $metaclass_name = $spec->{metaclass} ) {
+                    my $new_class = Mouse::Util::resolve_metaclass_alias(
+                        'Attribute',
+                        $metaclass_name
+                    );
+                    if ( $metaclass ne $new_class ) {
+                        $metaclass = $new_class;
+                    }
+                }
+
+                $metaclass->create($class, $name, %$spec);
             }
         }
     } else {
@@ -205,7 +236,7 @@ sub combine_apply {
     }
 
     # XXX Room for speed improvement in role to role
-    for my $modifier_type (qw/before after around/) {
+    for my $modifier_type (qw/before after around override/) {
         my $add_method = "add_${modifier_type}_method_modifier";
         for my $role_spec (@roles) {
             my $self = $role_spec->[0]->meta;
@@ -221,17 +252,17 @@ sub combine_apply {
 
     # append roles
     my %role_apply_cache;
-    my @apply_roles;
+    my $apply_roles = $class->roles;
     for my $role_spec (@roles) {
         my $self = $role_spec->[0]->meta;
-        push @apply_roles, $self unless $role_apply_cache{$self}++;
-        for my $role ($self->roles) {
-            push @apply_roles, $role unless $role_apply_cache{$role}++;
+        push @$apply_roles, $self unless $role_apply_cache{$self}++;
+        for my $role (@{ $self->roles }) {
+            push @$apply_roles, $role unless $role_apply_cache{$role}++;
         }
     }
 }
 
-for my $modifier_type (qw/before after around/) {
+for my $modifier_type (qw/before after around override/) {
     no strict 'refs';
     *{ __PACKAGE__ . '::' . "add_${modifier_type}_method_modifier" } = sub {
         my ($self, $method_name, $method) = @_;
@@ -248,5 +279,23 @@ for my $modifier_type (qw/before after around/) {
 
 sub roles { $_[0]->{roles} }
 
+
+# This is currently not passing all the Moose tests.
+sub does_role {
+    my ($self, $role_name) = @_;
+
+    (defined $role_name)
+        || confess "You must supply a role name to look for";
+
+    # if we are it,.. then return true
+    return 1 if $role_name eq $self->name;
+
+    for my $role (@{ $self->{roles} }) {
+        return 1 if $role->does_role($role_name);
+    }
+    return 0;
+}
+
+
 1;