use Carp 'confess';
use Scalar::Util 'weaken', 'reftype', 'blessed';
+use Try::Tiny;
use Class::MOP::Class;
use Class::MOP::Attribute;
*check_package_cache_flag = \&mro::get_pkg_gen;
}
-our $VERSION = '0.92_01';
+our $VERSION = '0.95';
our $XS_VERSION = $VERSION;
$VERSION = eval $VERSION;
our $AUTHORITY = 'cpan:STEVAN';
sub load_first_existing_class {
my @classes = @_
- or return;
+ or return;
foreach my $class (@classes) {
unless ( _is_valid_class_name($class) ) {
my $found;
my %exceptions;
- for my $class (@classes) {
- my $e = _try_load_one_class($class);
- if ($e) {
- my $pmfile = _class_to_pmfile($class);
- $exceptions{$class} = $e;
- last if $e !~ /^Can't locate \Q$pmfile\E in \@INC/;
- }
- else {
- $found = $class;
- last;
- }
- }
+ for my $class (@classes) {
+ my $file = _class_to_pmfile($class);
- return $found if $found;
+ return $class if is_class_loaded($class);;
- confess join(
- "\n",
- map {
- sprintf(
- "Could not load class (%s) because : %s", $_,
- $exceptions{$_}
- )
+ return $class if try {
+ local $SIG{__DIE__};
+ require $file;
+ return 1;
+ }
+ catch {
+ unless (/^Can't locate \Q$file\E in \@INC/) {
+ confess "Couldn't load class ($class) because: $_";
}
- grep {
- exists $exceptions{$_}
- } @classes
- );
-}
-sub _try_load_one_class {
- my $class = shift;
-
- return if is_class_loaded($class);
-
- my $file = _class_to_pmfile($class);
+ return;
+ };
+ }
- return do {
- local $@;
- local $SIG{__DIE__};
- eval { require($file) };
- $@;
- };
+ if ( @classes > 1 ) {
+ confess "Can't locate any of @classes in \@INC (\@INC contains: @INC).";
+ } else {
+ confess "Can't locate " . _class_to_pmfile($classes[0]) . " in \@INC (\@INC contains: @INC).";
+ }
}
sub load_class {
load_first_existing_class($_[0]);
- return;
+ # This is done to avoid breaking code which checked the return value. Said
+ # code is dumb. The return value was _always_ true, since it dies on
+ # failure!
+ return 1;
}
sub _is_valid_class_name {
);
Class::MOP::Package->meta->add_attribute(
- Class::MOP::Attribute->new('methods' => (
+ Class::MOP::Attribute->new('_methods' => (
reader => {
# NOTE:
# we just alias the original method
# rather than re-produce it here
- 'get_method_map' => \&Class::MOP::Package::get_method_map
+ '_full_method_map' => \&Class::MOP::Package::_full_method_map
},
default => sub { {} }
))
#
# we just alias the original method
# rather than re-produce it here
- 'get_attribute_map' => \&Class::MOP::Class::get_attribute_map
+ '_attribute_map' => \&Class::MOP::Class::_attribute_map
},
default => sub { {} }
))
in place of tricks like C<eval "use $module"> or using C<require>
unconditionally.
+If the module cannot be loaded, an exception is thrown.
+
+For historical reasons, this function explicitly returns a true value.
+
=item B<Class::MOP::is_class_loaded($class_name)>
Returns a boolean indicating whether or not C<$class_name> has been