Make Role::with die

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

diff --git a/lib/Mouse/Object.pm b/lib/Mouse/Object.pm
index dcb8590..5b7d17e 100644 (file)
--- a/lib/Mouse/Object.pm
+++ b/lib/Mouse/Object.pm
@@ -9,18 +9,42 @@ use Carp 'confess';
 
 sub new {
     my $class = shift;
-    my %args  = @_;
+    my %args;
+    if (scalar @_ == 1) {
+        if (defined $_[0]) {
+            (ref($_[0]) eq 'HASH')
+                || confess "Single parameters to new() must be a HASH ref";
+            %args = %{$_[0]};
+        }
+    }
+    else {
+        %args = @_;
+    }
+
     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 ($attribute->has_default || $attribute->has_builder) {
-                my $default = $attribute->default;
+        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
@@ -34,29 +58,15 @@ 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->{$key} = $args{$key};
-
-            weaken($instance->{$key})
-                if $attribute->weak_ref;
-
-            if ($attribute->has_trigger) {
-                $attribute->trigger->($instance, $args{$key}, $attribute);
-            }
-        }
     }
 
     $instance->BUILDALL(\%args);
@@ -74,7 +84,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, @_);