X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FDispatcher.pm;h=7ba40cc10e1ecbe98bad48ae0d799fe45907c3df;hb=e3a1377127efe66e918a24b9fa5275a3d2aa51e0;hp=b9bc30f0f5f6f7dbc601771945944f1e0b620820;hpb=694d15f1f6031de10d1ecb047b9e66dd0982e3a3;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Dispatcher.pm b/lib/Catalyst/Dispatcher.pm
index b9bc30f..7ba40cc 100644
--- a/lib/Catalyst/Dispatcher.pm
+++ b/lib/Catalyst/Dispatcher.pm
@@ -58,7 +58,7 @@ sub dispatch {
     my ( $self, $c ) = @_;
 
     if ( $c->action ) {
-        $c->forward( join( '/', '', $c->namespace, '_DISPATCH' ) );
+        $c->forward( join( '/', '', $c->action->namespace, '_DISPATCH' ) );
     }
 
     else {
@@ -85,7 +85,12 @@ sub forward {
         return 0;
     }
 
-    my $arguments = ( ref( $_[-1] ) eq 'ARRAY' ) ? pop(@_) : $c->req->args;
+    my $local_args = 0;
+    my $arguments  = $c->req->args;
+    if ( ref( $_[-1] ) eq 'ARRAY' ) {
+        $arguments  = pop(@_);
+        $local_args = 1;
+    }
 
     my $result;
 
@@ -93,7 +98,7 @@ sub forward {
         my $command_copy = $command;
 
         unless ( $command_copy =~ s/^\/// ) {
-            my $namespace = $c->namespace;
+            my $namespace = $c->stack->[-1]->namespace;
             $command_copy = "${namespace}/${command}";
         }
 
@@ -106,8 +111,9 @@ sub forward {
                 my $tail = $2;
                 $result = $c->get_action( $tail, $1 );
                 if ($result) {
-                    $command = $tail;
-                    push( @{$arguments}, @extra_args );
+                    $local_args = 1;
+                    $command    = $tail;
+                    unshift( @{$arguments}, @extra_args );
                     last DESCEND;
                 }
                 unshift( @extra_args, $tail );
@@ -135,7 +141,9 @@ qq/Couldn't forward to command "$command". Invalid action or component./;
                     code      => $code,
                     reverse   => "$class->$method",
                     class     => $class,
-                    namespace => $class,
+                    namespace => Catalyst::Utils::class2prefix(
+                        $class, $c->config->{case_sensitive}
+                    ),
                 }
             );
             $result = $action;
@@ -152,9 +160,11 @@ qq/Couldn't forward to command "$command". Invalid action or component./;
 
     }
 
-    local $c->request->{arguments} = [ @{$arguments} ];
-
-    $result->execute($c);
+    if ($local_args) {
+        local $c->request->{arguments} = [ @{$arguments} ];
+        $result->execute($c);
+    }
+    else { $result->execute($c) }
 
     return $c->state;
 }
@@ -188,6 +198,9 @@ sub prepare_action {
         unshift @args, pop @path;
     }
 
+    $c->log->debug( 'Path is "' . $c->req->match . '"' )
+      if ( $c->debug && $c->req->match );
+
     $c->log->debug( 'Arguments are "' . join( '/', @args ) . '"' )
       if ( $c->debug && @args );
 }
@@ -268,6 +281,10 @@ sub get_containers {
     return map { $_->getNodeValue } @match;
 }
 
+=item $self->register( $c, $action )
+
+=cut
+
 sub register {
     my ( $self, $c, $action ) = @_;
 
@@ -367,9 +384,9 @@ sub setup_actions {
     return unless $c->debug;
 
     my $privates = Text::SimpleTable->new(
-        [ 24, 'Private' ],
-        [ 23, 'Class' ],
-        [ 23, 'Method' ]
+        [ 20, 'Private' ],
+        [ 38, 'Class' ],
+        [ 12, 'Method' ]
     );
 
     my $has_private = 0;