still failing some tests. waiting for suggestions on whether to fix old CDIretardedness

[catagits/Catalyst-Runtime.git] / lib / Catalyst / Component.pm

diff --git a/lib/Catalyst/Component.pm b/lib/Catalyst/Component.pm
index cf47c27..a66a7c2 100644 (file)
--- a/lib/Catalyst/Component.pm
+++ b/lib/Catalyst/Component.pm
@@ -1,15 +1,15 @@
 package Catalyst::Component;
 
-use Class::C3;
 use Moose;
+use Class::MOP;
 use MooseX::Adopt::Class::Accessor::Fast;
 use Catalyst::Utils;
-
+use MRO::Compat;
+use mro 'c3';
 
 with 'MooseX::Emulate::Class::Accessor::Fast';
 with 'Catalyst::ClassData';
 
-no Moose;
 
 =head1 NAME
 
@@ -56,59 +56,40 @@ component loader with config() support and a process() method placeholder.
 
 __PACKAGE__->mk_classdata($_) for qw/_config _plugins/;
 
-sub new {
-    my ( $self, $c ) = @_;
+around new => sub {
+    my ( $orig, $self) = @_;
 
     # Temporary fix, some components does not pass context to constructor
     my $arguments = ( ref( $_[-1] ) eq 'HASH' ) ? $_[-1] : {};
 
     my $args =  $self->merge_config_hashes( $self->config, $arguments );
-    $self->next::method( $args );
-}
+    $self->$orig( $args );
+};
+
+no Moose;
 
 sub COMPONENT {
     my ( $self, $c ) = @_;
 
     # Temporary fix, some components does not pass context to constructor
     my $arguments = ( ref( $_[-1] ) eq 'HASH' ) ? $_[-1] : {};
-
-
-    #this is not the EXACT logic we had before, since  the original tested
-    #for a true value before returning meaning that a subsequent COMPONENT
-    #call could return undef and that would trigger a try to new, which could
-    #again return undef, which would lead to a straight bless of the args and
-    #config. I did not mantain that behavior because it did not seemed sane
-    # please rip me a new one if you have reason to believe i am being stupid
-    # --groditi
-    return $self->next::can ?
-      $self->next::method($c, $arguments) : $self->new($c, $arguments);
+    if( my $next = $self->next::can ){
+      my $class = blessed $self || $self;
+      my ($next_package) = Class::MOP::get_code_info($next);
+      warn "There is a COMPONENT method resolving after Catalyst::Component in ${next_package}. This behavior is deprecated and will stop working in future releases.";
+      return $next->($self, $arguments);
+    }
+    return $self->new($c, $arguments);
 }
 
 sub config {
     my $self = shift;
-    my $config_sub = $self->can('_config');
-    my $config = $self->$config_sub() || {};
+    my $config = $self->_config ||{};
     if (@_) {
         my $newconfig = { %{@_ > 1 ? {@_} : $_[0]} };
         $self->_config(
             $self->merge_config_hashes( $config, $newconfig )
         );
-    } else {
-        # this is a bit of a kludge, required to make
-        # __PACKAGE__->config->{foo} = 'bar';
-        # work in a subclass. Calling the Class::Data::Inheritable setter
-        # will create a new _config method in the current class if it's
-        # currently inherited from the superclass. So, the can() call will
-        # return a different subref in that case and that means we know to
-        # copy and reset the value stored in the class data.
-
-        $self->_config( $config );
-
-        if ((my $config_sub_now = $self->can('_config')) ne $config_sub) {
-
-            $config = $self->merge_config_hashes( $config, {} );
-            $self->$config_sub_now( $config );
-        }
     }
     return $config;
 }