X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FRole.pm;h=1065cfec58e7c72f1c1437c9de414488dde890b5;hb=ac4b3ad43aa91878ee9bc786e1800d5e9fbd876f;hp=98b322c95b7cdbe5b3d2229a57a5fe7b0f1c1dde;hpb=cbb03d24a2f835268ff62e898049aea411b82a1c;p=gitmo%2FMoose.git diff --git a/lib/Moose/Role.pm b/lib/Moose/Role.pm index 98b322c..1065cfe 100644 --- a/lib/Moose/Role.pm +++ b/lib/Moose/Role.pm @@ -1,90 +1,72 @@ - 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.88'; +$VERSION = eval $VERSION; our $AUTHORITY = 'cpan:STEVAN'; use Moose (); use Moose::Util (); +use Moose::Exporter; 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 { - 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 = @_; + my %options = ( definition_context => Moose::Util::_caller_info(), @_ ); my $attrs = ( ref($name) eq 'ARRAY' ) ? $name : [ ($name) ]; $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 +75,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_exporter( +Moose::Exporter->setup_import_methods( with_caller => [ qw( with requires excludes has before after around override make_immutable ) ], @@ -117,61 +99,44 @@ my $exporter = Moose::Exporter->build_exporter( ], ); -sub import { - my $caller = Moose::Exporter->get_caller(@_); - - # this works because both pragmas set $^H (see perldoc perlvar) - # which affects the current compilation - i.e. the file who use'd - # us - which is why we don't need to do anything special to make - # it affect that file rather than this one (which is already compiled) +sub init_meta { + shift; + my %args = @_; - strict->import; - warnings->import; + my $role = $args{for_class}; - # we should never export to main - if ($caller eq 'main') { - warn qq{Moose::Role does not export its sugar to the 'main' package.\n}; - return; + unless ($role) { + require Moose; + Moose->throw_error("Cannot call init_meta without specifying a for_class"); } - init_meta($caller); - - goto $exporter; -} - -sub unimport { - my $caller = Moose::Exporter->get_caller(@_); - - Moose::Exporter->remove_keywords( - source => __PACKAGE__, - from => $caller, - ); -} - -{ - my %METAS; - - sub init_meta { - my $role = shift; + my $metaclass = $args{metaclass} || "Moose::Meta::Role"; - return $METAS{$role} if exists $METAS{$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); + # FIXME copy from Moose.pm + my $meta; + if ($role->can('meta')) { + $meta = $role->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"; - } - else { - $meta = Moose::Meta::Role->initialize($role); - $meta->alias_method('meta' => sub { $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"); } - - return $METAS{$role} = $meta; } + else { + $meta = $metaclass->initialize($role); + + $meta->add_method( + 'meta' => sub { + # re-initialize so it inherits properly + $metaclass->initialize( ref($_[0]) || $_[0] ); + } + ); + } + + return $meta; } 1; @@ -210,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. This document +serves as API documentation. =head1 EXPORTED FUNCTIONS @@ -247,6 +207,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: @@ -273,16 +256,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 @@ -299,7 +272,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