From: Jesse Luehrs Date: Mon, 27 Sep 2010 06:19:45 +0000 (-0500) Subject: override metaclass compat stuff in a trait for CMOP::Object subclasses X-Git-Tag: 1.15~42 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=d27828133036cdd69923572453faad3920fd7c0e;p=gitmo%2FMoose.git override metaclass compat stuff in a trait for CMOP::Object subclasses --- diff --git a/lib/Moose/Meta/Attribute.pm b/lib/Moose/Meta/Attribute.pm index 342cbb6..aebca6f 100644 --- a/lib/Moose/Meta/Attribute.pm +++ b/lib/Moose/Meta/Attribute.pm @@ -17,9 +17,12 @@ use Moose::Meta::Method::Accessor; use Moose::Meta::Method::Delegation; use Moose::Util (); use Moose::Util::TypeConstraints (); +use Class::MOP::MiniTrait; use base 'Class::MOP::Attribute', 'Moose::Meta::Mixin::AttributeCore'; +Class::MOP::MiniTrait::apply(__PACKAGE__, 'Moose::Meta::Object::Trait'); + __PACKAGE__->meta->add_attribute('traits' => ( reader => 'applied_traits', predicate => 'has_applied_traits', diff --git a/lib/Moose/Meta/Class.pm b/lib/Moose/Meta/Class.pm index 801b39e..5183e80 100644 --- a/lib/Moose/Meta/Class.pm +++ b/lib/Moose/Meta/Class.pm @@ -23,9 +23,12 @@ use Moose::Meta::Class::Immutable::Trait; use Moose::Meta::Method::Constructor; use Moose::Meta::Method::Destructor; use Moose::Util; +use Class::MOP::MiniTrait; use base 'Class::MOP::Class'; +Class::MOP::MiniTrait::apply(__PACKAGE__, 'Moose::Meta::Object::Trait'); + __PACKAGE__->meta->add_attribute('roles' => ( reader => 'roles', default => sub { [] } @@ -376,10 +379,9 @@ sub _can_fix_class_metaclass_incompatibility_by_role_reconciliation { my $super_meta_name = $super_meta->_real_ref_name; - return $self->_classes_differ_by_roles_only( + return Moose::Util::_classes_differ_by_roles_only( blessed($self), $super_meta_name, - 'Moose::Meta::Class', ); } @@ -392,129 +394,12 @@ sub _can_fix_single_metaclass_incompatibility_by_role_reconciliation { my $super_specific_meta_name = $super_meta->$metaclass_type; my %metaclasses = $self->_base_metaclasses; - return $self->_classes_differ_by_roles_only( + return Moose::Util::_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 ); - - return - unless all { $self->_is_role_only_subclass($_) } - @super_meta_name_ancestor_names, - @class_meta_name_ancestor_names; - - return 1; -} - -sub _find_common_base { - my $self = shift; - my ($meta1, $meta2) = map { Class::MOP::class_of($_) } @_; - 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 - # history it inherits from both ClassA and ClassB, and $meta2 - # inherits from ClassB & ClassA, does it matter? And what crazy - # fool would do that anyway? - - my %meta1_parents = map { $_ => 1 } $meta1->linearized_isa; - - return first { $meta1_parents{$_} } $meta2->linearized_isa; -} - -sub _get_ancestors_until { - my $self = shift; - my ($start_name, $until_name) = @_; - - my @ancestor_names; - for my $ancestor_name (Class::MOP::class_of($start_name)->linearized_isa) { - last if $ancestor_name eq $until_name; - push @ancestor_names, $ancestor_name; - } - return @ancestor_names; -} - -sub _is_role_only_subclass { - my $self = shift; - my ($meta_name) = @_; - my $meta = Class::MOP::Class->initialize($meta_name); - my @parent_names = $meta->superclasses; - - # XXX: don't feel like messing with multiple inheritance here... what would - # that even do? - return unless @parent_names == 1; - my ($parent_name) = @parent_names; - my $parent_meta = Class::MOP::Class->initialize($parent_name); - - # only get the roles attached to this particular class, don't look at - # superclasses - my @roles = $meta->can('calculate_all_roles') - ? $meta->calculate_all_roles - : (); - - # it's obviously not a role-only subclass if it doesn't do any roles - return unless @roles; - - # loop over all methods that are a part of the current class - # (not inherited) - 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->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; - } - - # loop over all attributes that are a part of the current class - # (not inherited) - # FIXME - this really isn't right. Just because an attribute is - # 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) } @roles; - - return 0; - } - - return 1; -} - sub _fix_class_metaclass_incompatibility { my $self = shift; my ($super_meta) = @_; @@ -572,31 +457,6 @@ sub _replace_self { Class::MOP::weaken_metaclass( $self->name ) if $self->is_anon_class; } -sub _get_compatible_single_metaclass { - my $self = shift; - - return $self->SUPER::_get_compatible_single_metaclass(@_) - || $self->_get_compatible_single_metaclass_by_role_reconciliation(@_); -} - -sub _get_compatible_single_metaclass_by_role_reconciliation { - my $self = shift; - my ($single_meta_name) = @_; - - my $current_single_meta_name = $self->_get_associated_single_metaclass($single_meta_name); - - # XXX: gross - return unless $self->_classes_differ_by_roles_only( - $single_meta_name, - $current_single_meta_name, - $single_meta_name->isa('Class::MOP::Attribute') - ? 'Moose::Meta::Attribute' - : 'Moose::Meta::Method' - ); - - return Moose::Util::_reconcile_roles_for_metaclass($single_meta_name, $current_single_meta_name); -} - sub _process_attribute { my ( $self, $name, @args ) = @_; diff --git a/lib/Moose/Meta/Instance.pm b/lib/Moose/Meta/Instance.pm index 8158248..a31961a 100644 --- a/lib/Moose/Meta/Instance.pm +++ b/lib/Moose/Meta/Instance.pm @@ -8,8 +8,12 @@ our $VERSION = '1.14'; $VERSION = eval $VERSION; our $AUTHORITY = 'cpan:STEVAN'; +use Class::MOP::MiniTrait; + use base "Class::MOP::Instance"; +Class::MOP::MiniTrait::apply(__PACKAGE__, 'Moose::Meta::Object::Trait'); + 1; __END__ diff --git a/lib/Moose/Meta/Method.pm b/lib/Moose/Meta/Method.pm index 1a58ce2..b25e19f 100644 --- a/lib/Moose/Meta/Method.pm +++ b/lib/Moose/Meta/Method.pm @@ -7,8 +7,12 @@ our $VERSION = '1.14'; $VERSION = eval $VERSION; our $AUTHORITY = 'cpan:STEVAN'; +use Class::MOP::MiniTrait; + use base 'Class::MOP::Method'; +Class::MOP::MiniTrait::apply(__PACKAGE__, 'Moose::Meta::Object::Trait'); + sub _error_thrower { my $self = shift; ( ref $self && $self->associated_metaclass ) || "Moose::Meta::Class"; diff --git a/lib/Moose/Meta/Object/Trait.pm b/lib/Moose/Meta/Object/Trait.pm new file mode 100644 index 0000000..ae60025 --- /dev/null +++ b/lib/Moose/Meta/Object/Trait.pm @@ -0,0 +1,63 @@ + +package Moose::Meta::Object::Trait; + +use Scalar::Util qw(blessed); + +our $VERSION = '1.14'; +$VERSION = eval $VERSION; +our $AUTHORITY = 'cpan:STEVAN'; + +sub _get_compatible_metaclass { + my $orig = shift; + my $self = shift; + return $self->$orig(@_) + || $self->_get_compatible_metaclass_by_role_reconciliation(@_); +} + +sub _get_compatible_metaclass_by_role_reconciliation { + my $self = shift; + my ($other_name) = @_; + my $meta_name = blessed($self) ? $self->_real_ref_name : $self; + + return unless Moose::Util::_classes_differ_by_roles_only( + $meta_name, $other_name + ); + + return Moose::Util::_reconcile_roles_for_metaclass( + $meta_name, $other_name + ); +} + +1; + +__END__ + +=pod + +=head1 NAME + +Moose::Meta::Object::Trait - Some overrides for L functionality + +=head1 DESCRIPTION + +This module is entirely private, you shouldn't ever need to interact with +it directly. + +=head1 BUGS + +See L for details on reporting bugs. + +=head1 AUTHOR + +Jesse Luehrs Edoy at tozt dot netE + +=head1 COPYRIGHT AND LICENSE + +Copyright 2010 by Infinity Interactive, Inc. + +L + +This library is free software; you can redistribute it and/or modify +it under the same terms as Perl itself. + +=cut diff --git a/lib/Moose/Meta/Role.pm b/lib/Moose/Meta/Role.pm index e0e0e2a..11e1b59 100644 --- a/lib/Moose/Meta/Role.pm +++ b/lib/Moose/Meta/Role.pm @@ -19,11 +19,14 @@ use Moose::Meta::Role::Method; use Moose::Meta::Role::Method::Required; use Moose::Meta::Role::Method::Conflicting; use Moose::Util qw( ensure_all_roles ); +use Class::MOP::MiniTrait; use base 'Class::MOP::Module', 'Class::MOP::Mixin::HasAttributes', 'Class::MOP::Mixin::HasMethods'; +Class::MOP::MiniTrait::apply(__PACKAGE__, 'Moose::Meta::Object::Trait'); + ## ------------------------------------------------------------------ ## NOTE: ## I normally don't do this, but I am doing diff --git a/lib/Moose/Util.pm b/lib/Moose/Util.pm index de6a954..2ccb608 100644 --- a/lib/Moose/Util.pm +++ b/lib/Moose/Util.pm @@ -7,7 +7,8 @@ use Data::OptList; use Params::Util qw( _STRING ); use Sub::Exporter; use Scalar::Util 'blessed'; -use List::MoreUtils qw(any); +use List::Util qw(first); +use List::MoreUtils qw(any all); use Class::MOP 0.60; our $VERSION = '1.14'; @@ -336,6 +337,113 @@ sub _role_differences { return @differences; } +sub _classes_differ_by_roles_only { + my ( $self_meta_name, $super_meta_name ) = @_; + + my $common_base_name + = _find_common_base( $self_meta_name, $super_meta_name ); + + return unless defined $common_base_name; + + my @super_meta_name_ancestor_names + = _get_ancestors_until( $super_meta_name, $common_base_name ); + my @class_meta_name_ancestor_names + = _get_ancestors_until( $self_meta_name, $common_base_name ); + + return + unless all { _is_role_only_subclass($_) } + @super_meta_name_ancestor_names, + @class_meta_name_ancestor_names; + + return 1; +} + +sub _find_common_base { + my ($meta1, $meta2) = map { Class::MOP::class_of($_) } @_; + 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 + # history it inherits from both ClassA and ClassB, and $meta2 + # inherits from ClassB & ClassA, does it matter? And what crazy + # fool would do that anyway? + + my %meta1_parents = map { $_ => 1 } $meta1->linearized_isa; + + return first { $meta1_parents{$_} } $meta2->linearized_isa; +} + +sub _get_ancestors_until { + my ($start_name, $until_name) = @_; + + my @ancestor_names; + for my $ancestor_name (Class::MOP::class_of($start_name)->linearized_isa) { + last if $ancestor_name eq $until_name; + push @ancestor_names, $ancestor_name; + } + return @ancestor_names; +} + +sub _is_role_only_subclass { + my ($meta_name) = @_; + my $meta = Class::MOP::Class->initialize($meta_name); + my @parent_names = $meta->superclasses; + + # XXX: don't feel like messing with multiple inheritance here... what would + # that even do? + return unless @parent_names == 1; + my ($parent_name) = @parent_names; + my $parent_meta = Class::MOP::Class->initialize($parent_name); + + # only get the roles attached to this particular class, don't look at + # superclasses + my @roles = $meta->can('calculate_all_roles') + ? $meta->calculate_all_roles + : (); + + # it's obviously not a role-only subclass if it doesn't do any roles + return unless @roles; + + # loop over all methods that are a part of the current class + # (not inherited) + 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->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; + } + + # loop over all attributes that are a part of the current class + # (not inherited) + # FIXME - this really isn't right. Just because an attribute is + # 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) } @roles; + + return 0; + } + + return 1; +} + 1; __END__