X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FObject.pm;h=12ea2f029ca40e9e772f7934447ba1f6e595354d;hb=eaf5a43ef108f6a9dce74c84afc25a892cffdfb1;hp=8398099107f8a9ac8ed41511f411ebc91a71e1c4;hpb=66d33a5c5108b07d7777cce654f4ac63cfabbfc9;p=gitmo%2FMoose.git

diff --git a/lib/Moose/Object.pm b/lib/Moose/Object.pm
index 8398099..12ea2f0 100644
--- a/lib/Moose/Object.pm
+++ b/lib/Moose/Object.pm
@@ -4,18 +4,31 @@ package Moose::Object;
 use strict;
 use warnings;
 
+use Devel::GlobalDestruction qw(in_global_destruction);
+use MRO::Compat;
+use Scalar::Util;
+use Try::Tiny;
+
 use if ( not our $__mx_is_compiled ), 'Moose::Meta::Class';
 use if ( not our $__mx_is_compiled ), metaclass => 'Moose::Meta::Class';
 
-our $VERSION   = '0.73';
+our $VERSION   = '0.90';
 $VERSION = eval $VERSION;
 our $AUTHORITY = 'cpan:STEVAN';
 
 sub new {
     my $class = shift;
+
+    Carp::cluck 'Calling new() on an instance is deprecated,'
+      . ' please use (blessed $obj)->new' if blessed $class;
+
     my $params = $class->BUILDARGS(@_);
-    my $self = Class::MOP::Class->initialize($class)->new_object($params);
+
+    my $real_class = Scalar::Util::blessed($class) || $class;
+    my $self = Class::MOP::Class->initialize($real_class)->new_object($params);
+
     $self->BUILDALL($params);
+
     return $self;
 }
 
@@ -35,10 +48,10 @@ sub BUILDARGS {
 }
 
 sub BUILDALL {
-    # NOTE: we ask Perl if we even 
+    # NOTE: we ask Perl if we even
     # need to do this first, to avoid
     # extra meta level calls
-    return unless $_[0]->can('BUILD');    
+    return unless $_[0]->can('BUILD');
     my ($self, $params) = @_;
     foreach my $method (reverse Class::MOP::class_of($self)->find_all_methods_by_name('BUILD')) {
         $method->{code}->execute($self, $params);
@@ -46,28 +59,50 @@ sub BUILDALL {
 }
 
 sub DEMOLISHALL {
-    my $self = shift;    
-    # NOTE: we ask Perl if we even 
+    my $self = shift;
+    my ($in_global_destruction) = @_;
+
+    # NOTE: we ask Perl if we even
     # need to do this first, to avoid
-    # extra meta level calls    
+    # extra meta level calls
     return unless $self->can('DEMOLISH');
-    foreach my $method (Class::MOP::class_of($self)->find_all_methods_by_name('DEMOLISH')) {
-        $method->{code}->execute($self);
+
+    my @isa;
+    if ( my $meta = Class::MOP::class_of($self ) ) {
+        @isa = $meta->linearized_isa;
+    } else {
+        # 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 ;)
+        my $class_name = ref $self;
+        @isa = @{ mro::get_linear_isa($class_name) }
+    }
+
+    foreach my $class (@isa) {
+        no strict 'refs';
+        my $demolish = *{"${class}::DEMOLISH"}{CODE};
+        $self->$demolish($in_global_destruction)
+            if defined $demolish;
     }
 }
 
-sub DESTROY { 
-    # if we have an exception here ...
-    if ($@) {
-        # localize the $@ ...
-        local $@;
-        # run DEMOLISHALL ourselves, ...
-        $_[0]->DEMOLISHALL;
-        # and return ...
-        return;
+sub DESTROY {
+    my $self = shift;
+
+    local $?;
+
+    try {
+        $self->DEMOLISHALL(in_global_destruction);
     }
-    # otherwise it is normal destruction
-    $_[0]->DEMOLISHALL;
+    catch {
+        # Without this, Perl will warn "\t(in cleanup)$@" because of some
+        # bizarre fucked-up logic deep in the internals.
+        no warnings 'misc';
+        die $_;
+    };
+
+    return;
 }
 
 # support for UNIVERSAL::DOES ...
@@ -80,7 +115,7 @@ BEGIN {
     }';
 }
 
-# new does() methods will be created 
+# new does() methods will be created
 # as appropiate see Moose::Meta::Role
 sub does {
     my ($self, $role_name) = @_;
@@ -89,13 +124,13 @@ sub does {
         || $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 
-            if $m->can('does_role') && $m->does_role($role_name);            
+        return 1
+            if $m->can('does_role') && $m->does_role($role_name);
     }
-    return 0;   
+    return 0;
 }
 
-sub dump { 
+sub dump {
     my $self = shift;
     require Data::Dumper;
     local $Data::Dumper::Maxdepth = shift if @_;
@@ -158,7 +193,8 @@ C<BUILDARGS>.
 
 This will call every C<DEMOLISH> method in the inheritance hierarchy,
 starting with the object's class and ending with the most distant
-parent.
+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) >>
 
@@ -184,7 +220,7 @@ the maximum depth is 1, to avoid making a mess.
 
 =head1 BUGS
 
-All complex software has bugs lurking in it, and this module is no 
+All complex software has bugs lurking in it, and this module is no
 exception. If you find a bug please either email me, or add the bug
 to cpan-RT.
 
@@ -199,6 +235,6 @@ Copyright 2006-2009 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. 
+it under the same terms as Perl itself.
 
 =cut