X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FObject.pm;h=86dce7f63da9a2d86721f22538053a20aaa37732;hb=93cc8330c689c1eb92171550e5fabb628a8759a6;hp=c49710478a68b700ca38df19b7cadc31fb1e8435;hpb=0677220dc4c8246094e010c2036c5c64ef2cab3e;p=gitmo%2FMoose.git

diff --git a/lib/Moose/Object.pm b/lib/Moose/Object.pm
index c497104..86dce7f 100644
--- a/lib/Moose/Object.pm
+++ b/lib/Moose/Object.pm
@@ -3,45 +3,115 @@ package Moose::Object;
 
 use strict;
 use warnings;
-use metaclass 'Moose::Meta::Class' => (
-	':attribute_metaclass' => 'Moose::Meta::Attribute'
-);
+
+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.04';
+our $VERSION   = '0.54';
+our $AUTHORITY = 'cpan:STEVAN';
 
 sub new {
-    my $class  = shift;
-    my %params = (scalar @_ == 1) ? %{$_[0]} : @_;
-	my $self = $class->meta->new_object(%params);
-	$self->BUILDALL(\%params);
-	return $self;
+    my $class = shift;
+    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";
+            return {%{$_[0]}};
+        } 
+        else {
+            return {}; # FIXME this is compat behavior, but is it correct?
+        }
+    } 
+    else {
+        return {@_};
+    }
 }
 
 sub BUILDALL {
-	my ($self, $params) = @_;
-	foreach my $method (reverse $self->meta->find_all_methods_by_name('BUILD')) {
-		$method->{code}->($self, $params);
-	}
+    # NOTE: we ask Perl if we even 
+    # need to do this first, to avoid
+    # extra meta level calls
+    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);
+    }
 }
 
 sub DEMOLISHALL {
-	my $self = shift;
-	foreach my $method ($self->meta->find_all_methods_by_name('DEMOLISH')) {
-		$method->{code}->($self);
-	}	
+    my $self = shift;    
+    foreach my $method ($self->meta->find_all_methods_by_name('DEMOLISH')) {
+        $method->{code}->body->($self);
+    }
 }
 
-sub DESTROY { goto &DEMOLISHALL }
+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 $@ ...
+        local $@;
+        # run DEMOLISHALL ourselves, ...
+        $_[0]->DEMOLISHALL;
+        # and return ...
+        return;
+    }
+    # otherwise it is normal destruction
+    $_[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
 sub does {
-    my (undef, $role_name) = @_;
+    my ($self, $role_name) = @_;
     (defined $role_name)
-        || confess "You much supply a role name to does()";
-    0;    
+        || confess "You must supply a role name to does()";
+    my $meta = $self->meta;
+    foreach my $class ($meta->class_precedence_list) {
+        my $m = $meta->initialize($class);
+        return 1 
+            if $m->can('does_role') && $m->does_role($role_name);            
+    }
+    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;
+    local $Data::Dumper::Maxdepth = shift if @_;
+    Data::Dumper::Dumper $self;
 }
 
 1;
@@ -75,7 +145,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>
 
@@ -88,6 +163,24 @@ This will call every C<DEMOLISH> method in the inheritance hierarchy.
 
 =item B<does ($role_name)>
 
+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:
+
+ use Data::Dumper; 
+ warn Dumper $obj;
+
+It can get seriously annoying, so why not just use this.
+
 =back
 
 =head1 BUGS
@@ -102,11 +195,11 @@ Stevan Little E<lt>stevan@iinteractive.comE<gt>
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright 2006 by Infinity Interactive, Inc.
+Copyright 2006-2008 by Infinity Interactive, Inc.
 
 L<http://www.iinteractive.com>
 
 This library is free software; you can redistribute it and/or modify
 it under the same terms as Perl itself. 
 
-=cut
\ No newline at end of file
+=cut