X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FDispatcher.pm;h=616465fd4829cfe0ee24339c1942416ed27c966a;hb=14d2fa6a7c8d5033bcec01095abe5f95610e91db;hp=bb557cadde490bd60297a31b361af6d757404f68;hpb=9c1fc6d6a8c4701fa842fa5229c99d103aee1afa;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Dispatcher.pm b/lib/Catalyst/Dispatcher.pm
index bb557ca..616465f 100644
--- a/lib/Catalyst/Dispatcher.pm
+++ b/lib/Catalyst/Dispatcher.pm
@@ -14,6 +14,7 @@ use Catalyst::Utils;
 use Text::SimpleTable;
 use Tree::Simple;
 use Tree::Simple::Visitor::FindByPath;
+use Class::Load qw(load_class try_load_class);
 
 use namespace::clean -except => 'meta';
 
@@ -110,7 +111,7 @@ sub dispatch {
         my $error = $path
           ? qq/Unknown resource "$path"/
           : "No default action defined";
-        $c->log->error($error) if $c->debug;
+        $c->trace(1, $error);
         $c->error($error);
     }
 }
@@ -124,7 +125,7 @@ sub _command2action {
     my ( $self, $c, $command, @extra_params ) = @_;
 
     unless ($command) {
-        $c->log->debug('Nothing to go to') if $c->debug;
+        $c->trace(1,'Nothing to go to');
         return 0;
     }
 
@@ -199,7 +200,7 @@ sub _do_visit {
 
     if($error) {
         $c->error($error);
-        $c->log->debug($error) if $c->debug;
+        $c->trace(1,$error);
         return 0;
     }
 
@@ -247,7 +248,7 @@ sub _do_forward {
         my $error .= qq/Couldn't $opname to command "$command": /
                     .qq/Invalid action or component./;
         $c->error($error);
-        $c->log->debug($error) if $c->debug;
+        $c->trace(1,$error);
         return 0;
     }
 
@@ -344,8 +345,7 @@ sub _invoke_as_component {
         my $error =
           qq/Couldn't forward to "$component_class". Does not implement "$method"/;
         $c->error($error);
-        $c->log->debug($error)
-          if $c->debug;
+        $c->trace(1,$error);
         return 0;
     }
 }
@@ -384,11 +384,11 @@ sub prepare_action {
 
     s/%([0-9A-Fa-f]{2})/chr(hex($1))/eg for grep { defined } @{$req->captures||[]};
 
-    $c->log->debug( 'Path is "' . $req->match . '"' )
-      if ( $c->debug && defined $req->match && length $req->match );
+    $c->trace(1, 'Path is "' . $req->match . '"' )
+      if (defined $req->match && length $req->match );
 
-    $c->log->debug( 'Arguments are "' . join( '/', @args ) . '"' )
-      if ( $c->debug && @args );
+    $c->trace(1, 'Arguments are "' . join( '/', @args ) . '"' )
+      if @args;
 }
 
 =head2 $self->get_action( $action, $namespace )
@@ -516,8 +516,11 @@ sub register {
         unless ( $registered->{$class} ) {
             # FIXME - Some error checking and re-throwing needed here, as
             #         we eat exceptions loading dispatch types.
-            eval { Class::MOP::load_class($class) };
-            push( @{ $self->dispatch_types }, $class->new ) unless $@;
+            # see also try_load_class
+            eval { load_class($class) };
+            my $load_failed = $@;
+            $self->_check_deprecated_dispatch_type( $key, $load_failed );
+            push( @{ $self->dispatch_types }, $class->new ) unless $load_failed;
             $registered->{$class} = 1;
         }
     }
@@ -607,7 +610,7 @@ sub setup_actions {
 
     $self->_load_dispatch_types( @{ $self->postload_dispatch_types } );
 
-    return unless $c->debug;
+    return unless $c->trace_level;
     $self->_display_action_tables($c);
 }
 
@@ -642,7 +645,7 @@ sub _display_action_tables {
     };
 
     $walker->( $walker, $self->_tree, '' );
-    $c->log->debug( "Loaded Private actions:\n" . $privates->draw . "\n" )
+    $c->trace(1, "Loaded Private actions:\n" . $privates->draw . "\n" )
       if $has_private;
 
     # List all public actions
@@ -658,9 +661,8 @@ sub _load_dispatch_types {
         # first param is undef because we cannot get the appclass
         my $class = Catalyst::Utils::resolve_namespace(undef, 'Catalyst::DispatchType', $type);
 
-        eval { Class::MOP::load_class($class) };
-        Catalyst::Exception->throw( message => qq/Couldn't load "$class"/ )
-          if $@;
+        my ($success, $error) = try_load_class($class);
+        Catalyst::Exception->throw( message => $error ) if not $success;
         push @{ $self->dispatch_types }, $class->new;
 
         push @loaded, $class;
@@ -689,6 +691,28 @@ sub dispatch_type {
     return undef;
 }
 
+sub _check_deprecated_dispatch_type {
+    my ($self, $key, $load_failed) = @_;
+
+    return unless $key =~ /^(Local)?Regexp?/;
+
+    # TODO: Should these throw an exception rather than just warning?
+    if ($load_failed) {
+        warn(   "Attempt to use deprecated $key dispatch type.\n"
+              . "  Use Chained methods or install the standalone\n"
+              . "  Catalyst::DispatchType::Regex if necessary.\n" );
+    } elsif ( !defined $Catalyst::DispatchType::Regex::VERSION
+        || $Catalyst::DispatchType::Regex::VERSION le '5.90020' ) {
+        # We loaded the old core version of the Regex module this will break
+        warn(   "The $key DispatchType has been removed from Catalyst core.\n"
+              . "  An old version of the core Catalyst::DispatchType::Regex\n"
+              . "  has been loaded and will likely fail. Please remove\n"
+              . "   $INC{'Catalyst/DispatchType/Regex.pm'}\n"
+              . "  and use Chained methods or install the standalone\n"
+              . "  Catalyst::DispatchType::Regex if necessary.\n" );
+    }
+}
+
 use Moose;
 
 # 5.70 backwards compatibility hacks.