X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMouse%2FObject.pm;h=375cf60752cbe3f3910443f02de4dfdef797ba01;hb=20e25eb99981654f64a6b4a9139e55ddca399981;hp=81cb9bf87a20aac1754b2899a813fa283141358c;hpb=d07212475afdc6ff3c61b9a63c1dd1dd326ff003;p=gitmo%2FMouse.git

diff --git a/lib/Mouse/Object.pm b/lib/Mouse/Object.pm
index 81cb9bf..375cf60 100644
--- a/lib/Mouse/Object.pm
+++ b/lib/Mouse/Object.pm
@@ -1,10 +1,8 @@
-#!/usr/bin/env perl
 package Mouse::Object;
 use strict;
 use warnings;
-use MRO::Compat;
 
-use Scalar::Util qw/blessed weaken/;
+use Scalar::Util 'weaken';
 use Carp 'confess';
 
 sub new {
@@ -17,23 +15,19 @@ 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);
-            }
-
-            $attribute->verify_type_constraint($args->{$from})
-                if $attribute->has_type_constraint;
+            $args->{$from} = $attribute->coerce_constraint($args->{$from})
+                if $attribute->should_coerce;
+            $attribute->verify_against_type_constraint($args->{$from});
 
             $instance->{$key} = $args->{$from};
 
             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 {
@@ -44,11 +38,12 @@ sub new {
                     my $value = $attribute->has_builder
                               ? $instance->$builder
                               : ref($default) eq 'CODE'
-                                  ? $default->()
+                                  ? $default->($instance)
                                   : $default;
 
-                    $attribute->verify_type_constraint($value)
-                        if $attribute->has_type_constraint;
+                    $value = $attribute->coerce_constraint($value)
+                        if $attribute->should_coerce;
+                    $attribute->verify_against_type_constraint($value);
 
                     $instance->{$key} = $value;