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

diff --git a/lib/Mouse/Object.pm b/lib/Mouse/Object.pm
index f615ac9..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,11 +15,11 @@ 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})) {
-            $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};
 
@@ -40,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;
 
@@ -90,9 +89,9 @@ sub BUILDALL {
     # short circuit
     return unless $self->can('BUILD');
 
-    no strict 'refs';
-
     for my $class (reverse $self->meta->linearized_isa) {
+        no strict 'refs';
+        no warnings 'once';
         my $code = *{ $class . '::BUILD' }{CODE}
             or next;
         $code->($self, @_);
@@ -138,6 +137,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