X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=gitmo%2FMouse.git;a=blobdiff_plain;f=lib%2FMouse%2FObject.pm;h=268e845e592fad06bba4559d69cb4f2846e35b7b;hp=89bd8cac9cccda0cba92355431fd8c49f60be373;hb=9b9e4b6566015d6d6e2aa6c745644174efa74623;hpb=53875581c2449e237cc1135b8c2cf1674a874aed

diff --git a/lib/Mouse/Object.pm b/lib/Mouse/Object.pm
index 89bd8ca..268e845 100644
--- a/lib/Mouse/Object.pm
+++ b/lib/Mouse/Object.pm
@@ -1,8 +1,5 @@
 package Mouse::Object;
-use strict;
-use warnings;
-
-use Mouse::Util qw(does dump);
+use Mouse::Util qw(does dump); # enables strict and warnings
 
 sub new {
     my $class = shift;
@@ -22,6 +19,7 @@ sub BUILDARGS {
     if (scalar @_ == 1) {
         (ref($_[0]) eq 'HASH')
             || $class->meta->throw_error("Single parameters to new() must be a HASH ref");
+
         return {%{$_[0]}};
     }
     else {
@@ -29,7 +27,22 @@ sub BUILDARGS {
     }
 }
 
-sub DESTROY { shift->DEMOLISHALL }
+sub DESTROY {
+    my $self = shift;
+
+    local $?;
+
+    my $e = do{
+        local $@;
+        eval{
+            $self->DEMOLISHALL();
+        };
+        $@;
+    };
+
+    no warnings 'misc';
+    die $e if $e; # rethrow
+}
 
 sub BUILDALL {
     my $self = shift;
@@ -38,11 +51,13 @@ sub BUILDALL {
     return unless $self->can('BUILD');
 
     for my $class (reverse $self->meta->linearized_isa) {
-        no strict 'refs';
-        no warnings 'once';
-        my $code = *{ $class . '::BUILD' }{CODE}
-            or next;
-        $code->($self, @_);
+        my $build = do{
+            no strict 'refs';
+            no warnings 'once';
+            *{ $class . '::BUILD' }{CODE};
+        } or next;
+
+        $self->$build(@_);
     }
     return;
 }
@@ -59,9 +74,13 @@ 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} };
-        $self->$demolish()
-            if defined $demolish;
+        my $demolish = do{
+            no strict 'refs';
+            no warnings 'once';
+            *{ $class . '::DEMOLISH'}{CODE};
+        } or next;
+
+        $self->$demolish();
     }
     return;
 }
@@ -72,47 +91,50 @@ __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.39
 
 =head1 METHODS
 
-=head2 new arguments -> object
+=head2 C<< new (Arguments) -> Object >>
 
-Instantiates a new Mouse::Object. This is obviously intended for subclasses.
+Instantiates a new C<Mouse::Object>. This is obviously intended for subclasses.
 
-=head2 BUILDALL \%args
+=head2 C<< BUILDARGS (Arguments) -> HashRef >>
 
-Calls L</BUILD> on each class in the class hierarchy. This is called at the
-end of L</new>.
+Lets you override the arguments that C<new> takes. Return a hashref of
+parameters.
 
-=head2 BUILD \%args
+=head2 C<< BUILDALL (\%args) >>
 
-You may put any business logic initialization in BUILD methods. You don't
-need to redispatch or return any specific value.
+Calls C<BUILD> on each class in the class hierarchy. This is called at the
+end of C<new>.
 
-=head2 BUILDARGS
+=head2 C<< BUILD (\%args) >>
 
-Lets you override the arguments that C<new> takes. Return a hashref of
-parameters.
+You may put any business logic initialization in BUILD methods. You don't
+need to redispatch or return any specific value.
 
-=head2 DEMOLISHALL
+=head2 C<< DEMOLISHALL >>
 
-Calls L</DEMOLISH> on each class in the class hierarchy. This is called at
-L</DESTROY> time.
+Calls C<DEMOLISH> on each class in the class hierarchy. This is called at
+C<DESTROY> time.
 
-=head2 DEMOLISH
+=head2 C<< DEMOLISH >>
 
 You may put any business logic deinitialization in DEMOLISH methods. You don't
 need to redispatch or return any specific value.
 
 
-=head2 does $role_name
+=head2 C<< does ($role_name) -> Bool >>
 
-This will check if the invocant's class "does" a given C<$role_name>.
+This will check if the invocant's class B<does> a given C<$role_name>.
 This is similar to "isa" for object, but it checks the roles instead.
 
-
-=head2 B<dump ($maxdepth)>
+=head2 C<<dump ($maxdepth) -> Str >>
 
 From the Moose POD:
 
@@ -125,6 +147,9 @@ From the Moose POD:
 
 The implementation was lifted directly from Moose::Object.
 
-=cut
+=head1 SEE ALSO
 
+L<Moose::Object>
+
+=cut