X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=gitmo%2FMouse.git;a=blobdiff_plain;f=lib%2FMouse%2FMeta%2FAttribute.pm;h=54fc2b57bd4e6e8e2596f366f7ae2e0c939f4970;hp=548c7b369952832334b2a4b991d2961590ff50ef;hb=HEAD;hpb=1038bfa9e8a49b9c9f9ce872c46800f9590da8ed diff --git a/lib/Mouse/Meta/Attribute.pm b/lib/Mouse/Meta/Attribute.pm index 548c7b3..54fc2b5 100644 --- a/lib/Mouse/Meta/Attribute.pm +++ b/lib/Mouse/Meta/Attribute.pm @@ -34,6 +34,7 @@ my %valid_options = map { $_ => undef } ( # internally used 'associated_class', 'associated_methods', + '__METACLASS__', # Moose defines, but Mouse doesn't #'definition_context', @@ -79,17 +80,29 @@ sub new { } my $self = bless $args, $class; - - # extra attributes if($class ne __PACKAGE__){ $class->meta->_initialize_object($self, $args); } - return $self; } -sub has_read_method { $_[0]->has_reader || $_[0]->has_accessor } -sub has_write_method { $_[0]->has_writer || $_[0]->has_accessor } +sub has_read_method { $_[0]->has_reader || $_[0]->has_accessor } +sub has_write_method { $_[0]->has_writer || $_[0]->has_accessor } + +sub get_read_method { $_[0]->reader || $_[0]->accessor } +sub get_write_method { $_[0]->writer || $_[0]->accessor } + +sub get_read_method_ref{ + my($self) = @_; + return $self->{_mouse_cache_read_method_ref} + ||= $self->_get_accessor_method_ref('get_read_method', '_generate_reader'); +} + +sub get_write_method_ref{ + my($self) = @_; + return $self->{_mouse_cache_write_method_ref} + ||= $self->_get_accessor_method_ref('get_write_method', '_generate_writer'); +} sub interpolate_class{ my($class, $args) = @_; @@ -125,22 +138,6 @@ sub interpolate_class{ return( $class, @traits ); } -sub _coerce_and_verify { - #my($self, $value, $instance) = @_; - my($self, $value) = @_; - - my $type_constraint = $self->{type_constraint}; - return $value if !defined $type_constraint; - - if ($self->should_coerce && $type_constraint->has_coercion) { - $value = $type_constraint->coerce($value); - } - - $self->verify_against_type_constraint($value); - - return $value; -} - sub verify_against_type_constraint { my ($self, $value) = @_; @@ -186,7 +183,7 @@ sub clone_and_inherit_options{ # remove temporary caches foreach my $attr(keys %{$args}){ - if($attr =~ /\A _/xms){ + if($attr =~ /\A _mouse_cache_/xms){ delete $args->{$attr}; } } @@ -199,12 +196,6 @@ sub clone_and_inherit_options{ return $attribute_class->new($self->name, $args); } -sub get_read_method { - return $_[0]->reader || $_[0]->accessor -} -sub get_write_method { - return $_[0]->writer || $_[0]->accessor -} sub _get_accessor_method_ref { my($self, $type, $generator) = @_; @@ -221,16 +212,6 @@ sub _get_accessor_method_ref { } } -sub get_read_method_ref{ - my($self) = @_; - return $self->{_read_method_ref} ||= $self->_get_accessor_method_ref('get_read_method', '_generate_reader'); -} - -sub get_write_method_ref{ - my($self) = @_; - return $self->{_write_method_ref} ||= $self->_get_accessor_method_ref('get_write_method', '_generate_writer'); -} - sub set_value { my($self, $object, $value) = @_; return $self->get_write_method_ref()->($object, $value); @@ -243,7 +224,7 @@ sub get_value { sub has_value { my($self, $object) = @_; - my $accessor_ref = $self->{_predicate_ref} + my $accessor_ref = $self->{_mouse_cache_predicate_ref} ||= $self->_get_accessor_method_ref('predicate', '_generate_predicate'); return $accessor_ref->($object); @@ -251,13 +232,12 @@ sub has_value { sub clear_value { my($self, $object) = @_; - my $accessor_ref = $self->{_crealer_ref} + my $accessor_ref = $self->{_mouse_cache_crealer_ref} ||= $self->_get_accessor_method_ref('clearer', '_generate_clearer'); return $accessor_ref->($object); } - sub associate_method{ #my($attribute, $method_name) = @_; my($attribute) = @_; @@ -275,16 +255,24 @@ sub install_accessors{ if(exists $attribute->{$type}){ my $generator = '_generate_' . $type; my $code = $accessor_class->$generator($attribute, $metaclass); - $metaclass->add_method($attribute->{$type} => $code); - $attribute->associate_method($attribute->{$type}); + my $name = $attribute->{$type}; +# TODO: do something for compatibility +# if( $metaclass->name->can($name) ) { +# my $t = $metaclass->has_method($name) ? 'method' : 'function'; +# Carp::cluck("You are overwriting a locally defined $t" +# . " ($name) with an accessor"); +# } + $metaclass->add_method($name => $code); + $attribute->associate_method($name); } } # install delegation if(exists $attribute->{handles}){ - my %handles = $attribute->_canonicalize_handles($attribute->{handles}); - + my %handles = $attribute->_canonicalize_handles(); while(my($handle, $method_to_call) = each %handles){ + next if Mouse::Object->can($handle); + if($metaclass->has_method($handle)) { $attribute->throw_error("You cannot overwrite a locally defined method ($handle) with a delegation"); } @@ -305,48 +293,53 @@ sub delegation_metaclass() { ## no critic } sub _canonicalize_handles { - my($self, $handles) = @_; + my($self) = @_; + my $handles = $self->{handles}; - if (ref($handles) eq 'HASH') { + my $handle_type = ref $handles; + if ($handle_type eq 'HASH') { return %$handles; } - elsif (ref($handles) eq 'ARRAY') { + elsif ($handle_type eq 'ARRAY') { return map { $_ => $_ } @$handles; } - elsif ( ref($handles) eq 'CODE' ) { - my $class_or_role = ( $self->{isa} || $self->{does} ) - || $self->throw_error( "Cannot find delegate metaclass for attribute " . $self->name ); - return $handles->( $self, Mouse::Meta::Class->initialize("$class_or_role")); - } - elsif (ref($handles) eq 'Regexp') { - my $class_or_role = ($self->{isa} || $self->{does}) - || $self->throw_error("Cannot delegate methods based on a Regexp without a type constraint (isa)"); - - my $meta = Mouse::Meta::Class->initialize("$class_or_role"); # "" for stringify + elsif ($handle_type eq 'Regexp') { + my $meta = $self->_find_delegate_metaclass(); return map { $_ => $_ } - grep { !Mouse::Object->can($_) && $_ =~ $handles } + grep { /$handles/ } Mouse::Util::is_a_metarole($meta) ? $meta->get_method_list : $meta->get_all_method_names; } + elsif ($handle_type eq 'CODE') { + return $handles->( $self, $self->_find_delegate_metaclass() ); + } else { $self->throw_error("Unable to canonicalize the 'handles' option with $handles"); } } +sub _find_delegate_metaclass { + my($self) = @_; + my $meta; + if($self->{isa}) { + $meta = Mouse::Meta::Class->initialize("$self->{isa}"); + } + elsif($self->{does}) { + $meta = Mouse::Util::get_metaclass_by_name("$self->{does}"); + } + defined($meta) or $self->throw_error( + "Cannot find delegate metaclass for attribute " . $self->name); + return $meta; +} + + sub _make_delegation_method { my($self, $handle, $method_to_call) = @_; return Mouse::Util::load_class($self->delegation_metaclass) ->_generate_delegation($self, $handle, $method_to_call); } -sub throw_error{ - my $self = shift; - - my $metaclass = (ref $self && $self->associated_class) || 'Mouse::Meta::Class'; - $metaclass->throw_error(@_, depth => 1); -} - 1; __END__ @@ -356,7 +349,12 @@ Mouse::Meta::Attribute - The Mouse attribute metaclass =head1 VERSION -This document describes Mouse version 0.65 +This document describes Mouse version 0.95 + +=head1 DESCRIPTION + +This is a meta object protocol for Mouse attributes, +which is a subset of Moose::Meta::Attribute. =head1 METHODS