X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FRole.pm;h=55c283d00cec37eae943751ff5ce7197067a761e;hb=1edfdf1c2c930faea9d3b5e9fed40928fec420b0;hp=9fe4461842ff3e792e6ee477ed518cd95ac9a3de;hpb=68117c4523857f230ceac0f36db4187a951d315c;p=gitmo%2FMoose.git diff --git a/lib/Moose/Role.pm b/lib/Moose/Role.pm index 9fe4461..55c283d 100644 --- a/lib/Moose/Role.pm +++ b/lib/Moose/Role.pm @@ -4,13 +4,16 @@ package Moose::Role; use strict; use warnings; -use Scalar::Util (); +use Scalar::Util 'blessed'; use Carp 'confess'; use Sub::Name 'subname'; use Sub::Exporter; -our $VERSION = '0.05'; +our $VERSION = '0.07'; +our $AUTHORITY = 'cpan:STEVAN'; + +use Moose (); use Moose::Meta::Role; use Moose::Util::TypeConstraints; @@ -27,17 +30,18 @@ use Moose::Util::TypeConstraints; subtype $role => as 'Role' => where { $_->does($role) } + => optimize_as { blessed($_[0]) && $_[0]->can('does') && $_[0]->does($role) } unless find_type_constraint($role); my $meta; if ($role->can('meta')) { $meta = $role->meta(); (blessed($meta) && $meta->isa('Moose::Meta::Role')) - || confess "Whoops, not møøsey enough"; + || confess "You already have a &meta function, but it does not return a Moose::Meta::Role"; } else { - $meta = Moose::Meta::Role->new(role_name => $role); - $meta->_role_meta->add_method('meta' => sub { $meta }) + $meta = Moose::Meta::Role->initialize($role); + $meta->Moose::Meta::Class::add_method('meta' => sub { $meta }) } return $METAS{$role} = $meta; @@ -56,7 +60,7 @@ use Moose::Util::TypeConstraints; return subname 'Moose::Role::with' => sub (@) { my (@roles) = @_; confess "Must specify at least one role" unless @roles; - Moose::_load_all_classes(@roles); + Class::MOP::load_class($_) for @roles; ($_->can('meta') && $_->meta->isa('Moose::Meta::Role')) || confess "You can only consume roles, $_ is not a Moose role" foreach @roles; @@ -94,8 +98,8 @@ use Moose::Util::TypeConstraints; before => sub { my $meta = _find_meta(); return subname 'Moose::Role::before' => sub (@&) { - my $code = pop @_; - $meta->add_before_method_modifier($_, $code) for @_; + my $code = pop @_; + $meta->add_before_method_modifier($_, $code) for @_; }; }, after => sub { @@ -113,6 +117,10 @@ use Moose::Util::TypeConstraints; }; }, super => sub { + { + no strict 'refs'; + $Moose::SUPER_SLOT{$CALLER} = \*{"${CALLER}::super"}; + } my $meta = _find_meta(); return subname 'Moose::Role::super' => sub {}; }, @@ -120,19 +128,19 @@ use Moose::Util::TypeConstraints; my $meta = _find_meta(); return subname 'Moose::Role::override' => sub ($&) { my ($name, $code) = @_; - $meta->add_override_method_modifier($name, $code); + $meta->add_override_method_modifier($name, $code); }; }, inner => sub { my $meta = _find_meta(); return subname 'Moose::Role::inner' => sub { - confess "Moose::Role does not currently support 'inner'"; + confess "Moose::Role cannot support 'inner'"; }; }, augment => sub { my $meta = _find_meta(); return subname 'Moose::Role::augment' => sub { - confess "Moose::Role does not currently support 'augment'"; + confess "Moose::Role cannot support 'augment'"; }; }, confess => sub { @@ -151,7 +159,12 @@ use Moose::Util::TypeConstraints; }); sub import { - $CALLER = caller(); + $CALLER = + ref $_[1] && defined $_[1]->{into} ? $_[1]->{into} + : ref $_[1] + && defined $_[1]->{into_level} ? caller( $_[1]->{into_level} ) + : caller(); + strict->import; warnings->import; @@ -177,9 +190,7 @@ Moose::Role - The Moose Role =head1 SYNOPSIS package Eq; - use strict; - use warnings; - use Moose::Role; + use Moose::Role; # automatically turns on strict and warnings requires 'equal'; @@ -191,9 +202,7 @@ Moose::Role - The Moose Role # ... then in your classes package Currency; - use strict; - use warnings; - use Moose; + use Moose; # automatically turns on strict and warnings with 'Eq'; @@ -204,60 +213,61 @@ Moose::Role - The Moose Role =head1 DESCRIPTION -Role support in Moose is coming along quite well. It's best documentation -is still the the test suite, but 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. More complete -documentation is planned and will be included with the next official -(non-developer) release. +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. =head1 EXPORTED FUNCTIONS -Currently Moose::Role supports all of the functions that L exports, -but differs slightly in how some items are handled (see L below -for details). +Moose::Role currently supports all of the functions that L exports, but +differs slightly in how some items are handled (see L below for +details). -Moose::Role also offers two role specific keyword exports: +Moose::Role also offers two role-specific keyword exports: =over 4 =item B Roles can require that certain methods are implemented by any class which -C the role. +C the role. =item B Roles can C other roles, in effect saying "I can never be combined with these C<@role_names>". This is a feature which should not be used -lightly. +lightly. =back =head1 CAVEATS -The role support now has only a few caveats. They are as follows: +Role support has only a few caveats: =over 4 =item * -Roles cannot use the C keyword, it will throw an exception for now. +Roles cannot use the C keyword; it will throw an exception for now. The same is true of the C and C keywords (not sure those really make sense for roles). All other Moose keywords will be I -so that they can be applied to the consuming class. +so that they can be applied to the consuming class. =item * -Role composition does it's best to B be order sensitive when it comes -to conflict resolution and requirements detection. However, it is order -sensitive when it comes to method modifiers. All before/around/after modifiers -are included whenever a role is composed into a class, and then are applied -in the order the roles are used. This too means that there is no conflict for -before/around/after modifiers as well. +Role composition does its best to B be order-sensitive when it comes to +conflict resolution and requirements detection. However, it is order-sensitive +when it comes to method modifiers. All before/around/after modifiers are +included whenever a role is composed into a class, and then applied in the order +in which the roles are used. This also means that there is no conflict for +before/around/after modifiers. -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 +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 * @@ -266,9 +276,9 @@ 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 the attribute accessors will eventually be allowed to fufill -those requirements, either that or we will introduce a C keyword -of some kind instead. This descision has not yet been finalized. +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 @@ -286,7 +296,7 @@ Christian Hansen Echansen@cpan.orgE =head1 COPYRIGHT AND LICENSE -Copyright 2006 by Infinity Interactive, Inc. +Copyright 2006, 2007 by Infinity Interactive, Inc. L