This file documents the revision history for Perl extension Catalyst.
+ - Separated execute and dispatch on Catalyst::Action
- cleaned up logging and debug output
- minor doc fixes
- Added warning for setup being called twice
# Stringify to reverse for debug output etc.
q{""} => sub { shift->{reverse} },
- # Codulate to encapsulated action coderef
- '&{}' => sub { shift->{code} },
+ # Codulate to execute to invoke the encapsulated action coderef
+ '&{}' => sub { my $self = shift; sub { $self->execute(@_); }; },
# Make general $stuff still work
fallback => 1,
Returns a code reference to this action
-=head2 execute( $c )
+=head2 dispatch( $c )
-Execute this action against a context
+Dispatch this action against a context
=cut
-sub execute { # Execute ourselves against a context
+sub dispatch { # Execute ourselves against a context
my ( $self, $c ) = @_;
local $c->namespace = $self->namespace;
return $c->execute( $self->class, $self );
}
+=head2 execute( $controller, $c, @args )
+
+Execute this action's coderef against a given controller with a given
+context and arguments
+
+=cut
+
+sub execute {
+ my $self = shift;
+ $self->{code}->(@_);
+}
+
=head2 match( $c )
Check Args attribute, and makes sure number of args matches the setting.
sub match {
my ( $self, $c ) = @_;
return 1 unless exists $self->attributes->{Args};
- return scalar(@{$c->req->args}) == $self->attributes->{Args}[0];
+ return scalar( @{ $c->req->args } ) == $self->attributes->{Args}[0];
}
=head2 namespace
my ( $self, $c ) = @_;
my $begin = ( $c->get_actions( 'begin', $c->namespace ) )[-1];
return 1 unless $begin;
- $begin->execute($c);
+ $begin->dispatch( $c );
return !@{ $c->error };
}
my ( $self, $c ) = @_;
my @auto = $c->get_actions( 'auto', $c->namespace );
foreach my $auto (@auto) {
- $auto->execute($c);
+ $auto->dispatch( $c );
return 0 unless $c->state;
}
return 1;
&& $c->action->can('execute')
&& $c->req->action )
{
- $c->action->execute($c);
+ $c->action->dispatch( $c );
}
return !@{ $c->error };
}
my ( $self, $c ) = @_;
my $end = ( $c->get_actions( 'end', $c->namespace ) )[-1];
return 1 unless $end;
- $end->execute($c);
+ $end->dispatch( $c );
return !@{ $c->error };
}