X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMouse%2FMeta%2FRole.pm;h=870b69d9c5f260606ed41ab1892a38737f75fcbc;hb=69ac1dcfa408b64733ba3d2e47e8e791e4548f95;hp=8e42641c0ff7fd594c2095aff8f01ac11c205cce;hpb=da0c885dc9a21cad4c372d28c1dd6ef0813cc0bd;p=gitmo%2FMouse.git

diff --git a/lib/Mouse/Meta/Role.pm b/lib/Mouse/Meta/Role.pm
index 8e42641..870b69d 100644
--- a/lib/Mouse/Meta/Role.pm
+++ b/lib/Mouse/Meta/Role.pm
@@ -27,26 +27,33 @@ sub new {
     my $class = shift;
     my %args  = @_;
 
+    $args{attributes} ||= {};
+
     bless \%args, $class;
 }
 
 sub name { $_[0]->{name} }
 
-sub has_attribute { exists $_[0]->{attributes}->{$_[1]}  }
-sub add_attribute { $_[0]->{attributes}->{$_[1]} = $_[2] }
-sub get_attribute_list {
+sub add_attribute {
+    my $self = shift;
+    my $name = shift;
+    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 apply {
     my $self  = shift;
     my $class = shift;
-    my $pkg   = shift;
+    my $pkg   = $class->name;
 
     for my $name ($self->get_attribute_list) {
-        my $attr = $self->get_attribute($name);
-        Mouse::Meta::Attribute->create($pkg, $name, $attr);
+        my $spec = $self->get_attribute($name);
+        Mouse::Meta::Attribute->create($pkg, $name, %$spec);
     }
-
 }
 
 1;