X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FBase.pm;h=64848c076f0b5709d5204bc0d5bbae7a70a4a300;hb=812a28c90c5b43bdf5ce87f1b2a688725e552429;hp=abe23e9cc03bfbf8ca7dd8166044f9ad6acdbfcf;hpb=ac73326467a355b37917b030d8413c4838468aee;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst/Base.pm b/lib/Catalyst/Base.pm index abe23e9..64848c0 100644 --- a/lib/Catalyst/Base.pm +++ b/lib/Catalyst/Base.pm @@ -2,17 +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__->_cache( [] ); +__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 +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; @@ -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 @@ -82,8 +92,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 +105,11 @@ sub config { =cut -sub process { 1 } +sub process { + die( ( ref $_[0] || $_[0] ) . " did not override Catalyst::Base::process" ); +} + +=back =head1 SEE ALSO @@ -104,6 +118,7 @@ L. =head1 AUTHOR Sebastian Riedel, C +Marcus Ramberg, C =head1 COPYRIGHT