X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst.pm;h=c6f74047ca023ed2748a002db64ddd4d1e957f49;hb=9d3e016eb160b2d8a78cd34cec35bda020b9ed99;hp=781736c25994478e6b2f35a4d86aa823dcaf9275;hpb=261c571ec577304a8a41218a4576675c8099069a;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm index 781736c..c6f7404 100644 --- a/lib/Catalyst.pm +++ b/lib/Catalyst.pm @@ -22,7 +22,7 @@ __PACKAGE__->mk_accessors( qw/counter depth request response state action namespace/ ); -attributes->import(__PACKAGE__, \&namespace, 'lvalue'); +attributes->import( __PACKAGE__, \&namespace, 'lvalue' ); # Laziness++ *comp = \&component; @@ -415,8 +415,11 @@ sub setup { $class->setup_components; if ( $class->debug ) { - my $t = Text::SimpleTable->new(76); - $t->row($_) for sort keys %{ $class->components }; + my $t = Text::SimpleTable->new( [ 65, 'Class' ], [ 8, 'Type' ] ); + for my $comp ( sort keys %{ $class->components } ) { + my $type = ref $class->components->{$comp} ? 'instance' : 'class'; + $t->row( $comp, $type ); + } $class->log->debug( "Loaded components:\n" . $t->draw ) if ( keys %{ $class->components } ); } @@ -991,7 +994,7 @@ Get an action in a given namespace. =cut -sub get_action { my $c = shift; $c->dispatcher->get_action( @_ ) } +sub get_action { my $c = shift; $c->dispatcher->get_action(@_) } =item $c->get_actions( $action, $namespace )