foo
[gitmo/Moose.git] / lib / Moose / Meta / Attribute.pm
index 8a73555..c83c9cb 100644 (file)
@@ -8,7 +8,7 @@ use Scalar::Util 'blessed', 'weaken', 'reftype';
 use Carp         'confess';
 use overload     ();
 
-our $VERSION   = '0.13';
+our $VERSION   = '0.15';
 our $AUTHORITY = 'cpan:STEVAN';
 
 use Moose::Meta::Method::Accessor;
@@ -47,9 +47,9 @@ __PACKAGE__->meta->add_attribute('documentation' => (
 ));
 
 sub new {
-        my ($class, $name, %options) = @_;
-        $class->_process_options($name, \%options);
-        return $class->SUPER::new($name, %options);
+    my ($class, $name, %options) = @_;
+    $class->_process_options($name, \%options);
+    return $class->SUPER::new($name, %options);
 }
 
 sub clone_and_inherit_options {
@@ -75,23 +75,25 @@ sub clone_and_inherit_options {
     # new type is a subtype
     if ($options{isa}) {
         my $type_constraint;
-            if (blessed($options{isa}) && $options{isa}->isa('Moose::Meta::TypeConstraint')) {
-                        $type_constraint = $options{isa};
-                }
-                else {
-                    $type_constraint = Moose::Util::TypeConstraints::find_type_constraint($options{isa});
-                    (defined $type_constraint)
-                        || confess "Could not find the type constraint '" . $options{isa} . "'";
-                }
-                # NOTE:
-                # check here to see if the new type
-                # is a subtype of the old one
-                ($type_constraint->is_subtype_of($self->type_constraint->name))
-                    || confess "New type constraint setting must be a subtype of inherited one"
-                        # iff we have a type constraint that is ...
-                        if $self->has_type_constraint;
-                # then we use it :)
-                $actual_options{type_constraint} = $type_constraint;
+        if (blessed($options{isa}) && $options{isa}->isa('Moose::Meta::TypeConstraint')) {
+            $type_constraint = $options{isa};
+        }
+        else {
+            $type_constraint = Moose::Util::TypeConstraints::find_or_create_type_constraint(
+                $options{isa}
+            );
+            (defined $type_constraint)
+                || confess "Could not find the type constraint '" . $options{isa} . "'";
+        }
+        # NOTE:
+        # check here to see if the new type
+        # is a subtype of the old one
+        ($type_constraint->is_subtype_of($self->type_constraint->name))
+            || confess "New type constraint setting must be a subtype of inherited one"
+                # iff we have a type constraint that is ...
+                if $self->has_type_constraint;
+        # then we use it :)
+        $actual_options{type_constraint} = $type_constraint;
         delete $options{isa};
     }
     (scalar keys %options == 0)
@@ -102,97 +104,97 @@ sub clone_and_inherit_options {
 sub _process_options {
     my ($class, $name, $options) = @_;
 
-        if (exists $options->{is}) {
-                if ($options->{is} eq 'ro') {
-                        $options->{reader} ||= $name;
-                        (!exists $options->{trigger})
-                            || confess "Cannot have a trigger on a read-only attribute";
-                }
-                elsif ($options->{is} eq 'rw') {
-                        $options->{accessor} = $name;
+    if (exists $options->{is}) {
+        if ($options->{is} eq 'ro') {
+            $options->{reader} ||= $name;
+            (!exists $options->{trigger})
+                || confess "Cannot have a trigger on a read-only attribute";
+        }
+        elsif ($options->{is} eq 'rw') {
+            $options->{accessor} = $name;
             ((reftype($options->{trigger}) || '') eq 'CODE')
                 || confess "Trigger must be a CODE ref"
                     if exists $options->{trigger};
-                }
-                else {
-                    confess "I do not understand this option (is => " . $options->{is} . ")"
-                }
         }
+        else {
+            confess "I do not understand this option (is => " . $options->{is} . ")"
+        }
+    }
 
-        if (exists $options->{isa}) {
-
-            if (exists $options->{does}) {
-                if (eval { $options->{isa}->can('does') }) {
-                    ($options->{isa}->does($options->{does}))
-                        || confess "Cannot have an isa option and a does option if the isa does not do the does";
-                }
-                else {
-                    confess "Cannot have an isa option which cannot ->does()";
-                }
+    if (exists $options->{isa}) {
+        if (exists $options->{does}) {
+            if (eval { $options->{isa}->can('does') }) {
+                ($options->{isa}->does($options->{does}))
+                    || confess "Cannot have an isa option and a does option if the isa does not do the does";
             }
+            else {
+                confess "Cannot have an isa option which cannot ->does()";
+            }
+        }
 
-            # allow for anon-subtypes here ...
-            if (blessed($options->{isa}) && $options->{isa}->isa('Moose::Meta::TypeConstraint')) {
-                        $options->{type_constraint} = $options->{isa};
-                }
-                else {
-                    $options->{type_constraint} = Moose::Util::TypeConstraints::find_or_create_type_constraint(
-                        $options->{isa} => {
-                            parent     => Moose::Util::TypeConstraints::find_type_constraint('Object'),
-                        constraint => sub { $_[0]->isa($options->{isa}) }
-                    }
-                    );
-                }
+        # allow for anon-subtypes here ...
+        if (blessed($options->{isa}) && $options->{isa}->isa('Moose::Meta::TypeConstraint')) {
+            $options->{type_constraint} = $options->{isa};
         }
-        elsif (exists $options->{does}) {
-            # allow for anon-subtypes here ...
-            if (blessed($options->{does}) && $options->{does}->isa('Moose::Meta::TypeConstraint')) {
-                        $options->{type_constraint} = $options->{isa};
+        else {
+            $options->{type_constraint} = Moose::Util::TypeConstraints::find_or_create_type_constraint(
+                $options->{isa} => {
+                    parent     => Moose::Util::TypeConstraints::find_type_constraint('Object'),
+                    constraint => sub { $_[0]->isa($options->{isa}) }
                 }
-                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}) }
-                    }
-                    );
+            );
+        }
+    }
+    elsif (exists $options->{does}) {
+        # allow for anon-subtypes here ...
+        if (blessed($options->{does}) && $options->{does}->isa('Moose::Meta::TypeConstraint')) {
+                $options->{type_constraint} = $options->{isa};
+        }
+        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}) }
                 }
+            );
         }
