fixed absolute forward in root and cleaned tables

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

diff --git a/lib/Catalyst/Engine.pm b/lib/Catalyst/Engine.pm
index 9971412..641cc6d 100644 (file)
--- a/lib/Catalyst/Engine.pm
+++ b/lib/Catalyst/Engine.pm
@@ -1,8 +1,7 @@
 package Catalyst::Engine;
 
 use strict;
-use base
-  qw/Class::Data::Inheritable Class::Accessor::Fast Catalyst::Dispatcher/;
+use base qw/Class::Data::Inheritable Class::Accessor::Fast/;
 use UNIVERSAL::require;
 use CGI::Cookie;
 use Data::Dumper;
@@ -10,7 +9,6 @@ use HTML::Entities;
 use HTTP::Headers;
 use Time::HiRes qw/gettimeofday tv_interval/;
 use Text::ASCIITable;
-use Text::ASCIITable::Wrap 'wrap';
 use Catalyst::Request;
 use Catalyst::Request::Upload;
 use Catalyst::Response;
@@ -355,9 +353,7 @@ sub handler {
             $t->setColWidth( 'Action', 64, 1 );
             $t->setColWidth( 'Time',   9,  1 );
 
-            for my $stat (@stats) {
-                $t->addRow( wrap( $stat->[0], 64 ), wrap( $stat->[1], 9 ) );
-            }
+            for my $stat (@stats) { $t->addRow( $stat->[0], $stat->[1] ) }
             $class->log->info( "Request took $elapsed" . "s ($av/s)",
                 $t->draw );
         }
@@ -426,7 +422,7 @@ sub prepare {
         $t->setColWidth( 'Value', 36, 1 );
         for my $key ( keys %{ $c->req->params } ) {
             my $value = $c->req->params->{$key} || '';
-            $t->addRow( wrap( $key, 37 ), wrap( $value, 36 ) );
+            $t->addRow( $key, $value );
         }
         $c->log->debug( 'Parameters are', $t->draw );
     }
@@ -614,6 +610,12 @@ sub setup_components {
         $self->components->{ ref $comp } = $comp;
         push @comps, $comp;
     }
+    my $t = Text::ASCIITable->new( { hide_HeadRow => 1, hide_HeadLine => 1 } );
+    $t->setCols('Class');
+    $t->setColWidth( 'Class', 75, 1 );
+    $t->addRow($_) for keys %{ $self->components };
+    $self->log->debug( 'Loaded components', $t->draw )
+      if ( @{ $t->{tbl_rows} } && $self->debug );
     $self->setup_actions( [ $self, @comps ] );
 }