reverting back to when tests pass. applying changes one by one to find what failed

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

diff --git a/lib/Catalyst/Component.pm b/lib/Catalyst/Component.pm
index b5b56e2..116aa9a 100644 (file)
--- a/lib/Catalyst/Component.pm
+++ b/lib/Catalyst/Component.pm
@@ -1,27 +1,9 @@
 package Catalyst::Component;
 
-use Moose;
-#use MooseX::ClassAttribute;
-use Catalyst::Utils;
-use Class::Data::Inheritable;
+use strict;
+use base qw/Class::Accessor::Fast Class::Data::Inheritable/;
 use NEXT;
-
-{
-  my $mk_classdata =  Class::Data::Inheritable->can('mk_classdata');
-  __PACKAGE__->meta->add_method(mk_classdata => $mk_classdata);
-}
-
-__PACKAGE__->mk_classdata(_config => {});
-__PACKAGE__->mk_classdata('_plugins');
-
-# class_has _config  => (
-#                  is => 'rw',
-#                  isa => 'HashRef',
-#                  required => 1,
-#                  default => sub { {} }
-#                 );
-
-# class_has _plugins => ( is => 'rw' );
+use Catalyst::Utils;
 
 
 =head1 NAME
@@ -46,7 +28,7 @@ Catalyst::Component - Catalyst Component Base Class
         my ( $self, $c ) = @_;
         $c->response->output( $self->{foo} );
     }
-
+    
     1;
 
     # Methods can be a request step
@@ -59,7 +41,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
@@ -67,18 +49,19 @@ 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 );
-};
+
+    return $self->NEXT::new( 
+        $self->merge_config_hashes( $self->config, $arguments ) );
+}
 
 sub COMPONENT {
     my ( $self, $c ) = @_;
@@ -86,32 +69,26 @@ 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;
     }
-    #new here will always pass because $self ISA Moose::Object
     else {
         if ( my $new = $self->new( $c, $arguments ) ) {
             return $new;
         }
         else {
             my $class = ref $self || $self;
-            my $new   = $self->merge_config_hashes(
+            my $new   = $self->merge_config_hashes( 
                 $self->config, $arguments );
-            #this will break, Moose::Object::new won't act like this
             return bless $new, $class;
         }
     }
 }
 
-#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(
@@ -130,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 );
         }
@@ -167,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
@@ -177,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 )