X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FRole.pm;h=5b3a8d04e3aa9dc7edc6dbb1aecef82695f4c9f6;hb=a3319906531cef2b41a87138e75461ced7a3394b;hp=e1f2b9c3fc19a40e019422ca5b5a00cd7cf282c0;hpb=6549b0d1ae8b084898ac2d8ad60d6a57cccf4124;p=gitmo%2FMoose.git diff --git a/lib/Moose/Role.pm b/lib/Moose/Role.pm index e1f2b9c..5b3a8d0 100644 --- 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.73_01'; $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,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 keyword currently only works with actual methods. A method -modifier (before/around/after and override) will not count as a fulfillment -of the requirement, and neither will an autogenerated accessor for an attribute. - -It is likely that attribute accessors will eventually be allowed to fulfill those -requirements, or we will introduce a C keyword of some kind -instead. This decision has not yet been finalized. - =back =head1 BUGS