whoops

[gitmo/Moose.git] / lib / Moose / Object.pm

diff --git a/lib/Moose/Object.pm b/lib/Moose/Object.pm
index b54a89a..58af227 100644 (file)
--- a/lib/Moose/Object.pm
+++ b/lib/Moose/Object.pm
@@ -4,50 +4,52 @@ package Moose::Object;
 use strict;
 use warnings;
 
-use Moose::Meta::Class;
-use metaclass 'Moose::Meta::Class';
+use if ( not our $__mx_is_compiled ), 'Moose::Meta::Class';
+use if ( not our $__mx_is_compiled ), metaclass => 'Moose::Meta::Class';
 
 use Carp 'confess';
 
-our $VERSION   = '0.08';
+our $VERSION   = '0.10';
 our $AUTHORITY = 'cpan:STEVAN';
 
 sub new {
     my $class = shift;
     my %params;
     if (scalar @_ == 1) {
-        (ref($_[0]) eq 'HASH')
-            || confess "Single parameters to new() must be a HASH ref";
-        %params = %{$_[0]};
+        if (defined $_[0]) {
+            (ref($_[0]) eq 'HASH')
+                || confess "Single parameters to new() must be a HASH ref";
+            %params = %{$_[0]};
+        }
     }
     else {
         %params = @_;
     }
-       my $self = $class->meta->new_object(%params);
-       $self->BUILDALL(\%params);
-       return $self;
+    my $self = $class->meta->new_object(%params);
+    $self->BUILDALL(\%params);
+    return $self;
 }
 
 sub BUILDALL {
     # NOTE: we ask Perl if we even 
     # need to do this first, to avoid
     # extra meta level calls
-       return unless $_[0]->can('BUILD');    
-       my ($self, $params) = @_;
-       foreach my $method (reverse $self->meta->find_all_methods_by_name('BUILD')) {
-               $method->{code}->($self, $params);
-       }
+    return unless $_[0]->can('BUILD');    
+    my ($self, $params) = @_;
+    foreach my $method (reverse $self->meta->find_all_methods_by_name('BUILD')) {
+        $method->{code}->($self, $params);
+    }
 }
 
 sub DEMOLISHALL {
     # NOTE: we ask Perl if we even 
     # need to do this first, to avoid
     # extra meta level calls    
-       return unless $_[0]->can('DEMOLISH');    
-       my $self = shift;       
-       foreach my $method ($self->meta->find_all_methods_by_name('DEMOLISH')) {
-               $method->{code}->($self);
-       }       
+    return unless $_[0]->can('DEMOLISH');    
+    my $self = shift;    
+    foreach my $method ($self->meta->find_all_methods_by_name('DEMOLISH')) {
+        $method->{code}->($self);
+    }    
 }
 
 sub DESTROY { goto &DEMOLISHALL }
@@ -152,11 +154,11 @@ Stevan Little E<lt>stevan@iinteractive.comE<gt>
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright 2006, 2007 by Infinity Interactive, Inc.
+Copyright 2006-2008 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. 
 
-=cut
\ No newline at end of file
+=cut