use strict;
use warnings;
-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.75';
+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 BUILDALL {
- # NOTE: we ask Perl if we even
+ # NOTE: we ask Perl if we even
# need to do this first, to avoid
# extra meta level calls
- return unless $_[0]->can('BUILD');
+ return unless $_[0]->can('BUILD');
my ($self, $params) = @_;
foreach my $method (reverse Class::MOP::class_of($self)->find_all_methods_by_name('BUILD')) {
$method->{code}->execute($self, $params);
sub DEMOLISHALL {
my $self = shift;
+ my ($in_global_destruction) = @_;
# NOTE: we ask Perl if we even
# need to do this first, to avoid
# extra meta level calls
return unless $self->can('DEMOLISH');
- # This is a hack, because Moose::Meta::Class may not be the right
- # metaclass, but class_of may return undef during global
- # destruction, if the metaclass object has already been cleaned
- # up.
- my $meta = Class::MOP::class_of($self)
- || Moose::Meta::Class->initialize( ref $self );
+ my @isa;
+ if ( my $meta = Class::MOP::class_of($self ) ) {
+ @isa = $meta->linearized_isa;
+ } else {
+ # 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 ;)
+ my $class_name = ref $self;
+ @isa = @{ mro::get_linear_isa($class_name) }
+ }
- foreach my $method ( $meta->find_all_methods_by_name('DEMOLISH') ) {
- $method->{code}->execute($self);
+ foreach my $class (@isa) {
+ no strict 'refs';
+ my $demolish = *{"${class}::DEMOLISH"}{CODE};
+ $self->$demolish($in_global_destruction)
+ if defined $demolish;
}
}
-sub DESTROY {
- # if we have an exception here ...
- if ($@) {
- # localize the $@ ...
- local $@;
- # run DEMOLISHALL ourselves, ...
- $_[0]->DEMOLISHALL;
- # and return ...
- return;
+sub DESTROY {
+ my $self = shift;
+
+ local $?;
+
+ Try::Tiny::try {
+ $self->DEMOLISHALL(Devel::GlobalDestruction::in_global_destruction);
}
- # otherwise it is normal destruction
- $_[0]->DEMOLISHALL;
+ 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 ...
}';
}
-# new does() methods will be created
+# new does() methods will be created
# as appropiate see Moose::Meta::Role
sub 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);
- }
- return 0;
+ || $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;
}
-sub dump {
+sub dump {
my $self = shift;
require Data::Dumper;
local $Data::Dumper::Maxdepth = shift if @_;
This will call every C<DEMOLISH> method in the inheritance hierarchy,
starting with the object's class and ending with the most distant
-parent.
+parent. C<DEMOLISHALL> and C<DEMOLISH> will receive a boolean
+indicating whether or not we are currently in global destruction.
=item B<< $object->does($role_name) >>
=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>
This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself.
+it under the same terms as Perl itself.
=cut