X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FRole.pm;h=1065cfec58e7c72f1c1437c9de414488dde890b5;hb=ac4b3ad43aa91878ee9bc786e1800d5e9fbd876f;hp=58bbd6c496e9a2acde583868ba885f3e69e9daef;hpb=c138100057073893e58f4b9eec26a07939acb83e;p=gitmo%2FMoose.git

diff --git a/lib/Moose/Role.pm b/lib/Moose/Role.pm
index 58bbd6c..1065cfe 100644
--- a/lib/Moose/Role.pm
+++ b/lib/Moose/Role.pm
@@ -1,16 +1,13 @@
-
 package Moose::Role;
-
 use strict;
 use warnings;
 
 use Scalar::Util 'blessed';
 use Carp         'croak';
 
-use Data::OptList;
 use Sub::Exporter;
 
-our $VERSION   = '0.74';
+our $VERSION   = '0.88';
 $VERSION = eval $VERSION;
 our $AUTHORITY = 'cpan:STEVAN';
 
@@ -22,7 +19,7 @@ use Moose::Meta::Role;
 use Moose::Util::TypeConstraints;
 
 sub extends {
-    croak "Roles do not currently support 'extends'";
+    croak "Roles do not support 'extends' (you can use 'with' to specialize a role)";
 }
 
 sub with {
@@ -45,48 +42,31 @@ sub has {
     my $meta = Moose::Meta::Role->initialize(shift);
     my $name = shift;
     croak 'Usage: has \'name\' => ( key => value, ... )' if @_ == 1;
-    my %options = @_;
+    my %options = ( definition_context => Moose::Util::_caller_info(), @_ );
     my $attrs = ( ref($name) eq 'ARRAY' ) ? $name : [ ($name) ];
     $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 "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 "Roles 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 "Roles 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 {
@@ -195,13 +175,8 @@ Moose::Role - The Moose Role
 
 =head1 DESCRIPTION
 
-Role support in Moose is pretty solid at this point. However, the best
-documentation is still the the test suite. It is fairly safe to assume Perl 6
-style behavior and then either refer to the test suite, or ask questions on
-#moose if something doesn't quite do what you expect.
-
-We are planning writing some more documentation in the near future, but nothing
-is ready yet, sorry.
+The concept of roles is documented in L<Moose::Manual::Roles>. This document
+serves as API documentation.
 
 =head1 EXPORTED FUNCTIONS