=over 4
-=item $c->detach($command)
+=item $c->detach( $command [, \@arguments ] )
Like C<forward> 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 with DETACH signal, which will be caught in dispatching.
die $Catalyst::Engine::DETACH;
}
$c->execute( @{ $end->[0] } );
return if scalar @{ $c->error };
}
- }
-
- else {
+ } else {
my $path = $c->req->path;
my $error = $path
? qq/Unknown resource "$path"/
}
}
-=item $c->forward($command)
+=item $c->forward( $command [, \@arguments ] )
Forward processing to a private action or a method from a class.
If you define a class without method it will default to process().
+also takes an optional arrayref containing arguments to be passed
+to the new function. $c->req->args will be reset upon returning
+from the function.
$c->forward('/foo');
$c->forward('index');
return 0;
}
- my $caller = caller(0);
+ # Relative forwards from detach
+ my $caller = ( caller(0) )[0]->isa('Catalyst::Dispatcher')
+ && ( ( caller(1) )[3] =~ /::detach$/ ) ? caller(1) : caller(0);
+
my $namespace = '/';
+ my $arguments = ( ref( $_[-1] ) eq 'ARRAY' ) ? pop(@_) : $c->req->args;
if ( $command =~ /^\// ) {
$command =~ /^\/(.*)\/(\w+)$/;
my $results = $c->get_action( $command, $namespace );
unless ( @{$results} ) {
- my $class = $command || '';
- my $path = $class . '.pm';
- $path =~ s/::/\//g;
-
- unless ( $INC{$path} ) {
- my $error =
- qq/Couldn't forward to "$class". Invalid or not loaded./;
- $c->error($error);
- $c->log->debug($error) if $c->debug;
- return 0;
- }
- unless ( UNIVERSAL::isa( $class, 'Catalyst::Base' ) ) {
+ unless ( defined( $c->components->{$command} ) ) {
my $error =
- qq/Can't forward to "$class". Class is not a Catalyst component./;
+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';
- if ( my $code = $class->can($method) ) {
+ if ( my $code = $c->components->{$class}->can($method) ) {
$c->actions->{reverse}->{"$code"} = "$class->$method";
$results = [ [ [ $class, $code ] ] ];
- }
-
- else {
+ } else {
my $error =
qq/Couldn't forward to "$class". Does not implement "$method"/;
$c->error($error);
}
+ local $c->request->{arguments} = [ @{$arguments} ];
+
for my $result ( @{$results} ) {
$c->execute( @{ $result->[0] } );
return if scalar @{ $c->error };
push @results, [$result] if $result;
my $visitor = Tree::Simple::Visitor::FindByPath->new;
+ SEARCH:
for my $part ( split '/', $namespace ) {
$visitor->setSearchPath($part);
$parent->accept($visitor);
my $uid = $child->getUID if $child;
my $match = $c->actions->{private}->{$uid}->{$action} if $uid;
push @results, [$match] if $match;
- $parent = $child if $child;
+ if ($child) {
+ $parent = $child;
+ }
+ else {
+ last SEARCH;
+ }
}
}
if ( $flags{path} ) {
$flags{path} =~ s/^\w+//;
$flags{path} =~ s/\w+$//;
- if ( $flags{path} =~ /^'(.*)'$/ ) { $flags{path} = $1 }
- if ( $flags{path} =~ /^"(.*)"$/ ) { $flags{path} = $1 }
+ if ( $flags{path} =~ /^\s*'(.*)'\s*$/ ) { $flags{path} = $1 }
+ if ( $flags{path} =~ /^\s*"(.*)"\s*$/ ) { $flags{path} = $1 }
}
if ( $flags{regex} ) {
$flags{regex} =~ s/^\w+//;
$flags{regex} =~ s/\w+$//;
- if ( $flags{regex} =~ /^'(.*)'$/ ) { $flags{regex} = $1 }
- if ( $flags{regex} =~ /^"(.*)"$/ ) { $flags{regex} = $1 }
+ if ( $flags{regex} =~ /^\s*'(.*)'\s*$/ ) { $flags{regex} = $1 }
+ if ( $flags{regex} =~ /^\s*"(.*)"\s*$/ ) { $flags{regex} = $1 }
}
my $reverse = $prefix ? "$prefix/$method" : $method;
};
$walker->( $walker, $self->tree, '' );
- $self->log->debug( 'Loaded private actions', $privates->draw )
+ $self->log->debug( "Loaded private actions:\n" . $privates->draw )
if ( @{ $privates->{tbl_rows} } );
my $publics = Text::ASCIITable->new;
$publics->addRow( "/$plain", $reverse );
}
- $self->log->debug( 'Loaded public actions', $publics->draw )
+ $self->log->debug( "Loaded public actions:\n" . $publics->draw )
if ( @{ $publics->{tbl_rows} } );
my $regexes = Text::ASCIITable->new;
$regexes->addRow( $regex, $reverse );
}
- $self->log->debug( 'Loaded regex actions', $regexes->draw )
+ $self->log->debug( "Loaded regex actions:\n" . $regexes->draw )
if ( @{ $regexes->{tbl_rows} } );
}