X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=gitmo%2FMouse.git;a=blobdiff_plain;f=lib%2FMouse%2FObject.pm;h=911954d4b6930341e2ac78c1f5effc86786b52c9;hp=64f2ce4d0ef1bc9017537acc28a89111ac26c75b;hb=6d28c5cf89bfd4c00e675e95aff6c31b61aeb805;hpb=398327c34d5f6a94084b1dd6f7b439b771ef8b1b

diff --git a/lib/Mouse/Object.pm b/lib/Mouse/Object.pm
index 64f2ce4..911954d 100644
--- a/lib/Mouse/Object.pm
+++ b/lib/Mouse/Object.pm
@@ -1,68 +1,34 @@
-#!/usr/bin/env perl
 package Mouse::Object;
 use strict;
 use warnings;
-use MRO::Compat;
 
-use Scalar::Util qw/blessed weaken/;
-use Carp 'confess';
+use Mouse::Util;
 
 sub new {
     my $class = shift;
-    my %args  = @_;
-    my $instance = bless {}, $class;
-
-    for my $attribute ($class->meta->attributes) {
-        my $key = $attribute->init_arg;
-        my $default;
-
-        if (!exists($args{$key})) {
-            if ($attribute->has_default || $attribute->has_builder) {
-                unless ($attribute->is_lazy) {
-                    my $default = $attribute->default;
-                    my $builder = $attribute->builder;
-                    my $value = $attribute->has_builder
-                              ? $instance->$builder
-                              : ref($default) eq 'CODE'
-                                  ? $default->()
-                                  : $default;
-
-                    $attribute->verify_type_constraint($value)
-                        if $attribute->has_type_constraint;
-
-                    $instance->{$key} = $value;
-
-                    weaken($instance->{$key})
-                        if $attribute->weak_ref;
-                }
-            }
-            else {
-                if ($attribute->is_required) {
-                    confess "Attribute (".$attribute->name.") is required";
-                }
-            }
-        }
-
-        if (exists($args{$key})) {
-            $attribute->verify_type_constraint($args{$key})
-                if $attribute->has_type_constraint;
-
-            $instance->{$key} = $args{$key};
-
-            weaken($instance->{$key})
-                if $attribute->weak_ref;
-
-            if ($attribute->has_trigger) {
-                $attribute->trigger->($instance, $args{$key}, $attribute);
-            }
-        }
-    }
 
-    $instance->BUILDALL(\%args);
+    $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 {
@@ -71,13 +37,14 @@ sub BUILDALL {
     # short circuit
     return unless $self->can('BUILD');
 
-    no strict 'refs';
-
-    for my $class ($self->meta->linearized_isa) {
+    for my $class (reverse $self->meta->linearized_isa) {
+        no strict 'refs';
+        no warnings 'once';
         my $code = *{ $class . '::BUILD' }{CODE}
             or next;
         $code->($self, @_);
     }
+    return;
 }
 
 sub DEMOLISHALL {
@@ -86,15 +53,37 @@ sub DEMOLISHALL {
     # short circuit
     return unless $self->can('DEMOLISH');
 
-    no strict 'refs';
+    # 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 ;)
 
-    for my $class ($self->meta->linearized_isa) {
-        my $code = *{ $class . '::DEMOLISH' }{CODE}
-            or next;
-        $code->($self, @_);
+    foreach my $class (@{ Mouse::Util::get_linear_isa(ref $self) }) {
+        my $demolish = do{ no strict 'refs'; *{"${class}::DEMOLISH"}{CODE} };
+        $self->$demolish()
+            if defined $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($maxdepth || 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__
@@ -119,6 +108,11 @@ end of L</new>.
 You may put any business logic initialization in BUILD methods. You don't
 need to redispatch or return any specific value.
 
+=head2 BUILDARGS
+
+Lets you override the arguments that C<new> takes. Return a hashref of
+parameters.
+
 =head2 DEMOLISHALL
 
 Calls L</DEMOLISH> on each class in the class hierarchy. This is called at
@@ -129,5 +123,26 @@ L</DESTROY> time.
 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
+
+This will check if the invocant's class "does" a given C<$role_name>.
+This is similar to "isa" for object, but it checks the roles instead.
+
+
+=head2 B<dump ($maxdepth)>
+
+From the Moose POD:
+
+    C'mon, how many times have you written the following code while debugging:
+
+     use Data::Dumper; 
+     warn Dumper $obj;
+
+    It can get seriously annoying, so why not just use this.
+
+The implementation was lifted directly from Moose::Object.
+
 =cut
 
+