X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FBase.pm;h=ec25476b1b70be7a35ff129bd0f34eaba48c71fa;hb=4f6748f101647dd3344339b19510947df6836412;hp=f0138cf8a70f91c6931ea7102f949ebef7764b41;hpb=748161c4ad23fb071c9906201f98d7aaaad29222;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Base.pm b/lib/Catalyst/Base.pm
index f0138cf..ec25476 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__->_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
 
@@ -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;
@@ -48,17 +60,32 @@ This is the universal base class for Catalyst components
 It provides you with a generic new() for instantiation through Catalyst's
 component loader with config() support and a process() method placeholder.
 
-=head2 METHODS
+=head1 METHODS
+
+=over 4
+
+=item new($c)
 
-=head3 new
 =cut
 
 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);
 }
 
-=head3 config
+# remember to leave blank lines between the consecutive =item's
+# otherwise the pod tools don't recognize the subsequent =items
+
+=item $c->config
+
+=item $c->config($hashref)
+
+=item $c->config($key, $value, ...)
 
 =cut
 
@@ -74,11 +101,15 @@ sub config {
     return $self->_config;
 }
 
-=head3 process
+=item $c->process()
 
 =cut
 
-sub process { 1 }
+sub process {
+    die( ( ref $_[0] || $_[0] ) . " did not override Catalyst::Base::process" );
+}
+
+=back
 
 =head1 SEE ALSO
 
@@ -87,6 +118,7 @@ L<Catalyst>.
 =head1 AUTHOR
 
 Sebastian Riedel, C<sri@cpan.org>
+Marcus Ramberg, C<mramberg@cpan.org>
 
 =head1 COPYRIGHT