# Therefore leaving it in indefinitely.
use MRO::Compat;
-use Carp;
+use Carp ();
-our $VERSION = 1.0006;
+our $VERSION = 1.0009;
my $invalid_class = qr/(?: \b:\b | \:{3,} | \:\:$ )/x;
return if ( *{"${f_class}::$_"}{CODE} );
}
-
# require always returns true on success
- eval { require($file) } or do {
+ # ill-behaved modules might very well obliterate $_
+ eval { local $_; require($file) } or do {
$@ = "Invalid class name '$f_class'" if $f_class =~ $invalid_class;
if ($class->can('throw_exception')) {
$class->throw_exception($@);
} else {
- croak $@;
+ Carp::croak $@;
}
};
my $class = shift;
my $target = shift;
- my %isa = map { $_ => 1 } ($target, @{mro::get_linear_isa($target)} );
+ mro::set_mro($target, 'c3');
- for (reverse @_) {
+ for my $comp (reverse @_) {
no strict 'refs';
- unless ($isa{$_}++) {
- unshift ( @{"${target}::ISA"}, $_ );
+ unless ($target eq $comp || $target->isa($comp)) {
+ my @heritage = @{mro::get_linear_isa($comp)};
+
+ my @before = map {
+ my $to_run = $Class::C3::Componentised::ApplyHooks::Before{$_};
+ ($to_run?[$_,$to_run]:())
+ } @heritage;
+
+ for my $todo (@before) {
+ my ($parent, $fn) = @$todo;
+ for my $f (reverse @$fn) {
+ $target->$f($parent)
+ }
+ }
+
+ unshift ( @{"${target}::ISA"}, $comp );
+
+ my @after = map {
+ my $to_run = $Class::C3::Componentised::ApplyHooks::After{$_};
+ ($to_run?[$_,$to_run]:())
+ } @heritage;
+
+ for my $todo (reverse @after) {
+ my ($parent, $fn) = @$todo;
+ for my $f (@$fn) {
+ $target->$f($parent)
+ }
+ }
}
}
-
- mro::set_mro($target, 'c3');
}
=head2 load_optional_class
}
}
-=head1 AUTHOR
+=head1 AUTHORS
-Matt S. Trout and the DBIx::Class team
+Matt S. Trout and the L<DBIx::Class team|DBIx::Class/CONTRIBUTORS>
Pulled out into seperate module by Ash Berlin C<< <ash@cpan.org> >>
+Optimizations and overall bolt-tightening by Peter "ribasushi" Rabbitson
+C<< <ribasushi@cpan.org> >>
+
+=head1 COPYRIGHT
+
+Copyright (c) 2006 - 2011 the Class::C3::Componentised L</AUTHORS> as listed
+above.
+
=head1 LICENSE
You may distribute this code under the same terms as Perl itself.