Add dump_these method to Catalyst, which returns the structures dumped on error

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

diff --git a/lib/Catalyst/Engine.pm b/lib/Catalyst/Engine.pm
index 7b8fe91..2c39782 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,14 @@ 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>
 
+        $infos = join(
+            "\n", "<br/>",
+            map {
+                sprintf "<b><u>%s</u></b><br/>\n<pre>%s</pre>", $_->[0],
+                  encode_entities( Dumper $_->[1] )
+              } $c->dump_these
+        );
     }
     else {
         $title = $name;