cmop is no longer a separate dist

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

diff --git a/lib/Moose/Object.pm b/lib/Moose/Object.pm
index 1cd1f6a..1143231 100644 (file)
--- a/lib/Moose/Object.pm
+++ b/lib/Moose/Object.pm
@@ -4,6 +4,7 @@ package Moose::Object;
 use strict;
 use warnings;
 
+use Carp ();
 use Devel::GlobalDestruction ();
 use MRO::Compat ();
 use Scalar::Util ();
@@ -12,21 +13,13 @@ use Try::Tiny ();
 use if ( not our $__mx_is_compiled ), 'Moose::Meta::Class';
 use if ( not our $__mx_is_compiled ), metaclass => 'Moose::Meta::Class';
 
-our $VERSION   = '0.94';
-$VERSION = eval $VERSION;
-our $AUTHORITY = 'cpan:STEVAN';
-
 sub new {
     my $class = shift;
-
-    my $params = $class->BUILDARGS(@_);
-
     my $real_class = Scalar::Util::blessed($class) || $class;
-    my $self = Class::MOP::Class->initialize($real_class)->new_object($params);
 
-    $self->BUILDALL($params);
+    my $params = $real_class->BUILDARGS(@_);
 
-    return $self;
+    return Class::MOP::Class->initialize($real_class)->new_object($params);
 }
 
 sub BUILDARGS {
@@ -39,6 +32,12 @@ sub BUILDARGS {
         }
         return { %{ $_[0] } };
     }
+    elsif ( @_ % 2 ) {
+        Carp::carp(
+            "The new() method for $class expects a hash reference or a key/value list."
+                . " You passed an odd number of arguments" );
+        return { @_, undef };
+    }
     else {
         return {@_};
     }
@@ -93,9 +92,6 @@ sub DESTROY {
         $self->DEMOLISHALL(Devel::GlobalDestruction::in_global_destruction);
     }
     Try::Tiny::catch {
-        # Without this, Perl will warn "\t(in cleanup)$@" because of some
-        # bizarre fucked-up logic deep in the internals.
-        no warnings 'misc';
         die $_;
     };
 
@@ -132,14 +128,12 @@ sub dump {
 
 1;
 
+# ABSTRACT: The base object for Moose
+
 __END__
 
 =pod
 
-=head1 NAME
-
-Moose::Object - The base object for Moose
-
 =head1 DESCRIPTION
 
 This class is the default base class for all Moose-using classes. When
@@ -215,17 +209,4 @@ the maximum depth is 1, to avoid making a mess.
 
 See L<Moose/BUGS> for details on reporting bugs.
 
-=head1 AUTHOR
-
-Stevan Little E<lt>stevan@iinteractive.comE<gt>
-
-=head1 COPYRIGHT AND LICENSE
-
-Copyright 2006-2010 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