X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FRole.pm;h=5910c9801d9aa92943181256e1c89ea0243f2d73;hb=2ee514b1f22357435ed4271f8a9f9d1dd175e508;hp=93727ef42ec171b6eeb7d42d6c924fcb4a0ae22c;hpb=0338a41154d38a6fb6b6452a1245044f12fc40d6;p=gitmo%2FMoose.git diff --git a/lib/Moose/Role.pm b/lib/Moose/Role.pm index 93727ef..5910c98 100644 --- a/lib/Moose/Role.pm +++ b/lib/Moose/Role.pm @@ -1,21 +1,19 @@ package Moose::Role; -use strict; -use warnings; - use Scalar::Util 'blessed'; -use Carp 'confess', 'croak'; +use Carp 'croak'; -use Data::OptList; use Sub::Exporter; -our $VERSION = '0.56'; +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; @@ -24,23 +22,23 @@ sub extends { } sub with { - Moose::Util::apply_all_roles( shift->meta(), @_ ); + Moose::Util::apply_all_roles( Moose::Meta::Role->initialize(shift), @_ ); } sub requires { - my $meta = shift->meta(); + my $meta = Moose::Meta::Role->initialize(shift); croak "Must specify at least one method" unless @_; $meta->add_required_methods(@_); } sub excludes { - my $meta = shift->meta(); + my $meta = Moose::Meta::Role->initialize(shift); croak "Must specify at least one role" unless @_; $meta->add_excluded_roles(@_); } sub has { - my $meta = shift->meta(); + my $meta = Moose::Meta::Role->initialize(shift); my $name = shift; croak 'Usage: has \'name\' => ( key => value, ... )' if @_ == 1; my %options = @_; @@ -48,43 +46,26 @@ sub has { $meta->add_attribute( $_, %options ) for @$attrs; } -sub before { - my $meta = shift->meta(); +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 = shift->meta(); +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 = shift->meta(); - 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 { @@ -93,20 +74,20 @@ sub super { } sub override { - my $meta = shift->meta(); + my $meta = Moose::Meta::Role->initialize(shift); my ( $name, $code ) = @_; $meta->add_override_method_modifier( $name, $code ); } 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->build_import_methods( +Moose::Exporter->setup_import_methods( with_caller => [ qw( with requires excludes has before after around override make_immutable ) ], @@ -117,35 +98,44 @@ my $exporter = Moose::Exporter->build_import_methods( ], ); -{ - my %METAS; +sub init_meta { + shift; + my %args = @_; - sub _init_meta { - shift; - my %args = @_; + my $role = $args{for_class}; - my $role = $args{for_class} - or confess - "Cannot call _init_meta without specifying a for_class"; + unless ($role) { + require Moose; + Moose->throw_error("Cannot call init_meta without specifying a for_class"); + } - return $METAS{$role} if exists $METAS{$role}; + my $metaclass = $args{metaclass} || "Moose::Meta::Role"; - # make a subtype for each Moose class - role_type $role unless find_type_constraint($role); + # make a subtype for each Moose class + role_type $role unless find_type_constraint($role); - 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"; - } - else { - $meta = Moose::Meta::Role->initialize($role); - $meta->alias_method('meta' => sub { $meta }); - } + # FIXME copy from Moose.pm + my $meta; + if ($role->can('meta')) { + $meta = $role->meta(); - return $METAS{$role} = $meta; + 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); + + $meta->add_method( + 'meta' => sub { + # re-initialize so it inherits properly + $metaclass->initialize( ref($_[0]) || $_[0] ); + } + ); } + + return $meta; } 1; @@ -221,6 +211,29 @@ Moose::Role offers a way to remove the keywords it exports, through the C method. You simply have to say C at the bottom of your code for this to work. +=head2 B<< Moose::Role->init_meta(for_class => $role, metaclass => $metaclass) >> + +The C method sets up the metaclass object for the role +specified by C. It also injects a a C accessor into +the role so you can get at this object. + +The default metaclass is L. You can specify an +alternate metaclass with the C 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 object will have the specified traits +applied to it. See L for more details. + =head1 CAVEATS Role support has only a few caveats: @@ -247,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 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 keyword of some kind -instead. This decision has not yet been finalized. - =back =head1 BUGS @@ -273,7 +276,7 @@ Christian Hansen Echansen@cpan.orgE =head1 COPYRIGHT AND LICENSE -Copyright 2006-2008 by Infinity Interactive, Inc. +Copyright 2006-2009 by Infinity Interactive, Inc. L