Begin writing excludes.. seeing some weird errors, but.. heading to bed

[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 cd9d732..2db4d16 100644 (file)
--- a/lib/MooseX/Role/Parameterized.pm
+++ b/lib/MooseX/Role/Parameterized.pm
@@ -1,8 +1,13 @@
 #!/usr/bin/env perl
 package MooseX::Role::Parameterized;
-use Moose qw/extends around confess/;
+use Moose (
+    extends => { -as => 'moose_extends' },
+    qw/around confess/,
+);
+
+use Carp 'croak';
 use Moose::Role ();
-extends 'Moose::Exporter';
+moose_extends 'Moose::Exporter';
 
 use MooseX::Role::Parameterized::Meta::Role::Parameterizable;
 
@@ -10,7 +15,7 @@ our $CURRENT_METACLASS;
 
 __PACKAGE__->setup_import_methods(
     with_caller => ['parameter', 'role', 'method'],
-    as_is       => ['has'],
+    as_is       => ['has', 'with', 'extends', 'requires', 'excludes', 'augment', 'inner'],
 );
 
 sub parameter {
@@ -20,14 +25,14 @@ sub parameter {
     $names = [$names] if !ref($names);
 
     for my $name (@$names) {
-        $caller->meta->add_parameter($name, @_);
+        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 {
@@ -70,7 +75,7 @@ sub method {
     my $name   = shift;
     my $body   = shift;
 
-    my $method = Moose::Meta::Method->wrap(
+    my $method = $CURRENT_METACLASS->method_metaclass->wrap(
         package_name => $caller,
         name         => $name,
         body         => $body,
@@ -79,5 +84,31 @@ sub method {
     $CURRENT_METACLASS->add_method($name => $method);
 }
 
+sub with {
+    confess "with must be called within the role { ... } block."
+        unless $CURRENT_METACLASS;
+    Moose::Util::apply_all_roles($CURRENT_METACLASS, @_);
+}
+
+sub requires {
+    confess "requires must be called within the role { ... } block."
+        unless $CURRENT_METACLASS;
+    croak "Must specify at least one method" unless @_;
+    $CURRENT_METACLASS->add_required_methods(@_);
+}
+
+sub excludes {
+    confess "excludes must be called within the role { ... } block."
+        unless $CURRENT_METACLASS;
+    croak "Must specify at least one role" unless @_;
+    $CURRENT_METACLASS->add_excluded_roles(@_);
+}
+
+sub extends { croak "Roles do not currently support 'extends'" }
+
+sub inner { croak "Roles cannot support 'inner'" }
+
+sub augment { croak "Roles cannot support 'augment'" }
+
 1;