+    }
 
-        if (exists $options->{coerce} && $options->{coerce}) {
-            (exists $options->{type_constraint})
-                || confess "You cannot have coercion without specifying a type constraint";
+    if (exists $options->{coerce} && $options->{coerce}) {
+        (exists $options->{type_constraint})
+            || confess "You cannot have coercion without specifying a type constraint";
         confess "You cannot have a weak reference to a coerced value"
             if $options->{weak_ref};
-        }
+    }
 
-        if (exists $options->{auto_deref} && $options->{auto_deref}) {
-            (exists $options->{type_constraint})
-                || confess "You cannot auto-dereference without specifying a type constraint";
-            ($options->{type_constraint}->is_a_type_of('ArrayRef') ||
+    if (exists $options->{auto_deref} && $options->{auto_deref}) {
+        (exists $options->{type_constraint})
+            || confess "You cannot auto-dereference without specifying a type constraint";
+        ($options->{type_constraint}->is_a_type_of('ArrayRef') ||
          $options->{type_constraint}->is_a_type_of('HashRef'))
-                || confess "You cannot auto-dereference anything other than a ArrayRef or HashRef";
-        }
+            || confess "You cannot auto-dereference anything other than a ArrayRef or HashRef";
+    }
 
-        if (exists $options->{lazy_build} && $options->{lazy_build} == 1) {
-            confess("You can not use lazy_build and default for the same attribute")
-              if exists $options->{default};
-            $options->{lazy} = 1;
-            $options->{required} = 1;
-                $options->{builder}   ||= "_build_${name}";
-            if($name =~ /^_/){
-                $options->{clearer}   ||= "_clear${name}";
-                $options->{predicate} ||= "_has${name}";
-            } else {
-                $options->{clearer}   ||= "clear_${name}";
-                $options->{predicate} ||= "has_${name}";
-            }
+    if (exists $options->{lazy_build} && $options->{lazy_build} == 1) {
+        confess("You can not use lazy_build and default for the same attribute")
+            if exists $options->{default};
+        $options->{lazy}      = 1;
+        $options->{required}  = 1;
+        $options->{builder} ||= "_build_${name}";
+        if ($name =~ /^_/) {
+            $options->{clearer}   ||= "_clear${name}";
+            $options->{predicate} ||= "_has${name}";
+        } 
+        else {
+            $options->{clearer}   ||= "clear_${name}";
+            $options->{predicate} ||= "has_${name}";
         }
+    }
 
-        if (exists $options->{lazy} && $options->{lazy}) {
-            (exists $options->{default} || exists $options->{builder} )
-                || confess "You cannot have lazy attribute without specifying a default value for it";
-        }
+    if (exists $options->{lazy} && $options->{lazy}) {
+        (exists $options->{default} || exists $options->{builder} )
+            || confess "You cannot have lazy attribute without specifying a default value for it";
+    }
 
 }
 
@@ -202,12 +204,10 @@ sub initialize_instance_slot {
     # try to fetch the init arg from the %params ...
 
     my $val;
+    my $value_is_set;
     if (exists $params->{$init_arg}) {
         $val = $params->{$init_arg};
-
-        if (!defined $val && $self->is_required) {
-            confess "Attribute (" . $self->name . ") is required and cannot be undef";
-        }
+        $value_is_set = 1;    
     }
     else {
         # skip it if it's lazy
@@ -215,41 +215,44 @@ sub initialize_instance_slot {
         # and die if it's required and doesn't have a default value
         confess "Attribute (" . $self->name . ") is required"
             if $self->is_required && !$self->has_default && !$self->has_builder;
-    }
 
-    # if nothing was in the %params, we can use the
-    # attribute's default value (if it has one)
-    if (!defined $val && $self->has_default) {
-        $val = $self->default($instance);
-    } elsif (!defined $val && $self->has_builder) {
-        my $builder = $self->builder;
-        if($builder = $instance->can($builder)){
-            $val = $instance->$builder;
-        } else {
-            confess(blessed($instance)." does not support builder method '$builder' for attribute '" . $self->name . "'");
+        # if nothing was in the %params, we can use the
+        # attribute's default value (if it has one)
+        if ($self->has_default) {
+            $val = $self->default($instance);
+            $value_is_set = 1;
+        } 
+        elsif ($self->has_builder) {
+            if (my $builder = $instance->can($self->builder)){
+                $val = $instance->$builder;
+                $value_is_set = 1;
+            } 
+            else {
+                confess(blessed($instance)." does not support builder method '".$self->builder."' for attribute '" . $self->name . "'");
+            }
         }
     }
 
-        if (defined $val || $self->has_default) {
-            if ($self->has_type_constraint) {
-                my $type_constraint = $self->type_constraint;
-                    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
-                               ? (blessed($val) && overload::Overloaded($val)
-                                    ? overload::StrVal($val)
-                                    : $val)
-                               : 'undef') .
-                           "'";
-        }
+    return unless $value_is_set;
+
+    if ($self->has_type_constraint) {
+        my $type_constraint = $self->type_constraint;
+        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
+                           ? (blessed($val) && overload::Overloaded($val)
+                                ? overload::StrVal($val)
+                                : $val)
+                           : 'undef') .
+                       "'";
+    }
 
     $meta_instance->set_slot_value($instance, $self->name, $val);
     $meta_instance->weaken_slot_value($instance, $self->name)
@@ -307,22 +310,28 @@ sub get_value {
     my ($self, $instance) = @_;
 
     if ($self->is_lazy) {
-            unless ($self->has_value($instance)) {
-                if ($self->has_default) {
-                    my $default = $self->default($instance);
-                    $self->set_value($instance, $default);
-                }
-                if ( $self->has_builder ){
-                    my $builder = $self->builder;
-                    if($builder = $instance->can($builder)){
-                        $self->set_value($instance, $instance->$builder);
-                    } else {
-                        confess(blessed($instance)." does not support builder method '$builder' for attribute '" . $self->name . "'");
-                    }
-                } else {
-                    $self->set_value($instance, undef);
+        unless ($self->has_value($instance)) {
+            if ($self->has_default) {
+                my $default = $self->default($instance);
+                $self->set_value($instance, $default);
+            }
+            if ( $self->has_builder ){
+                if (my $builder = $instance->can($self->builder)){
+                    $self->set_value($instance, $instance->$builder);
+                } 
+                else {
+                    confess(blessed($instance) 
+                          . " does not support builder method '"
+                          . $self->builder 
+                          . "' for attribute '" 
+                          . $self->name 
+                          . "'");
                 }
+            } 
+            else {
+                $self->set_value($instance, undef);
             }
+        }
     }
 
     if ($self->should_auto_deref) {
@@ -367,14 +376,10 @@ sub install_accessors {
         # to delagate to, see that method for details
         my %handles = $self->_canonicalize_handles();
 
-        # find the name of the accessor for this attribute
-        my $accessor_name = $self->reader || $self->accessor;
-        (defined $accessor_name)
-            || confess "You cannot install delegation without a reader or accessor for the attribute";
-
-        # make sure we handle HASH accessors correctly
-        ($accessor_name) = keys %{$accessor_name}
-            if ref($accessor_name) eq 'HASH';
+        # find the accessor method for this attribute
+        my $accessor = $self->get_read_method_ref;
+        # then unpack it if we need too ...
+        $accessor = $accessor->body if blessed $accessor;
 
         # install the delegation ...
         my $associated_class = $self->associated_class;
@@ -400,9 +405,9 @@ sub install_accessors {
                     # we should check for lack of
                     # a callable return value from
                     # the accessor here
-                    my $proxy = (shift)->$accessor_name();
+                    my $proxy = (shift)->$accessor();
                     @_ = ($proxy, @_);
-                    goto &{ $proxy->can($method_to_call)};
+                    goto &{ $proxy->can($method_to_call) };
                 });
             }
         }