X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMouse%2FObject.pm;h=f615ac9839340c03e39a461b50baaf83e85accb8;hb=d574882a10a05f5e8c515a87358460f7ae0ed247;hp=e870e7890a1087488e069bd90e20943fc1cfdfe0;hpb=fb706f5c1e60ddafe873717be7209066d47b8998;p=gitmo%2FMouse.git

diff --git a/lib/Mouse/Object.pm b/lib/Mouse/Object.pm
index e870e78..f615ac9 100644
--- a/lib/Mouse/Object.pm
+++ b/lib/Mouse/Object.pm
@@ -9,14 +9,30 @@ 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 (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;
@@ -33,34 +49,37 @@ sub new {
                     $instance->{$key} = $value;
 
                     weaken($instance->{$key})
-                        if $attribute->weak_ref;
+                        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";
                 }
             }
         }
+    }
 
-        if (exists($args{$key})) {
-            $attribute->verify_type_constraint($args{$key})
-                if $attribute->has_type_constraint;
+    $instance->BUILDALL($args);
 
-            $instance->{$key} = $args{$key};
+    return $instance;
+}
 
-            weaken($instance->{$key})
-                if $attribute->weak_ref;
+sub BUILDARGS {
+    my $class = shift;
 
-            if ($attribute->has_trigger) {
-                $attribute->trigger->($instance, $args{$key}, $attribute);
-            }
+    if (scalar @_ == 1) {
+        if (defined $_[0]) {
+            (ref($_[0]) eq 'HASH')
+                || confess "Single parameters to new() must be a HASH ref";
+            return {%{$_[0]}};
+        } else {
+            return {};
         }
     }
-
-    $instance->BUILDALL(\%args);
-
-    return $instance;
+    else {
+        return {@_};
+    }
 }
 
 sub DESTROY { shift->DEMOLISHALL }
@@ -73,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, @_);