BUILDARGS

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

diff --git a/lib/Mouse/Object.pm b/lib/Mouse/Object.pm
index 82cbec0..f615ac9 100644 (file)
--- a/lib/Mouse/Object.pm
+++ b/lib/Mouse/Object.pm
@@ -4,56 +4,84 @@ use strict;
 use warnings;
 use MRO::Compat;
 
-use Scalar::Util 'blessed';
+use Scalar::Util qw/blessed weaken/;
 use Carp 'confess';
 
 sub new {
     my $class = shift;
-    my %args  = @_;
+
+    my $args = $class->BUILDARGS(@_);
+
     my $instance = bless {}, $class;
 
-    for my $attribute ($class->meta->attributes) {
-        my $key = $attribute->init_arg;
+    for my $attribute ($class->meta->compute_all_applicable_attributes) {
+        my $from = $attribute->init_arg;
+        my $key  = $attribute->name;
         my $default;
 
-        if (!exists($args{$key})) {
-            if (exists($attribute->{default})) {
-                unless ($attribute->{lazy}) {
-                    if (ref($attribute->{default}) eq 'CODE') {
-                        $instance->{$key} = $attribute->{default}->();
-                        Scalar::Util::weaken($instance->{$key})
-                            if $attribute->{weak_ref};
-                    }
-                    else {
-                        $instance->{$key} = $attribute->{default};
-                        Scalar::Util::weaken($instance->{$key})
-                            if $attribute->{weak_ref};
-                    }
+        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;
+                    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} = $value;
+
+                    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})) {
-            $instance->{$key} = $args{$key};
-            Scalar::Util::weaken($instance->{$key})
-                if $attribute->{weak_ref};
-
-            if ($attribute->{trigger}) {
-                $attribute->{trigger}->($instance, $args{$key}, $attribute);
-            }
-        }
     }
 
-    $instance->BUILDALL(\%args);
+    $instance->BUILDALL($args);
 
     return $instance;
 }
 
+sub BUILDARGS {
+    my $class = shift;
+
+    if (scalar @_ == 1) {
+        if (defined $_[0]) {
+            (ref($_[0]) eq 'HASH')
+                || confess "Single parameters to new() must be a HASH ref";
+            return {%{$_[0]}};
+        } else {
+            return {};
+        }
+    }
+    else {
+        return {@_};
+    }
+}
+
 sub DESTROY { shift->DEMOLISHALL }
 
 sub BUILDALL {
@@ -64,7 +92,7 @@ sub BUILDALL {
 
     no strict 'refs';
 
-    for my $class ($self->meta->linearized_isa) {
+    for my $class (reverse $self->meta->linearized_isa) {
         my $code = *{ $class . '::BUILD' }{CODE}
             or next;
         $code->($self, @_);