X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FObject.pm;h=afcd693fddad21a1cba9d9f37621a8625e53f237;hb=f9b1ab71234d11a9121de96c574ca980bbfb3eaa;hp=56eaff4d34d568ab835a78e7bc4fdadce44fee4b;hpb=a94188ac85b86f501de86f25496e821e31d74cac;p=gitmo%2FMoose.git

diff --git a/lib/Moose/Object.pm b/lib/Moose/Object.pm
index 56eaff4..afcd693 100644
--- a/lib/Moose/Object.pm
+++ b/lib/Moose/Object.pm
@@ -4,34 +4,40 @@ package Moose::Object;
 use strict;
 use warnings;
 
+use Scalar::Util;
+
 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.56';
+our $VERSION   = '0.74';
+$VERSION = eval $VERSION;
 our $AUTHORITY = 'cpan:STEVAN';
 
 sub new {
     my $class = shift;
+
     my $params = $class->BUILDARGS(@_);
-    my $self = $class->meta->new_object(%$params);
+
+    # We want to support passing $self->new, but initialize
+    # takes only an unblessed class name
+    my $real_class = Scalar::Util::blessed($class) || $class;
+    my $self = Class::MOP::Class->initialize($real_class)->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?
+    if ( scalar @_ == 1 ) {
+        unless ( defined $_[0] && ref $_[0] eq 'HASH' ) {
+            Class::MOP::class_of($class)->throw_error(
+                "Single parameters to new() must be a HASH ref",
+                data => $_[0] );
         }
-    } 
+        return { %{ $_[0] } };
+    }
     else {
         return {@_};
     }
@@ -43,23 +49,32 @@ sub BUILDALL {
     # 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);
+    foreach my $method (reverse Class::MOP::class_of($self)->find_all_methods_by_name('BUILD')) {
+        $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);
+    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');
+
+    # This is a hack, because Moose::Meta::Class may not be the right
+    # metaclass, but class_of may return undef during global
+    # destruction, if the metaclass object has already been cleaned
+    # up.
+    my $meta = Class::MOP::class_of($self)
+        || Moose::Meta::Class->initialize( ref $self );
+
+    foreach my $method ( $meta->find_all_methods_by_name('DEMOLISH') ) {
+        $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 $@ ...
@@ -84,12 +99,12 @@ BEGIN {
 }
 
 # new does() methods will be created 
-# as approiate see Moose::Meta::Role
+# as appropiate see Moose::Meta::Role
 sub does {
     my ($self, $role_name) = @_;
+    my $meta = Class::MOP::class_of($self);
     (defined $role_name)
-        || confess "You must supply a role name to does()";
-    my $meta = $self->meta;
+        || $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 
@@ -98,15 +113,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;
@@ -126,60 +132,71 @@ Moose::Object - The base object for Moose
 
 =head1 DESCRIPTION
 
-This serves as the base object for all Moose classes. Every 
-effort will be made to ensure that all classes which C<use Moose> 
-will inherit from this class. It provides a default constructor 
-and destructor, which run all the BUILD and DEMOLISH methods in 
-the class tree.
+This class is the default base class for all Moose-using classes. When
+you C<use Moose> in this class, your class will inherit from this
+class.
 
-You don't actually I<need> to inherit from this in order to 
-use Moose though. It is just here to make life easier.
+It provides a default constructor and destructor, which run the
+C<BUILDALL> and C<DEMOLISHALL> methods respectively.
+
+You don't actually I<need> to inherit from this in order to use Moose,
+but it makes it easier to take advantage of all of Moose's features.
 
 =head1 METHODS
 
 =over 4
 
-=item B<meta>
+=item B<< Moose::Object->new(%params) >>
+
+This method calls C<< $class->BUILDARGS(@_) >>, and then creates a new
+instance of the appropriate class. Once the instance is created, it
+calls C<< $instance->BUILDALL($params) >>.
 
-This will return the metaclass associated with the given class.
+=item B<< Moose::Object->BUILDARGS(%params) >>
 
-=item B<new>
+The default implementation of this method accepts a hash or hash
+reference of named parameters. If it receives a single argument that
+I<isn't> a hash reference it throws an error.
 
-This will call C<BUILDARGS>, create a new instance and call C<BUILDALL>.
+You can override this method in your class to handle other types of
+options passed to the constructor.
 
-=item B<BUILDARGS>
+This method should always return a hash reference of named options.
 
-This method processes an argument list into a hash reference. It is used by
-C<new>.
+=item B<< $object->BUILDALL($params) >>
 
-=item B<BUILDALL>
+This method will call every C<BUILD> method in the inheritance
+hierarchy, starting with the most distant parent class and ending with
+the object's class.
 
-This will call every C<BUILD> method in the inheritance hierarchy, 
-and pass it a hash-ref of the the C<%params> passed to C<new>.
+The C<BUILD> method will be passed the hash reference returned by
+C<BUILDARGS>.
 
-=item B<DEMOLISHALL>
+=item B<< $object->DEMOLISHALL >>
 
-This will call every C<DEMOLISH> method in the inheritance hierarchy.
+This will call every C<DEMOLISH> method in the inheritance hierarchy,
+starting with the object's class and ending with the most distant
+parent.
 
-=item B<does ($role_name)>
+=item B<< $object->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.
+This returns true if the object does the given role.
 
 =item B<DOES ($class_or_role_name)>
 
-A Moose Role aware implementation of L<UNIVERSAL/DOES>.
+This is a a Moose role-aware implementation of L<UNIVERSAL/DOES>.
 
-C<DOES> is equivalent to C<isa> or C<does>.
+This is effectively the same as writing:
 
-=item B<dump ($maxdepth)>
+  $object->does($name) || $object->isa($name)
 
-Cmon, how many times have you written the following code while debugging:
+This method will work with Perl 5.8, which did not implement
+C<UNIVERSAL::DOES>.
 
- use Data::Dumper; 
- warn Dumper $obj;
+=item B<< $object->dump($maxdepth) >>
 
-It can get seriously annoying, so why not just use this.
+This is a handy utility for C<Data::Dumper>ing an object. By default,
+the maximum depth is 1, to avoid making a mess.
 
 =back
 
@@ -195,7 +212,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>