use strict;
use warnings;
-use Devel::GlobalDestruction qw(in_global_destruction);
-use MRO::Compat;
-use Scalar::Util;
+use Carp ();
+use Devel::GlobalDestruction ();
+use MRO::Compat ();
+use Scalar::Util ();
+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.81';
+our $VERSION = '1.25';
$VERSION = eval $VERSION;
our $AUTHORITY = 'cpan:STEVAN';
sub new {
my $class = shift;
-
- my $params = $class->BUILDARGS(@_);
-
- # We want to support passing $self->new, but initialize
- # takes only an unblessed class name
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 {
}
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 {@_};
}
}
sub DESTROY {
- # if we have an exception here ...
- if ($@) {
- # localize the $@ ...
- local $@;
- # run DEMOLISHALL ourselves, ...
- $_[0]->DEMOLISHALL(in_global_destruction);
- # and return ...
- return;
+ my $self = shift;
+
+ local $?;
+
+ Try::Tiny::try {
+ $self->DEMOLISHALL(Devel::GlobalDestruction::in_global_destruction);
}
- # otherwise it is normal destruction
- $_[0]->DEMOLISHALL(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 $_;
+ };
+
+ return;
}
# support for UNIVERSAL::DOES ...
my ($self, $role_name) = @_;
my $meta = Class::MOP::class_of($self);
(defined $role_name)
- || $meta->throw_error("You much supply a role name to does()");
- foreach my $class ($meta->class_precedence_list) {
- my $m = $meta->initialize($class);
- return 1
- if $m->can('does_role') && $m->does_role($role_name);
- }
+ || $meta->throw_error("You must supply a role name to does()");
+ return 1 if $meta->can('does_role') && $meta->does_role($role_name);
return 0;
}
=head1 BUGS
-All complex software has bugs lurking in it, and this module is no
-exception. If you find a bug please either email me, or add the bug
-to cpan-RT.
+See L<Moose/BUGS> for details on reporting bugs.
=head1 AUTHOR
=head1 COPYRIGHT AND LICENSE
-Copyright 2006-2009 by Infinity Interactive, Inc.
+Copyright 2006-2010 by Infinity Interactive, Inc.
L<http://www.iinteractive.com>