X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FBase.pm;h=cbd95aef931cf1d6cdd7efbf56f7c5cc7908d22c;hb=0bbb5a1fb9748b4c0b7b1b0c397b95b1d0f1fccf;hp=dd38bea61195066d04cdc42ddc58df76b047fb7e;hpb=a268a0112398ac10d8fabd86ed28a183cbe4398e;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Base.pm b/lib/Catalyst/Base.pm
index dd38bea..cbd95ae 100644
--- a/lib/Catalyst/Base.pm
+++ b/lib/Catalyst/Base.pm
@@ -1,22 +1,56 @@
 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/_attr_cache _action_cache _config/;
-__PACKAGE__->_attr_cache( {} );
-__PACKAGE__->_action_cache( [] );
+__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 _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;
+}
 
-# note - see attributes(3pm)
-sub MODIFY_CODE_ATTRIBUTES {
-    my ( $class, $code, @attrs ) = @_;
-    $class->_attr_cache->{$code} = [@attrs];
-    push @{ $class->_action_cache }, [ $code, [@attrs] ];
-    return ();
+sub _ACTION : Private {
+    my ( $self, $c ) = @_;
+    $c->action->execute($c);
+    return !@{ $c->error };
 }
 
-sub FETCH_CODE_ATTRIBUTES { $_[0]->_attr_cache->{ $_[1] } || () }
+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
 
@@ -69,11 +103,11 @@ component loader with config() support and a process() method placeholder.
 
 sub new {
     my ( $self, $c ) = @_;
- 
+
     # Temporary fix, some components does not pass context to constructor
     my $arguments = ( ref( $_[-1] ) eq 'HASH' ) ? $_[-1] : {};
 
-    return $self->NEXT::new( { %{ $self->config }, %{ $arguments } } );
+    return $self->NEXT::new( { %{ $self->config }, %{$arguments} } );
 }
 
 # remember to leave blank lines between the consecutive =item's
@@ -104,12 +138,10 @@ sub config {
 =cut
 
 sub process {
-    die( ( ref $_[0] || $_[0] ) . " did not override Catalyst::Base::process" );
-}
 
-=item FETCH_CODE_ATTRIBUTES
-
-=item MODIFY_CODE_ATTRIBUTES
+    Catalyst::Exception->throw( message => ( ref $_[0] || $_[0] )
+          . " did not override Catalyst::Base::process" );
+}
 
 =back
 
@@ -121,6 +153,7 @@ L<Catalyst>.
 
 Sebastian Riedel, C<sri@cpan.org>
 Marcus Ramberg, C<mramberg@cpan.org>
+Matt S Trout, C<mst@shadowcatsystems.co.uk>
 
 =head1 COPYRIGHT