X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FMeta%2FClass.pm;h=2951ead33af0f8fd255a9b0ba5b6661251723ff5;hb=e06951bb83e29645bd9186e3180a6af480929050;hp=1e2cb86d05d175dbf49bb39ff0b077b4d960d56a;hpb=6a52b083252adecd5049dc7dde4a2b8f1e13ddd1;p=gitmo%2FMoose.git diff --git a/lib/Moose/Meta/Class.pm b/lib/Moose/Meta/Class.pm index 1e2cb86..2951ead 100644 --- a/lib/Moose/Meta/Class.pm +++ b/lib/Moose/Meta/Class.pm @@ -12,7 +12,7 @@ use List::Util qw( first ); use List::MoreUtils qw( any all uniq first_index ); use Scalar::Util 'weaken', 'blessed'; -our $VERSION = '1.04'; +our $VERSION = '1.14'; $VERSION = eval $VERSION; our $AUTHORITY = 'cpan:STEVAN'; @@ -69,19 +69,6 @@ sub initialize { ); } -sub _immutable_options { - my ( $self, @args ) = @_; - - $self->SUPER::_immutable_options( - inline_destructor => 1, - - # Moose always does this when an attribute is created - inline_accessors => 0, - - @args, - ); -} - sub create { my ($class, $package_name, %options) = @_; @@ -364,7 +351,7 @@ sub _base_metaclasses { sub _find_common_base { my $self = shift; my ($meta1, $meta2) = map { Class::MOP::class_of($_) } @_; - return unless defined($meta1) && defined($meta2); + return unless defined $meta1 && defined $meta2; # FIXME? This doesn't account for multiple inheritance (not sure # if it needs to though). For example, if somewhere in $meta1's @@ -401,16 +388,32 @@ sub _is_role_only_subclass { my ($parent_name) = @parent_names; my $parent_meta = Class::MOP::Class->initialize($parent_name); + my @roles = $meta->can('calculate_all_roles_with_inheritance') + ? $meta->calculate_all_roles_with_inheritance + : (); + # loop over all methods that are a part of the current class # (not inherited) - for my $method (map { $meta->get_method($_) } $meta->get_method_list) { + for my $method ( $meta->_get_local_methods ) { # always ignore meta next if $method->name eq 'meta'; # we'll deal with attributes below - next if $method->isa('Class::MOP::Method::Accessor'); + next if $method->can('associated_attribute'); # if the method comes from a role we consumed, ignore it next if $meta->can('does_role') && $meta->does_role($method->original_package_name); + # FIXME - this really isn't right. Just because a modifier is + # defined in a role doesn't mean it isn't _also_ defined in the + # subclass. + next if $method->isa('Class::MOP::Method::Wrapped') + && ( + (!scalar($method->around_modifiers) + || any { $_->has_around_method_modifiers($method->name) } @roles) + && (!scalar($method->before_modifiers) + || any { $_->has_before_method_modifiers($method->name) } @roles) + && (!scalar($method->after_modifiers) + || any { $_->has_after_method_modifiers($method->name) } @roles) + ); return 0; } @@ -421,8 +424,7 @@ sub _is_role_only_subclass { # defined in a role doesn't mean it isn't _also_ defined in the # subclass. for my $attr (map { $meta->get_attribute($_) } $meta->get_attribute_list) { - next if any { $_->has_attribute($attr->name) } - $meta->calculate_all_roles_with_inheritance; + next if any { $_->has_attribute($attr->name) } @roles; return 0; } @@ -435,20 +437,12 @@ sub _can_fix_class_metaclass_incompatibility_by_role_reconciliation { my ($super_meta) = @_; my $super_meta_name = $super_meta->_real_ref_name; - my $common_base_name = $self->_find_common_base(blessed($self), $super_meta_name); - # if they're not both moose metaclasses, and the cmop fixing couldn't - # do anything, there's nothing more we can do - return unless defined($common_base_name); - return unless $common_base_name->isa('Moose::Meta::Class'); - - my @super_meta_name_ancestor_names = $self->_get_ancestors_until($super_meta_name, $common_base_name); - my @class_meta_name_ancestor_names = $self->_get_ancestors_until(blessed($self), $common_base_name); - # we're only dealing with roles here - return unless all { $self->_is_role_only_subclass($_) } - (@super_meta_name_ancestor_names, - @class_meta_name_ancestor_names); - return 1; + return $self->_classes_differ_by_roles_only( + blessed($self), + $super_meta_name, + 'Moose::Meta::Class', + ); } sub _can_fix_single_metaclass_incompatibility_by_role_reconciliation { @@ -460,18 +454,36 @@ sub _can_fix_single_metaclass_incompatibility_by_role_reconciliation { my $super_specific_meta_name = $super_meta->$metaclass_type; my %metaclasses = $self->_base_metaclasses; - my $common_base_name = $self->_find_common_base($class_specific_meta_name, $super_specific_meta_name); - # if they're not both moose metaclasses, and the cmop fixing couldn't - # do anything, there's nothing more we can do - return unless defined($common_base_name); - return unless $common_base_name->isa($metaclasses{$metaclass_type}); + return $self->_classes_differ_by_roles_only( + $class_specific_meta_name, + $super_specific_meta_name, + $metaclasses{$metaclass_type}, + ); +} + +sub _classes_differ_by_roles_only { + my $self = shift; + my ( $self_meta_name, $super_meta_name, $expected_ancestor ) = @_; + + my $common_base_name + = $self->_find_common_base( $self_meta_name, $super_meta_name ); + + # If they're not both moose metaclasses, and the cmop fixing couldn't do + # anything, there's nothing more we can do. The $expected_ancestor should + # always be a Moose metaclass name like Moose::Meta::Class or + # Moose::Meta::Attribute. + return unless defined $common_base_name; + return unless $common_base_name->isa($expected_ancestor); + + my @super_meta_name_ancestor_names + = $self->_get_ancestors_until( $super_meta_name, $common_base_name ); + my @class_meta_name_ancestor_names + = $self->_get_ancestors_until( $self_meta_name, $common_base_name ); - my @super_specific_meta_name_ancestor_names = $self->_get_ancestors_until($super_specific_meta_name, $common_base_name); - my @class_specific_meta_name_ancestor_names = $self->_get_ancestors_until($class_specific_meta_name, $common_base_name); - # we're only dealing with roles here - return unless all { $self->_is_role_only_subclass($_) } - (@super_specific_meta_name_ancestor_names, - @class_specific_meta_name_ancestor_names); + return + unless all { $self->_is_role_only_subclass($_) } + @super_meta_name_ancestor_names, + @class_meta_name_ancestor_names; return 1; } @@ -500,6 +512,14 @@ sub _reconcile_roles_for_metaclass { my @role_differences = $self->_role_differences( $class_meta_name, $super_meta_name, ); + + # handle the case where we need to fix compatibility between a class and + # its parent, but all roles in the class are already also done by the + # parent + # see t/050/054.t + return Class::MOP::class_of($super_meta_name) + unless @role_differences; + return Moose::Meta::Class->create_anon_class( superclasses => [$super_meta_name], roles => \@role_differences, @@ -560,13 +580,14 @@ sub _fix_single_metaclass_incompatibility { || confess "Can't fix metaclass incompatibility for " . $self->name . " because it is not pristine."; + my $super_meta_name = $super_meta->_real_ref_name; my $class_specific_meta_subclass_meta = $self->_reconcile_roles_for_metaclass($self->$metaclass_type, $super_meta->$metaclass_type); my $new_self = $super_meta->reinitialize( $self->name, $metaclass_type => $class_specific_meta_subclass_meta->name, ); - $self->_replace_self( $new_self, blessed($super_meta) ); + $self->_replace_self( $new_self, $super_meta_name ); } } @@ -619,6 +640,21 @@ sub _process_inherited_attribute { } } +## Immutability + +sub _immutable_options { + my ( $self, @args ) = @_; + + $self->SUPER::_immutable_options( + inline_destructor => 1, + + # Moose always does this when an attribute is created + inline_accessors => 0, + + @args, + ); +} + ## ------------------------------------------------- our $error_level; @@ -734,8 +770,8 @@ This overrides the parent's method to add a few options. Specifically, it uses the Moose-specific constructor and destructor classes, and enables inlining the destructor. -Also, since Moose always inlines attributes, it sets the -C option to false. +Since Moose always inlines attributes, it sets the C option +to false. =item B<< $metaclass->new_object(%params) >> @@ -806,8 +842,8 @@ be provided as a hash reference. =item B<< $metaclass->destructor_class($class_name) >> -These are the names of classes used when making a class -immutable. These default to L and +These are the names of classes used when making a class immutable. These +default to L and L respectively. These accessors are read-write, so you can use them to change the class name.