X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMooseX%2FUndefTolerant%2FConstructor.pm;h=4406f2c66aa457ba35bc652d80d8ba76b9f05899;hb=2dca5fcfeb72f43c830f3af4003f26e9875e524d;hp=47d81283c857615c8a5846794279d4b4bc094e85;hpb=d10a4d7f63850b562f9c5267707b9072b84d33f3;p=gitmo%2FMooseX-UndefTolerant.git

diff --git a/lib/MooseX/UndefTolerant/Constructor.pm b/lib/MooseX/UndefTolerant/Constructor.pm
index 47d8128..4406f2c 100644
--- a/lib/MooseX/UndefTolerant/Constructor.pm
+++ b/lib/MooseX/UndefTolerant/Constructor.pm
@@ -1,26 +1,34 @@
 package MooseX::UndefTolerant::Constructor;
 use Moose::Role;
 
-around('_generate_slot_initializer', sub {
+if ( $Moose::VERSION < 1.9900 ) {
+    around('_generate_slot_initializer', sub {
         my $orig = shift;
         my $self = shift;
-        my $attr = $self->_attributes->[$_[0]]->init_arg;
+
+        # note the key in the params may not match the attr name.
+        my $key_name = $self->_attributes->[$_[0]]->init_arg;
 
         # insert a line of code at the start of the initializer,
         # clearing the param if it's undefined.
 
-        if (defined $attr) {
-                my $tolerant_code = 
-                     qq# delete \$params->{'$attr'} unless # . 
-                     qq# exists \$params->{'$attr'} && defined \$params->{'$attr'};\n#;
+        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(@_);
+            }
         }
-        else {
-                return $self->$orig(@_);
-        }
+
+        return $self->$orig(@_);
 });
 
 no Moose::Role;
-
 1;