X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst%2FComponent.pm;h=7de7e4e1c423ed55847ce12417731acd549e68b9;hp=9cbe331978702023ff93d51ff7bcca244deb2478;hb=6f1f968a6bc42bf4a4b50a1ee22d3aaecd801876;hpb=615bfadf17b568b98fe61ac76a19767c90f9f58a

diff --git a/lib/Catalyst/Component.pm b/lib/Catalyst/Component.pm
index 9cbe331..7de7e4e 100644
--- a/lib/Catalyst/Component.pm
+++ b/lib/Catalyst/Component.pm
@@ -1,18 +1,16 @@
 package Catalyst::Component;
 
+use MRO::Compat;
+use mro 'c3';
 use Moose;
-use MooseX::ClassAttribute;
+use MooseX::Adopt::Class::Accessor::Fast;
 use Catalyst::Utils;
 
-has _config  => (
-                 is => 'rw',
-                 isa => 'HashRef',
-                 required => 1,
-                 default => sub { {} }
-                );
 
-class_has _plugins => ( is => 'rw' );
+with 'MooseX::Emulate::Class::Accessor::Fast';
+with 'Catalyst::ClassData';
 
+no Moose;
 
 =head1 NAME
 
@@ -36,7 +34,7 @@ Catalyst::Component - Catalyst Component Base Class
         my ( $self, $c ) = @_;
         $c->response->output( $self->{foo} );
     }
-
+    
     1;
 
     # Methods can be a request step
@@ -49,7 +47,7 @@ Catalyst::Component - Catalyst Component Base Class
 
 =head1 DESCRIPTION
 
-This is the universal base class for Catalyst components
+This is the universal base class for Catalyst components 
 (Model/View/Controller).
 
 It provides you with a generic new() for instantiation through Catalyst's
@@ -57,18 +55,17 @@ component loader with config() support and a process() method placeholder.
 
 =cut
 
-#to do: are we switching to moose-style key => value constructors from
-#       catalyst-style {key => value} constructors ?
+__PACKAGE__->mk_classdata($_) for qw/_config _plugins/;
 
-around new => sub {
-    my $orig = shift;
+sub new {
     my ( $self, $c ) = @_;
 
     # Temporary fix, some components does not pass context to constructor
     my $arguments = ( ref( $_[-1] ) eq 'HASH' ) ? $_[-1] : {};
-    my $merged = $self->merge_config_hashes( $self->config, $arguments );
-    $orig->( $self, $merged );
-};
+
+    my $args =  $self->merge_config_hashes( $self->config, $arguments );
+    $self->next::method( $args );
+}
 
 sub COMPONENT {
     my ( $self, $c ) = @_;
@@ -76,30 +73,22 @@ sub COMPONENT {
     # Temporary fix, some components does not pass context to constructor
     my $arguments = ( ref( $_[-1] ) eq 'HASH' ) ? $_[-1] : {};
 
-    #Moose TODO: I don't think I fully grok NEXT. is this here for MI or something?
-    # how can we have a next here? this -is- the base class....
-    if ( my $new = $self->NEXT::COMPONENT( $c, $arguments ) ) {
-        return $new;
-    }
-    else {
-        if ( my $new = $self->new( $c, $arguments ) ) {
-            return $new;
-        }
-        else {
-            my $class = ref $self || $self;
-            my $new   = $self->merge_config_hashes(
-                $self->config, $arguments );
-            return bless $new, $class;
-        }
-    }
+
+    #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);
 }
 
-#Moose TODO:  I have no fucking clue what's going on here (groditi)
 sub config {
     my $self = shift;
     my $config_sub = $self->can('_config');
-    my $config = $self->$config_sub();
-    #my $config = $self->_config;
+    my $config = $self->$config_sub() || {};
     if (@_) {
         my $newconfig = { %{@_ > 1 ? {@_} : $_[0]} };
         $self->_config(
@@ -118,7 +107,6 @@ sub config {
 
         if ((my $config_sub_now = $self->can('_config')) ne $config_sub) {
 
-            #this is retarded. if we want a new ref we could do:  { %$config }
             $config = $self->merge_config_hashes( $config, {} );
             $self->$config_sub_now( $config );
         }
@@ -155,8 +143,8 @@ If this method is present (as it is on all Catalyst::Component subclasses,
 it is called by Catalyst during setup_components with the application class
 as $c and any config entry on the application for this component (for example,
 in the case of MyApp::Controller::Foo this would be
-MyApp->config->{'Controller::Foo'}). The arguments are expected to be a
-hashref and are merged with the __PACKAGE__->config hashref before calling
+MyApp->config->{'Controller::Foo'}). The arguments are expected to be a 
+hashref and are merged with the __PACKAGE__->config hashref before calling 
 ->new to instantiate the component.
 
 =head2 $c->config
@@ -165,15 +153,15 @@ hashref and are merged with the __PACKAGE__->config hashref before calling
 
 =head2 $c->config($key, $value, ...)
 
-Accessor for this component's config hash. Config values can be set as
+Accessor for this component's config hash. Config values can be set as 
 key value pair, or you can specify a hashref. In either case the keys
-will be merged with any existing config settings. Each component in
+will be merged with any existing config settings. Each component in 
 a Catalyst application has it's own config hash.
 
 =head2 $c->process()
 
 This is the default method called on a Catalyst component in the dispatcher.
-For instance, Views implement this action to render the response body
+For instance, Views implement this action to render the response body 
 when you forward to them. The default is an abstract method.
 
 =head2 $c->merge_config_hashes( $hashref, $hashref )