fixed borked Cookbook merge

[catagits/Catalyst-Runtime.git] / lib / Catalyst / Dispatcher.pm

diff --git a/lib/Catalyst/Dispatcher.pm b/lib/Catalyst/Dispatcher.pm
index af4f7ce..7e534e0 100644 (file)
--- a/lib/Catalyst/Dispatcher.pm
+++ b/lib/Catalyst/Dispatcher.pm
@@ -24,15 +24,15 @@ See L<Catalyst>.
 
 =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 $Catalyst::Engine::DETACH;
 }
 
@@ -104,7 +104,7 @@ sub dispatch {
     }
 }
 
-=item $c->forward($command [args]))
+=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().
@@ -130,15 +130,7 @@ sub forward {
 
     my $caller    = caller(0);
     my $namespace = '/';
-    my $args;
-
-    if ( ref( $_[0] ) eq 'ARRAY' ) {
-        $args=$c->req->args();
-        $c->req->args( shift );
-    } elsif ( ref( $_[1] ) eq 'ARRAY' ) {
-        $args=$c->req->args();
-        $c->req->args( $_[1] );
-    }
+    my $arguments = ( ref( $_[-1] ) eq 'ARRAY' ) ? pop(@_) : $c->req->args;
 
     if ( $command =~ /^\// ) {
         $command =~ /^\/(.*)\/(\w+)$/;
@@ -156,29 +148,19 @@ sub forward {
     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 ( $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 ] ] ];
         }
@@ -194,14 +176,14 @@ sub forward {
 
     }
 
+    local $c->request->{arguments} = [ @{$arguments} ];
+
     for my $result ( @{$results} ) {
         $c->execute( @{ $result->[0] } );
-        last if scalar @{ $c->error };
+        return if scalar @{ $c->error };
         last unless $c->state;
     }
-    $c->req->args( $args ) if $args;
 
-    return if scalar @{ $c->error };
     return $c->state;
 }