X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMouse%2FMeta%2FClass.pm;h=b991ab2c79f0cae29c43b362ee5809108926fe39;hb=43e6a50b260b096a34b0c46da87296bd220c4184;hp=a9c76f4e902ecece156369a047f676b26b52734f;hpb=ad022aac12ce95ee336af9dde0758ae98037f3ab;p=gitmo%2FMouse.git diff --git a/lib/Mouse/Meta/Class.pm b/lib/Mouse/Meta/Class.pm index a9c76f4..b991ab2 100644 --- a/lib/Mouse/Meta/Class.pm +++ b/lib/Mouse/Meta/Class.pm @@ -2,16 +2,19 @@ package Mouse::Meta::Class; use strict; use warnings; -use Mouse::Meta::Method::Constructor; -use Mouse::Meta::Method::Destructor; use Scalar::Util qw/blessed weaken/; + use Mouse::Util qw/get_linear_isa not_supported/; +use Mouse::Meta::Method::Constructor; +use Mouse::Meta::Method::Destructor; +use Mouse::Meta::Module; + use base qw(Mouse::Meta::Module); sub method_metaclass(){ 'Mouse::Meta::Method' } # required for get_method() -sub _new { +sub _construct_meta { my($class, %args) = @_; $args{attributes} ||= {}; @@ -23,7 +26,19 @@ sub _new { \@{ $args{package} . '::ISA' }; }; - bless \%args, $class; + #return Mouse::Meta::Class->initialize($class)->new_object(%args) + # if $class ne __PACKAGE__; + + return bless \%args, ref($class) || $class; +} + +sub create_anon_class{ + my $self = shift; + return $self->create(undef, @_); +} + +sub is_anon_class{ + return exists $_[0]->{anon_serial_id}; } sub roles { $_[0]->{roles} } @@ -36,7 +51,23 @@ sub superclasses { @{ $self->{superclasses} } = @_; } - @{ $self->{superclasses} }; + return @{ $self->{superclasses} }; +} + +sub find_method_by_name{ + my($self, $method_name) = @_; + defined($method_name) + or $self->throw_error('You must define a method name to find'); + foreach my $class( $self->linearized_isa ){ + my $method = $self->initialize($class)->get_method($method_name); + return $method if defined $method; + } + return undef; +} + +sub get_all_methods { + my($self) = @_; + return map{ $self->find_method_by_name($self) } $self->get_all_method_names; } sub get_all_method_names { @@ -50,34 +81,55 @@ sub get_all_method_names { sub add_attribute { my $self = shift; - if (@_ == 1 && blessed($_[0])) { - my $attr = shift @_; - $self->{'attributes'}{$attr->name} = $attr; - } else { - my $names = shift @_; - $names = [$names] if !ref($names); - my $metaclass = 'Mouse::Meta::Attribute'; - my %options = @_; - - if ( my $metaclass_name = delete $options{metaclass} ) { - my $new_class = Mouse::Util::resolve_metaclass_alias( - 'Attribute', - $metaclass_name - ); - if ( $metaclass ne $new_class ) { - $metaclass = $new_class; + my($attr, $name); + + if(blessed $_[0]){ + $attr = $_[0]; + + $attr->isa('Mouse::Meta::Attribute') + || $self->throw_error("Your attribute must be an instance of Mouse::Meta::Attribute (or a subclass)"); + + $name = $attr->name; + } + else{ + # _process_attribute + $name = shift; + + my %args = (@_ == 1) ? %{$_[0]} : @_; + + defined($name) + or $self->throw_error('You must provide a name for the attribute'); + + if ($name =~ s/^\+//) { # inherited attributes + my $inherited_attr; + + foreach my $class($self->linearized_isa){ + my $meta = Mouse::Meta::Module::get_metaclass_by_name($class) or next; + $inherited_attr = $meta->get_attribute($name) and last; } + + defined($inherited_attr) + or $self->throw_error("Could not find an attribute by the name of '$name' to inherit from in ".$self->name); + + $attr = $inherited_attr->clone_and_inherit_options($name, \%args); } + else{ + my($attribute_class, @traits) = Mouse::Meta::Attribute->interpolate_class($name, \%args); + $args{traits} = \@traits if @traits; - for my $name (@$names) { - if ($name =~ s/^\+//) { - $metaclass->clone_parent($self, $name, @_); - } - else { - $metaclass->create($self, $name, @_); - } + $attr = $attribute_class->new($name, \%args); } } + + weaken( $attr->{associated_class} = $self ); + + $self->{attributes}{$attr->name} = $attr; + $attr->install_accessors(); + + if(!$attr->{associated_methods} && ($attr->{is} || '') ne 'bare'){ + Carp::cluck(qq{Attribute (}.$attr->name.qq{) of class }.$self->name.qq{ has no associated methods (did you mean to provide an "is" argument?)}); + } + return $attr; } sub compute_all_applicable_attributes { shift->get_all_attributes(@_) } @@ -102,10 +154,19 @@ sub linearized_isa { @{ get_linear_isa($_[0]->name) } } sub new_object { my $self = shift; - my $args = (@_ == 1) ? $_[0] : { @_ }; + my %args = (@_ == 1 ? %{$_[0]} : @_); my $instance = bless {}, $self->name; + $self->_initialize_instance($instance, \%args); + return $instance; +} + +sub _initialize_instance{ + my($self, $instance, $args) = @_; + + my @triggers_queue; + foreach my $attribute ($self->get_all_attributes) { my $from = $attribute->init_arg; my $key = $attribute->name; @@ -113,6 +174,7 @@ sub new_object { if (defined($from) && exists($args->{$from})) { $args->{$from} = $attribute->coerce_constraint($args->{$from}) if $attribute->should_coerce; + $attribute->verify_against_type_constraint($args->{$from}); $instance->{$key} = $args->{$from}; @@ -121,7 +183,7 @@ sub new_object { if ref($instance->{$key}) && $attribute->is_weak_ref; if ($attribute->has_trigger) { - $attribute->trigger->($instance, $args->{$from}); + push @triggers_queue, [ $attribute->trigger, $args->{$from} ]; } } else { @@ -152,25 +214,27 @@ sub new_object { } } } + + foreach my $trigger_and_value(@triggers_queue){ + my($trigger, $value) = @{$trigger_and_value}; + $trigger->($instance, $value); + } + + if($self->is_anon_class){ + $instance->{__METACLASS__} = $self; + } + return $instance; } sub clone_object { my $class = shift; my $instance = shift; + my %params = (@_ == 1) ? %{$_[0]} : @_; (blessed($instance) && $instance->isa($class->name)) || $class->throw_error("You must pass an instance of the metaclass (" . $class->name . "), not ($instance)"); - $class->clone_instance($instance, @_); -} - -sub clone_instance { - my ($class, $instance, %params) = @_; - - (blessed($instance)) - || $class->throw_error("You can only clone instances, ($instance) is not a blessed instance"); - my $clone = bless { %$instance }, ref $instance; foreach my $attr ($class->get_all_attributes()) { @@ -182,7 +246,13 @@ sub clone_instance { } return $clone; +} + +sub clone_instance { + my ($class, $instance, %params) = @_; + Carp::cluck('clone_instance has been deprecated. Use clone_object instead'); + return $class->clone_object($instance, %params); } sub make_immutable { @@ -213,27 +283,90 @@ sub make_mutable { not_supported } sub is_immutable { $_[0]->{is_immutable} } sub is_mutable { !$_[0]->{is_immutable} } +sub _install_modifier_pp{ + my( $self, $into, $type, $name, $code ) = @_; + + my $original = $into->can($name) + or $self->throw_error("The method '$name' is not found in the inheritance hierarchy for class $into"); + + my $modifier_table = $self->{modifiers}{$name}; + + if(!$modifier_table){ + my(@before, @after, @around, $cache, $modified); + + $cache = $original; + + $modified = sub { + for my $c (@before) { $c->(@_) } + + if(wantarray){ # list context + my @rval = $cache->(@_); + + for my $c(@after){ $c->(@_) } + return @rval; + } + elsif(defined wantarray){ # scalar context + my $rval = $cache->(@_); + + for my $c(@after){ $c->(@_) } + return $rval; + } + else{ # void context + $cache->(@_); + + for my $c(@after){ $c->(@_) } + return; + } + }; + + $self->{modifiers}{$name} = $modifier_table = { + original => $original, + + before => \@before, + after => \@after, + around => \@around, + + cache => \$cache, # cache for around modifiers + }; + + $self->add_method($name => $modified); + } + + if($type eq 'before'){ + unshift @{$modifier_table->{before}}, $code; + } + elsif($type eq 'after'){ + push @{$modifier_table->{after}}, $code; + } + else{ # around + push @{$modifier_table->{around}}, $code; + + my $next = ${ $modifier_table->{cache} }; + ${ $modifier_table->{cache} } = sub{ $code->($next, @_) }; + } + + return; +} + sub _install_modifier { my ( $self, $into, $type, $name, $code ) = @_; - # which is modifer class available? - my $modifier_class = do { - if (eval "require Class::Method::Modifiers::Fast; 1") { - 'Class::Method::Modifiers::Fast'; - } elsif (eval "require Class::Method::Modifiers; 1") { - 'Class::Method::Modifiers'; - } else { - Carp::croak("Method modifiers require the use of Class::Method::Modifiers or Class::Method::Modifiers::Fast. Please install it from CPAN and file a bug report with this application."); - } + # load Class::Method::Modifiers first + my $no_cmm_fast = $ENV{MOUSE_NO_CMM_FAST} || do{ + local $@; + eval q{ require Class::Method::Modifiers::Fast }; + $@; }; - my $modifier = $modifier_class->can('_install_modifier'); - # replace this method itself :) - { - no warnings 'redefine'; - *_install_modifier = sub { + my $impl; + if($no_cmm_fast){ + $impl = \&_install_modifier_pp; + } + else{ + my $install_modifier = Class::Method::Modifiers::Fast->can('_install_modifier'); + $impl = sub { my ( $self, $into, $type, $name, $code ) = @_; - $modifier->( + $install_modifier->( $into, $type, $name, @@ -244,8 +377,13 @@ sub _install_modifier { }; } - # call me. for first time. - $self->_install_modifier( $into, $type, $name, $code ); + # replace this method itself :) + { + no warnings 'redefine'; + *_install_modifier = $impl; + } + + $self->$impl( $into, $type, $name, $code ); } sub add_before_method_modifier { @@ -281,10 +419,11 @@ sub does_role { || $self->throw_error("You must supply a role name to look for"); for my $class ($self->linearized_isa) { - my $meta = Mouse::class_of($class); + my $meta = Mouse::Meta::Module::class_of($class); next unless $meta && $meta->can('roles'); for my $role (@{ $meta->roles }) { + return 1 if $role->does_role($role_name); } } @@ -292,130 +431,13 @@ sub does_role { return 0; } -sub create { - my ($class, $package_name, %options) = @_; - - (ref $options{superclasses} eq 'ARRAY') - || $class->throw_error("You must pass an ARRAY ref of superclasses") - if exists $options{superclasses}; - - (ref $options{attributes} eq 'ARRAY') - || $class->throw_error("You must pass an ARRAY ref of attributes") - if exists $options{attributes}; - - (ref $options{methods} eq 'HASH') - || $class->throw_error("You must pass a HASH ref of methods") - if exists $options{methods}; - - { - ( defined $package_name && $package_name ) - || $class->throw_error("You must pass a package name"); - - no strict 'refs'; - ${ $package_name . '::VERSION' } = $options{version} if exists $options{version}; - ${ $package_name . '::AUTHORITY' } = $options{authority} if exists $options{authority}; - } - - my %initialize_options = %options; - delete @initialize_options{qw( - package - superclasses - attributes - methods - version - authority - )}; - my $meta = $class->initialize( $package_name => %initialize_options ); - - # FIXME totally lame - $meta->add_method('meta' => sub { - Mouse::Meta::Class->initialize(ref($_[0]) || $_[0]); - }); - - $meta->superclasses(@{$options{superclasses}}) - if exists $options{superclasses}; - # NOTE: - # process attributes first, so that they can - # install accessors, but locally defined methods - # can then overwrite them. It is maybe a little odd, but - # I think this should be the order of things. - if (exists $options{attributes}) { - foreach my $attr (@{$options{attributes}}) { - Mouse::Meta::Attribute->create($meta, $attr->{name}, %$attr); - } - } - if (exists $options{methods}) { - foreach my $method_name (keys %{$options{methods}}) { - $meta->add_method($method_name, $options{methods}->{$method_name}); - } - } - return $meta; -} - -{ - my $ANON_CLASS_SERIAL = 0; - my $ANON_CLASS_PREFIX = 'Mouse::Meta::Class::__ANON__::SERIAL::'; - - my %IMMORTAL_ANON_CLASSES; - sub create_anon_class { - my ( $class, %options ) = @_; - - my $cache = $options{cache}; - my $cache_key; - - if($cache){ # anonymous but not mortal - # something like Super::Class|Super::Class::2=Role|Role::1 - $cache_key = join '=' => ( - join('|', @{$options{superclasses} || []}), - join('|', sort @{$options{roles} || []}), - ); - return $IMMORTAL_ANON_CLASSES{$cache_key} if exists $IMMORTAL_ANON_CLASSES{$cache_key}; - } - my $package_name = $ANON_CLASS_PREFIX . ++$ANON_CLASS_SERIAL; - my $meta = $class->create( $package_name, anon_class_id => $ANON_CLASS_SERIAL, %options ); - - if($cache){ - $IMMORTAL_ANON_CLASSES{$cache_key} = $meta; - } - else{ - Mouse::Meta::Module::weaken_metaclass($package_name); - } - return $meta; - } - - sub is_anon_class{ - return exists $_[0]->{anon_class_id}; - } - - - sub DESTROY{ - my($self) = @_; - - my $serial_id = $self->{anon_class_id}; - - return if !$serial_id; - - my $stash = $self->namespace; - - @{$self->{sperclasses}} = (); - %{$stash} = (); - Mouse::Meta::Module::remove_metaclass_by_name($self->name); - - no strict 'refs'; - delete ${$ANON_CLASS_PREFIX}{ $serial_id . '::' }; - - return; - } - -} - 1; __END__ =head1 NAME -Mouse::Meta::Class - hook into the Mouse MOP +Mouse::Meta::Class - The Mouse class metaclass =head1 METHODS @@ -424,10 +446,6 @@ Mouse::Meta::Class - hook into the Mouse MOP Finds or creates a Mouse::Meta::Class instance for the given ClassName. Only one instance should exist for a given class. -=head2 new %args -> Mouse::Meta::Class - -Creates a new Mouse::Meta::Class. Don't call this directly. - =head2 name -> ClassName Returns the name of the owner class. @@ -436,7 +454,7 @@ Returns the name of the owner class. Gets (or sets) the list of superclasses of the owner class. -=head2 add_attribute (Mouse::Meta::Attribute| name => spec) +=head2 add_attribute (name => spec | Mouse::Meta::Attribute) Begins keeping track of the existing L for the owner class. @@ -469,15 +487,18 @@ Returns the L with the given name. Returns the list of classes in method dispatch order, with duplicates removed. +=head2 new_object Parameters -> Instance + +Create a new instance. + =head2 clone_object Instance -> Instance Clones the given C which must be an instance governed by this metaclass. -=head2 clone_instance Instance, Parameters -> Instance +=head1 SEE ALSO -The clone_instance method has been made private. -The public version is deprecated. +L =cut