X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMouse%2FObject.pm;h=900530d428df17ff6ab18a0cb6909ab9c07f32e4;hb=6c169c5063b77a791818f5db2c1da3bd9b47d3f9;hp=115a5344e45e5b9898010693ebfb87b3c330d4a1;hpb=a08e715f7c381c665e5974976e56ebae491f7eda;p=gitmo%2FMouse.git

diff --git a/lib/Mouse/Object.pm b/lib/Mouse/Object.pm
index 115a534..900530d 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 Scalar::Util qw/weaken/;
 use Carp 'confess';
 
 sub new {
@@ -17,9 +16,10 @@ 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})) {
+            $args->{$from} = $attribute->coerce_constraint($args->{$from})
+                if $attribute->should_coerce;
             $attribute->verify_type_constraint($args->{$from})
                 if $attribute->has_type_constraint;
 
@@ -40,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;