Moose compat: init_arg is not used for the hash key, name is

[gitmo/Mouse.git] / lib / Mouse / Object.pm

diff --git a/lib/Mouse/Object.pm b/lib/Mouse/Object.pm
index 27f914b..e72542c 100644 (file)
--- a/lib/Mouse/Object.pm
+++ b/lib/Mouse/Object.pm
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 use MRO::Compat;
 
-use Scalar::Util 'blessed';
+use Scalar::Util qw/blessed weaken/;
 use Carp 'confess';
 
 sub new {
@@ -12,15 +12,14 @@ sub new {
     my %args  = @_;
     my $instance = bless {}, $class;
 
-    for my $attribute ($class->meta->attributes) {
-        my $key = $attribute->init_arg;
+    for my $attribute (values %{ $class->meta->get_attribute_map }) {
+        my $key = $attribute->name;
         my $default;
 
         if (!exists($args{$key})) {
             if ($attribute->has_default || $attribute->has_builder) {
-                my $default = $attribute->default;
-
                 unless ($attribute->is_lazy) {
+                    my $default = $attribute->default;
                     my $builder = $attribute->builder;
                     my $value = $attribute->has_builder
                               ? $instance->$builder
@@ -33,13 +32,13 @@ sub new {
 
                     $instance->{$key} = $value;
 
-                    Scalar::Util::weaken($instance->{$key})
-                        if $attribute->weak_ref;
+                    weaken($instance->{$key})
+                        if ref($instance->{$key}) && $attribute->is_weak_ref;
                 }
             }
             else {
                 if ($attribute->is_required) {
-                    confess "Attribute '".$attribute->name."' is required";
+                    confess "Attribute (".$attribute->name.") is required";
                 }
             }
         }
@@ -50,8 +49,8 @@ sub new {
 
             $instance->{$key} = $args{$key};
 
-            Scalar::Util::weaken($instance->{$key})
-                if $attribute->weak_ref;
+            weaken($instance->{$key})
+                if ref($instance->{$key}) && $attribute->is_weak_ref;
 
             if ($attribute->has_trigger) {
                 $attribute->trigger->($instance, $args{$key}, $attribute);