From: Shawn M Moore <sartak@gmail.com>
Date: Fri, 13 Jun 2008 01:53:45 +0000 (+0000)
Subject: Add support for undef init_arg
X-Git-Tag: 0.04~12
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=491e5923fc4a4ca01cf73410ccb913f9d4b5f6e0;p=gitmo%2FMouse.git

Add support for undef init_arg
---

diff --git a/Changes b/Changes
index 4debfb4..be60339 100644
--- a/Changes
+++ b/Changes
@@ -8,6 +8,7 @@ Revision history for Mouse
        - Add support for ->new({...})
        - Use compute_all_applicable_attributes in the constructor to get the
          attributes of superclasses
+       - Add better support for undef init_arg
 
      * Mouse::Meta::Class:
        - More methods: compute_all_applicable_attributes, has_attribute
diff --git a/lib/Mouse/Object.pm b/lib/Mouse/Object.pm
index 2138adf..5b7d17e 100644
--- a/lib/Mouse/Object.pm
+++ b/lib/Mouse/Object.pm
@@ -28,7 +28,20 @@ sub new {
         my $key  = $attribute->name;
         my $default;
 
-        if (!exists($args{$from})) {
+        if (defined($from) && exists($args{$from})) {
+            $attribute->verify_type_constraint($args{$from})
+                if $attribute->has_type_constraint;
+
+            $instance->{$key} = $args{$from};
+
+            weaken($instance->{$key})
+                if ref($instance->{$key}) && $attribute->is_weak_ref;
+
+            if ($attribute->has_trigger) {
+                $attribute->trigger->($instance, $args{$from}, $attribute);
+            }
+        }
+        else {
             if ($attribute->has_default || $attribute->has_builder) {
                 unless ($attribute->is_lazy) {
                     my $default = $attribute->default;
@@ -54,20 +67,6 @@ sub new {
                 }
             }
         }
-
-        if (exists($args{$from})) {
-            $attribute->verify_type_constraint($args{$from})
-                if $attribute->has_type_constraint;
-
-            $instance->{$key} = $args{$from};
-
-            weaken($instance->{$key})
-                if ref($instance->{$key}) && $attribute->is_weak_ref;
-
-            if ($attribute->has_trigger) {
-                $attribute->trigger->($instance, $args{$from}, $attribute);
-            }
-        }
     }
 
     $instance->BUILDALL(\%args);