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=0c5759465349917d5e7a94694da060791478a85e;hb=f671555230c6928a7834a9c6be047649cd0c4f5b;hpb=4188b837041f2d3b244daf2c57ddecca151e7418

diff --git a/lib/Mouse/Object.pm b/lib/Mouse/Object.pm
index 0c57594..804f461 100644
--- a/lib/Mouse/Object.pm
+++ b/lib/Mouse/Object.pm
@@ -1,9 +1,8 @@
-#!/usr/bin/env perl
 package Mouse::Object;
 use strict;
 use warnings;
 
-use Mouse::Util qw/weaken/;
+use Scalar::Util 'weaken';
 use Carp 'confess';
 
 sub new {
@@ -16,11 +15,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->is_coerce;
+                if $attribute->should_coerce;
             $attribute->verify_type_constraint($args->{$from})
                 if $attribute->has_type_constraint;
 
@@ -41,11 +39,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->is_coerce;
+                        if $attribute->should_coerce;
                     $attribute->verify_type_constraint($value)
                         if $attribute->has_type_constraint;