Keep track of the instantiated metaclass in associated_class, use the MOP better...

[gitmo/Mouse.git] / lib / Mouse / Meta / Role.pm

diff --git a/lib/Mouse/Meta/Role.pm b/lib/Mouse/Meta/Role.pm
index 3c7aff1..f4bf289 100644 (file)
--- a/lib/Mouse/Meta/Role.pm
+++ b/lib/Mouse/Meta/Role.pm
@@ -37,23 +37,23 @@ sub name { $_[0]->{name} }
 sub add_attribute {
     my $self = shift;
     my $name = shift;
-    $self->{attributes}->{$name} = [ @_ ];
+    my $spec = shift;
+    $self->{attributes}->{$name} = $spec;
 }
 
 sub has_attribute { exists $_[0]->{attributes}->{$_[1]}  }
 sub get_attribute_list { keys %{ $_[0]->{attributes} } }
-sub get_attribute { @{ $_->[0]->{attributes}->{$_[1]} || [] } }
+sub get_attribute { $_[0]->{attributes}->{$_[1]} }
 
 sub apply {
     my $self  = shift;
     my $class = shift;
-    my $pkg   = $class->name;
 
     for my $name ($self->get_attribute_list) {
-        my @spec = $self->get_attribute($name);
-        Mouse::Meta::Attribute->create($pkg, $name, @spec);
+        next if $class->has_attribute($name);
+        my $spec = $self->get_attribute($name);
+        Mouse::Meta::Attribute->create($class, $name, %$spec);
     }
-
 }
 
 1;