package Catalyst::Base;
use strict;
-use base qw/Class::Data::Inheritable Class::Accessor::Fast/;
+use base qw/Catalyst::AttrContainer Class::Accessor::Fast/;
+
+use Catalyst::Exception;
use NEXT;
-__PACKAGE__->mk_classdata($_) for qw/_attrcache _cache _config/;
-__PACKAGE__->_cache( [] );
-__PACKAGE__->_attrchache( {} );
+__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);
+ }
-# note - see attributes(3pm)
-sub MODIFY_CODE_ATTRIBUTES {
- my ( $class, $code, @attrs ) = @_;
- $class->_attrcache->{$code} = [@attrs];
- push @{ $class->_cache }, [ $code, [@attrs] ];
- return ();
+ $c->forward('_END');
}
-sub FETCH_CODE_ATTTRIBUTES { $_[0]->_attrcache->{ $_[1] } || () }
+sub _BEGIN : Private {
+ my ( $self, $c ) = @_;
+ my $begin = @{ $c->get_action( 'begin', $c->namespace, 1 ) }[-1];
+ return 1 unless $begin;
+ $begin->[0]->execute($c);
+ return !@{ $c->error };
+}
+
+sub _AUTO : Private {
+ my ( $self, $c ) = @_;
+ my @auto = @{ $c->get_action( 'auto', $c->namespace, 1 ) };
+ foreach my $auto (@auto) {
+ $auto->[0]->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_action( 'end', $c->namespace, 1 ) }[-1];
+ return 1 unless $end;
+ $end->[0]->execute($c);
+ return !@{ $c->error };
+}
=head1 NAME
sub new {
my ( $self, $c ) = @_;
- return $self->NEXT::new( $self->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" );
}
=back
Sebastian Riedel, C<sri@cpan.org>
Marcus Ramberg, C<mramberg@cpan.org>
+Matt S Trout, C<mst@shadowcatsystems.co.uk>
=head1 COPYRIGHT