X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FObject.pm;h=2f06b5a666e5bf630ab1bfd92c27f7449eafcf70;hb=817660201c58e0d4a697bfe2d0f65781622318d7;hp=2c52c1d2205083d5a761b8cfc784f95d4333242f;hpb=267f8179e340201137fb8c257855fc56d2bd39e6;p=gitmo%2FMoose.git

diff --git a/lib/Moose/Object.pm b/lib/Moose/Object.pm
index 2c52c1d..2f06b5a 100644
--- a/lib/Moose/Object.pm
+++ b/lib/Moose/Object.pm
@@ -7,31 +7,31 @@ use warnings;
 use if ( not our $__mx_is_compiled ), 'Moose::Meta::Class';
 use if ( not our $__mx_is_compiled ), metaclass => 'Moose::Meta::Class';
 
-use Carp 'confess';
-
-our $VERSION   = '0.52';
+our $VERSION   = '0.62_01';
+$VERSION = eval $VERSION;
 our $AUTHORITY = 'cpan:STEVAN';
 
 sub new {
     my $class = shift;
     my $params = $class->BUILDARGS(@_);
-    my $self = $class->meta->new_object(%$params);
+    my $self = $class->meta->new_object($params);
     $self->BUILDALL($params);
     return $self;
 }
 
 sub BUILDARGS {
     my $class = shift;
-
     if (scalar @_ == 1) {
         if (defined $_[0]) {
             (ref($_[0]) eq 'HASH')
-                || confess "Single parameters to new() must be a HASH ref";
+                || $class->meta->throw_error("Single parameters to new() must be a HASH ref", data => $_[0]);
             return {%{$_[0]}};
-        } else {
+        } 
+        else {
             return {}; # FIXME this is compat behavior, but is it correct?
         }
-    } else {
+    } 
+    else {
         return {@_};
     }
 }
@@ -43,14 +43,14 @@ sub BUILDALL {
     return unless $_[0]->can('BUILD');    
     my ($self, $params) = @_;
     foreach my $method (reverse $self->meta->find_all_methods_by_name('BUILD')) {
-        $method->{code}->body->($self, $params);
+        $method->{code}->execute($self, $params);
     }
 }
 
 sub DEMOLISHALL {
     my $self = shift;    
     foreach my $method ($self->meta->find_all_methods_by_name('DEMOLISH')) {
-        $method->{code}->body->($self);
+        $method->{code}->execute($self);
     }
 }
 
@@ -72,21 +72,23 @@ sub DESTROY {
     $_[0]->DEMOLISHALL;
 }
 
-sub DOES {
-    my ( $self, $class_or_role_name ) = @_;
-
-    $self->SUPER::DOES($class_or_role_name)
-        or
-    $self->does($class_or_role_name);
+# support for UNIVERSAL::DOES ...
+BEGIN {
+    my $does = UNIVERSAL->can("DOES") ? "SUPER::DOES" : "isa";
+    eval 'sub DOES {
+        my ( $self, $class_or_role_name ) = @_;
+        return $self->'.$does.'($class_or_role_name)
+            || $self->does($class_or_role_name);
+    }';
 }
 
 # new does() methods will be created 
-# as approiate see Moose::Meta::Role
+# as appropiate see Moose::Meta::Role
 sub does {
     my ($self, $role_name) = @_;
-    (defined $role_name)
-        || confess "You must supply a role name to does()";
     my $meta = $self->meta;
+    (defined $role_name)
+        || $meta->throw_error("You much supply a role name to does()");
     foreach my $class ($meta->class_precedence_list) {
         my $m = $meta->initialize($class);
         return 1