X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FMeta%2FClass.pm;h=a83ee1d069a9b8c298367973e4ca5d3f63c78bd6;hb=eae0508f6f8fca847956c2ed8c48ec23cebd3106;hp=986dcab81a209637b2c1894edef57daeae55ba53;hpb=322abb07081516383efa6c6cdb55ecdef066eff7;p=gitmo%2FMoose.git diff --git a/lib/Moose/Meta/Class.pm b/lib/Moose/Meta/Class.pm index 986dcab..a83ee1d 100644 --- a/lib/Moose/Meta/Class.pm +++ b/lib/Moose/Meta/Class.pm @@ -8,16 +8,19 @@ use Class::MOP; 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.73'; +our $VERSION = '0.81'; $VERSION = eval $VERSION; our $AUTHORITY = 'cpan:STEVAN'; use Moose::Meta::Method::Overridden; use Moose::Meta::Method::Augmented; use Moose::Error::Default; +use Moose::Meta::Class::Immutable::Trait; +use Moose::Meta::Method::Constructor; +use Moose::Meta::Method::Destructor; use base 'Class::MOP::Class'; @@ -26,6 +29,18 @@ __PACKAGE__->meta->add_attribute('roles' => ( default => sub { [] } )); +__PACKAGE__->meta->add_attribute('role_applications' => ( + reader => '_get_role_applications', + default => sub { [] } +)); + +__PACKAGE__->meta->add_attribute( + Class::MOP::Attribute->new('immutable_trait' => ( + accessor => "immutable_trait", + default => 'Moose::Meta::Class::Immutable::Trait', + )) +); + __PACKAGE__->meta->add_attribute('constructor_class' => ( accessor => 'constructor_class', default => 'Moose::Meta::Method::Constructor', @@ -41,22 +56,34 @@ __PACKAGE__->meta->add_attribute('error_class' => ( default => 'Moose::Error::Default', )); - sub initialize { my $class = shift; my $pkg = shift; - return Class::MOP::get_metaclass_by_name($pkg) + return Class::MOP::get_metaclass_by_name($pkg) || $class->SUPER::initialize($pkg, 'attribute_metaclass' => 'Moose::Meta::Attribute', 'method_metaclass' => 'Moose::Meta::Method', 'instance_metaclass' => 'Moose::Meta::Instance', @_ - ); + ); +} + +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 ($self, $package_name, %options) = @_; - + (ref $options{roles} eq 'ARRAY') || $self->throw_error("You must pass an ARRAY ref of roles", data => $options{roles}) if exists $options{roles}; @@ -67,18 +94,18 @@ sub create { if ($roles) { Moose::Util::apply_all_roles( $class, @$roles ); } - + return $class; } -sub check_metaclass_compatibility { +sub _check_metaclass_compatibility { my $self = shift; if ( my @supers = $self->superclasses ) { $self->_fix_metaclass_incompatibility(@supers); } - $self->SUPER::check_metaclass_compatibility(@_); + $self->SUPER::_check_metaclass_compatibility(@_); } my %ANON_CLASSES; @@ -87,17 +114,17 @@ sub create_anon_class { my ($self, %options) = @_; 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} || []}), ); - + if ($cache_ok && defined $ANON_CLASSES{$cache_key}) { return $ANON_CLASSES{$cache_key}; } - + my $new_class = $self->SUPER::create_anon_class(%options); $ANON_CLASSES{$cache_key} = $new_class @@ -113,6 +140,19 @@ sub add_role { push @{$self->roles} => $role; } +sub role_applications { + my ($self) = @_; + + return @{$self->_get_role_applications}; +} + +sub add_role_application { + my ($self, $application) = @_; + (blessed($application) && $application->isa('Moose::Meta::Role::Application::ToClass')) + || $self->throw_error("Role applications must be instances of Moose::Meta::Role::Application::ToClass", data => $application); + push @{$self->_get_role_applications} => $application; +} + sub calculate_all_roles { my $self = shift; my %seen; @@ -127,6 +167,10 @@ sub does_role { foreach my $class ($self->class_precedence_list) { my $meta = Class::MOP::class_of($class); + # when a Moose metaclass is itself extended with a role, + # this check needs to be done since some items in the + # class_precedence_list might in fact be Class::MOP + # based still. next unless $meta && $meta->can('roles'); foreach my $role (@{$meta->roles}) { return 1 if $role->does_role($role_name); @@ -137,17 +181,18 @@ sub does_role { sub excludes_role { my ($self, $role_name) = @_; + (defined $role_name) || $self->throw_error("You must supply a role name to look for"); + foreach my $class ($self->class_precedence_list) { - next unless $class->can('meta'); - # NOTE: - # in the pretty rare instance when a Moose metaclass - # is itself extended with a role, this check needs to - # be done since some items in the class_precedence_list - # might in fact be Class::MOP based still. - next unless $class->meta->can('roles'); - foreach my $role (@{$class->meta->roles}) { + my $meta = Class::MOP::class_of($class); + # when a Moose metaclass is itself extended with a role, + # this check needs to be done since some items in the + # class_precedence_list might in fact be Class::MOP + # based still. + next unless $meta && $meta->can('roles'); + foreach my $role (@{$meta->roles}) { return 1 if $role->excludes_role($role_name); } } @@ -159,7 +204,7 @@ sub new_object { my $params = @_ == 1 ? $_[0] : {@_}; my $self = $class->SUPER::new_object($params); - foreach my $attr ( $class->compute_all_applicable_attributes() ) { + foreach my $attr ( $class->get_all_attributes() ) { next unless $attr->can('has_trigger') && $attr->has_trigger; @@ -176,14 +221,13 @@ sub new_object { ? $attr->get_read_method_ref->($self) : $params->{$init_arg} ), - $attr ); } return $self; } -sub construct_instance { +sub _construct_instance { my $class = shift; my $params = @_ == 1 ? $_[0] : {@_}; my $meta_instance = $class->get_meta_instance; @@ -192,20 +236,32 @@ sub construct_instance { # 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->compute_all_applicable_attributes()) { + 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) { + Class::MOP::load_class($super); + my $meta = Class::MOP::class_of($super); + Moose->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( (blessed $_[0] && $_[0]->isa('Class::MOP::Attribute') - ? $_[0] - : $self->_process_attribute(@_)) + ? $_[0] + : $self->_process_attribute(@_)) ); } @@ -250,24 +306,47 @@ sub _fix_metaclass_incompatibility { my ($self, @superclasses) = @_; foreach my $super (@superclasses) { - next if $self->_superclass_meta_is_compatible($super); + my $meta = Class::MOP::Class->initialize($super); + + my @all_supers = $meta->linearized_isa; + shift @all_supers; + + my @super_metas_to_fix = ($meta); + + # We need to check & fix the immediate superclass. If its @ISA + # contains a class without a metaclass instance, followed by a + # class _with_ a metaclass instance, init a metaclass instance + # for classes without one and fix compat up to and including + # the class which was already initialized. + my $idx = first_index { Class::MOP::class_of($_) } @all_supers; + + push @super_metas_to_fix, + map { Class::MOP::Class->initialize($_) } @all_supers[ 0 .. $idx ] + if $idx >= 0; - unless ( $self->is_pristine ) { - $self->throw_error( - "Cannot attempt to reinitialize metaclass for " - . $self->name - . ", it isn't pristine" ); + foreach my $super_meta (@super_metas_to_fix) { + $self->_fix_one_incompatible_metaclass($super_meta); } + } +} + +sub _fix_one_incompatible_metaclass { + my ($self, $meta) = @_; + + return if $self->_superclass_meta_is_compatible($meta); - $self->_reconcile_with_superclass_meta($super); + 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"); @@ -284,13 +363,16 @@ sub _superclass_meta_is_compatible { # I don't want to have to type this >1 time my @MetaClassTypes = - qw( attribute_metaclass method_metaclass instance_metaclass - constructor_class destructor_class error_class ); + qw( attribute_metaclass + method_metaclass + wrapped_method_metaclass + instance_metaclass + constructor_class + destructor_class + error_class ); sub _reconcile_with_superclass_meta { - my ($self, $super) = @_; - - my $super_meta = $super->meta; + my ($self, $super_meta) = @_; my $super_meta_name = $super_meta->is_immutable @@ -457,7 +539,7 @@ sub _all_roles_until { sub _reconcile_role_differences { my ($self, $super_meta) = @_; - my $self_meta = $self->meta; + my $self_meta = Class::MOP::class_of($self); my %roles; @@ -486,14 +568,6 @@ sub _reconcile_role_differences { return $self; } -# NOTE: -# this was crap anyway, see -# Moose::Util::apply_all_roles -# instead -sub _apply_all_roles { - Carp::croak 'DEPRECATED: use Moose::Util::apply_all_roles($meta, @roles) instead' -} - sub _process_attribute { my ( $self, $name, @args ) = @_; @@ -530,36 +604,6 @@ sub _process_inherited_attribute { ## ------------------------------------------------- -use Moose::Meta::Method::Constructor; -use Moose::Meta::Method::Destructor; - - -sub _default_immutable_transformer_options { - my $self = shift; - - my %options = $self->SUPER::_default_immutable_transformer_options; - - # We need to copy the references as we do not want to alter the - # superclass's references. - $options{cannot_call} = [ @{ $options{cannot_call} }, 'add_role' ]; - $options{memoize} = { - %{ $options{memoize} }, - calculate_all_roles => 'ARRAY', - }; - - %options = ( - %options, - constructor_class => $self->constructor_class, - destructor_class => $self->destructor_class, - inline_destructor => 1, - - # Moose always does this when an attribute is created - inline_accessors => 0, - ); - - return %options -} - our $error_level; sub throw_error { @@ -690,6 +734,18 @@ which are attached to this class. This takes a L object, and adds it to the class's list of roles. This I actually apply the role to the class. +=item B<< $metaclass->role_applications >> + +Returns a list of L +objects, which contain the arguments to role application. + +=item B<< $metaclass->add_role_application($application) >> + +This takes a L object, and +adds it to the class's list of role applications. This I +actually apply any role to the class; it is only for tracking role +applications. + =item B<< $metaclass->does_role($role_name) >> This returns a boolean indicating whether or not the class does the