Minor engine cleanup

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

diff --git a/lib/Catalyst/Dispatcher.pm b/lib/Catalyst/Dispatcher.pm
index cf05df1..91e39a5 100644 (file)
--- a/lib/Catalyst/Dispatcher.pm
+++ b/lib/Catalyst/Dispatcher.pm
@@ -2,7 +2,7 @@ package Catalyst::Dispatcher;
 
 use strict;
 use base 'Class::Data::Inheritable';
-use Memoize;
+use Catalyst::Utils;
 use Text::ASCIITable;
 use Tree::Simple;
 use Tree::Simple::Visitor::FindByPath;
@@ -17,11 +17,9 @@ __PACKAGE__->actions(
 # We use a tree
 __PACKAGE__->tree( Tree::Simple->new( 0, Tree::Simple->ROOT ) );
 
-memoize('_class2prefix');
-
 =head1 NAME
 
-Catalyst::Dispatch - The Catalyst Dispatcher
+Catalyst::Dispatcher - The Catalyst Dispatcher
 
 =head1 SYNOPSIS
 
@@ -48,7 +46,8 @@ sub dispatch {
 
     unless ($namespace) {
         if ( my $result = $c->get_action($action) ) {
-            $namespace = _class2prefix( $result->[0]->[0]->[0] );
+            $namespace =
+              Catalyst::Utils::class2prefix( $result->[0]->[0]->[0] );
         }
     }
 
@@ -66,16 +65,15 @@ sub dispatch {
         }
 
         # Execute the auto chain
-        my $auto = 0;
-        for my $auto ( @{ $c->get_action( 'auto', $namespace ) } ) {
+        my $auto;
+        for $auto ( @{ $c->get_action( 'auto', $namespace ) } ) {
             $c->execute( @{ $auto->[0] } );
             return if scalar @{ $c->error };
             last unless $c->state;
-            $auto++;
         }
 
         # Execute the action or last default
-        my $mkay = $auto ? $c->state ? 1 : 0 : 1;
+        my $mkay = defined $auto ? $c->state ? 1 : 0 : 1;
         if ( ( my $action = $c->req->action ) && $mkay ) {
             if ( my $result = @{ $c->get_action( $action, $default ) }[-1] ) {
                 $c->execute( @{ $result->[0] } );
@@ -130,15 +128,26 @@ sub forward {
         $command =~ s/^\///;
     }
 
-    else { $namespace = _class2prefix($caller) || '/' }
+    else { $namespace = Catalyst::Utils::class2prefix($caller) || '/' }
 
     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;
+        }
 
-        if ( $class =~ /[^\w\:]/ ) {
-            my $error = qq/Couldn't forward to "$class"/;
+        unless ( UNIVERSAL::isa( $class, 'Catalyst::Base' ) ) {
+            my $error =
+              qq/Can't forward to "$class". Class is not a Catalyst component./;
             $c->error($error);
             $c->log->debug($error) if $c->debug;
             return 0;
@@ -152,7 +161,8 @@ sub forward {
         }
 
         else {
-            my $error = qq/Couldn't forward to "$class"/;
+            my $error =
+              qq/Couldn't forward to "$class". Does not implement "$method"/;
             $c->error($error);
             $c->log->debug($error)
               if $c->debug;
@@ -236,13 +246,7 @@ sub get_action {
             my $name  = $c->actions->{compiled}->[$i]->[0];
             my $regex = $c->actions->{compiled}->[$i]->[1];
 
-            if ( $action =~ $regex ) {
-                my @snippets;
-                for my $i ( 1 .. 9 ) {
-                    no strict 'refs';
-                    last unless ${$i};
-                    push @snippets, ${$i};
-                }
+            if ( my @snippets = ( $action =~ $regex ) ) {
                 return [ [ $c->actions->{regex}->{$name}, $name, \@snippets ] ];
             }
 
@@ -260,7 +264,7 @@ Set an action in a given namespace.
 sub set_action {
     my ( $c, $method, $code, $namespace, $attrs ) = @_;
 
-    my $prefix = _class2prefix($namespace) || '';
+    my $prefix = Catalyst::Utils::class2prefix($namespace) || '';
     my %flags;
 
     for my $attr ( @{$attrs} ) {
@@ -352,7 +356,7 @@ sub setup_actions {
     for my $comp (@$comps) {
         $comp = ref $comp || $comp;
 
-        for my $action ( @{ $comp->_cache } ) {
+        for my $action ( @{ Catalyst::Utils::reflect_actions($comp) } ) {
             my ( $code, $attrs ) = @{$action};
             my $name = '';
             no strict 'refs';
@@ -442,23 +446,6 @@ sub setup_actions {
       if ( @{ $regexes->{tbl_rows} } && $self->debug );
 }
 
-sub _prefix {
-    my ( $class, $name ) = @_;
-    my $prefix = _class2prefix($class);
-    $name = "$prefix/$name" if $prefix;
-    return $name;
-}
-
-sub _class2prefix {
-    my $class = shift || '';
-    my $prefix;
-    if ( $class =~ /^.*::([MVC]|Model|View|Controller)?::(.*)$/ ) {
-        $prefix = lc $2;
-        $prefix =~ s/\:\:/\//g;
-    }
-    return $prefix;
-}
-
 =back
 
 =head1 AUTHOR