X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMouse%2FObject.pm;h=c7add331d08377de7beb5a3f9085440bdd056338;hb=74f2f839994288ca48292d561c9dc2d822deae39;hp=1511d2836f75650c749b790699b57460919c5823;hpb=9baf5d6bc5ac4b034196d755c234062dc5673ad7;p=gitmo%2FMouse.git

diff --git a/lib/Mouse/Object.pm b/lib/Mouse/Object.pm
index 1511d28..c7add33 100644
--- a/lib/Mouse/Object.pm
+++ b/lib/Mouse/Object.pm
@@ -3,8 +3,7 @@ package Mouse::Object;
 use strict;
 use warnings;
 
-use MRO::Compat;
-use Scalar::Util qw/blessed weaken/;
+use Mouse::Util qw/weaken/;
 use Carp 'confess';
 
 sub new {
@@ -17,38 +16,20 @@ sub new {
     for my $attribute ($class->meta->compute_all_applicable_attributes) {
         my $from = $attribute->init_arg;
         my $key  = $attribute->name;
-        my $default;
 
         if (defined($from) && exists($args->{$from})) {
-            if ($attribute->has_trigger && $attribute->trigger->{before}) {
-                $attribute->trigger->{before}->($instance, $args->{$from}, $attribute);
-            }
-
-            if ($attribute->has_trigger && $attribute->trigger->{around}) {
-                $attribute->trigger->{around}->(sub {
-                    $args->{$from} = $_[1];
-
-                    $attribute->verify_type_constraint($args->{$from})
-                        if $attribute->has_type_constraint;
+            $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};
+            $instance->{$key} = $args->{$from};
 
-                    weaken($instance->{$key})
-                        if ref($instance->{$key}) && $attribute->is_weak_ref;
-                }, $instance, $args->{$from}, $attribute);
-            }
-            else {
-                $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;
-            }
+            weaken($instance->{$key})
+                if ref($instance->{$key}) && $attribute->is_weak_ref;
 
-            if ($attribute->has_trigger && $attribute->trigger->{after}) {
-                $attribute->trigger->{after}->($instance, $args->{$from}, $attribute);
+            if ($attribute->has_trigger) {
+                $attribute->trigger->($instance, $args->{$from}, $attribute);
             }
         }
         else {
@@ -59,9 +40,11 @@ sub new {
                     my $value = $attribute->has_builder
                               ? $instance->$builder
                               : ref($default) eq 'CODE'
-                                  ? $default->()
+                                  ? $default->($instance)
                                   : $default;
 
+                    $value = $attribute->coerce_constraint($value)
+                        if $attribute->should_coerce;
                     $attribute->verify_type_constraint($value)
                         if $attribute->has_type_constraint;