Added recursive -r flag to prove example

[catagits/Catalyst-Runtime.git] / lib / Catalyst / Engine.pm
diff --git a/lib/Catalyst/Engine.pm b/lib/Catalyst/Engine.pm

index d35eb53..de7e082 100644 (file)
--- a/lib/Catalyst/Engine.pm
+++ b/lib/Catalyst/Engine.pm
@@ -16,11 +16,6 @@ use Catalyst::Request::Upload;
 use Catalyst::Response;
 use Catalyst::Utils;
 
-require Module::Pluggable::Fast;
-
-# For pretty dumps
-$Data::Dumper::Terse = 1;
-
 __PACKAGE__->mk_classdata('components');
 __PACKAGE__->mk_accessors(qw/counter depth request response state/);
 
@@ -288,7 +283,12 @@ sub finalize_error {
 
     my ( $title, $error, $infos );
     if ( $c->debug ) {
-        $error = join '<br/>', @{ $c->error };
+
+        # For pretty dumps
+        local $Data::Dumper::Terse = 1;
+        $error = join '',
+          map { '<code class="error">' . encode_entities($_) . '</code>' }
+          @{ $c->error };
         $error ||= 'No output';
         $title = $name = "$name on Catalyst $Catalyst::VERSION";
         my $req   = encode_entities Dumper $c->req;
@@ -364,6 +364,12 @@ sub finalize_error {
             margin: 4px;
             -moz-border-radius: 10px;
         }
+        code.error {
+            display: block;
+            margin: 1em 0;
+            overflow: auto;
+            white-space: pre;
+        }
     </style>
 </head>
 <body>
@@ -418,7 +424,8 @@ sub handler {
             $t->setColWidth( 'Time',   9,  1 );
 
             for my $stat (@stats) { $t->addRow( $stat->[0], $stat->[1] ) }
-            $class->log->info( "Request took ${elapsed}s ($av/s)\n" . $t->draw );
+            $class->log->info(
+                "Request took ${elapsed}s ($av/s)\n" . $t->draw );
         }
         else { $status = &$handler }