X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FRole.pm;h=5b3a8d04e3aa9dc7edc6dbb1aecef82695f4c9f6;hb=a3319906531cef2b41a87138e75461ced7a3394b;hp=a86515a25a7acdf9c8010b49e8326c1ce05f4595;hpb=82750a8aa67b0f6cd139537bef64162d7a7c4d52;p=gitmo%2FMoose.git

diff --git a/lib/Moose/Role.pm b/lib/Moose/Role.pm
index a86515a..5b3a8d0 100644
--- a/lib/Moose/Role.pm
+++ b/lib/Moose/Role.pm
@@ -10,13 +10,14 @@ use Carp         'croak';
 use Data::OptList;
 use Sub::Exporter;
 
-our $VERSION   = '0.62_01';
+our $VERSION   = '0.73_01';
 $VERSION = eval $VERSION;
 our $AUTHORITY = 'cpan:STEVAN';
 
 use Moose       ();
 use Moose::Util ();
 
+use Moose::Exporter;
 use Moose::Meta::Role;
 use Moose::Util::TypeConstraints;
 
@@ -107,7 +108,7 @@ sub augment {
     croak "Roles cannot support 'augment'";
 }
 
-my $exporter = Moose::Exporter->setup_import_methods(
+Moose::Exporter->setup_import_methods(
     with_caller => [
         qw( with requires excludes has before after around override make_immutable )
     ],
@@ -122,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";
 
@@ -134,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);
@@ -259,16 +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 fufillment
-of the requirement, and neither will an autogenerated accessor for an attribute.
-
-It is likely that attribute accessors will eventually be allowed to fufill those
-requirements, or we will introduce a C<requires_attr> keyword of some kind
-instead. This decision has not yet been finalized.
-
 =back
 
 =head1 BUGS
@@ -285,7 +283,7 @@ Christian Hansen E<lt>chansen@cpan.orgE<gt>
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright 2006-2008 by Infinity Interactive, Inc.
+Copyright 2006-2009 by Infinity Interactive, Inc.
 
 L<http://www.iinteractive.com>