Use method_metaclass; the other hardcoded classnames are easily overridden or fleeting

[gitmo/MooseX-Role-Parameterized.git] / lib / MooseX / Role / Parameterized.pm

diff --git a/lib/MooseX/Role/Parameterized.pm b/lib/MooseX/Role/Parameterized.pm
index f1fc28e..80ba9c5 100644 (file)
--- a/lib/MooseX/Role/Parameterized.pm
+++ b/lib/MooseX/Role/Parameterized.pm
@@ -1,33 +1,40 @@
 #!/usr/bin/env perl
 package MooseX::Role::Parameterized;
-use Moose;
+use Moose qw/extends around confess/;
 use Moose::Role ();
 extends 'Moose::Exporter';
 
-use MooseX::Role::Parameterized::Meta::Role;
+use MooseX::Role::Parameterized::Meta::Role::Parameterizable;
 
-our $CURRENT_ROLE;
+our $CURRENT_METACLASS;
 
 __PACKAGE__->setup_import_methods(
-    with_caller => ['parameter', 'role'],
+    with_caller => ['parameter', 'role', 'method'],
+    as_is       => ['has'],
 );
 
 sub parameter {
     my $caller = shift;
-    $caller->meta->add_parameter(@_);
+    my $names  = shift;
+
+    $names = [$names] if !ref($names);
+
+    for my $name (@$names) {
+        Class::MOP::Class->initialize($caller)->add_parameter($name, @_);
+    }
 }
 
 sub role {
     my $caller         = shift;
     my $role_generator = shift;
-    $caller->meta->role_generator($role_generator);
+    Class::MOP::Class->initialize($caller)->role_generator($role_generator);
 }
 
 sub init_meta {
     my $self = shift;
 
     return Moose::Role->init_meta(@_,
-        metaclass => 'MooseX::Role::Parameterized::Meta::Role',
+        metaclass => 'MooseX::Role::Parameterized::Meta::Role::Parameterizable',
     );
 }
 
@@ -43,5 +50,34 @@ around _make_wrapper => sub {
     return $orig->(@_);
 };
 
+sub has {
+    confess "has must be called within the role { ... } block."
+        unless $CURRENT_METACLASS;
+
+    my $names = shift;
+    $names = [$names] if !ref($names);
+
+    for my $name (@$names) {
+        $CURRENT_METACLASS->add_attribute($name, @_);
+    }
+}
+
+sub method {
+    confess "method must be called within the role { ... } block."
+        unless $CURRENT_METACLASS;
+
+    my $caller = shift;
+    my $name   = shift;
+    my $body   = shift;
+
+    my $method = $CURRENT_METACLASS->method_metaclass->wrap(
+        package_name => $caller,
+        name         => $name,
+        body         => $body,
+    );
+
+    $CURRENT_METACLASS->add_method($name => $method);
+}
+
 1;