X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=gitmo%2FMouse.git;a=blobdiff_plain;f=lib%2FMouse%2FObject.pm;h=804f46156e88452c987b8e00a79a9f00db6de17e;hp=1dd548152e783e0d11b01ad4faf63e9e7e7e3bb2;hb=f671555230c6928a7834a9c6be047649cd0c4f5b;hpb=1be61030b949daee746b57e7135202c27eeb1c2f

diff --git a/lib/Mouse/Object.pm b/lib/Mouse/Object.pm
index 1dd5481..804f461 100644
--- a/lib/Mouse/Object.pm
+++ b/lib/Mouse/Object.pm
@@ -1,65 +1,86 @@
-#!/usr/bin/env perl
 package Mouse::Object;
 use strict;
 use warnings;
-use MRO::Compat;
 
-use Scalar::Util 'blessed';
+use Scalar::Util '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;
-        my $default;
-
-        if (!exists($args{$key})) {
-            if (exists($attribute->{default}) || exists($attribute->{builder})) {
-                unless ($attribute->{lazy}) {
-                    my $builder = $attribute->{builder};
-                    my $default = exists($attribute->{builder})
-                                ? $instance->$builder
-                                : ref($attribute->{default}) eq 'CODE'
-                                    ? $attribute->{default}->()
-                                    : $attribute->{default};
-
-                    $attribute->verify_type_constraint($default)
+    for my $attribute ($class->meta->compute_all_applicable_attributes) {
+        my $from = $attribute->init_arg;
+        my $key  = $attribute->name;
+
+        if (defined($from) && exists($args->{$from})) {
+            $args->{$from} = $attribute->coerce_constraint($args->{$from})
+                if $attribute->should_coerce;
+            $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->($instance)
+                                  : $default;
+
+                    $value = $attribute->coerce_constraint($value)
+                        if $attribute->should_coerce;
+                    $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 $attribute->has_type_constraint;
+    $instance->BUILDALL($args);
 
-            $instance->{$key} = $args{$key};
+    return $instance;
+}
 
-            Scalar::Util::weaken($instance->{$key})
-                if $attribute->{weak_ref};
+sub BUILDARGS {
+    my $class = shift;
 
-            if ($attribute->{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 }
@@ -70,9 +91,9 @@ sub BUILDALL {
     # short circuit
     return unless $self->can('BUILD');
 
-    no strict 'refs';
-
-    for my $class ($self->meta->linearized_isa) {
+    for my $class (reverse $self->meta->linearized_isa) {
+        no strict 'refs';
+        no warnings 'once';
         my $code = *{ $class . '::BUILD' }{CODE}
             or next;
         $code->($self, @_);
@@ -118,6 +139,11 @@ end of L</new>.
 You may put any business logic initialization in BUILD methods. You don't
 need to redispatch or return any specific value.
 
+=head2 BUILDARGS
+
+Lets you override the arguments that C<new> takes. Return a hashref of
+parameters.
+
 =head2 DEMOLISHALL
 
 Calls L</DEMOLISH> on each class in the class hierarchy. This is called at