projects / catagits/Catalyst-Runtime.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw
Removed a couple warn calls
[catagits/Catalyst-Runtime.git] / lib / Catalyst / Engine.pm
diff --git a/lib/Catalyst/Engine.pm b/lib/Catalyst/Engine.pm
index 7b8fe91..2230908 100644 (file)
--- a/lib/Catalyst/Engine.pm
+++ b/lib/Catalyst/Engine.pm
@@ -45,14 +45,14 @@ Finalize body.  Prints the response output.
 sub finalize_body {
     my ( $self, $c ) = @_;
     if ( ref $c->response->body && $c->response->body->can('read') ) {
-        my $buffer;
         while ( !$c->response->body->eof() ) {
-            $c->response->body->read( $buffer, $CHUNKSIZE );
+            $c->response->body->read( my $buffer, $CHUNKSIZE );
             $self->write( $c, $buffer );
         }
+        $c->response->body->close();
     }
     else {
-        $self->write( $c, $c->response->output );
+        $self->write( $c, $c->response->body );
     }
 }
 
@@ -117,15 +117,26 @@ sub finalize_error {
         my $req   = encode_entities Dumper $c->req;
         my $res   = encode_entities Dumper $c->res;
         my $stash = encode_entities Dumper $c->stash;
-        $infos = <<"";
-<br/>
-<b><u>Request</u></b><br/>
-<pre>$req</pre>
-<b><u>Response</u></b><br/>
-<pre>$res</pre>
-<b><u>Stash</u></b><br/>
-<pre>$stash</pre>
 
+        my @infos;
+        my $i = 0;
+        for my $dump ( $c->dump_these ) {
+            my $name  = $dump->[0];
+            my $value = encode_entities( Dumper $dump->[1] );
+            push @infos, sprintf <<"EOF", $name, $value;
+<div>
+    <b><u>
+        <a href="#" onclick="toggleDump(dump_$i); return false">%s</a>
+    </u></b>
+</div>
+<br/>
+<div id="dump_$i">
+    <pre>%s</pre>
+</div>
+EOF
+            $i++;
+        }
+        $infos = join "\n", @infos;
     }
     else {
         $title = $name;
@@ -148,6 +159,18 @@ sub finalize_error {
 <html>
 <head>
     <title>$title</title>
+    <script language="JavaScript">
+        <!--
+        function toggleDump (dumpElement) {
+            if (dumpElement.style.display == "none") {
+                dumpElement.style.display = "";
+            }
+            else {
+                dumpElement.style.display = "none";
+            }
+        }
+        -->
+    </script>
     <style type="text/css">
         body {
             font-family: "Bitstream Vera Sans", "Trebuchet MS", Verdana,
@@ -157,6 +180,9 @@ sub finalize_error {
             margin: 0px;
             padding: 0px;
         }
+        :link, :link:hover, :visited, :visited:hover {
+            color: #ddd;
+        }
         div.box {
             background-color: #ccc;
             border: 1px solid #aaa;
The Perl MVC Framework (catagits@git.shadowcat.co.uk:Catalyst-Runtime.git)