s/constraint/coercion/

[gitmo/Moose.git] / lib / Moose / Role.pm

diff --git a/lib/Moose/Role.pm b/lib/Moose/Role.pm
index 12ab7c1..c763936 100644 (file)
--- a/lib/Moose/Role.pm
+++ b/lib/Moose/Role.pm
@@ -10,7 +10,7 @@ use Carp         'croak';
 use Data::OptList;
 use Sub::Exporter;
 
-our $VERSION   = '0.67';
+our $VERSION   = '0.72';
 $VERSION = eval $VERSION;
 our $AUTHORITY = 'cpan:STEVAN';
 
@@ -123,8 +123,12 @@ sub init_meta {
     shift;
     my %args = @_;
 
-    my $role = $args{for_class}
-        or Moose->throw_error("Cannot call init_meta without specifying a for_class");
+    my $role = $args{for_class};
+
+    unless ($role) {
+        require Moose;
+        Moose->throw_error("Cannot call init_meta without specifying a for_class");
+    }
 
     my $metaclass = $args{metaclass} || "Moose::Meta::Role";
 
@@ -135,8 +139,11 @@ sub init_meta {
     my $meta;
     if ($role->can('meta')) {
         $meta = $role->meta();
-        (blessed($meta) && $meta->isa('Moose::Meta::Role'))
-            || Moose->throw_error("You already have a &meta function, but it does not return a Moose::Meta::Role");
+
+        unless ( blessed($meta) && $meta->isa('Moose::Meta::Role') ) {
+            require Moose;
+            Moose->throw_error("You already have a &meta function, but it does not return a Moose::Meta::Role");
+        }
     }
     else {
         $meta = $metaclass->initialize($role);
@@ -260,12 +267,6 @@ In most cases, this will be a non-issue; however, it is something to keep in
 mind when using method modifiers in a role. You should never assume any
 ordering.
 
-=item *
-
-The C<requires> keyword currently only works with actual methods. A
-method modifier (before/around/after and override) will not count as a
-fulfillment of the requirement.
-
 =back
 
 =head1 BUGS