Fix lie in the docs (error_class does to have a default)

[gitmo/Moose.git] / lib / Moose / Object.pm

diff --git a/lib/Moose/Object.pm b/lib/Moose/Object.pm
index feab57b..0857edc 100644 (file)
--- a/lib/Moose/Object.pm
+++ b/lib/Moose/Object.pm
@@ -7,15 +7,14 @@ 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.53';
+our $VERSION   = '0.60';
+$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;
 }
@@ -25,7 +24,7 @@ sub BUILDARGS {
     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 {
@@ -74,23 +73,22 @@ sub DESTROY {
 }
 
 # support for UNIVERSAL::DOES ...
-sub DOES {
-    my ( $self, $class_or_role_name ) = @_;
-    if (my $DOES = __PACKAGE__->meta->find_next_method_by_name('DOES')) {
-        return $DOES->body->($self, $class_or_role_name) 
+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);
-    }
-    return $self->isa($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