Method::Required->name is required

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

diff --git a/lib/Moose/Role.pm b/lib/Moose/Role.pm
index b8ebd73..5910c98 100644 (file)
--- a/lib/Moose/Role.pm
+++ b/lib/Moose/Role.pm
@@ -1,22 +1,19 @@
 
 package Moose::Role;
 
-use strict;
-use warnings;
-
 use Scalar::Util 'blessed';
 use Carp         'croak';
 
-use Data::OptList;
 use Sub::Exporter;
 
-our $VERSION   = '0.60';
+our $VERSION   = '0.79';
 $VERSION = eval $VERSION;
 our $AUTHORITY = 'cpan:STEVAN';
 
 use Moose       ();
 use Moose::Util ();
 
+use Moose::Exporter;
 use Moose::Meta::Role;
 use Moose::Util::TypeConstraints;
 
@@ -49,43 +46,26 @@ sub has {
     $meta->add_attribute( $_, %options ) for @$attrs;
 }
 
-sub before {
+sub _add_method_modifier {
+    my $type = shift;
     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 before method modifiers"
+            . " references for $type method modifiers"
             if ref $_;
-        $meta->add_before_method_modifier( $_, $code );
+        my $add_method = "add_${type}_method_modifier";
+        $meta->$add_method( $_, $code );
     }
 }
 
-sub after {
-    my $meta = Moose::Meta::Role->initialize(shift);
+sub before { _add_method_modifier('before', @_) }
 
-    my $code = pop @_;
-    for (@_) {
-        croak "Moose::Role do not currently support "
-            . ref($_)
-            . " references for after method modifiers"
-            if ref $_;
-        $meta->add_after_method_modifier( $_, $code );
-    }
-}
+sub after  { _add_method_modifier('after',  @_) }
 
-sub around {
-    my $meta = Moose::Meta::Role->initialize(shift);
-    my $code = pop @_;
-    for (@_) {
-        croak "Moose::Role do not currently support "
-            . ref($_)
-            . " references for around method modifiers"
-            if ref $_;
-        $meta->add_around_method_modifier( $_, $code );
-    }
-}
+sub around { _add_method_modifier('around', @_) }
 
 # see Moose.pm for discussion
 sub super {
@@ -100,14 +80,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,8 +102,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 +118,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);
@@ -233,6 +220,20 @@ the role so you can get at this object.
 The default metaclass is L<Moose::Meta::Role>. You can specify an
 alternate metaclass with the C<metaclass> parameter.
 
+=head1 METACLASS
+
+When you use Moose::Role, you can specify which metaclass to use:
+
+    use Moose::Role -metaclass => 'My::Meta::Role';
+
+You can also specify traits which will be applied to your role metaclass:
+
+    use Moose::Role -traits => 'My::Trait';
+
+This is very similar to the attribute traits feature. When you do
+this, your class's C<meta> object will have the specified traits
+applied to it. See L<Moose/TRAIT NAME RESOLUTION> for more details.
+
 =head1 CAVEATS
 
 Role support has only a few caveats:
@@ -259,16 +260,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 +276,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>