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;
-__PACKAGE__->mk_classdata($_) for qw/_attrcache _cache _config/;
-__PACKAGE__->_cache( [] );
-__PACKAGE__->_attrcache( {} );
+__PACKAGE__->mk_classdata($_) for qw/_config/;
-# note - see attributes(3pm)
-sub MODIFY_CODE_ATTRIBUTES {
- my ( $class, $code, @attrs ) = @_;
- $class->_attrcache->{$code} = [@attrs];
- push @{ $class->_cache }, [ $code, [@attrs] ];
- return ();
-}
+sub _DISPATCH :Private {
+ my ( $self, $c ) = @_;
+ my @containers = $c->dispatcher->get_containers( $c->namespace );
+ my %actions;
+ foreach my $name (qw/begin auto end/) {
+
+ # Go down the container list representing each part of the
+ # current namespace inheritance tree, grabbing the actions hash
+ # of the ActionContainer object and looking for actions of the
+ # appropriate name registered to the namespace
+
+ $actions{$name} = [
+ map { $_->{$name} }
+ grep { exists $_->{$name} }
+ map { $_->actions } @containers
+ ];
+ }
+
+ # Errors break the normal flow and the end action is instantly run
+ my $error = 0;
+
+ # Execute last begin
+ $c->state(1);
+ if ( my $begin = @{ $actions{begin} }[-1] ) {
+ $begin->execute($c);
+ $error++ if scalar @{ $c->error };
+ }
+
+ # Execute the auto chain
+ my $autorun = 0;
+ for my $auto ( @{ $actions{auto} } ) {
+ last if $error;
+ $autorun++;
+ $auto->execute($c);
+ $error++ if scalar @{ $c->error };
+ last unless $c->state;
+ }
-sub FETCH_CODE_ATTRIBUTES { $_[0]->_attrcache->{ $_[1] } || () }
+ # Execute the action or last default
+ my $mkay = $autorun ? $c->state ? 1 : 0 : 1;
+ if ($mkay) {
+ unless ($error) {
+ $c->action->execute($c);
+ $error++ if scalar @{ $c->error };
+ }
+ }
+
+ # Execute last end
+ if ( my $end = @{ $actions{end} }[-1] ) {
+ $end->execute($c);
+ }
+}
=head1 NAME
sub new {
my ( $self, $c ) = @_;
- 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);
+
+ # Temporary fix, some components does not pass context to constructor
+ my $arguments = ( ref( $_[-1] ) eq 'HASH' ) ? $_[-1] : {};
+
+ return $self->NEXT::new( { %{ $self->config }, %{ $arguments } } );
}
# remember to leave blank lines between the consecutive =item's
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;
}
=cut
sub process {
- die( ( ref $_[0] || $_[0] ) . " did not override Catalyst::Base::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
Sebastian Riedel, C<sri@cpan.org>
Marcus Ramberg, C<mramberg@cpan.org>
+Matt S Trout, C<mst@shadowcatsystems.co.uk>
=head1 COPYRIGHT