X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FMeta%2FRole%2FApplication%2FToRole.pm;h=844c4f283998aa8f88511c580be961f2ac1dac06;hb=75d2da3428d70afc00efb0f295fd0656a05d6b9f;hp=13fff101b83f1c08bdbb8bfe27d197a855072368;hpb=709c321c3bdc9a36769c9a2b24723b5315439fd3;p=gitmo%2FMoose.git diff --git a/lib/Moose/Meta/Role/Application/ToRole.pm b/lib/Moose/Meta/Role/Application/ToRole.pm index 13fff10..844c4f2 100644 --- a/lib/Moose/Meta/Role/Application/ToRole.pm +++ b/lib/Moose/Meta/Role/Application/ToRole.pm @@ -4,12 +4,10 @@ use strict; use warnings; use metaclass; -use Carp 'confess'; use Scalar::Util 'blessed'; -use Data::Dumper; - -our $VERSION = '0.01'; +our $VERSION = '0.77'; +$VERSION = eval $VERSION; our $AUTHORITY = 'cpan:STEVAN'; use base 'Moose::Meta::Role::Application'; @@ -17,16 +15,20 @@ use base 'Moose::Meta::Role::Application'; sub apply { my ($self, $role1, $role2) = @_; $self->SUPER::apply($role1, $role2); - $role2->add_role($role1); + $role2->add_role($role1); } sub check_role_exclusions { my ($self, $role1, $role2) = @_; - confess "Conflict detected: " . $role2->name . " excludes role '" . $role1->name . "'" - if $role2->excludes_role($role1->name); + if ( $role2->excludes_role($role1->name) ) { + require Moose; + Moose->throw_error("Conflict detected: " . $role2->name . " excludes role '" . $role1->name . "'"); + } foreach my $excluded_role_name ($role1->get_excluded_roles_list) { - confess "The class " . $role2->name . " does the excluded role '$excluded_role_name'" - if $role2->does_role($excluded_role_name); + if ( $role2->does_role($excluded_role_name) ) { + require Moose; + Moose->throw_error("The class " . $role2->name . " does the excluded role '$excluded_role_name'"); + } $role2->add_excluded_roles($excluded_role_name); } } @@ -34,13 +36,16 @@ sub check_role_exclusions { sub check_required_methods { my ($self, $role1, $role2) = @_; foreach my $required_method_name ($role1->get_required_method_list) { + + next if $self->is_aliased_method($required_method_name); + $role2->add_required_methods($required_method_name) unless $role2->find_method_by_name($required_method_name); } } sub check_required_attributes { - + } sub apply_attributes { @@ -50,8 +55,10 @@ sub apply_attributes { if ($role2->has_attribute($attribute_name) && # make sure we haven't seen this one already too $role2->get_attribute($attribute_name) != $role1->get_attribute($attribute_name)) { - confess "Role '" . $role1->name . "' has encountered an attribute conflict " . - "during composition. This is fatal error and cannot be disambiguated."; + + require Moose; + Moose->throw_error("Role '" . $role1->name . "' has encountered an attribute conflict " . + "during composition. This is fatal error and cannot be disambiguated."); } else { $role2->add_attribute( @@ -65,6 +72,33 @@ sub apply_attributes { sub apply_methods { my ($self, $role1, $role2) = @_; foreach my $method_name ($role1->get_method_list) { + + if ($self->is_method_aliased($method_name)) { + my $aliased_method_name = $self->get_method_aliases->{$method_name}; + # it if it has one already + if ($role2->has_method($aliased_method_name) && + # and if they are not the same thing ... + $role2->get_method($aliased_method_name)->body != $role1->get_method($method_name)->body) { + + require Moose; + Moose->throw_error("Cannot create a method alias if a local method of the same name exists"); + } + + $role2->add_method( + $aliased_method_name, + $role1->get_method($method_name) + ); + + if (!$role2->has_method($method_name)) { + $role2->add_required_methods($method_name) + unless $self->is_method_excluded($method_name); + } + + next; + } + + next if $self->is_method_excluded($method_name); + # it if it has one already if ($role2->has_method($method_name) && # and if they are not the same thing ... @@ -74,12 +108,14 @@ sub apply_methods { $role2->add_required_methods($method_name); } else { - # add it, although it could be overriden - $role2->alias_method( + # add it, although it could be overridden + $role2->add_method( $method_name, $role1->get_method($method_name) ); + } + } } @@ -90,11 +126,12 @@ sub apply_override_method_modifiers { if ($role2->has_method($method_name)) { # if it is being composed into another role # we have a conflict here, because you cannot - # combine an overriden method with a locally + # combine an overridden method with a locally # defined one - confess "Role '" . $role1->name . "' has encountered an 'override' method conflict " . + require Moose; + Moose->throw_error("Role '" . $role1->name . "' has encountered an 'override' method conflict " . "during composition (A local method of the same name as been found). This " . - "is fatal error."; + "is fatal error."); } else { # if we are a role, we need to make sure @@ -102,9 +139,11 @@ sub apply_override_method_modifiers { # we are composing into if ($role2->has_override_method_modifier($method_name) && $role2->get_override_method_modifier($method_name) != $role2->get_override_method_modifier($method_name)) { - confess "Role '" . $role1->name . "' has encountered an 'override' method conflict " . + + require Moose; + Moose->throw_error("Role '" . $role1->name . "' has encountered an 'override' method conflict " . "during composition (Two 'override' methods of the same name encountered). " . - "This is fatal error."; + "This is fatal error."); } else { # if there is no conflict, @@ -139,7 +178,7 @@ __END__ =head1 NAME -Moose::Meta::Role::Application::ToRole +Moose::Meta::Role::Application::ToRole - Compose a role into another role =head1 DESCRIPTION @@ -181,7 +220,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