X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FMeta%2FAttribute.pm;h=80c16cdd8117d64c352abeda1f2dfb58c8245ee8;hb=9c10b5ad9c24b7d09982daa5e07cf009222049cf;hp=9a7545e418ee55d9597cc1f115108653a9e42772;hpb=42bc21a45d17c5ca41e63241ee70f4eacea5230c;p=gitmo%2FMoose.git diff --git a/lib/Moose/Meta/Attribute.pm b/lib/Moose/Meta/Attribute.pm index 9a7545e..80c16cd 100644 --- a/lib/Moose/Meta/Attribute.pm +++ b/lib/Moose/Meta/Attribute.pm @@ -9,7 +9,7 @@ use Carp 'confess'; use Sub::Name 'subname'; use overload (); -our $VERSION = '0.17'; +our $VERSION = '0.22'; our $AUTHORITY = 'cpan:STEVAN'; use Moose::Meta::Method::Accessor; @@ -71,6 +71,14 @@ sub clone_and_inherit_options { $actual_options{handles} = $options{handles}; delete $options{handles}; } + + # handles can only be added, not changed + if ($options{builder}) { + confess "You can only add the 'builder' option, you cannot change it" + if $self->has_builder; + $actual_options{builder} = $options{builder}; + delete $options{builder}; + } # isa can be changed, but only if the # new type is a subtype @@ -149,13 +157,15 @@ sub _process_options { elsif (exists $options->{does}) { # allow for anon-subtypes here ... if (blessed($options->{does}) && $options->{does}->isa('Moose::Meta::TypeConstraint')) { - $options->{type_constraint} = $options->{isa}; + $options->{type_constraint} = $options->{does}; } else { $options->{type_constraint} = Moose::Util::TypeConstraints::find_or_create_type_constraint( $options->{does} => { parent => Moose::Util::TypeConstraints::find_type_constraint('Role'), - constraint => sub { $_[0]->does($options->{does}) } + constraint => sub { + Moose::Util::does_role($_[0], $options->{does}) + } } ); } @@ -193,10 +203,14 @@ sub _process_options { } if (exists $options->{lazy} && $options->{lazy}) { - (exists $options->{default} || exists $options->{builder} ) + (exists $options->{default} || defined $options->{builder} ) || confess "You cannot have lazy attribute without specifying a default value for it"; } + if ( $options->{required} && !( ( !exists $options->{init_arg} || defined $options->{init_arg} ) || exists $options->{default} || defined $options->{builder} ) ) { + confess "You cannot have a required attribute without a default, builder, or an init_arg"; + } + } sub initialize_instance_slot { @@ -206,7 +220,7 @@ sub initialize_instance_slot { my $val; my $value_is_set; - if (exists $params->{$init_arg}) { + if ( defined($init_arg) and exists $params->{$init_arg}) { $val = $params->{$init_arg}; $value_is_set = 1; } @@ -241,25 +255,59 @@ sub initialize_instance_slot { if ($self->should_coerce && $type_constraint->has_coercion) { $val = $type_constraint->coerce($val); } - (defined($type_constraint->check($val))) - || confess "Attribute (" . - $self->name . - ") does not pass the type constraint (" . - $type_constraint->name . - ") with '" . - (defined $val - ? overload::StrVal($val) - : 'undef') . - "'"; + $type_constraint->check($val) + || confess "Attribute (" + . $self->name + . ") does not pass the type constraint because: " + . $type_constraint->get_message($val); } - $meta_instance->set_slot_value($instance, $self->name, $val); + $self->set_initial_value($instance, $val); $meta_instance->weaken_slot_value($instance, $self->name) if ref $val && $self->is_weak_ref; } ## Slot management +# FIXME: +# this duplicates too much code from +# Class::MOP::Attribute, we need to +# refactor these bits eventually. +# - SL +sub _set_initial_slot_value { + my ($self, $meta_instance, $instance, $value) = @_; + + my $slot_name = $self->name; + + return $meta_instance->set_slot_value($instance, $slot_name, $value) + unless $self->has_initializer; + + my ($type_constraint, $can_coerce); + if ($self->has_type_constraint) { + $type_constraint = $self->type_constraint; + $can_coerce = ($self->should_coerce && $type_constraint->has_coercion); + } + + my $callback = sub { + my $val = shift; + if ($type_constraint) { + $val = $type_constraint->coerce($val) + if $can_coerce; + $type_constraint->check($val) + || confess "Attribute (" + . $slot_name + . ") does not pass the type constraint because: " + . $type_constraint->get_message($val); + } + $meta_instance->set_slot_value($instance, $slot_name, $val); + }; + + my $initializer = $self->initializer; + + # most things will just want to set a value, so make it first arg + $instance->$initializer($value, $callback, $self); +} + sub set_value { my ($self, $instance, $value) = @_; @@ -276,15 +324,12 @@ sub set_value { if ($self->should_coerce) { $value = $type_constraint->coerce($value); - } + } $type_constraint->_compiled_type_constraint->($value) - || confess "Attribute ($attr_name) does not pass the type constraint (" - . $type_constraint->name - . ") with " - . (defined($value) - ? ("'" . overload::StrVal($value) . "'") - : "undef") - if defined($value); + || confess "Attribute (" + . $self->name + . ") does not pass the type constraint because " + . $type_constraint->get_message($value); } my $meta_instance = Class::MOP::Class->initialize(blessed($instance)) @@ -308,11 +353,11 @@ sub get_value { unless ($self->has_value($instance)) { if ($self->has_default) { my $default = $self->default($instance); - $self->set_value($instance, $default); + $self->set_initial_value($instance, $default); } if ( $self->has_builder ){ if (my $builder = $instance->can($self->builder)){ - $self->set_value($instance, $instance->$builder); + $self->set_initial_value($instance, $instance->$builder); } else { confess(blessed($instance) @@ -324,7 +369,7 @@ sub get_value { } } else { - $self->set_value($instance, undef); + $self->set_initial_value($instance, undef); } } } @@ -400,10 +445,22 @@ sub install_accessors { $associated_class->add_method($handle => subname $name, $method_to_call); } else { + # NOTE: + # we used to do a goto here, but the + # goto didn't handle failure correctly + # (it just returned nothing), so I took + # that out. However, the more I thought + # about it, the less I liked it doing + # the goto, and I prefered the act of + # delegation being actually represented + # in the stack trace. + # - SL $associated_class->add_method($handle => subname $name, sub { my $proxy = (shift)->$accessor(); - @_ = ($proxy, @_); - goto &{ $proxy->can($method_to_call) || return }; + (defined $proxy) + || confess "Cannot delegate $handle to $method_to_call because " . + "the value of " . $self->name . " is not defined"; + $proxy->$method_to_call(@_); }); } }