X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FMeta%2FRole%2FApplication%2FToClass.pm;h=514368977a7b4f48dd404f17ffdfcb8e0131ccdc;hb=55d05fb16429c2150b5337b1a0130ae334e129d0;hp=28d1ef45ca3ee93c832eda76c429fcd3a254aa9d;hpb=ff9c4953b4d4b024482f4021c036052b2a9b7547;p=gitmo%2FMoose.git diff --git a/lib/Moose/Meta/Role/Application/ToClass.pm b/lib/Moose/Meta/Role/Application/ToClass.pm index 28d1ef4..5143689 100644 --- a/lib/Moose/Meta/Role/Application/ToClass.pm +++ b/lib/Moose/Meta/Role/Application/ToClass.pm @@ -5,9 +5,9 @@ use warnings; use metaclass; use Moose::Util 'english_list'; -use Scalar::Util 'blessed'; +use Scalar::Util 'weaken', 'blessed'; -our $VERSION = '0.77'; +our $VERSION = '1.12'; $VERSION = eval $VERSION; our $AUTHORITY = 'cpan:STEVAN'; @@ -15,22 +15,23 @@ use base 'Moose::Meta::Role::Application'; __PACKAGE__->meta->add_attribute('role' => ( reader => 'role', - writer => 'set_role', )); __PACKAGE__->meta->add_attribute('class' => ( reader => 'class', - writer => 'set_class', )); sub apply { my ($self, $role, $class) = @_; - $self->set_role($role); - $self->set_class($class); + # We need weak_ref in CMOP :( + weaken($self->{role} = $role); + weaken($self->{class} = $class); $self->SUPER::apply($role, $class); + $class->add_role($role); + $class->add_role_application($self); } sub check_role_exclusions { @@ -57,13 +58,14 @@ sub check_required_methods { # attribute accessors. However I am thinking # that maybe those are somehow exempt from # the require methods stuff. - foreach my $required_method_name ($role->get_required_method_list) { + foreach my $required_method ($role->get_required_method_list) { + my $required_method_name = $required_method->name; if (!$class->find_method_by_name($required_method_name)) { next if $self->is_aliased_method($required_method_name); - push @missing, $required_method_name; + push @missing, $required_method; } } @@ -71,7 +73,40 @@ sub check_required_methods { my $error = ''; - if (@missing) { + @missing = sort { $a->name cmp $b->name } @missing; + my @conflicts = grep { $_->isa('Moose::Meta::Role::Method::Conflicting') } @missing; + + if (@conflicts) { + my $conflict = $conflicts[0]; + my $roles = $conflict->roles_as_english_list; + + my @same_role_conflicts = grep { $_->roles_as_english_list eq $roles } @conflicts; + + if (@same_role_conflicts == 1) { + $error + .= "Due to a method name conflict in roles " + . $roles + . ", the method '" + . $conflict->name + . "' must be implemented or excluded by '" + . $class->name + . q{'}; + } + else { + my $methods + = Moose::Util::english_list( map { q{'} . $_->name . q{'} } @same_role_conflicts ); + + $error + .= "Due to method name conflicts in roles " + . $roles + . ", the methods " + . $methods + . " must be implemented or excluded by '" + . $class->name + . q{'}; + } + } + elsif (@missing) { my $noun = @missing == 1 ? 'method' : 'methods'; my $list @@ -94,6 +129,8 @@ sub check_required_attributes { sub apply_attributes { my ($self, $role, $class) = @_; + my $attr_metaclass = $class->attribute_metaclass; + foreach my $attribute_name ($role->get_attribute_list) { # it if it has one already if ($class->has_attribute($attribute_name) && @@ -103,47 +140,50 @@ sub apply_attributes { } else { $class->add_attribute( - $attribute_name, - $role->get_attribute($attribute_name) + $role->get_attribute($attribute_name)->attribute_for_class($attr_metaclass) ); } } } sub apply_methods { - my ($self, $role, $class) = @_; - foreach my $method_name ($role->get_method_list) { - - 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) - ); - } - } + my ( $self, $role, $class ) = @_; + + foreach my $method ( $role->_get_local_methods ) { + my $method_name = $method->name; + + next if $method_name eq 'meta'; + + unless ( $self->is_method_excluded($method_name) ) { + + my $class_method = $class->get_method($method_name); + + next if $class_method && $class_method->body != $method->body; - 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) { - $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) + $method_name, + $method, + ); + } + + next unless $self->is_method_aliased($method_name); + + my $aliased_method_name = $self->get_method_aliases->{$method_name}; + + my $class_method = $class->get_method($aliased_method_name); + + if ( $class_method && $class_method->body != $method->body ) { + $class->throw_error( + "Cannot create a method alias if a local method of the same name exists" ); } + + $class->add_method( + $aliased_method_name, + $method, + ); } + # we must reset the cache here since # we are just aliasing methods, otherwise # the modifiers go wonky. @@ -222,9 +262,7 @@ Moose::Meta::Role::Application::ToClass - Compose a role into a class =head1 BUGS -All complex software has bugs lurking in it, and this module is no -exception. If you find a bug please either email me, or add the bug -to cpan-RT. +See L for details on reporting bugs. =head1 AUTHOR @@ -232,7 +270,7 @@ Stevan Little Estevan@iinteractive.comE =head1 COPYRIGHT AND LICENSE -Copyright 2006-2009 by Infinity Interactive, Inc. +Copyright 2006-2010 by Infinity Interactive, Inc. L