X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMooseX%2FUndefTolerant%2FConstructor.pm;h=969facab9ddce5a238b0228faa4e8bb447d2eb42;hb=3991a5d2d6058c15d85b028dae0c548922c38dbe;hp=841811d0119e2aebe7f8d7d0c4e19df906585d39;hpb=8e67fa0cc9dee4d8ea506e8f7db0c5d6a2ef9917;p=gitmo%2FMooseX-UndefTolerant.git

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