From: Christian Hansen <chansen@cpan.org>
Date: Sun, 24 Apr 2005 20:36:48 +0000 (+0000)
Subject: Impoved error messaging when $c->forward to an non loaded class
X-Git-Tag: 5.7099_04~1437
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=fe14cf787d3101e6b8c63ec881de377ee0528dd6;hp=8f5912113dcd6b0dcd152cfa593fae67cf991ccc

Impoved error messaging when $c->forward to an non loaded class
---

diff --git a/lib/Catalyst/Dispatcher.pm b/lib/Catalyst/Dispatcher.pm
index c3ae865..ea751e5 100644
--- a/lib/Catalyst/Dispatcher.pm
+++ b/lib/Catalyst/Dispatcher.pm
@@ -135,9 +135,11 @@ sub forward {
 
     unless ( @{$results} ) {
         my $class = $command || '';
+        my $path  = $class . '.pm';
+        $path =~ s/::/\//g;
 
-        if ( $class =~ /[^\w\:]/ ) {
-            my $error = qq/"$class" is an invalid Class name/;
+        unless ( $INC{ $path } ) {
+            my $error = qq/Unknown class "$class"/;
             $c->error($error);
             $c->log->debug($error) if $c->debug;
             return 0;
@@ -145,7 +147,6 @@ sub forward {
 
         my $method = shift || 'process';
 
-        require $class;
         if ( my $code = $class->can($method) ) {
             $c->actions->{reverse}->{"$code"} = "$class->$method";
             $results = [ [ [ $class, $code ] ] ];