X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMouse%2FObject.pm;h=5f09e0af151a2d51a5cad516cbab6b81e310ec61;hb=5ecfc2defd2955d68c9cbc3ad048ce80bd1020da;hp=59f1297059d368d6b06fddee1502a1c8328a9200;hpb=a25ca8d637c040b2f929b1a23dd62ff63d85f5d1;p=gitmo%2FMouse.git

diff --git a/lib/Mouse/Object.pm b/lib/Mouse/Object.pm
index 59f1297..5f09e0a 100644
--- a/lib/Mouse/Object.pm
+++ b/lib/Mouse/Object.pm
@@ -4,13 +4,24 @@ use Mouse::Util qw(does dump); # enables strict and warnings
 sub new {
     my $class = shift;
 
-    $class->throw_error('Cannot call new() on an instance') if ref $class;
+    $class->meta->throw_error('Cannot call new() on an instance') if ref $class;
 
     my $args = $class->BUILDARGS(@_);
 
-    my $instance = Mouse::Meta::Class->initialize($class)->new_object($args);
-    $instance->BUILDALL($args);
-    return $instance;
+    my $meta = Mouse::Meta::Class->initialize($class);
+    my $self = $meta->new_object($args);
+
+    # BUILDALL
+    if( $self->can('BUILD') ) {
+        for my $class (reverse $meta->linearized_isa) {
+            my $build = Mouse::Util::get_code_ref($class, 'BUILD')
+                || next;
+
+            $self->$build($args);
+        }
+    }
+
+    return $self;
 }
 
 sub BUILDARGS {
@@ -30,12 +41,27 @@ sub BUILDARGS {
 sub DESTROY {
     my $self = shift;
 
+    return unless $self->can('DEMOLISH'); # short circuit
+
     local $?;
 
     my $e = do{
         local $@;
         eval{
-            $self->DEMOLISHALL();
+
+            # DEMOLISHALL
+
+            # We cannot count on being able to retrieve a previously made
+            # metaclass, _or_ being able to make a new one during global
+            # destruction. However, we should still be able to use mro at
+            # that time (at least tests suggest so ;)
+
+            foreach my $class (@{ Mouse::Util::get_linear_isa(ref $self) }) {
+                my $demolish = Mouse::Util::get_code_ref($class, 'DEMOLISH')
+                    || next;
+
+                $self->$demolish();
+            }
         };
         $@;
     };
@@ -51,8 +77,8 @@ sub BUILDALL {
     return unless $self->can('BUILD');
 
     for my $class (reverse $self->meta->linearized_isa) {
-        my $build = do{ no strict 'refs'; *{ $class . '::BUILD' }{CODE} }
-            or next;
+        my $build = Mouse::Util::get_code_ref($class, 'BUILD')
+            || next;
 
         $self->$build(@_);
     }
@@ -71,8 +97,8 @@ sub DEMOLISHALL {
     # that time (at least tests suggest so ;)
 
     foreach my $class (@{ Mouse::Util::get_linear_isa(ref $self) }) {
-        my $demolish = do{ no strict 'refs'; *{ $class . '::DEMOLISH'}{CODE} }
-            or next;
+        my $demolish = Mouse::Util::get_code_ref($class, 'DEMOLISH')
+            || next;
 
         $self->$demolish();
     }
@@ -89,7 +115,7 @@ Mouse::Object - The base object for Mouse classes
 
 =head1 VERSION
 
-This document describes Mouse version 0.37_06
+This document describes Mouse version 0.40_05
 
 =head1 METHODS