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=9bc6e302330f03fb844a42da222aa9628100a1c3;hp=d3eaa3c027e73c53eb4978e4e1e1ac3eea5af48e;hb=deb9a0f32002cd07012c50884a227335b93f1449;hpb=0449307510ab4425a6b340fee9bf85824eb994b1 diff --git a/lib/Mouse/Meta/Attribute.pm b/lib/Mouse/Meta/Attribute.pm index d3eaa3c..9bc6e30 100644 --- a/lib/Mouse/Meta/Attribute.pm +++ b/lib/Mouse/Meta/Attribute.pm @@ -31,8 +31,12 @@ sub _process_options{ my $can_be_required = defined( $args->{init_arg} ); if(exists $args->{builder}){ + # XXX: + # Moose refuses a CODE ref builder, but Mouse doesn't for backward compatibility + # This feature will be changed in a future. (gfx) $class->throw_error('builder must be a defined scalar value which is a method name') - if ref $args->{builder} || !(defined $args->{builder}); + #if ref $args->{builder} || !defined $args->{builder}; + if !defined $args->{builder}; $can_be_required++; } @@ -138,11 +142,11 @@ sub new { $args{name} = $name; - my $instance = bless \%args, $class; + my $self = bless \%args, $class; # extra attributes if($class ne __PACKAGE__){ - $class->meta->_initialize_instance($instance,\%args); + $class->meta->_initialize_object($self, \%args); } # XXX: there is no fast way to check attribute validity @@ -152,7 +156,7 @@ sub new { # Carp::cluck("Found unknown argument(s) passed to '$name' attribute constructor in '$class': @bad"); # } - return $instance + return $self; } # readers @@ -181,9 +185,6 @@ sub builder { $_[0]->{builder} } sub should_auto_deref { $_[0]->{auto_deref} } sub should_coerce { $_[0]->{coerce} } -sub get_read_method { $_[0]->{reader} || $_[0]->{accessor} } -sub get_write_method { $_[0]->{writer} || $_[0]->{accessor} } - # predicates sub has_accessor { exists $_[0]->{accessor} } @@ -201,7 +202,7 @@ sub has_builder { exists $_[0]->{builder} } sub has_read_method { exists $_[0]->{reader} || exists $_[0]->{accessor} } sub has_write_method { exists $_[0]->{writer} || exists $_[0]->{accessor} } -sub _create_args { +sub _create_args { # DEPRECATED $_[0]->{_create_args} = $_[1] if @_ > 1; $_[0]->{_create_args} } @@ -240,7 +241,7 @@ sub interpolate_class{ return( $class, @traits ); } -sub canonicalize_args{ +sub canonicalize_args{ # DEPRECATED my ($self, $name, %args) = @_; Carp::cluck("$self->canonicalize_args has been deprecated." @@ -261,15 +262,32 @@ sub create { return $self; } +sub _coerce_and_verify { + my($self, $value, $instance) = @_; + + my $type_constraint = $self->{type_constraint}; + + return $value if !$type_constraint; + + if ($self->should_coerce && $type_constraint->has_coercion) { + $value = $type_constraint->coerce($value); + } + + return $value if $type_constraint->check($value); + + $self->verify_against_type_constraint($value); + + return $value; +} + sub verify_against_type_constraint { my ($self, $value) = @_; - my $tc = $self->type_constraint; - return 1 unless $tc; - local $_ = $value; - return 1 if $tc->check($value); + my $type_constraint = $self->{type_constraint}; + return 1 if !$type_constraint;; + return 1 if $type_constraint->check($value); - $self->verify_type_constraint_error($self->name, $value, $tc); + $self->verify_type_constraint_error($self->name, $value, $type_constraint); } sub verify_type_constraint_error { @@ -277,9 +295,12 @@ sub verify_type_constraint_error { $self->throw_error("Attribute ($name) does not pass the type constraint because: " . $type->get_message($value)); } -sub coerce_constraint { ## my($self, $value) = @_; +sub coerce_constraint { # DEPRECATED my $type = $_[0]->{type_constraint} or return $_[1]; + + Carp::cluck("coerce_constraint() has been deprecated, which was an internal utility anyway"); + return Mouse::Util::TypeConstraints->typecast_constraints($_[0]->associated_class->name, $type, $_[1]); } @@ -305,7 +326,7 @@ sub clone_and_inherit_options{ return ref($self)->new($name, %{$self}, (@_ == 1) ? %{$_[0]} : @_); } -sub clone_parent { +sub clone_parent { # DEPRECATED my $self = shift; my $class = shift; my $name = shift; @@ -318,7 +339,7 @@ sub clone_parent { $self->clone_and_inherited_args($class, $name, %args); } -sub get_parent_args { +sub get_parent_args { # DEPRECATED my $self = shift; my $class = shift; my $name = shift; @@ -332,6 +353,48 @@ sub get_parent_args { $self->throw_error("Could not find an attribute by the name of '$name' to inherit from"); } + +sub get_read_method { # DEPRECATED + $_[0]->{reader} || $_[0]->{accessor} +} +sub get_write_method { # DEPRECATED + $_[0]->{writer} || $_[0]->{accessor} +} + +sub get_read_method_ref{ + my($self) = @_; + + $self->{_read_method_ref} ||= do{ + my $metaclass = $self->associated_class + or $self->throw_error('No asocciated class for ' . $self->name); + + my $reader = $self->{reader} || $self->{accessor}; + if($reader){ + $metaclass->name->can($reader); + } + else{ + Mouse::Meta::Method::Accessor->_generate_reader($self, undef, $metaclass); + } + }; +} + +sub get_write_method_ref{ + my($self) = @_; + + $self->{_write_method_ref} ||= do{ + my $metaclass = $self->associated_class + or $self->throw_error('No asocciated class for ' . $self->name); + + my $reader = $self->{writer} || $self->{accessor}; + if($reader){ + $metaclass->name->can($reader); + } + else{ + Mouse::Meta::Method::Accessor->_generate_writer($self, undef, $metaclass); + } + }; +} + sub associate_method{ my ($attribute, $method) = @_; $attribute->{associated_methods}++; @@ -345,7 +408,7 @@ sub install_accessors{ foreach my $type(qw(accessor reader writer predicate clearer handles)){ if(exists $attribute->{$type}){ - my $installer = '_install_' . $type; + my $installer = '_generate_' . $type; Mouse::Meta::Method::Accessor->$installer($attribute, $attribute->{$type}, $metaclass); @@ -374,7 +437,7 @@ __END__ =head1 NAME -Mouse::Meta::Attribute - attribute metaclass +Mouse::Meta::Attribute - The Mouse attribute metaclass =head1 METHODS @@ -482,6 +545,13 @@ is equivalent to this: =back +=head2 C<< associate_method(Method) >> + +Associates a method with the attribute. Typically, this is called internally +when an attribute generates its accessors. + +Currently the argument I is ignored in Mouse. + =head2 C<< verify_against_type_constraint(Item) -> TRUE | ERROR >> Checks that the given value passes this attribute's type constraint. Returns C @@ -492,9 +562,20 @@ on success, otherwise Ces. Creates a new attribute in the owner class, inheriting options from parent classes. Accessors and helper methods are installed. Some error checking is done. +=head2 C<< get_read_method_ref >> + +=head2 C<< get_write_method_ref >> + +Returns the subroutine reference of a method suitable for reading or +writing the attribute's value in the associated class. These methods +always return a subroutine reference, regardless of whether or not the +attribute is read- or write-only. + =head1 SEE ALSO L +L + =cut