X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FMeta%2FRole%2FApplication%2FToClass.pm;h=2bc593eb14bd60967fecf6c9ad2eb3ecc20ac1d6;hb=d03bd989b97597428b460d7f9a021e2931893fa0;hp=8101d7547c6875886896a054b0d96e10aa33e44e;hpb=eaa35e6e0f9132abf6ed0cec60515dd7259ce704;p=gitmo%2FMoose.git diff --git a/lib/Moose/Meta/Role/Application/ToClass.pm b/lib/Moose/Meta/Role/Application/ToClass.pm index 8101d75..2bc593e 100644 --- a/lib/Moose/Meta/Role/Application/ToClass.pm +++ b/lib/Moose/Meta/Role/Application/ToClass.pm @@ -4,36 +4,39 @@ use strict; use warnings; use metaclass; -use Carp 'confess'; -use Scalar::Util 'blessed'; +use Moose::Util 'english_list'; +use Scalar::Util 'blessed'; -use Data::Dumper; - -our $VERSION = '0.50'; +our $VERSION = '0.75_01'; +$VERSION = eval $VERSION; our $AUTHORITY = 'cpan:STEVAN'; use base 'Moose::Meta::Role::Application'; sub apply { - my ($self, $role, $class) = @_; + my ($self, $role, $class) = @_; $self->SUPER::apply($role, $class); - $class->add_role($role); + $class->add_role($role); } sub check_role_exclusions { my ($self, $role, $class) = @_; if ($class->excludes_role($role->name)) { - confess "Conflict detected: " . $class->name . " excludes role '" . $role->name . "'"; + $class->throw_error("Conflict detected: " . $class->name . " excludes role '" . $role->name . "'"); } foreach my $excluded_role_name ($role->get_excluded_roles_list) { if ($class->does_role($excluded_role_name)) { - confess "The class " . $class->name . " does the excluded role '$excluded_role_name'"; + $class->throw_error("The class " . $class->name . " does the excluded role '$excluded_role_name'"); } } } sub check_required_methods { my ($self, $role, $class) = @_; + + my @missing; + my @is_attr; + # NOTE: # we might need to move this down below the # the attributes so that we can require any @@ -43,41 +46,36 @@ sub check_required_methods { foreach my $required_method_name ($role->get_required_method_list) { if (!$class->find_method_by_name($required_method_name)) { - + next if $self->is_aliased_method($required_method_name); - - confess "'" . $role->name . "' requires the method '$required_method_name' " . - "to be implemented by '" . $class->name . "'"; - } - else { - # NOTE: - # we need to make sure that the method is - # not a method modifier, because those do - # not satisfy the requirements ... - my $method = $class->find_method_by_name($required_method_name); - - # check if it is a generated accessor ... - (!$method->isa('Class::MOP::Method::Accessor')) - || confess "'" . $role->name . "' requires the method '$required_method_name' " . - "to be implemented by '" . $class->name . "', the method is only an attribute accessor"; - - # NOTE: - # All other tests here have been removed, they were tests - # for overriden methods and before/after/around modifiers. - # But we realized that for classes any overriden or modified - # methods would be backed by a real method of that name - # (and therefore meet the requirement). And for roles, the - # overriden and modified methods are "in statis" and so would - # not show up in this test anyway (and as a side-effect they - # would not fufill the requirement, which is exactly what we - # want them to do anyway). - # - SL + + push @missing, $required_method_name; } } + + return unless @missing; + + my $error = ''; + + if (@missing) { + my $noun = @missing == 1 ? 'method' : 'methods'; + + my $list + = Moose::Util::english_list( map { q{'} . $_ . q{'} } @missing ); + + $error + .= q{'} + . $role->name + . "' requires the $noun $list " + . "to be implemented by '" + . $class->name . q{'}; + } + + $class->throw_error($error); } sub check_required_attributes { - + } sub apply_attributes { @@ -101,41 +99,41 @@ sub apply_attributes { sub apply_methods { my ($self, $role, $class) = @_; foreach my $method_name ($role->get_method_list) { - - next if $self->is_method_excluded($method_name); - - # it if it has one already - if ($class->has_method($method_name) && - # and if they are not the same thing ... - $class->get_method($method_name)->body != $role->get_method($method_name)->body) { - next; - } - else { - # add it, although it could be overriden - $class->alias_method( - $method_name, - $role->get_method($method_name) - ); + + unless ($self->is_method_excluded($method_name)) { + # it if it has one already + if ($class->has_method($method_name) && + # and if they are not the same thing ... + $class->get_method($method_name)->body != $role->get_method($method_name)->body) { + next; + } + else { + # add it, although it could be overridden + $class->add_method( + $method_name, + $role->get_method($method_name) + ); + } } - + if ($self->is_method_aliased($method_name)) { my $aliased_method_name = $self->get_method_aliases->{$method_name}; # it if it has one already if ($class->has_method($aliased_method_name) && # and if they are not the same thing ... $class->get_method($aliased_method_name)->body != $role->get_method($method_name)->body) { - confess "Cannot create a method alias if a local method of the same name exists"; - } - $class->alias_method( + $class->throw_error("Cannot create a method alias if a local method of the same name exists"); + } + $class->add_method( $aliased_method_name, $role->get_method($method_name) - ); - } + ); + } } # we must reset the cache here since # we are just aliasing methods, otherwise # the modifiers go wonky. - $class->reset_package_cache_flag; + $class->reset_package_cache_flag; } sub apply_override_method_modifiers { @@ -220,7 +218,7 @@ Stevan Little Estevan@iinteractive.comE =head1 COPYRIGHT AND LICENSE -Copyright 2006-2008 by Infinity Interactive, Inc. +Copyright 2006-2009 by Infinity Interactive, Inc. L