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=fc1cb8fd44689d42468238ef29d70cdcb2379885;hp=67889db8e38940114bf074d6bf0b64d66beef970;hb=319200322d3631cdd936d6e36aa081d1caa2e7e1;hpb=72e60273ff56052a78344eb0ea2af882f3ede200 diff --git a/lib/Mouse/Meta/Attribute.pm b/lib/Mouse/Meta/Attribute.pm index 67889db..fc1cb8f 100644 --- a/lib/Mouse/Meta/Attribute.pm +++ b/lib/Mouse/Meta/Attribute.pm @@ -12,6 +12,12 @@ use Mouse::Meta::Method::Accessor; sub _process_options{ my($class, $name, $args) = @_; + + # XXX: for backward compatibility (with method modifiers) + if($class->can('canonicalize_args') != \&canonicalize_args){ + %{$args} = $class->canonicalize_args($name, %{$args}); + } + # taken from Class::MOP::Attribute::new defined($name) @@ -25,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++; } @@ -72,7 +82,8 @@ sub _process_options{ $args->{type_constraint} = Mouse::Util::TypeConstraints::find_or_create_isa_type_constraint($args->{isa}); } elsif(exists $args->{does}){ - $args->{type_constraint} = Mouse::Util::TypeConstraints::find_or_create_does_type_constraint($args->{does}); + # TODO + # $args->{type_constraint} = Mouse::Util::TypeConstraints::find_or_create_does_type_constraint($args->{does}); } $tc = $args->{type_constraint}; @@ -118,10 +129,6 @@ sub _process_options{ || $class->throw_error("You cannot have lazy attribute ($name) without specifying a default value for it"); } - # XXX: for backward compatibility (with method modifiers) - if($class->can('canonicalize_args') != \&canonicalize_args){ - %{$args} = $class->canonicalize_args($name, %{$args}); - } return; } @@ -203,8 +210,6 @@ sub _create_args { $_[0]->{_create_args} } -sub accessor_metaclass { 'Mouse::Meta::Method::Accessor' } - sub interpolate_class{ my($class, $name, $args) = @_; @@ -243,7 +248,8 @@ sub canonicalize_args{ my ($self, $name, %args) = @_; Carp::cluck("$self->canonicalize_args has been deprecated." - . "Use \$self->_process_options instead."); + . "Use \$self->_process_options instead.") + if _MOUSE_VERBOSE; return %args; } @@ -252,7 +258,8 @@ sub create { my ($self, $class, $name, %args) = @_; Carp::cluck("$self->create has been deprecated." - . "Use \$meta->add_attribute and \$attr->install_accessors instead."); + . "Use \$meta->add_attribute and \$attr->install_accessors instead.") + if _MOUSE_VERBOSE; # noop return $self; @@ -277,7 +284,7 @@ sub verify_type_constraint_error { sub coerce_constraint { ## my($self, $value) = @_; my $type = $_[0]->{type_constraint} or return $_[1]; - return Mouse::Util::TypeConstraints->typecast_constraints($_[0]->associated_class->name, $_[0]->type_constraint, $_[1]); + return Mouse::Util::TypeConstraints->typecast_constraints($_[0]->associated_class->name, $type, $_[1]); } sub _canonicalize_handles { @@ -299,7 +306,7 @@ sub clone_and_inherit_options{ my $self = shift; my $name = shift; - return ref($self)->new($name, %{$self}, @_ == 1 ? %{$_[0]} : @_); + return ref($self)->new($name, %{$self}, (@_ == 1) ? %{$_[0]} : @_); } sub clone_parent { @@ -309,10 +316,10 @@ sub clone_parent { my %args = ($self->get_parent_args($class, $name), @_); Carp::cluck("$self->clone_parent has been deprecated." - . "Use \$meta->add_attribute and \$attr->install_accessors instead."); + . "Use \$meta->add_attribute and \$attr->install_accessors instead.") + if _MOUSE_VERBOSE; - - $self->create($class, $name, %args); + $self->clone_and_inherited_args($class, $name, %args); } sub get_parent_args { @@ -329,21 +336,29 @@ sub get_parent_args { $self->throw_error("Could not find an attribute by the name of '$name' to inherit from"); } +sub associate_method{ + my ($attribute, $method) = @_; + $attribute->{associated_methods}++; + return; +} + sub install_accessors{ my($attribute) = @_; my $metaclass = $attribute->{associated_class}; - my $generator_class = $attribute->accessor_metaclass; foreach my $type(qw(accessor reader writer predicate clearer handles)){ if(exists $attribute->{$type}){ my $installer = '_install_' . $type; - $generator_class->$installer($attribute, $attribute->{$type}, $metaclass); + + Mouse::Meta::Method::Accessor->$installer($attribute, $attribute->{$type}, $metaclass); + $attribute->{associated_methods}++; } } if($attribute->can('create') != \&create){ + # backword compatibility $attribute->create($metaclass, $attribute->name, %{$attribute}); } @@ -375,7 +390,7 @@ It adds the following options to the constructor: =over 4 -=item * C<< is => 'ro', 'rw', 'bare' >> +=item C<< is => 'ro', 'rw', 'bare' >> This provides a shorthand for specifying the C, C, or C names. If the attribute is read-only ('ro') then it will @@ -391,7 +406,7 @@ Use 'bare' when you are deliberately not installing any methods Moose will issue a deprecation warning when this attribute is added to a metaclass. -=item * C<< isa => Type >> +=item C<< isa => Type >> This option accepts a type. The type can be a string, which should be a type name. If the type name is unknown, it is assumed to be a class @@ -403,14 +418,14 @@ If you I provide a C option, then your C option must be a class name, and that class must do the role specified with C. -=item * C<< does => Role >> +=item C<< does => Role >> This is short-hand for saying that the attribute's type must be an object which does the named role. B -=item * C<< coerce => Bool >> +=item C<< coerce => Bool >> This option is only valid for objects with a type constraint (C). If this is true, then coercions will be applied whenever @@ -418,12 +433,12 @@ this attribute is set. You can make both this and the C option true. -=item * C<< trigger => CodeRef >> +=item C<< trigger => CodeRef >> This option accepts a subroutine reference, which will be called after the attribute is set. -=item * C<< required => Bool >> +=item C<< required => Bool >> An attribute which is required must be provided to the constructor. An attribute which is required can also have a C or C, @@ -432,24 +447,24 @@ which will satisfy its required-ness. A required attribute must have a C, C or a non-C C -=item * C<< lazy => Bool >> +=item C<< lazy => Bool >> A lazy attribute must have a C or C. When an attribute is lazy, the default value will not be calculated until the attribute is read. -=item * C<< weak_ref => Bool >> +=item C<< weak_ref => Bool >> If this is true, the attribute's value will be stored as a weak reference. -=item * C<< auto_deref => Bool >> +=item C<< auto_deref => Bool >> If this is true, then the reader will dereference the value when it is called. The attribute must have a type constraint which defines the attribute as an array or hash reference. -=item * C<< lazy_build => Bool >> +=item C<< lazy_build => Bool >> Setting this to true makes the attribute lazy and provides a number of default methods. @@ -478,7 +493,7 @@ on success, otherwise Ces. =head2 C<< clone_and_inherit_options(options) -> Mouse::Meta::Attribute >> -Creates a new attribute in OwnerClass, inheriting options from parent classes. +Creates a new attribute in the owner class, inheriting options from parent classes. Accessors and helper methods are installed. Some error checking is done. =head1 SEE ALSO