X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FMeta%2FRole%2FApplication%2FToClass.pm;h=7f0d986a8e000f9e9662108d4837f135a4bdc87c;hb=dbe21639d532a07229d0beeffafafba66a7e26f5;hp=479dd4b185fed7fd2941027ec057aa71d6efa1dd;hpb=9409e92e75a6e1060eb3d0adcfc7965713d3d776;p=gitmo%2FMoose.git diff --git a/lib/Moose/Meta/Role/Application/ToClass.pm b/lib/Moose/Meta/Role/Application/ToClass.pm index 479dd4b..7f0d986 100644 --- a/lib/Moose/Meta/Role/Application/ToClass.pm +++ b/lib/Moose/Meta/Role/Application/ToClass.pm @@ -5,18 +5,33 @@ use warnings; use metaclass; use Moose::Util 'english_list'; -use Scalar::Util 'blessed'; +use Scalar::Util 'weaken', 'blessed'; -our $VERSION = '0.72'; +our $VERSION = '0.79'; $VERSION = eval $VERSION; our $AUTHORITY = 'cpan:STEVAN'; use base 'Moose::Meta::Role::Application'; +__PACKAGE__->meta->add_attribute('role' => ( + reader => 'role', +)); + +__PACKAGE__->meta->add_attribute('class' => ( + reader => 'class', +)); + sub apply { - my ($self, $role, $class) = @_; + my ($self, $role, $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($role); + $class->add_role_application($self); } sub check_role_exclusions { @@ -46,7 +61,7 @@ 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); push @missing, $required_method_name; @@ -75,7 +90,7 @@ sub check_required_methods { } sub check_required_attributes { - + } sub apply_attributes { @@ -99,7 +114,7 @@ sub apply_attributes { 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) && @@ -112,10 +127,10 @@ sub apply_methods { $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 @@ -123,17 +138,17 @@ sub apply_methods { # 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) - ); - } + ); + } } # 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 {