X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMouse%2FObject.pm;h=70ad475b6f010a27204e4db69ef6ac91673a8db4;hb=615d5d5fa75cb9c4d1445184b63dae565dcc790e;hp=e72542c5aed460adb60d9872462b86b8a5c0a7f2;hpb=f3c1ccc818bb5c50c50e17b9141b91c09b077b04;p=gitmo%2FMouse.git diff --git a/lib/Mouse/Object.pm b/lib/Mouse/Object.pm index e72542c..70ad475 100644 --- a/lib/Mouse/Object.pm +++ b/lib/Mouse/Object.pm @@ -13,10 +13,11 @@ sub new { my $instance = bless {}, $class; for my $attribute (values %{ $class->meta->get_attribute_map }) { - my $key = $attribute->name; + my $from = $attribute->init_arg; + my $key = $attribute->name; my $default; - if (!exists($args{$key})) { + if (!exists($args{$from})) { if ($attribute->has_default || $attribute->has_builder) { unless ($attribute->is_lazy) { my $default = $attribute->default; @@ -43,17 +44,17 @@ sub new { } } - if (exists($args{$key})) { - $attribute->verify_type_constraint($args{$key}) + if (exists($args{$from})) { + $attribute->verify_type_constraint($args{$from}) if $attribute->has_type_constraint; - $instance->{$key} = $args{$key}; + $instance->{$key} = $args{$from}; weaken($instance->{$key}) if ref($instance->{$key}) && $attribute->is_weak_ref; if ($attribute->has_trigger) { - $attribute->trigger->($instance, $args{$key}, $attribute); + $attribute->trigger->($instance, $args{$from}, $attribute); } } }