X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FDispatcher.pm;h=bb7b44423aa3459838c5450e844b16c7e343854e;hb=49070d25dbed19417f2d64bae672bc03e8ea160e;hp=5d92eb2e4d3debd46aa4485fd6291bc052ff49cc;hpb=91d4abc5cc6b75fb46cef7aac04f3cb58f6b3551;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Dispatcher.pm b/lib/Catalyst/Dispatcher.pm
index 5d92eb2..bb7b444 100644
--- a/lib/Catalyst/Dispatcher.pm
+++ b/lib/Catalyst/Dispatcher.pm
@@ -8,14 +8,17 @@ use Catalyst::Action;
 use Catalyst::ActionContainer;
 use Catalyst::DispatchType::Default;
 use Catalyst::DispatchType::Index;
-use Text::ASCIITable;
+use Text::SimpleTable;
 use Tree::Simple;
 use Tree::Simple::Visitor::FindByPath;
 
 # Stringify to class
 use overload '""' => sub { return ref shift }, fallback => 1;
 
-__PACKAGE__->mk_accessors(qw/tree dispatch_types registered_dispatch_types/);
+__PACKAGE__->mk_accessors(
+    qw/tree dispatch_types registered_dispatch_types
+      method_action_class action_container_class/
+);
 
 # Preload these action types
 our @PRELOAD = qw/Path Regex/;
@@ -77,6 +80,8 @@ sub forward {
     my $c       = shift;
     my $command = shift;
 
+    $command = ref $command if ref $command;
+
     unless ($command) {
         $c->log->debug('Nothing to forward to') if $c->debug;
         return 0;
@@ -101,7 +106,7 @@ sub forward {
       DESCEND: while ( $command_copy =~ s/^(.*)\/(\w+)$/$1/ ) {
             my $tail = $2;
             $result = $c->get_action( $tail, $1 );
-            if ( $result ) {
+            if ($result) {
                 $command = $tail;
                 push( @{$arguments}, @extra_args );
                 last DESCEND;
@@ -110,9 +115,11 @@ sub forward {
         }
     }
 
-    unless ( $result ) {
+    unless ($result) {
+
+        my $comp;
 
-        unless ( $c->components->{$command} ) {
+        unless ( $comp = $c->component($command) ) {
             my $error =
 qq/Couldn't forward to command "$command". Invalid action or component./;
             $c->error($error);
@@ -120,11 +127,11 @@ qq/Couldn't forward to command "$command". Invalid action or component./;
             return 0;
         }
 
-        my $class  = $command;
+        my $class  = ref $comp;
         my $method = shift || 'process';
 
-        if ( my $code = $c->components->{$class}->can($method) ) {
-            my $action = Catalyst::Action->new(
+        if ( my $code = $class->can($method) ) {
+            my $action = $self->method_action_class->new(
                 {
                     name      => $method,
                     code      => $code,
@@ -148,7 +155,6 @@ qq/Couldn't forward to command "$command". Invalid action or component./;
     }
 
     local $c->request->{arguments} = [ @{$arguments} ];
-    local $c->{namespace} = $result->namespace;
 
     $result->execute($c);
 
@@ -202,8 +208,7 @@ sub get_action {
 
     return unless @match;
 
-    if ( my $action = $match[-1]->get_action( $c, $name ) )
-    {
+    if ( my $action = $match[-1]->get_action( $c, $name ) ) {
         return $action if $action->namespace eq $namespace;
     }
 }
@@ -220,7 +225,7 @@ sub get_actions {
 
     my @match = $self->get_containers($namespace);
 
-    return map { $_->get_action($c, $action) } @match;
+    return map { $_->get_action( $c, $action ) } @match;
 }
 
 =item $self->get_containers( $namespace )
@@ -297,17 +302,17 @@ sub register {
     }
 
     # Set the method value
-    $parent->getNodeValue->actions->{$action->name} = $action;
+    $parent->getNodeValue->actions->{ $action->name } = $action;
 
     my $registered = $self->registered_dispatch_types;
 
-    foreach my $key (keys %{$action->attributes}) {
-            my $class = "Catalyst::DispatchType::$key";
-            unless ( $registered->{$class} ) {
-                eval "require $class";
-                push( @{ $self->dispatch_types }, $class->new ) unless $@;
-                $registered->{$class} = 1;
-            }
+    foreach my $key ( keys %{ $action->attributes } ) {
+        my $class = "Catalyst::DispatchType::$key";
+        unless ( $registered->{$class} ) {
+            eval "require $class";
+            push( @{ $self->dispatch_types }, $class->new ) unless $@;
+            $registered->{$class} = 1;
+        }
     }
 
     # Pass the action to our dispatch types so they can register it if reqd.
@@ -325,6 +330,8 @@ sub setup_actions {
 
     $self->dispatch_types( [] );
     $self->registered_dispatch_types( {} );
+    $self->method_action_class('Catalyst::Action');
+    $self->action_container_class('Catalyst::ActionContainer');
 
     # Preload action types
     for my $type (@PRELOAD) {
@@ -341,10 +348,10 @@ sub setup_actions {
       Catalyst::ActionContainer->new( { part => '/', actions => {} } );
     $self->tree( Tree::Simple->new( $container, Tree::Simple->ROOT ) );
 
-    $c->register_actions( $c );
+    $c->register_actions($c);
 
-    foreach my $comp ( values %{$c->components} ) {
-        $comp->register_actions( $c ) if $comp->can('register_actions');
+    foreach my $comp ( values %{ $c->components } ) {
+        $comp->register_actions($c) if $comp->can('register_actions');
     }
 
     # Postload action types
@@ -358,11 +365,9 @@ sub setup_actions {
 
     return unless $c->debug;
 
-    my $privates = Text::ASCIITable->new;
-    $privates->setCols( 'Private', 'Class' );
-    $privates->setColWidth( 'Private', 36, 1 );
-    $privates->setColWidth( 'Class',   37, 1 );
+    my $privates = Text::SimpleTable->new( [ 36, 'Private' ], [ 37, 'Class' ] );
 
+    my $has_private = 0;
     my $walker = sub {
         my ( $walker, $parent, $prefix ) = @_;
         $prefix .= $parent->getNodeValue || '';
@@ -374,7 +379,8 @@ sub setup_actions {
             next
               if ( ( $action =~ /^_.*/ )
                 && ( !$c->config->{show_internal_actions} ) );
-            $privates->addRow( "$prefix$action", $action_obj->class );
+            $privates->row( "$prefix$action", $action_obj->class );
+            $has_private = 1;
         }
 
         $walker->( $walker, $_, $prefix ) for $parent->getAllChildren;
@@ -382,7 +388,7 @@ sub setup_actions {
 
     $walker->( $walker, $self->tree, '' );
     $c->log->debug( "Loaded Private actions:\n" . $privates->draw )
-      if ( @{ $privates->{tbl_rows} } );
+      if ($has_private);
 
     # List all public actions
     $_->list($c) for @{ $self->dispatch_types };
@@ -393,6 +399,7 @@ sub setup_actions {
 =head1 AUTHOR
 
 Sebastian Riedel, C<sri@cpan.org>
+Matt S Trout, C<mst@shadowcatsystems.co.uk>
 
 =head1 COPYRIGHT