search spec components factored out of T365

[catagits/Reaction.git] / lib / Reaction / Role.pm

diff --git a/lib/Reaction/Role.pm b/lib/Reaction/Role.pm
index 13815db..ea09925 100644 (file)
--- a/lib/Reaction/Role.pm
+++ b/lib/Reaction/Role.pm
@@ -5,50 +5,36 @@ use Reaction::ClassExporter;
 use Reaction::Class;
 use Moose::Meta::Class;
 
-use Sub::Name 'subname';
-use Scalar::Util qw/blessed reftype/;
-
 #TODO: review for Reaction::Object switch / Reaction::Meta::Class
-#lifted from class MOP as a temp fix (groditi)
-*Moose::Meta::Role::add_method
-  = subname 'Moose::Meta::Role::add_method' => sub {
-    my ($self, $method_name, $code) = @_;
-    (defined $method_name && $method_name)
-      || confess "You must define a method name";
-
-    confess "Your code block must be a CODE reference"
-      unless 'CODE' eq reftype($code);
 
-    my $method = $self->method_metaclass->wrap($code);
-    $self->get_method_map->{$method_name} = $method;
+use namespace::clean -except => [ qw(meta) ];
 
-    my $full_name = ($self->name . '::' . $method_name);
-    $self->add_package_symbol("&${method_name}" => subname $full_name => $code);
-  };
 
+override exports_for_package => sub {
+  my ($self, $package) = @_;
+  my %exports = $self->SUPER::exports_for_package($package);
+  delete $exports{class};
+  $exports{role} = sub { $self->do_role_sub($package, @_); };
+  return %exports;
+};
 
-class Role which {
-
-  override exports_for_package => sub {
-    my ($self, $package) = @_;
-    my %exports = $self->SUPER::exports_for_package($package);
-    delete $exports{class};
-    $exports{role} = sub { $self->do_role_sub($package, @_); };
-    return %exports;
-  };
+override next_import_package => sub { 'Moose::Role' };
 
-  override next_import_package => sub { 'Moose::Role' };
+override default_base => sub { () };
 
-  override default_base => sub { () };
+override add_method_to_target => sub {
+  my ($self, $target, $method) = @_;
+  $target->meta->alias_method(@$method);
+};
+sub do_role_sub {
+  my ($self, $package, $role, $which, $setup) = @_;
+  confess "Invalid role declaration, should be: role Role which { ... }"
+    unless ($which eq 'which' && ref($setup) eq 'CODE');
+  $self->setup_and_cleanup($role, $setup);
+};
 
-  implements do_role_sub => as {
-    my ($self, $package, $role, $which, $setup) = @_;
-    confess "Invalid role declaration, should be: role Role which { ... }"
-      unless ($which eq 'which' && ref($setup) eq 'CODE');
-    $self->setup_and_cleanup($role, $setup);
-  };
+__PACKAGE__->meta->make_immutable;
 
-};
 
 1;