these version checks already happen in the exporter

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

diff --git a/lib/MooseX/UndefTolerant/Constructor.pm b/lib/MooseX/UndefTolerant/Constructor.pm
index 47d8128..9f4046c 100644 (file)
--- a/lib/MooseX/UndefTolerant/Constructor.pm
+++ b/lib/MooseX/UndefTolerant/Constructor.pm
@@ -1,26 +1,33 @@
 package MooseX::UndefTolerant::Constructor;
 use Moose::Role;
 
-around('_generate_slot_initializer', sub {
-        my $orig = shift;
-        my $self = shift;
-        my $attr = $self->_attributes->[$_[0]]->init_arg;
+around _generate_slot_initializer => sub {
+    my $orig = shift;
+    my $self = shift;
 
-        # insert a line of code at the start of the initializer,
-        # clearing the param if it's undefined.
+    # note the key in the params may not match the attr name.
+    my $key_name = $self->_attributes->[$_[0]]->init_arg;
 
-        if (defined $attr) {
-                my $tolerant_code = 
-                     qq# delete \$params->{'$attr'} unless # . 
-                     qq# exists \$params->{'$attr'} && defined \$params->{'$attr'};\n#;
+    # insert a line of code at the start of the initializer,
+    # clearing the param if it's undefined.
 
-                return $tolerant_code . $self->$orig(@_);
-        }
-        else {
-                return $self->$orig(@_);
+    if (defined $key_name)
+    {
+        # leave the value unscathed if the attribute's type constraint can
+        # handle undef (or doesn't have one, which implicitly means it can)
+        my $type_constraint = $self->_attributes->[$_[0]]->type_constraint;
+        if ($type_constraint and not $type_constraint->check(undef))
+        {
+            my $tolerant_code =
+                qq# delete \$params->{'$key_name'} unless # .
+                qq# exists \$params->{'$key_name'} && defined \$params->{'$key_name'};\n#;
+
+            return $tolerant_code . $self->$orig(@_);
         }
-});
+    }
 
-no Moose::Role;
+    return $self->$orig(@_);
+};
 
+no Moose::Role;
 1;