X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=gitmo%2FMouse.git;a=blobdiff_plain;f=lib%2FMouse%2FObject.pm;h=0915aebb0636eb296dff19de3e63c60d803e63cf;hp=60f6aad4f538a23c726d94b4d21ab86115f9ad6f;hb=a4cbb3cb944aa43521dfa69a9f04b206c6b7a6ea;hpb=7746ba36780a891bd98d610a99e42ccae5e8cdb2

diff --git a/lib/Mouse/Object.pm b/lib/Mouse/Object.pm
index 60f6aad..0915aeb 100644
--- a/lib/Mouse/Object.pm
+++ b/lib/Mouse/Object.pm
@@ -1,48 +1,7 @@
 package Mouse::Object;
-use Mouse::Util qw(does dump); # enables strict and warnings
+use Mouse::Util qw(does dump meta); # enables strict and warnings
 
-sub new {
-    my $class = shift;
-
-    $class->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;
-}
-
-sub BUILDARGS {
-    my $class = shift;
-
-    if (scalar @_ == 1) {
-        (ref($_[0]) eq 'HASH')
-            || $class->meta->throw_error("Single parameters to new() must be a HASH ref");
-
-        return {%{$_[0]}};
-    }
-    else {
-        return {@_};
-    }
-}
-
-sub DESTROY {
-    my $self = shift;
-
-    local $?;
-
-    my $e = do{
-        local $@;
-        eval{
-            $self->DEMOLISHALL();
-        };
-        $@;
-    };
-
-    no warnings 'misc';
-    die $e if $e; # rethrow
-}
+sub new;
 
 sub BUILDALL {
     my $self = shift;
@@ -51,8 +10,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 +30,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();
     }
@@ -80,13 +39,16 @@ sub DEMOLISHALL {
 }
 
 1;
-
 __END__
 
 =head1 NAME
 
 Mouse::Object - The base object for Mouse classes
 
+=head1 VERSION
+
+This document describes Mouse version 0.44
+
 =head1 METHODS
 
 =head2 C<< new (Arguments) -> Object >>
@@ -124,7 +86,7 @@ need to redispatch or return any specific value.
 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 C<<dump ($maxdepth) -> Str >>
+=head2 C<< dump ($maxdepth) -> Str >>
 
 From the Moose POD: