Add failing tests for auto_deref, where I'll pick up next time

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

diff --git a/lib/Mouse/Object.pm b/lib/Mouse/Object.pm
index 2a5a639..70ad475 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,44 +12,49 @@ 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 $from = $attribute->init_arg;
+        my $key  = $attribute->name;
         my $default;
 
-        if (!exists($args{$key})) {
-            if (exists($attribute->{default})) {
-                unless ($attribute->{lazy}) {
-                    my $default = ref($attribute->{default}) eq 'CODE'
-                                ? $attribute->{default}->()
-                                : $attribute->{default};
-
-                    $attribute->verify_type_constraint($default)
+        if (!exists($args{$from})) {
+            if ($attribute->has_default || $attribute->has_builder) {
+                unless ($attribute->is_lazy) {
+                    my $default = $attribute->default;
+                    my $builder = $attribute->builder;
+                    my $value = $attribute->has_builder
+                              ? $instance->$builder
+                              : ref($default) eq 'CODE'
+                                  ? $default->()
+                                  : $default;
+
+                    $attribute->verify_type_constraint($value)
                         if $attribute->has_type_constraint;
 
-                    $instance->{$key} = $default;
+                    $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->{required}) {
-                    confess "Attribute '$attribute->{name}' is required";
+                if ($attribute->is_required) {
+                    confess "Attribute (".$attribute->name.") is required";
                 }
             }
         }
 
-        if (exists($args{$key})) {
-            $attribute->verify_type_constraint($args{$key})
+        if (exists($args{$from})) {
+            $attribute->verify_type_constraint($args{$from})
                 if $attribute->has_type_constraint;
 
-            $instance->{$key} = $args{$key};
+            $instance->{$key} = $args{$from};
 
-            Scalar::Util::weaken($instance->{$key})
-                if $attribute->{weak_ref};
+            weaken($instance->{$key})
+                if ref($instance->{$key}) && $attribute->is_weak_ref;
 
-            if ($attribute->{trigger}) {
-                $attribute->{trigger}->($instance, $args{$key}, $attribute);
+            if ($attribute->has_trigger) {
+                $attribute->trigger->($instance, $args{$from}, $attribute);
             }
         }
     }