X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FMeta%2FClass.pm;h=f1630438882925a030479da4c7944ca68580e8e1;hb=3eb89f709f04907580b508f821d6be2316fcb65f;hp=34ff29db26bfa0389b3aa32de94c7cbb91430655;hpb=6d5cbd2b637d672d74ad86d5309580f142ee3439;p=gitmo%2FMoose.git diff --git a/lib/Moose/Meta/Class.pm b/lib/Moose/Meta/Class.pm index 34ff29d..f163043 100644 --- a/lib/Moose/Meta/Class.pm +++ b/lib/Moose/Meta/Class.pm @@ -6,13 +6,21 @@ use warnings; use Class::MOP; -use Carp 'confess'; -use Scalar::Util 'weaken', 'blessed', 'reftype'; +use Carp (); +use List::Util qw( first ); +use List::MoreUtils qw( any all uniq first_index ); +use Scalar::Util 'weaken', 'blessed'; -our $VERSION = '0.21'; +our $VERSION = '1.01'; +$VERSION = eval $VERSION; our $AUTHORITY = 'cpan:STEVAN'; -use Moose::Meta::Method::Overriden; +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'; @@ -21,49 +29,99 @@ __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', +)); + +__PACKAGE__->meta->add_attribute('destructor_class' => ( + accessor => 'destructor_class', + default => 'Moose::Meta::Method::Destructor', +)); + +__PACKAGE__->meta->add_attribute('error_class' => ( + accessor => 'error_class', + default => 'Moose::Error::Default', +)); + sub initialize { my $class = shift; my $pkg = shift; - $class->SUPER::initialize($pkg, - 'attribute_metaclass' => 'Moose::Meta::Attribute', - 'method_metaclass' => 'Moose::Meta::Method', - 'instance_metaclass' => 'Moose::Meta::Instance', - @_); + 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') - || confess "You must pass an ARRAY ref of roles" + || $self->throw_error("You must pass an ARRAY ref of roles", data => $options{roles}) if exists $options{roles}; - + my $roles = delete $options{roles}; + my $class = $self->SUPER::create($package_name, %options); - - if (exists $options{roles}) { - Moose::Util::apply_all_roles($class, @{$options{roles}}); + + if ($roles) { + Moose::Util::apply_all_roles( $class, @$roles ); } - + return $class; } +sub _check_metaclass_compatibility { + my $self = shift; + + if ( my @supers = $self->superclasses ) { + $self->_fix_metaclass_incompatibility(@supers); + } + + $self->SUPER::_check_metaclass_compatibility(@_); +} + my %ANON_CLASSES; 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('|', sort @{$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}; } - + my $new_class = $self->SUPER::create_anon_class(%options); $ANON_CLASSES{$cache_key} = $new_class @@ -72,13 +130,79 @@ sub create_anon_class { 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')) - || confess "Roles must be instances of Moose::Meta::Role"; + || $self->throw_error("Roles must be instances of Moose::Meta::Role", data => $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; @@ -87,11 +211,18 @@ sub calculate_all_roles { sub does_role { my ($self, $role_name) = @_; + (defined $role_name) - || confess "You must supply a role name to look for"; + || $self->throw_error("You must supply a role name to look for"); + foreach my $class ($self->class_precedence_list) { - next unless $class->can('meta'); - 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->does_role($role_name); } } @@ -100,17 +231,18 @@ sub does_role { sub excludes_role { my ($self, $role_name) = @_; + (defined $role_name) - || confess "You must supply a role name to look for"; + || $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); } } @@ -118,146 +250,86 @@ sub excludes_role { } sub new_object { - my ($class, %params) = @_; - my $self = $class->SUPER::new_object(%params); - foreach my $attr ($class->compute_all_applicable_attributes()) { - if ( defined( my $init_arg = $attr->init_arg ) ) { - if ( exists($params{$init_arg}) && $attr->can('has_trigger') && $attr->has_trigger ) { - $attr->trigger->($self, $params{$init_arg}, $attr); - } - } - } - return $self; -} + my $class = shift; + my $params = @_ == 1 ? $_[0] : {@_}; + my $self = $class->SUPER::new_object($params); -sub construct_instance { - my ($class, %params) = @_; - my $meta_instance = $class->get_meta_instance; - # FIXME: - # the code below is almost certainly incorrect - # but this is foreign inheritence, 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()) { - $attr->initialize_instance_slot($meta_instance, $instance, \%params) - } - return $instance; -} - -# FIXME: -# This is ugly -sub get_method_map { - my $self = shift; - - if (defined $self->{'$!_package_cache_flag'} && - $self->{'$!_package_cache_flag'} == Class::MOP::check_package_cache_flag($self->meta->name)) { - return $self->{'%!methods'}; - } - - my $map = $self->{'%!methods'}; + foreach my $attr ( $class->get_all_attributes() ) { - my $class_name = $self->name; - my $method_metaclass = $self->method_metaclass; + next unless $attr->can('has_trigger') && $attr->has_trigger; - foreach my $symbol ($self->list_all_package_symbols('CODE')) { + my $init_arg = $attr->init_arg; - my $code = $self->get_package_symbol('&' . $symbol); + next unless defined $init_arg; - next if exists $map->{$symbol} && - defined $map->{$symbol} && - $map->{$symbol}->body == $code; + next unless exists $params->{$init_arg}; - my ($pkg, $name) = Class::MOP::get_code_info($code); - - if ($pkg->can('meta') - # NOTE: - # we don't know what ->meta we are calling - # here, so we need to be careful cause it - # just might blow up at us, or just complain - # loudly (in the case of Curses.pm) so we - # just be a little overly cautious here. - # - SL - && eval { no warnings; blessed($pkg->meta) } - && $pkg->meta->isa('Moose::Meta::Role')) { - #my $role = $pkg->meta->name; - #next unless $self->does_role($role); - } - else { - next if ($pkg || '') ne $class_name && - ($name || '') ne '__ANON__'; + $attr->trigger->( + $self, + ( + $attr->should_coerce + ? $attr->get_read_method_ref->($self) + : $params->{$init_arg} + ), + ); + } - } + return $self; +} - $map->{$symbol} = $method_metaclass->wrap($code); +sub superclasses { + my $self = shift; + my @supers = @_; + foreach my $super (@supers) { + 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 $map; + 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(@_)) - ); + ? $_[0] + : $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 { my ($self, $name, $method, $_super_package) = @_; + (!$self->has_method($name)) - || confess "Cannot add an override method if a local method is already present"; - # need this for roles ... - $_super_package ||= $self->name; - my $super = $self->find_next_method_by_name($name); - (defined $super) - || confess "You cannot override '$name' because it has no super method"; - $self->add_method($name => Moose::Meta::Method::Overriden->wrap(sub { - my @args = @_; - no warnings 'redefine'; - if ($Moose::SUPER_SLOT{$_super_package}) { - local *{$Moose::SUPER_SLOT{$_super_package}} = sub { $super->body->(@args) }; - return $method->(@args); - } else { - confess "Trying to call override modifier'd method without super()"; - } - })); + || $self->throw_error("Cannot add an override method if a local method is already present"); + + $self->add_method($name => Moose::Meta::Method::Overridden->new( + method => $method, + class => $self, + package => $_super_package, # need this for roles + name => $name, + )); } sub add_augment_method_modifier { my ($self, $name, $method) = @_; (!$self->has_method($name)) - || confess "Cannot add an augment method if a local method is already present"; - my $super = $self->find_next_method_by_name($name); - (defined $super) - || confess "You cannot augment '$name' because it has no super method"; - my $_super_package = $super->package_name; - # BUT!,... if this is an overriden method .... - if ($super->isa('Moose::Meta::Method::Overriden')) { - # we need to be sure that we actually - # find the next method, which is not - # an 'override' method, the reason is - # that an 'override' method will not - # be the one calling inner() - my $real_super = $self->_find_next_method_by_name_which_is_not_overridden($name); - $_super_package = $real_super->package_name; - } - $self->add_method($name => sub { - my @args = @_; - no warnings 'redefine'; - if ($Moose::INNER_SLOT{$_super_package}) { - local *{$Moose::INNER_SLOT{$_super_package}} = sub { - local *{$Moose::INNER_SLOT{$_super_package}} = sub {}; - $method->(@args); - }; - return $super->body->(@args); - } - else { - return $super->body->(@args); - } - }); + || $self->throw_error("Cannot add an augment method if a local method is already present"); + + $self->add_method($name => Moose::Meta::Method::Augmented->new( + method => $method, + class => $self, + name => $name, + )); } ## Private Utility methods ... @@ -266,120 +338,280 @@ sub _find_next_method_by_name_which_is_not_overridden { my ($self, $name) = @_; foreach my $method ($self->find_all_methods_by_name($name)) { return $method->{code} - if blessed($method->{code}) && !$method->{code}->isa('Moose::Meta::Method::Overriden'); + if blessed($method->{code}) && !$method->{code}->isa('Moose::Meta::Method::Overridden'); } return undef; } -sub _fix_metaclass_incompatability { +sub _fix_metaclass_incompatibility { my ($self, @superclasses) = @_; - foreach my $super (@superclasses) { - # don't bother if it does not have a meta. - next unless $super->can('meta'); - # get the name, make sure we take - # immutable classes into account - my $super_meta_name = ($super->meta->is_immutable - ? $super->meta->get_mutable_metaclass_name - : blessed($super->meta)); - # if it's meta is a vanilla Moose, - # then we can safely ignore it. - next if $super_meta_name eq 'Moose::Meta::Class'; - # but if we have anything else, - # we need to check it out ... - unless (# see if of our metaclass is incompatible - ($self->isa($super_meta_name) && - # and see if our instance metaclass is incompatible - $self->instance_metaclass->isa($super->meta->instance_metaclass)) && - # ... and if we are just a vanilla Moose - $self->isa('Moose::Meta::Class')) { - # re-initialize the meta ... - my $super_meta = $super->meta; - # NOTE: - # We might want to consider actually - # transfering any attributes from the - # original meta into this one, but in - # general you should not have any there - # at this point anyway, so it's very - # much an obscure edge case anyway - $self = $super_meta->reinitialize($self->name => ( - 'attribute_metaclass' => $super_meta->attribute_metaclass, - 'method_metaclass' => $super_meta->method_metaclass, - 'instance_metaclass' => $super_meta->instance_metaclass, - )); - } + + $self->_fix_one_incompatible_metaclass($_) + for map { Moose::Meta::Class->initialize($_) } @superclasses; +} + +sub _fix_one_incompatible_metaclass { + my ($self, $meta) = @_; + + 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" ); } - return $self; + + $self->_reconcile_with_superclass_meta($meta); +} + +sub _superclass_meta_is_compatible { + 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 + : ref($super_meta); + + return 1 + if $self->isa($super_meta_name) + and + $self->instance_metaclass->isa( $super_meta->instance_metaclass ); +} + +# I don't want to have to type this >1 time +my @MetaClassTypes = + qw( attribute_metaclass + method_metaclass + wrapped_method_metaclass + instance_metaclass + constructor_class + destructor_class + error_class ); + +sub _reconcile_with_superclass_meta { + my ($self, $super_meta) = @_; + + my $super_meta_name + = $super_meta->is_immutable + ? $super_meta->_get_mutable_metaclass_name + : ref($super_meta); + + my $self_metaclass = ref $self; + + # If neither of these is true we have a more serious + # incompatibility that we just cannot fix (yet?). + if ( $super_meta_name->isa( ref $self ) + && all { $super_meta->$_->isa( $self->$_ ) } @MetaClassTypes ) { + $self->_reinitialize_with($super_meta); + } + elsif ( $self->_all_metaclasses_differ_by_roles_only($super_meta) ) { + $self->_reconcile_role_differences($super_meta); + } +} + +sub _reinitialize_with { + my ( $self, $new_meta ) = @_; + + my $new_self = $new_meta->reinitialize( + $self->name, + attribute_metaclass => $new_meta->attribute_metaclass, + method_metaclass => $new_meta->method_metaclass, + instance_metaclass => $new_meta->instance_metaclass, + ); + + $new_self->$_( $new_meta->$_ ) + for qw( constructor_class destructor_class error_class ); + + %$self = %$new_self; + + bless $self, ref $new_self; + + # We need to replace the cached metaclass instance or else when it + # goes out of scope Class::MOP::Class destroy's the namespace for + # the metaclass's class, causing much havoc. + Class::MOP::store_metaclass_by_name( $self->name, $self ); + Class::MOP::weaken_metaclass( $self->name ) if $self->is_anon_class; +} + +# In the more complex case, we share a common ancestor with our +# superclass's metaclass, but each metaclass (ours and the parent's) +# has a different set of roles applied. We reconcile this by first +# reinitializing into the parent class, and _then_ applying our own +# roles. +sub _all_metaclasses_differ_by_roles_only { + my ($self, $super_meta) = @_; + + for my $pair ( + [ ref $self, ref $super_meta ], + map { [ $self->$_, $super_meta->$_ ] } @MetaClassTypes + ) { + + next if $pair->[0] eq $pair->[1]; + + my $self_meta_meta = Class::MOP::Class->initialize( $pair->[0] ); + my $super_meta_meta = Class::MOP::Class->initialize( $pair->[1] ); + + my $common_ancestor + = _find_common_ancestor( $self_meta_meta, $super_meta_meta ); + + return unless $common_ancestor; + + return + unless _is_role_only_subclass_of( + $self_meta_meta, + $common_ancestor, + ) + && _is_role_only_subclass_of( + $super_meta_meta, + $common_ancestor, + ); + } + + return 1; +} + +# This, and some other functions, could be called as methods, but +# they're not for two reasons. One, we just end up ignoring the first +# argument, because we can't call these directly on one of the real +# arguments, because one of them could be a Class::MOP::Class object +# and not a Moose::Meta::Class. Second, only a completely insane +# person would attempt to subclass this stuff! +sub _find_common_ancestor { + my ($meta1, $meta2) = @_; + + # FIXME? This doesn't account for multiple inheritance (not sure + # if it needs to though). For example, is 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 _is_role_only_subclass_of { + my ($meta, $ancestor) = @_; + + return 1 if $meta->name eq $ancestor; + + my @roles = _all_roles_until( $meta, $ancestor ); + + my %role_packages = map { $_->name => 1 } @roles; + + my $ancestor_meta = Class::MOP::Class->initialize($ancestor); + + my %shared_ancestors = map { $_ => 1 } $ancestor_meta->linearized_isa; + + for my $method ( $meta->get_all_methods() ) { + next if $method->name eq 'meta'; + next if $method->can('associated_attribute'); + + next + if $role_packages{ $method->original_package_name } + || $shared_ancestors{ $method->original_package_name }; + + return 0; + } + + # 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 ( $meta->get_all_attributes ) { + next if $shared_ancestors{ $attr->associated_class->name }; + + next if any { $_->has_attribute( $attr->name ) } @roles; + + return 0; + } + + return 1; +} + +sub _all_roles { + my $meta = shift; + + return _all_roles_until($meta); +} + +sub _all_roles_until { + my ($meta, $stop_at_class) = @_; + + return unless $meta->can('calculate_all_roles'); + + my @roles = $meta->calculate_all_roles; + + for my $class ( $meta->linearized_isa ) { + last if $stop_at_class && $stop_at_class eq $class; + + my $meta = Class::MOP::Class->initialize($class); + last unless $meta->can('calculate_all_roles'); + + push @roles, $meta->calculate_all_roles; + } + + return uniq @roles; } -# NOTE: -# this was crap anyway, see -# Moose::Util::apply_all_roles -# instead -sub _apply_all_roles { - die 'DEPRECATED: use Moose::Util::apply_all_roles($meta, @roles) instead' +sub _reconcile_role_differences { + my ($self, $super_meta) = @_; + + my $self_meta = Class::MOP::class_of($self); + + my %roles; + + if ( my @roles = map { $_->name } _all_roles($self_meta) ) { + $roles{metaclass_roles} = \@roles; + } + + for my $thing (@MetaClassTypes) { + my $name = $self->$thing(); + + my $thing_meta = Class::MOP::Class->initialize($name); + + my @roles = map { $_->name } _all_roles($thing_meta) + or next; + + $roles{ $thing . '_roles' } = \@roles; + } + + $self->_reinitialize_with($super_meta); + + Moose::Util::MetaRole::apply_metaclass_roles( + for_class => $self->name, + %roles, + ); + + return $self; } sub _process_attribute { - my $self = shift; - my $name = shift; - my %options = ((scalar @_ == 1 && ref($_[0]) eq 'HASH') ? %{$_[0]} : @_); + my ( $self, $name, @args ) = @_; + + @args = %{$args[0]} if scalar @args == 1 && ref($args[0]) eq 'HASH'; - if ($name =~ /^\+(.*)/) { - return $self->_process_inherited_attribute($1, %options); + if (($name || '') =~ /^\+(.*)/) { + return $self->_process_inherited_attribute($1, @args); } else { - my $attr_metaclass_name; - if ($options{metaclass}) { - my $metaclass_name = $options{metaclass}; - eval { - my $possible_full_name = 'Moose::Meta::Attribute::Custom::' . $metaclass_name; - Class::MOP::load_class($possible_full_name); - $metaclass_name = $possible_full_name->can('register_implementation') - ? $possible_full_name->register_implementation - : $possible_full_name; - }; - if ($@) { - Class::MOP::load_class($metaclass_name); - } - $attr_metaclass_name = $metaclass_name; - } - else { - $attr_metaclass_name = $self->attribute_metaclass; - } - - if ($options{traits}) { - my @traits; - foreach my $trait (@{$options{traits}}) { - eval { - my $possible_full_name = 'Moose::Meta::Attribute::Custom::Trait::' . $trait; - Class::MOP::load_class($possible_full_name); - push @traits => $possible_full_name->can('register_implementation') - ? $possible_full_name->register_implementation - : $possible_full_name; - }; - if ($@) { - push @traits => $trait; - } - } - - my $class = Moose::Meta::Class->create_anon_class( - superclasses => [ $attr_metaclass_name ], - roles => [ @traits ], - cache => 1, - ); - - $attr_metaclass_name = $class->name; - } - - return $attr_metaclass_name->new($name, %options); + return $self->_process_new_attribute($name, @args); } } +sub _process_new_attribute { + my ( $self, $name, @args ) = @_; + + $self->attribute_metaclass->interpolate_class_and_new($name, @args); +} + sub _process_inherited_attribute { my ($self, $attr_name, %options) = @_; my $inherited_attr = $self->find_attribute_by_name($attr_name); (defined $inherited_attr) - || confess "Could not find an attribute by the name of '$attr_name' to inherit from"; + || $self->throw_error("Could not find an attribute by the name of '$attr_name' to inherit from in ${\$self->name}", data => $attr_name); if ($inherited_attr->isa('Moose::Meta::Attribute')) { return $inherited_attr->clone_and_inherit_options(%options); } @@ -392,50 +624,42 @@ sub _process_inherited_attribute { ## ------------------------------------------------- -use Moose::Meta::Method::Constructor; -use Moose::Meta::Method::Destructor; +our $error_level; -# This could be done by using SUPER and altering ->options -# I am keeping it this way to make it more explicit. -sub create_immutable_transformer { - my $self = shift; - my $class = Class::MOP::Immutable->new($self, { - read_only => [qw/superclasses/], - cannot_call => [qw/ - add_method - alias_method - remove_method - add_attribute - remove_attribute - add_package_symbol - remove_package_symbol - add_role - /], - memoize => { - class_precedence_list => 'ARRAY', - compute_all_applicable_attributes => 'ARRAY', - get_meta_instance => 'SCALAR', - get_method_map => 'SCALAR', - # maybe .... - calculate_all_roles => 'ARRAY', - } - }); - return $class; +sub throw_error { + my ( $self, @args ) = @_; + local $error_level = ($error_level || 0) + 1; + $self->raise_error($self->create_error(@args)); } -sub make_immutable { - my $self = shift; - $self->SUPER::make_immutable - ( - constructor_class => 'Moose::Meta::Method::Constructor', - destructor_class => 'Moose::Meta::Method::Destructor', - inline_destructor => 1, - # NOTE: - # no need to do this, - # Moose always does it - inline_accessors => 0, - @_, - ); +sub raise_error { + my ( $self, @args ) = @_; + die @args; +} + +sub create_error { + my ( $self, @args ) = @_; + + require Carp::Heavy; + + local $error_level = ($error_level || 0 ) + 1; + + if ( @args % 2 == 1 ) { + unshift @args, "message"; + } + + my %args = ( metaclass => $self, last_error => $@, @args ); + + $args{depth} += $error_level; + + my $class = ref $self ? $self->error_class : "Moose::Error::Default"; + + Class::MOP::load_class($class); + + $class->new( + Carp::caller_info($args{depth}), + %args + ); } 1; @@ -450,111 +674,139 @@ Moose::Meta::Class - The Moose metaclass =head1 DESCRIPTION -This is a subclass of L with Moose specific -extensions. +This class is a subclass of L that provides +additional Moose-specific functionality. -For the most part, the only time you will ever encounter an -instance of this class is if you are doing some serious deep -introspection. To really understand this class, you need to refer -to the L documentation. +To really understand this class, you will need to start with the +L documentation. This class can be understood as a +set of additional features on top of the basic feature provided by +that parent class. + +=head1 INHERITANCE + +C is a subclass of L. =head1 METHODS =over 4 -=item B +=item B<< Moose::Meta::Class->initialize($package_name, %options) >> + +This overrides the parent's method in order to provide its own +defaults for the C, C, and +C options. + +These all default to the appropriate Moose class. + +=item B<< Moose::Meta::Class->create($package_name, %options) >> + +This overrides the parent's method in order to accept a C +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 => [...] ); + +=item B<< Moose::Meta::Class->create_anon_class >> + +This overrides the parent's method to accept a C option, just +as C does. -=item B +It also accepts a C option. If this is true, then the anonymous +class will be cached based on its superclasses and roles. If an +existing anonymous class in the cache has the same superclasses and +roles, it will be reused. -Overrides original to accept a list of roles to apply to -the created class. + my $metaclass = Moose::Meta::Class->create_anon_class( + superclasses => ['Foo'], + roles => [qw/Some Roles Go Here/], + cache => 1, + ); - my $metaclass = Moose::Meta::Class->create( 'New::Class', roles => [...] ); +=item B<< $metaclass->make_immutable(%options) >> -=item B +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. -Overrides original to support roles and caching. +Also, since Moose always inlines attributes, it sets the +C option to false. - my $metaclass = Moose::Meta::Class->create_anon_class( - superclasses => ['Foo'], - roles => [qw/Some Roles Go Here/], - cache => 1, - ); +=item B<< $metaclass->new_object(%params) >> -=item B +This overrides the parent's method in order to add support for +attribute triggers. -Override original to add default options for inlining destructor -and altering the Constructor metaclass. +=item B<< $metaclass->add_override_method_modifier($name, $sub) >> -=item B +This adds an C method modifier to the package. -Override original to lock C and memoize C +=item B<< $metaclass->add_augment_method_modifier($name, $sub) >> -=item B +This adds an C method modifier to the package. -We override this method to support the C attribute option. +=item B<< $metaclass->calculate_all_roles >> -=item B +This will return a unique array of C instances +which are attached to this class. -This provides some Moose specific extensions to this method, you -almost never call this method directly unless you really know what -you are doing. +=item B<< $metaclass->add_role($role) >> -This method makes sure to handle the moose weak-ref, type-constraint -and type coercion features. +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 +=item B<< $metaclass->role_applications >> -This accommodates Moose::Meta::Role::Method instances, which are -aliased, instead of added, but still need to be counted as valid -methods. +Returns a list of L +objects, which contain the arguments to role application. -=item B +=item B<< $metaclass->add_role_application($application) >> -This will create an C method modifier for you, and install -it in the package. +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 +=item B<< $metaclass->does_role($role) >> -This will create an C method modifier for you, and install -it in the package. +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 +object. This tests both the class and its parents. -=item B +=item B<< $metaclass->excludes_role($role_name) >> -=item B +A class excludes a role if it has already composed a role which +excludes the named role. This tests both the class and its parents. -This will return an array of C instances which are -attached to this class. +=item B<< $metaclass->add_attribute($attr_name, %params|$params) >> -=item B +This overrides the parent's method in order to allow the parameters to +be provided as a hash reference. -This takes an instance of C in C<$role>, and adds it -to the list of associated roles. +=item B<< $metaclass->constructor_class ($class_name) >> -=item B +=item B<< $metaclass->destructor_class ($class_name) >> -This will test if this class C a given C<$role_name>. It will -not only check it's local roles, but ask them as well in order to -cascade down the role hierarchy. +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. -=item B +=item B<< $metaclass->error_class($class_name) >> -This will test if this class C a given C<$role_name>. It will -not only check it's local roles, but ask them as well in order to -cascade down the role hierarchy. +The name of the class used to throw errors. This defaults to +L, which generates an error with a stacktrace +just like C. -=item B +=item B<< $metaclass->throw_error($message, %extra) >> -This method does the same thing as L, but adds -support for taking the C<$params> as a HASH ref. +Throws the error created by C using C =back =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 for details on reporting bugs. =head1 AUTHOR @@ -562,7 +814,7 @@ Stevan Little Estevan@iinteractive.comE =head1 COPYRIGHT AND LICENSE -Copyright 2006-2008 by Infinity Interactive, Inc. +Copyright 2006-2010 by Infinity Interactive, Inc. L