use Catalyst::ActionContainer;
use Catalyst::DispatchType::Default;
use Catalyst::DispatchType::Index;
-use Text::ASCIITable;
+use Text::SimpleTable;
use Tree::Simple;
use Tree::Simple::Visitor::FindByPath;
# Stringify to class
use overload '""' => sub { return ref shift }, fallback => 1;
-__PACKAGE__->mk_accessors(qw/tree dispatch_types registered_dispatch_types/);
+__PACKAGE__->mk_accessors(qw/tree dispatch_types registered_dispatch_types
+ method_action_class action_container_class/);
# Preload these action types
our @PRELOAD = qw/Path Regex/;
unless ( $result ) {
- unless ( $c->components->{$command} ) {
+ my $comp;
+
+ unless ( $comp = $c->component($command) ) {
my $error =
qq/Couldn't forward to command "$command". Invalid action or component./;
$c->error($error);
return 0;
}
- my $class = $command;
+ my $class = ref $comp;
my $method = shift || 'process';
- if ( my $code = $c->components->{$class}->can($method) ) {
- my $action = Catalyst::Action->new(
+ if ( my $code = $class->can($method) ) {
+ my $action = $self->method_action_class->new(
{
name => $method,
code => $code,
}
local $c->request->{arguments} = [ @{$arguments} ];
- local $c->{namespace} = $result->namespace;
$result->execute($c);
$self->dispatch_types( [] );
$self->registered_dispatch_types( {} );
+ $self->method_action_class( 'Catalyst::Action' );
+ $self->action_container_class( 'Catalyst::ActionContainer' );
# Preload action types
for my $type (@PRELOAD) {
return unless $c->debug;
- my $privates = Text::ASCIITable->new;
- $privates->setCols( 'Private', 'Class' );
- $privates->setColWidth( 'Private', 36, 1 );
- $privates->setColWidth( 'Class', 37, 1 );
+ my $privates
+ = Text::SimpleTable->new( [ 36, 'Private' ], [ 37, 'Class' ] );
+ my $has_private = 0;
my $walker = sub {
my ( $walker, $parent, $prefix ) = @_;
$prefix .= $parent->getNodeValue || '';
next
if ( ( $action =~ /^_.*/ )
&& ( !$c->config->{show_internal_actions} ) );
- $privates->addRow( "$prefix$action", $action_obj->class );
+ $privates->row( "$prefix$action", $action_obj->class );
+ $has_private = 1;
}
$walker->( $walker, $_, $prefix ) for $parent->getAllChildren;
$walker->( $walker, $self->tree, '' );
$c->log->debug( "Loaded Private actions:\n" . $privates->draw )
- if ( @{ $privates->{tbl_rows} } );
+ if ( $has_private );
# List all public actions
$_->list($c) for @{ $self->dispatch_types };
=head1 AUTHOR
Sebastian Riedel, C<sri@cpan.org>
+Matt S Trout, C<mst@shadowcatsystems.co.uk>
=head1 COPYRIGHT