X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FRole.pm;h=c763936bf31faa4c8b648051d4996b1070e80b2e;hb=c638628232a4382013a4c6ef0a87c245a89d9d68;hp=47ff32477e1ba122640b798c83e605532166cc45;hpb=72d15b838f9f72a7fe7dcc1570c4b445d9252c2b;p=gitmo%2FMoose.git

diff --git a/lib/Moose/Role.pm b/lib/Moose/Role.pm
index 47ff324..c763936 100644
--- a/lib/Moose/Role.pm
+++ b/lib/Moose/Role.pm
@@ -5,18 +5,19 @@ use strict;
 use warnings;
 
 use Scalar::Util 'blessed';
-use Carp         'confess', 'croak';
+use Carp         'croak';
 
 use Data::OptList;
 use Sub::Exporter;
 
-our $VERSION   = '0.55_01';
+our $VERSION   = '0.72';
 $VERSION = eval $VERSION;
 our $AUTHORITY = 'cpan:STEVAN';
 
 use Moose       ();
 use Moose::Util ();
 
+use Moose::Exporter;
 use Moose::Meta::Role;
 use Moose::Util::TypeConstraints;
 
@@ -54,7 +55,7 @@ sub before {
     my $code = pop @_;
 
     for (@_) {
-        croak "Moose::Role do not currently support "
+        croak "Roles do not currently support "
             . ref($_)
             . " references for before method modifiers"
             if ref $_;
@@ -67,7 +68,7 @@ sub after {
 
     my $code = pop @_;
     for (@_) {
-        croak "Moose::Role do not currently support "
+        croak "Roles do not currently support "
             . ref($_)
             . " references for after method modifiers"
             if ref $_;
@@ -79,7 +80,7 @@ sub around {
     my $meta = Moose::Meta::Role->initialize(shift);
     my $code = pop @_;
     for (@_) {
-        croak "Moose::Role do not currently support "
+        croak "Roles do not currently support "
             . ref($_)
             . " references for around method modifiers"
             if ref $_;
@@ -100,14 +101,14 @@ sub override {
 }
 
 sub inner {
-    croak "Moose::Role cannot support 'inner'";
+    croak "Roles cannot support 'inner'";
 }
 
 sub augment {
-    croak "Moose::Role cannot support '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,9 +123,12 @@ sub init_meta {
     shift;
     my %args = @_;
 
-    my $role = $args{for_class}
-        or confess
-        "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'))
-            || confess "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<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
@@ -286,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>