X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst%2FActionChain.pm;h=fc39f0974bc3d4b87e19b7cbd4310c1f3315efc2;hp=6b08e2b107eded5c2eb8e25dca79b3737453cfa2;hb=4a62800defdaa16ec1a5bef88f3e639c983b6f1d;hpb=ee1ac3770d375006a96f1fba8308c1294e82e633

diff --git a/lib/Catalyst/ActionChain.pm b/lib/Catalyst/ActionChain.pm
index 6b08e2b..fc39f09 100644
--- a/lib/Catalyst/ActionChain.pm
+++ b/lib/Catalyst/ActionChain.pm
@@ -1,22 +1,10 @@
 package Catalyst::ActionChain;
 
-use strict;
-use base qw/Catalyst::Action/;
+use Moose;
+extends qw(Catalyst::Action);
 
-__PACKAGE__->mk_accessors(qw/chain/);
-
-use overload (
-
-    # Stringify to reverse for debug output etc.
-    q{""} => sub { shift->{reverse} },
-
-    # Codulate to execute to invoke the encapsulated action coderef
-    '&{}' => sub { my $self = shift; sub { $self->execute(@_); }; },
-
-    # Make general $stuff still work
-    fallback => 1,
-
-);
+has chain => (is => 'rw');
+no Moose;
 
 =head1 NAME
 
@@ -24,7 +12,7 @@ Catalyst::ActionChain - Chain of Catalyst Actions
 
 =head1 SYNOPSIS
 
-See L<Catalyst>.
+See L<Catalyst::Manual::Intro> for more info about Chained actions.
 
 =head1 DESCRIPTION
 
@@ -32,18 +20,6 @@ This class represents a chain of Catalyst Actions. It behaves exactly like
 the action at the *end* of the chain except on dispatch it will execute all
 the actions in the chain in order.
 
-=head1 METHODS
-
-=head2 chain
-
-Accessor for the action chain; will be an arrayref of the Catalyst::Action
-objects encapsulated by this chain.
-
-=head2 dispatch( $c )
-
-Dispatch this action chain against a context; will dispatch the encapsulated
-actions in order.
-
 =cut
 
 sub dispatch {
@@ -53,37 +29,75 @@ sub dispatch {
     my $last = pop(@chain);
     foreach my $action ( @chain ) {
         my @args;
-        if (my $cap = $action->attributes->{Captures}) {
-          @args = splice(@captures, 0, $cap->[0]);
+        if (my $cap = $action->number_of_captures) {
+          @args = splice(@captures, 0, $cap);
         }
         local $c->request->{arguments} = \@args;
         $action->dispatch( $c );
+
+        # break the chain if exception occurs in the middle of chain.  We
+        # check the global config flag 'abort_chain_on_error_fix', but this
+        # is now considered true by default, so unless someone explictly sets
+        # it to false we default it to true (if its not defined).
+        my $abort = defined($c->config->{abort_chain_on_error_fix}) ?
+          $c->config->{abort_chain_on_error_fix} : 1;
+        return if ($c->has_errors && $abort);
     }
     $last->dispatch( $c );
 }
 
+sub from_chain {
+    my ( $self, $actions ) = @_;
+    my $final = $actions->[-1];
+    return $self->new({ %$final, chain => $actions });
+}
+
+sub number_of_captures {
+    my ( $self ) = @_;
+    my $chain = $self->chain;
+    my $captures = 0;
+
+    $captures += $_->number_of_captures for @$chain;
+    return $captures;
+}
+
+__PACKAGE__->meta->make_immutable;
+1;
+
+__END__
+
+=head1 METHODS
+
+=head2 chain
+
+Accessor for the action chain; will be an arrayref of the Catalyst::Action
+objects encapsulated by this chain.
+
+=head2 dispatch( $c )
+
+Dispatch this action chain against a context; will dispatch the encapsulated
+actions in order.
+
 =head2 from_chain( \@actions )
 
 Takes a list of Catalyst::Action objects and constructs and returns a
 Catalyst::ActionChain object representing a chain of these actions
 
-=cut
+=head2 number_of_captures
 
-sub from_chain {
-    my ( $self, $actions ) = @_;
-    my $final = $actions->[-1];
-    return $self->new({ %$final, chain => $actions });
-}
+Returns the total number of captures for the entire chain of actions.
+
+=head2 meta
 
-=head1 AUTHOR
+Provided by Moose
 
-Matt S. Trout
+=head1 AUTHORS
+
+Catalyst Contributors, see Catalyst.pm
 
 =head1 COPYRIGHT
 
-This program is free software, you can redistribute it and/or modify it under
+This library is free software. You can redistribute it and/or modify it under
 the same terms as Perl itself.
 
 =cut
-
-1;