X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst%2FEngine.pm;h=de7e082ba29e9c7ca98fd583fae07f3256992f6c;hp=4e63058ecb0da12bad064ddb3a020be30650c6ce;hb=21465c884872c1ec8c30acd72796445f9eaacb31;hpb=f45789b1af1b76c31c498f4b713ab48a5f28ba0c
diff --git a/lib/Catalyst/Engine.pm b/lib/Catalyst/Engine.pm
index 4e63058..de7e082 100644
--- 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 '
', @{ $c->error };
+
+ # For pretty dumps
+ local $Data::Dumper::Terse = 1;
+ $error = join '',
+ map { '' . encode_entities($_) . '' }
+ @{ $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;
+ }
@@ -418,8 +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)",
- $t->draw );
+ $class->log->info(
+ "Request took ${elapsed}s ($av/s)\n" . $t->draw );
}
else { $status = &$handler }
@@ -671,105 +677,6 @@ Returns a C object.
my $res = $c->res;
-=item $class->setup
-
-Setup.
-
- MyApp->setup;
-
-=cut
-
-sub setup {
- my $self = shift;
-
- # Initialize our data structure
- $self->components( {} );
-
- $self->setup_components;
-
- if ( $self->debug ) {
- my $t = Text::ASCIITable->new;
- $t->setOptions( 'hide_HeadRow', 1 );
- $t->setOptions( 'hide_HeadLine', 1 );
- $t->setCols('Class');
- $t->setColWidth( 'Class', 75, 1 );
- $t->addRow($_) for sort keys %{ $self->components };
- $self->log->debug( "Loaded components:\n" . $t->draw )
- if ( @{ $t->{tbl_rows} } );
- }
-
- # Add our self to components, since we are also a component
- $self->components->{$self} = $self;
-
- $self->setup_actions;
-
- if ( $self->debug ) {
- my $name = $self->config->{name} || 'Application';
- $self->log->info("$name powered by Catalyst $Catalyst::VERSION");
- }
-}
-
-=item $class->setup_components
-
-Setup components.
-
-=cut
-
-sub setup_components {
- my $self = shift;
-
- my $callback = sub {
- my ( $component, $context ) = @_;
-
- unless ( $component->isa('Catalyst::Base') ) {
- return $component;
- }
-
- my $suffix = Catalyst::Utils::class2classsuffix($component);
- my $config = $self->config->{$suffix} || {};
-
- my $instance;
-
- eval { $instance = $component->new( $context, $config ); };
-
- if ( my $error = $@ ) {
-
- chomp $error;
-
- Catalyst::Exception->throw(
- message => qq/Couldn't instantiate component "$component", "$error"/
- );
- }
-
- return $instance;
- };
-
- eval {
- Module::Pluggable::Fast->import(
- name => '_components',
- search => [
- "$self\::Controller", "$self\::C",
- "$self\::Model", "$self\::M",
- "$self\::View", "$self\::V"
- ],
- callback => $callback
- );
- };
-
- if ( my $error = $@ ) {
-
- chomp $error;
-
- Catalyst::Exception->throw(
- message => qq/Couldn't load components "$error"/
- );
- }
-
- for my $component ( $self->_components($self) ) {
- $self->components->{ ref $component || $component } = $component;
- }
-}
-
=item $c->state
Contains the return value of the last executed action.