package Catalyst::Base;
use strict;
-use base qw/Class::Data::Inheritable Class::Accessor::Fast/;
-use Catalyst::Utils;
+use base qw/Catalyst::AttrContainer Class::Accessor::Fast/;
+
use Catalyst::Exception;
use NEXT;
-# 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 ) = @_;
- $class->_attr_cache->{$code} = [@attrs];
- push @{ $class->_action_cache }, [ $code, [@attrs] ];
- return ();
+__PACKAGE__->mk_classdata($_) for qw/_config _dispatch_steps/;
+
+__PACKAGE__->_dispatch_steps( [qw/_BEGIN _AUTO _ACTION/] );
+
+sub _DISPATCH : Private {
+ my ( $self, $c ) = @_;
+
+ foreach my $disp ( @{ $self->_dispatch_steps } ) {
+ last unless $c->forward($disp);
+ }
+
+ $c->forward('_END');
}
-sub FETCH_CODE_ATTRIBUTES { $_[0]->_attr_cache->{ $_[1] } || () }
+sub _BEGIN : Private {
+ my ( $self, $c ) = @_;
+ my $begin = ($c->get_actions( 'begin', $c->namespace))[-1];
+ return 1 unless $begin;
+ $begin->execute($c);
+ return !@{ $c->error };
+}
+
+sub _AUTO : Private {
+ my ( $self, $c ) = @_;
+ my @auto = $c->get_actions('auto', $c->namespace);
+ foreach my $auto (@auto) {
+ $auto->execute($c);
+ return 0 unless $c->state;
+ }
+ return 1;
+}
+
+sub _ACTION : Private {
+ my ( $self, $c ) = @_;
+ $c->action->execute($c);
+ return !@{ $c->error };
+}
+
+sub _END : Private {
+ my ( $self, $c ) = @_;
+ my $end = ($c->get_actions( 'end', $c->namespace))[-1];
+ return 1 unless $end;
+ $end->execute($c);
+ return !@{ $c->error };
+}
=head1 NAME
sub new {
my ( $self, $c ) = @_;
- # 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} } );
+ return $self->NEXT::new( { %{ $self->config }, %{$arguments} } );
}
# remember to leave blank lines between the consecutive =item's
. " did not override Catalyst::Base::process" );
}
-=item FETCH_CODE_ATTRIBUTES
-
-=item MODIFY_CODE_ATTRIBUTES
-
=back
=head1 SEE ALSO
Sebastian Riedel, C<sri@cpan.org>
Marcus Ramberg, C<mramberg@cpan.org>
+Matt S Trout, C<mst@shadowcatsystems.co.uk>
=head1 COPYRIGHT