X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FBase.pm;h=a0f81ef0b5fd964dd760ab31fbd1ab7d87a49c02;hb=9b793a51e8b5edb92c9fad8a87323be0235961d4;hp=abe23e9cc03bfbf8ca7dd8166044f9ad6acdbfcf;hpb=ac73326467a355b37917b030d8413c4838468aee;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Base.pm b/lib/Catalyst/Base.pm
index abe23e9..a0f81ef 100644
--- a/lib/Catalyst/Base.pm
+++ b/lib/Catalyst/Base.pm
@@ -2,17 +2,25 @@ package Catalyst::Base;
 
 use strict;
 use base qw/Class::Data::Inheritable Class::Accessor::Fast/;
+use Catalyst::Utils;
+use Catalyst::Exception;
 use NEXT;
 
-__PACKAGE__->mk_classdata($_) for qw/_cache _config/;
-__PACKAGE__->_cache( [] );
+# Some caches...
+__PACKAGE__->mk_classdata($_) for qw/_attr_cache _action_cache _config/;
+__PACKAGE__->_attr_cache( {} );
+__PACKAGE__->_action_cache( [] );
 
+# note - see attributes(3pm)
 sub MODIFY_CODE_ATTRIBUTES {
     my ( $class, $code, @attrs ) = @_;
-    push @{ $class->_cache }, [ $code, [@attrs] ];
+    $class->_attr_cache->{$code} = [@attrs];
+    push @{ $class->_action_cache }, [ $code, [@attrs] ];
     return ();
 }
 
+sub FETCH_CODE_ATTRIBUTES { $_[0]->_attr_cache->{ $_[1] } || () }
+
 =head1 NAME
 
 Catalyst::Base - Catalyst Universal Base Class
@@ -40,7 +48,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;
@@ -65,7 +72,22 @@ component loader with config() support and a process() method placeholder.
 
 sub new {
     my ( $self, $c ) = @_;
-    return $self->NEXT::new( $self->config );
+
+    # You'll find yourself naked and strung from a tree if you ever
+    # remove this again, k? :)
+    my $class     = ref $self || $self;
+    my $appname   = Catalyst::Utils::class2appclass($class);
+    my $suffix    = Catalyst::Utils::class2classsuffix($class);
+    my $appconfig = {};
+
+    # Not catched, for compatibility with non Catalyst apps
+    eval '$appconfig = $appname->config->{$suffix} || {}';
+    my $config = { %{ $self->config }, %{$appconfig} };
+
+    # Temporary fix, some components does not pass context to constructor
+    my $arguments = ( ref( $_[-1] ) eq 'HASH' ) ? $_[-1] : {};
+
+    return $self->NEXT::new( { %{$config}, %{$arguments} } );
 }
 
 # remember to leave blank lines between the consecutive =item's
@@ -82,8 +104,8 @@ sub new {
 sub config {
     my $self = shift;
     $self->_config( {} ) unless $self->_config;
-    if ( $_[0] ) {
-        my $config = $_[1] ? {@_} : $_[0];
+    if (@_) {
+        my $config = @_ > 1 ? {@_} : $_[0];
         while ( my ( $key, $val ) = each %$config ) {
             $self->_config->{$key} = $val;
         }
@@ -95,7 +117,17 @@ sub config {
 
 =cut
 
-sub process { 1 }
+sub process {
+
+    Catalyst::Exception->throw( message => ( ref $_[0] || $_[0] )
+          . " did not override Catalyst::Base::process" );
+}
+
+=item FETCH_CODE_ATTRIBUTES
+
+=item MODIFY_CODE_ATTRIBUTES
+
+=back
 
 =head1 SEE ALSO
 
@@ -104,6 +136,7 @@ L<Catalyst>.
 =head1 AUTHOR
 
 Sebastian Riedel, C<sri@cpan.org>
+Marcus Ramberg, C<mramberg@cpan.org>
 
 =head1 COPYRIGHT