do nothing at construction time for attributes with undef init_arg - fixes undefined...

[gitmo/MooseX-UndefTolerant.git] / lib / MooseX / UndefTolerant / Attribute.pm

diff --git a/lib/MooseX/UndefTolerant/Attribute.pm b/lib/MooseX/UndefTolerant/Attribute.pm
index aa8f5d1..644611e 100644 (file)
--- a/lib/MooseX/UndefTolerant/Attribute.pm
+++ b/lib/MooseX/UndefTolerant/Attribute.pm
@@ -4,23 +4,23 @@ use Moose::Role;
 around('initialize_instance_slot', sub {
     my $orig = shift;
     my $self = shift;
+    my ($meta_instance, $instance, $params) = @_;
 
     my $key_name = $self->init_arg;
 
-    # $_[2] is the hashref of options passed to the constructor.
-    # If our parameter passed in was undef, pop it off the args...
+    # If our parameter passed in was undef, remove it from the parameter list...
     # but leave the value unscathed if the attribute's type constraint can
     # handle undef (or doesn't have one, which implicitly means it can)
-    if (not defined $key_name or not defined($_[2]->{$key_name}))
+    if (defined $key_name and not defined($params->{$key_name}))
     {
         my $type_constraint = $self->type_constraint;
         if ($type_constraint and not $type_constraint->check(undef))
         {
-            pop;
+            delete $params->{$key_name};
         }
     }
 
-    # Invoke the real init, as the above line cleared the undef
+    # Invoke the real init, as the above line cleared the undef param value
     $self->$orig(@_)
 });