X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FBase.pm;h=04a2153803469fa98d4754df785401f057767195;hb=6d1ab9154b299ce3697ec69d4ffd10dda4c07c0e;hp=6448f3d570ee20909b74f7d5eb0d9c9f0d126f32;hpb=23f9d93414eadb11350029f13b51841d8309363b;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Base.pm b/lib/Catalyst/Base.pm
index 6448f3d..04a2153 100644
--- a/lib/Catalyst/Base.pm
+++ b/lib/Catalyst/Base.pm
@@ -2,9 +2,22 @@ package Catalyst::Base;
 
 use strict;
 use base qw/Class::Data::Inheritable Class::Accessor::Fast/;
+use Catalyst::Utils;
 use NEXT;
 
-__PACKAGE__->mk_classdata('_config');
+__PACKAGE__->mk_classdata($_) for qw/_attrcache _cache _config/;
+__PACKAGE__->_cache( [] );
+__PACKAGE__->_attrcache( {} );
+
+# 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
 
@@ -33,7 +46,6 @@ Catalyst::Base - Catalyst Universal Base Class
 
     # Methods can be a request step
     $c->forward(qw/MyApp::Model::Something forward_to_me/);
-    MyApp->action( 'index.html' => \&MyApp::Model::Something::forward_to_me );
 
     # Or just methods
     print $c->comp('MyApp::Model::Something')->test;
@@ -58,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
@@ -88,7 +105,11 @@ sub config {
 
 =cut
 
-sub process { 1 }
+sub process {
+    die( ( ref $_[0] || $_[0] ) . " did not override Catalyst::Base::process" );
+}
+
+=back
 
 =head1 SEE ALSO
 
@@ -97,6 +118,7 @@ L<Catalyst>.
 =head1 AUTHOR
 
 Sebastian Riedel, C<sri@cpan.org>
+Marcus Ramberg, C<mramberg@cpan.org>
 
 =head1 COPYRIGHT