X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FBase.pm;h=ec25476b1b70be7a35ff129bd0f34eaba48c71fa;hb=386777dc6439f150392cbca5da094803296d3640;hp=a79cfa2e2e545ed9eea6b49dbb4afc4ee8c3594b;hpb=42a57832aea5e5c4684d534aa7d133c15aac4b42;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Base.pm b/lib/Catalyst/Base.pm
index a79cfa2..ec25476 100644
--- a/lib/Catalyst/Base.pm
+++ b/lib/Catalyst/Base.pm
@@ -2,18 +2,23 @@ package Catalyst::Base;
 
 use strict;
 use base qw/Class::Data::Inheritable Class::Accessor::Fast/;
+use Catalyst::Utils;
 use NEXT;
 
-__PACKAGE__->mk_classdata($_) for qw/_cache _config/;
+__PACKAGE__->mk_classdata($_) for qw/_attrcache _cache _config/;
+__PACKAGE__->_attrcache( {} );
 __PACKAGE__->_cache( [] );
 
 # note - see attributes(3pm)
 sub MODIFY_CODE_ATTRIBUTES {
     my ( $class, $code, @attrs ) = @_;
+    $class->_attrcache->{$code} = [@attrs];
     push @{ $class->_cache }, [ $code, [@attrs] ];
     return ();
 }
 
+sub FETCH_CODE_ATTRIBUTES { $_[0]->_attrcache->{ $_[1] } || () }
+
 =head1 NAME
 
 Catalyst::Base - Catalyst Universal Base Class
@@ -65,7 +70,12 @@ component loader with config() support and a process() method placeholder.
 
 sub new {
     my ( $self, $c ) = @_;
-    return $self->NEXT::new( $self->config );
+    my $class     = ref $self || $self;
+    my $appname   = Catalyst::Utils::class2appclass($class);
+    my $suffix    = Catalyst::Utils::class2classsuffix($class);
+    my $appconfig = $appname->config->{$suffix} || {};
+    my $config    = { %{ $self->config }, %{$appconfig} };
+    return $self->NEXT::new($config);
 }
 
 # remember to leave blank lines between the consecutive =item's
@@ -95,7 +105,9 @@ sub config {
 
 =cut
 
-sub process { die ((ref $_[0] || $_[0])." did not override Catalyst::Base::process"); }
+sub process {
+    die( ( ref $_[0] || $_[0] ) . " did not override Catalyst::Base::process" );
+}
 
 =back