use Carp ();
use List::Util qw( first );
-use List::MoreUtils qw( any all uniq );
+use List::MoreUtils qw( any all uniq first_index );
use Scalar::Util 'weaken', 'blessed';
-our $VERSION = '0.77';
+our $VERSION = '0.99';
$VERSION = eval $VERSION;
our $AUTHORITY = 'cpan:STEVAN';
my $cache_ok = delete $options{cache};
- # something like Super::Class|Super::Class::2=Role|Role::1
- my $cache_key = join '=' => (
- join('|', @{$options{superclasses} || []}),
- join('|', sort @{$options{roles} || []}),
- );
+ my $cache_key
+ = _anon_cache_key( $options{superclasses}, $options{roles} );
if ($cache_ok && defined $ANON_CLASSES{$cache_key}) {
return $ANON_CLASSES{$cache_key};
return $new_class;
}
+sub _anon_cache_key {
+ # Makes something like Super::Class|Super::Class::2=Role|Role::1
+ return join '=' => (
+ join( '|', @{ $_[0] || [] } ),
+ join( '|', sort @{ $_[1] || [] } ),
+ );
+}
+
+sub reinitialize {
+ my $self = shift;
+ my $pkg = shift;
+
+ my $meta = blessed $pkg ? $pkg : Class::MOP::class_of($pkg);
+
+ my $cache_key;
+
+ my %existing_classes;
+ if ($meta) {
+ %existing_classes = map { $_ => $meta->$_() } qw(
+ attribute_metaclass
+ method_metaclass
+ wrapped_method_metaclass
+ instance_metaclass
+ constructor_class
+ destructor_class
+ error_class
+ );
+
+ $cache_key = _anon_cache_key(
+ [ $meta->superclasses ],
+ [ map { $_->name } @{ $meta->roles } ],
+ ) if $meta->is_anon_class;
+ }
+
+ my $new_meta = $self->SUPER::reinitialize(
+ $pkg,
+ %existing_classes,
+ @_,
+ );
+
+ return $new_meta unless defined $cache_key;
+
+ my $new_cache_key = _anon_cache_key(
+ [ $meta->superclasses ],
+ [ map { $_->name } @{ $meta->roles } ],
+ );
+
+ delete $ANON_CLASSES{$cache_key};
+ $ANON_CLASSES{$new_cache_key} = $new_meta;
+
+ return $new_meta;
+}
+
sub add_role {
my ($self, $role) = @_;
(blessed($role) && $role->isa('Moose::Meta::Role'))
return $self;
}
-sub _construct_instance {
- my $class = shift;
- my $params = @_ == 1 ? $_[0] : {@_};
- my $meta_instance = $class->get_meta_instance;
- # FIXME:
- # the code below is almost certainly incorrect
- # but this is foreign inheritance, so we might
- # have to kludge it in the end.
- my $instance = $params->{'__INSTANCE__'} || $meta_instance->create_instance();
- foreach my $attr ($class->get_all_attributes()) {
- $attr->initialize_instance_slot($meta_instance, $instance, $params);
- }
- return $instance;
-}
-
sub superclasses {
my $self = shift;
my @supers = @_;
foreach my $super (@supers) {
- my $meta = Class::MOP::load_class($super);
- Moose->throw_error("You cannot inherit from a Moose Role ($super)")
+ Class::MOP::load_class($super);
+ my $meta = Class::MOP::class_of($super);
+ $self->throw_error("You cannot inherit from a Moose Role ($super)")
if $meta && $meta->isa('Moose::Meta::Role')
}
return $self->SUPER::superclasses(@supers);
sub add_attribute {
my $self = shift;
- $self->SUPER::add_attribute(
+ my $attr =
(blessed $_[0] && $_[0]->isa('Class::MOP::Attribute')
? $_[0]
- : $self->_process_attribute(@_))
- );
+ : $self->_process_attribute(@_));
+ $self->SUPER::add_attribute($attr);
+ # it may be a Class::MOP::Attribute, theoretically, which doesn't have
+ # 'bare' and doesn't implement this method
+ if ($attr->can('_check_associated_methods')) {
+ $attr->_check_associated_methods;
+ }
+ return $attr;
}
sub add_override_method_modifier {
sub _fix_metaclass_incompatibility {
my ($self, @superclasses) = @_;
- foreach my $super (@superclasses) {
- next if $self->_superclass_meta_is_compatible($super);
+ $self->_fix_one_incompatible_metaclass($_)
+ for map { Moose::Meta::Class->initialize($_) } @superclasses;
+}
- unless ( $self->is_pristine ) {
- $self->throw_error(
- "Cannot attempt to reinitialize metaclass for "
- . $self->name
- . ", it isn't pristine" );
- }
+sub _fix_one_incompatible_metaclass {
+ my ($self, $meta) = @_;
- $self->_reconcile_with_superclass_meta($super);
+ return if $self->_superclass_meta_is_compatible($meta);
+
+ unless ( $self->is_pristine ) {
+ $self->throw_error(
+ "Cannot attempt to reinitialize metaclass for "
+ . $self->name
+ . ", it isn't pristine" );
}
+
+ $self->_reconcile_with_superclass_meta($meta);
}
sub _superclass_meta_is_compatible {
- my ($self, $super) = @_;
-
- my $super_meta = Class::MOP::Class->initialize($super)
- or return 1;
+ my ($self, $super_meta) = @_;
next unless $super_meta->isa("Class::MOP::Class");
my $super_meta_name
= $super_meta->is_immutable
- ? $super_meta->get_mutable_metaclass_name
+ ? $super_meta->_get_mutable_metaclass_name
: ref($super_meta);
return 1
error_class );
sub _reconcile_with_superclass_meta {
- my ($self, $super) = @_;
-
- my $super_meta = Class::MOP::class_of($super);
+ my ($self, $super_meta) = @_;
my $super_meta_name
= $super_meta->is_immutable
- ? $super_meta->get_mutable_metaclass_name
+ ? $super_meta->_get_mutable_metaclass_name
: ref($super_meta);
my $self_metaclass = ref $self;
=item B<< Moose::Meta::Class->create($package_name, %options) >>
This overrides the parent's method in order to accept a C<roles>
-option. This should be an array reference containing one more roles
-that the class does.
+option. This should be an array reference containing roles
+that the class does, each optionally followed by a hashref of options
+(C<-excludes> and C<-alias>).
my $metaclass = Moose::Meta::Class->create( 'New::Class', roles => [...] );
actually apply any role to the class; it is only for tracking role
applications.
-=item B<< $metaclass->does_role($role_name) >>
+=item B<< $metaclass->does_role($role) >>
-This returns a boolean indicating whether or not the class does the
-specified role. This tests both the class and its parents.
+This returns a boolean indicating whether or not the class does the specified
+role. The role provided can be either a role name or a L<Moose::Meta::Role>
+object. This tests both the class and its parents.
=item B<< $metaclass->excludes_role($role_name) >>
=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<Moose/BUGS> for details on reporting bugs.
=head1 AUTHOR
=head1 COPYRIGHT AND LICENSE
-Copyright 2006-2009 by Infinity Interactive, Inc.
+Copyright 2006-2010 by Infinity Interactive, Inc.
L<http://www.iinteractive.com>
projects / gitmo/Moose.git / blobdiff