X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FEngine.pm;h=de506cb54af73eff4b1601153098817888eb5fa0;hb=c81ae4e1a54b3016a91b61a19abfac302c21ecb7;hp=2082f59c9c8417ae26a78207e58ee865f272370a;hpb=0c2b4ac08eb8e3a3932b4487ebce81c946e3db3b;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst/Engine.pm b/lib/Catalyst/Engine.pm index 2082f59..de506cb 100644 --- a/lib/Catalyst/Engine.pm +++ b/lib/Catalyst/Engine.pm @@ -3,7 +3,7 @@ package Catalyst::Engine; use strict; use base 'Class::Accessor::Fast'; use CGI::Cookie; -use Data::Dumper; +use Data::Dump qw/dump/; use HTML::Entities; use HTTP::Body; use HTTP::Headers; @@ -40,7 +40,7 @@ Finalize body. Prints the response output. sub finalize_body { my ( $self, $c ) = @_; my $body = $c->response->body; - if ( ref $body && ($body->can('read') || ref($body) eq 'GLOB') ) { + if ( ref $body && ( $body->can('read') || ref($body) eq 'GLOB' ) ) { while ( !eof $body ) { read $body, my ($buffer), $CHUNKSIZE; last unless $self->write( $c, $buffer ); @@ -93,13 +93,12 @@ sub finalize_error { my ( $self, $c ) = @_; $c->res->content_type('text/html; charset=utf-8'); - my $name = $c->config->{name} || 'Catalyst Application'; + my $name = $c->config->{name} || join(' ', split('::', ref $c)); my ( $title, $error, $infos ); if ( $c->debug ) { # For pretty dumps - local $Data::Dumper::Terse = 1; $error = join '', map { '
'
. encode_entities($_)
@@ -120,15 +119,11 @@ sub finalize_error {
# Don't show response header state in dump
delete $c->res->{_finalized_headers};
- my $req = encode_entities Dumper $c->req;
- my $res = encode_entities Dumper $c->res;
- my $stash = encode_entities Dumper $c->stash;
-
my @infos;
my $i = 0;
for my $dump ( $c->dump_these ) {
my $name = $dump->[0];
- my $value = encode_entities( Dumper $dump->[1] );
+ my $value = encode_entities( dump( $dump->[1] ));
push @infos, sprintf <<"EOF", $name, $value;
%s