X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FObject.pm;h=a0ed7e4bdb0c3c61c182fcab48eaa0f79ea14e57;hb=9409e92e75a6e1060eb3d0adcfc7965713d3d776;hp=1806daadb9438f7725bbce4ecbcc8f34e424df6e;hpb=ca0e380d7e2b356396c0d374f7fce4ec45c25162;p=gitmo%2FMoose.git

diff --git a/lib/Moose/Object.pm b/lib/Moose/Object.pm
index 1806daa..a0ed7e4 100644
--- a/lib/Moose/Object.pm
+++ b/lib/Moose/Object.pm
@@ -7,27 +7,33 @@ 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.13';
+our $VERSION   = '0.72';
+$VERSION = eval $VERSION;
 our $AUTHORITY = 'cpan:STEVAN';
 
 sub new {
     my $class = shift;
-    my %params;
+    my $params = $class->BUILDARGS(@_);
+    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";
-            %params = %{$_[0]};
+                || $class->meta->throw_error("Single parameters to new() must be a HASH ref", data => $_[0]);
+            return {%{$_[0]}};
+        } 
+        else {
+            return {}; # FIXME this is compat behavior, but is it correct?
         }
-    }
+    } 
     else {
-        %params = @_;
+        return {@_};
     }
-    my $self = $class->meta->new_object(%params);
-    $self->BUILDALL(\%params);
-    return $self;
 }
 
 sub BUILDALL {
@@ -37,22 +43,22 @@ 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;    
+    # NOTE: we ask Perl if we even 
+    # need to do this first, to avoid
+    # extra meta level calls    
+    return unless $self->can('DEMOLISH');
     foreach my $method ($self->meta->find_all_methods_by_name('DEMOLISH')) {
-        $method->{code}->body->($self);
+        $method->{code}->execute($self);
     }
 }
 
 sub DESTROY { 
-    # NOTE: we ask Perl if we even 
-    # need to do this first, to avoid
-    # extra meta level calls    
-    return unless $_[0]->can('DEMOLISH');
     # if we have an exception here ...
     if ($@) {
         # localize the $@ ...
@@ -63,16 +69,26 @@ sub DESTROY {
         return;
     }
     # otherwise it is normal destruction
-    goto &DEMOLISHALL;
+    $_[0]->DEMOLISHALL;
+}
+
+# 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 much 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 
@@ -81,15 +97,6 @@ sub does {
     return 0;   
 }
 
-# RANT:
-# Cmon, how many times have you written 
-# the following code while debugging:
-# 
-#  use Data::Dumper; 
-#  warn Dumper \%thing;
-#
-# It can get seriously annoying, so why 
-# not just do this ...
 sub dump { 
     my $self = shift;
     require Data::Dumper;
@@ -128,7 +135,12 @@ This will return the metaclass associated with the given class.
 
 =item B<new>
 
-This will create a new instance and call C<BUILDALL>.
+This will call C<BUILDARGS>, create a new instance and call C<BUILDALL>.
+
+=item B<BUILDARGS>
+
+This method processes an argument list into a hash reference. It is used by
+C<new>.
 
 =item B<BUILDALL>
 
@@ -144,9 +156,15 @@ This will call every C<DEMOLISH> method in the inheritance hierarchy.
 This will check if the invocant's class C<does> a given C<$role_name>. 
 This is similar to C<isa> for object, but it checks the roles instead.
 
+=item B<DOES ($class_or_role_name)>
+
+A Moose Role aware implementation of L<UNIVERSAL/DOES>.
+
+C<DOES> is equivalent to C<isa> or C<does>.
+
 =item B<dump ($maxdepth)>
 
-Cmon, how many times have you written the following code while debugging:
+C'mon, how many times have you written the following code while debugging:
 
  use Data::Dumper; 
  warn Dumper $obj;
@@ -167,7 +185,7 @@ Stevan Little E<lt>stevan@iinteractive.comE<gt>
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright 2006-2008 by Infinity Interactive, Inc.
+Copyright 2006-2009 by Infinity Interactive, Inc.
 
 L<http://www.iinteractive.com>