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=116aa9ad8dab10a71f01adf705a69f49d0f6502a;hp=4b12fdab40932773a3a4addc2d8c79888862bec8;hb=e8b9f2a92084b3b9dab6b2b879900481b8548b3b;hpb=825dbf857c7bf90368937efaaeadec92d91fd990

diff --git a/lib/Catalyst/Component.pm b/lib/Catalyst/Component.pm
index 4b12fda..116aa9a 100644
--- a/lib/Catalyst/Component.pm
+++ b/lib/Catalyst/Component.pm
@@ -3,8 +3,8 @@ package Catalyst::Component;
 use strict;
 use base qw/Class::Accessor::Fast Class::Data::Inheritable/;
 use NEXT;
+use Catalyst::Utils;
 
-__PACKAGE__->mk_classdata($_) for qw/_config _plugins/;
 
 =head1 NAME
 
@@ -41,20 +41,17 @@ 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
 component loader with config() support and a process() method placeholder.
 
-=head1 METHODS
+=cut
 
-=head2 new($c, $arguments)
+__PACKAGE__->mk_classdata($_) for qw/_config _plugins/;
 
-Called by COMPONENT to instantiate the component; should return an object
-to be stored in the application's component hash.
 
-=cut
 
 sub new {
     my ( $self, $c ) = @_;
@@ -62,21 +59,10 @@ sub new {
     # Temporary fix, some components does not pass context to constructor
     my $arguments = ( ref( $_[-1] ) eq 'HASH' ) ? $_[-1] : {};
 
-    return $self->NEXT::new( { %{ $self->config }, %{$arguments} } );
+    return $self->NEXT::new( 
+        $self->merge_config_hashes( $self->config, $arguments ) );
 }
 
-=head2 COMPONENT($c, $arguments)
-
-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 ->new to
-instantiate the component.
-
-=cut
-
 sub COMPONENT {
     my ( $self, $c ) = @_;
 
@@ -92,39 +78,47 @@ sub COMPONENT {
         }
         else {
             my $class = ref $self || $self;
-            my $new = { %{ $self->config }, %{$arguments} };
+            my $new   = $self->merge_config_hashes( 
+                $self->config, $arguments );
             return bless $new, $class;
         }
     }
 }
 
-# remember to leave blank lines between the consecutive =head2's
-# otherwise the pod tools don't recognize the subsequent =head2s
-
-=head2 $c->config
-
-=head2 $c->config($hashref)
-
-=head2 $c->config($key, $value, ...)
-
-=cut
-
 sub config {
     my $self = shift;
-    my $config = $self->_config;
-    unless ($config) {
-        $self->_config( $config = {} );
-    }
+    my $config_sub = $self->can('_config');
+    my $config = $self->$config_sub() || {};
     if (@_) {
-        $config = { %{$config}, %{@_ > 1 ? {@_} : $_[0]} };
-        $self->_config($config);
+        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;
 }
 
-=head2 $c->process()
+sub merge_config_hashes {
+    my ( $self, $lefthash, $righthash ) = @_;
 
-=cut
+    return Catalyst::Utils::merge_hashes( $lefthash, $righthash );
+}
 
 sub process {
 
@@ -132,6 +126,49 @@ sub process {
           . " did not override Catalyst::Component::process" );
 }
 
+1;
+
+__END__
+
+=head1 METHODS
+
+=head2 new($c, $arguments)
+
+Called by COMPONENT to instantiate the component; should return an object
+to be stored in the application's component hash.
+
+=head2 COMPONENT($c, $arguments)
+
+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 
+->new to instantiate the component.
+
+=head2 $c->config
+
+=head2 $c->config($hashref)
+
+=head2 $c->config($key, $value, ...)
+
+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 
+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 
+when you forward to them. The default is an abstract method.
+
+=head2 $c->merge_config_hashes( $hashref, $hashref )
+
+Merges two hashes together recursively, giving right-hand precedence.
+Alias for the method in L<Catalyst::Utils>.
+
 =head1 OPTIONAL METHODS
 
 =head2 ACCEPT_CONTEXT($c, @args)
@@ -162,5 +199,3 @@ This program is free software, you can redistribute it and/or modify it under
 the same terms as Perl itself.
 
 =cut
-
-1;