On role apply, apply all method modifiers

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

diff --git a/lib/Mouse/Meta/Role.pm b/lib/Mouse/Meta/Role.pm
index 78e01a4..07203c3 100644 (file)
--- a/lib/Mouse/Meta/Role.pm
+++ b/lib/Mouse/Meta/Role.pm
@@ -37,22 +37,49 @@ 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);
     }
+
+    for my $modifier_type (qw/before after around/) {
+        my $add_method = "add_${modifier_type}_method_modifier";
+        my $modified = $self->{"${modifier_type}_method_modifiers"};
+
+        for my $method_name (keys %$modified) {
+            for my $code (@{ $modified->{$method_name} }) {
+                $class->$add_method($method_name => $code);
+            }
+        }
+    }
+}
+
+for my $modifier_type (qw/before after around/) {
+    no strict 'refs';
+    *{ __PACKAGE__ . '::' . "add_${modifier_type}_method_modifier" } = sub {
+        my ($self, $method_name, $method) = @_;
+
+        push @{ $self->{"${modifier_type}_method_modifiers"}->{$method_name} },
+            $method;
+    };
+
+    *{ __PACKAGE__ . '::' . "get_${modifier_type}_method_modifiers" } = sub {
+        my ($self, $method_name, $method) = @_;
+        @{ $self->{"${modifier_type}_method_modifiers"}->{$method_name} || [] }
+    };
 }
 
 1;