X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMouse%2FObject.pm;h=7cc315aeb730513ee0431b00a739902c68cdfe82;hb=bf1c5d5c92ddde0cfaef2f9489d7a743216e5933;hp=f1cd27e4237231236fbc17d5b385d9a301d24265;hpb=31c5194bc6a176cec4de515163d27f174eba5c9b;p=gitmo%2FMouse.git

diff --git a/lib/Mouse/Object.pm b/lib/Mouse/Object.pm
index f1cd27e..7cc315a 100644
--- a/lib/Mouse/Object.pm
+++ b/lib/Mouse/Object.pm
@@ -1,39 +1,38 @@
 package Mouse::Object;
-use strict;
-use warnings;
+use Mouse::Util qw(does dump); # enables strict and warnings
 
-use Mouse::Util qw(does dump);
+sub new;
 
-sub new {
-    my $class = shift;
+sub DESTROY {
+    my $self = shift;
 
-    $class->throw_error('Cannot call new() on an instance') if ref $class;
+    return unless $self->can('DEMOLISH'); # short circuit
 
-    my $args = $class->BUILDARGS(@_);
+    local $?;
 
-    my $instance = Mouse::Meta::Class->initialize($class)->new_object($args);
-    $instance->BUILDALL($args);
-    return $instance;
-}
+    my $e = do{
+        local $@;
+        eval{
 
-sub BUILDARGS {
-    my $class = shift;
+            # DEMOLISHALL
 
-    if (scalar @_ == 1) {
-        (ref($_[0]) eq 'HASH')
-            || $class->meta->throw_error("Single parameters to new() must be a HASH ref");
+            # 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 ;)
 
-        return {%{$_[0]}};
-    }
-    else {
-        return {@_};
-    }
-}
+            foreach my $class (@{ Mouse::Util::get_linear_isa(ref $self) }) {
+                my $demolish = Mouse::Util::get_code_ref($class, 'DEMOLISH')
+                    || next;
 
-sub DESTROY {
-    my $self = shift;
+                $self->$demolish();
+            }
+        };
+        $@;
+    };
 
-    $self->DEMOLISHALL();
+    no warnings 'misc';
+    die $e if $e; # rethrow
 }
 
 sub BUILDALL {
@@ -43,8 +42,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(@_);
     }
@@ -63,8 +62,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();
     }
@@ -77,7 +76,11 @@ __END__
 
 =head1 NAME
 
-Mouse::Object - we don't need to steenkin' constructor
+Mouse::Object - The base object for Mouse classes
+
+=head1 VERSION
+
+This document describes Mouse version 0.40_05
 
 =head1 METHODS