X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FObject.pm;h=e619d1f136d96fc7a44d08f220ff1d11a99694af;hb=48ac876af2c1991bd6cdba0d54b775a121e01725;hp=11432318aa9771e555b269996d8f0c266294d3ee;hpb=1d30d796884fc2b7f2e63432c73408a94264a32c;p=gitmo%2FMoose.git

diff --git a/lib/Moose/Object.pm b/lib/Moose/Object.pm
index 1143231..e619d1f 100644
--- a/lib/Moose/Object.pm
+++ b/lib/Moose/Object.pm
@@ -112,7 +112,8 @@ BEGIN {
 # as appropiate see Moose::Meta::Role
 sub does {
     my ($self, $role_name) = @_;
-    my $meta = Class::MOP::class_of($self);
+    my $class = Scalar::Util::blessed($self) || $self;
+    my $meta = Class::MOP::Class->initialize($class);
     (defined $role_name)
         || $meta->throw_error("You must supply a role name to does()");
     return 1 if $meta->can('does_role') && $meta->does_role($role_name);
@@ -140,8 +141,9 @@ 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.
 
-It provides a default constructor and destructor, which run the
-C<BUILDALL> and C<DEMOLISHALL> methods respectively.
+It provides a default constructor and destructor, which run all of the
+C<BUILD> and C<DEMOLISH> methods in the inheritance hierarchy,
+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.
@@ -150,13 +152,14 @@ but it makes it easier to take advantage of all of Moose's features.
 
 =over 4
 
-=item B<< Moose::Object->new(%params) >>
+=item B<< Moose::Object->new(%params|$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) >>.
+calls C<< $instance->BUILD($params) >> for each C<BUILD> method in the
+inheritance hierarchy.
 
-=item B<< Moose::Object->BUILDARGS(%params) >>
+=item B<< Moose::Object->BUILDARGS(%params|$params) >>
 
 The default implementation of this method accepts a hash or hash
 reference of named parameters. If it receives a single argument that
@@ -167,27 +170,11 @@ options passed to the constructor.
 
 This method should always return a hash reference of named options.
 
-=item B<< $object->BUILDALL($params) >>
-
-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.
-
-The C<BUILD> method will be passed the hash reference returned by
-C<BUILDARGS>.
-
-=item B<< $object->DEMOLISHALL >>
-
-This will call every C<DEMOLISH> method in the inheritance hierarchy,
-starting with the object's class and ending with the most distant
-parent. C<DEMOLISHALL> and C<DEMOLISH> will receive a boolean
-indicating whether or not we are currently in global destruction.
-
 =item B<< $object->does($role_name) >>
 
 This returns true if the object does the given role.
 
-=item B<DOES ($class_or_role_name)>
+=item B<< $object->DOES($class_or_role_name) >>
 
 This is a a Moose role-aware implementation of L<UNIVERSAL/DOES>.
 
@@ -203,6 +190,12 @@ C<UNIVERSAL::DOES>.
 This is a handy utility for C<Data::Dumper>ing an object. By default,
 the maximum depth is 1, to avoid making a mess.
 
+=item B<< $object->DESTROY >>
+
+A default destructor is provided, which calls
+C<< $instance->DEMOLISH($in_global_destruction) >> for each C<DEMOLISH>
+method in the inheritance hierarchy.
+
 =back
 
 =head1 BUGS