From: Sebastian Riedel Date: Tue, 5 Jul 2005 21:43:57 +0000 (+0000) Subject: Added attributes for detach X-Git-Tag: 5.7099_04~1271 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=bd7d2e943ac38b8884bb36c2eaeb9e57ce85d0d6 Added attributes for detach --- diff --git a/Changes b/Changes index c10b983..1b46fe8 100644 --- a/Changes +++ b/Changes @@ -3,6 +3,7 @@ This file documents the revision history for Perl extension Catalyst. 5.31 2005-06-04 12:35:00 - fixed $Data::Dumper::Terse (Robin Berjon) + - added arguments for detach 5.30 2005-06-04 12:35:00 diff --git a/lib/Catalyst/Dispatcher.pm b/lib/Catalyst/Dispatcher.pm index ca6c0ee..7e534e0 100644 --- a/lib/Catalyst/Dispatcher.pm +++ b/lib/Catalyst/Dispatcher.pm @@ -24,15 +24,15 @@ See L. =over 4 -=item $c->detach($command) +=item $c->detach( $command [, \@arguments ] ) Like C but doesn't return. =cut sub detach { - my ( $c, $command ) = @_; - $c->forward($command) if $command; + my ( $c, $command, @args ) = @_; + $c->forward( $command, @args ) if $command; die $Catalyst::Engine::DETACH; } @@ -148,14 +148,15 @@ sub forward { my $results = $c->get_action( $command, $namespace ); unless ( @{$results} ) { - + unless ( $c->components->{$command} ) { - my $error = qq/Couldn't forward to command "$command". Invalid action or component./; + my $error = +qq/Couldn't forward to command "$command". Invalid action or component./; $c->error($error); $c->log->debug($error) if $c->debug; return 0; } - + my $class = $command; my $method = shift || 'process'; @@ -165,7 +166,8 @@ sub forward { } else { - my $error = qq/Couldn't forward to "$class". Does not implement "$method"/; + my $error = + qq/Couldn't forward to "$class". Does not implement "$method"/; $c->error($error); $c->log->debug($error) if $c->debug; @@ -173,8 +175,8 @@ sub forward { } } - - local $c->request->{arguments} = [ @{ $arguments } ]; + + local $c->request->{arguments} = [ @{$arguments} ]; for my $result ( @{$results} ) { $c->execute( @{ $result->[0] } );