X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=gitmo%2FMouse.git;a=blobdiff_plain;f=lib%2FMouse%2FObject.pm;h=7f205482e6ae1f359dba6774312b435a023e6d78;hp=16846f5d5a7c57f203cde7a0a1e805f970df7859;hb=8aba926dbf11e9cf418c7c79b925d15e60e1e990;hpb=1b9e472d8c7e704eced9b2ea83194f83f0265018

diff --git a/lib/Mouse/Object.pm b/lib/Mouse/Object.pm
index 16846f5..7f20548 100644
--- a/lib/Mouse/Object.pm
+++ b/lib/Mouse/Object.pm
@@ -1,35 +1,8 @@
 package Mouse::Object;
-use strict;
-use warnings;
+use Mouse::Util qw(does dump meta); # enables strict and warnings
 
-use Mouse::Util;
+sub new;
 
-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 { shift->DEMOLISHALL }
 
 sub BUILDALL {
     my $self = shift;
@@ -38,11 +11,10 @@ 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 = Mouse::Util::get_code_ref($class, 'BUILD')
+            || next;
+
+        $self->$build(@_);
     }
     return;
 }
@@ -59,79 +31,64 @@ 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 = Mouse::Util::get_code_ref($class, 'DEMOLISH')
+            || next;
+
+        $self->$demolish();
     }
     return;
 }
 
-sub dump { 
-    my($self, $maxdepth) = @_;
-
-    require 'Data/Dumper.pm'; # we don't want to create its namespace
-    my $dd = Data::Dumper->new([$self]);
-    $dd->Maxdepth(defined($maxdepth) ? $maxdepth : 2);
-    $dd->Indent(1);
-    return $dd->Dump();
-}
-
-
-sub does {
-    my ($self, $role_name) = @_;
-    (defined $role_name)
-        || $self->meta->throw_error("You must supply a role name to does()");
-
-    return $self->meta->does_role($role_name);
-};
-
 1;
 
 __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_07
 
 =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:
 
@@ -144,6 +101,9 @@ From the Moose POD:
 
 The implementation was lifted directly from Moose::Object.
 
-=cut
+=head1 SEE ALSO
 
+L<Moose::Object>
+
+=cut