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/;
my $result;
- my $command_copy = $command;
+ unless ( ref $command ) {
+ my $command_copy = $command;
- unless ( $command_copy =~ s/^\/// ) {
- my $namespace = $c->namespace;
- $command_copy = "${namespace}/${command}";
- }
+ unless ( $command_copy =~ s/^\/// ) {
+ my $namespace = $c->namespace;
+ $command_copy = "${namespace}/${command}";
+ }
- unless ( $command_copy =~ /\// ) {
- $result = $c->get_action( $command_copy, '/' );
- }
- else {
- my @extra_args;
- DESCEND: while ( $command_copy =~ s/^(.*)\/(\w+)$/$1/ ) {
- my $tail = $2;
- $result = $c->get_action( $tail, $1 );
- if ( $result ) {
- $command = $tail;
- push( @{$arguments}, @extra_args );
- last DESCEND;
+ unless ( $command_copy =~ /\// ) {
+ $result = $c->get_action( $command_copy, '/' );
+ }
+ else {
+ my @extra_args;
+ DESCEND: while ( $command_copy =~ s/^(.*)\/(\w+)$/$1/ ) {
+ my $tail = $2;
+ $result = $c->get_action( $tail, $1 );
+ if ($result) {
+ $command = $tail;
+ push( @{$arguments}, @extra_args );
+ last DESCEND;
+ }
+ unshift( @extra_args, $tail );
}
- unshift( @extra_args, $tail );
}
}
- unless ( $result ) {
+ unless ($result) {
- unless ( $c->components->{$command} ) {
+ my $class = ref($command) || ref($c->component($command));
+ my $method = shift || 'process';
+
+ unless ( $class ) {
my $error =
qq/Couldn't forward to command "$command". Invalid action or component./;
$c->error($error);
return 0;
}
- my $class = $command;
- 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);
return unless @match;
- if ( my $action = $match[-1]->get_action( $c, $name ) )
- {
+ if ( my $action = $match[-1]->get_action( $c, $name ) ) {
return $action if $action->namespace eq $namespace;
}
}
my @match = $self->get_containers($namespace);
- return map { $_->get_action($c, $action) } @match;
+ return map { $_->get_action( $c, $action ) } @match;
}
=item $self->get_containers( $namespace )
}
# Set the method value
- $parent->getNodeValue->actions->{$action->name} = $action;
+ $parent->getNodeValue->actions->{ $action->name } = $action;
my $registered = $self->registered_dispatch_types;
- foreach my $key (keys %{$action->attributes}) {
- my $class = "Catalyst::DispatchType::$key";
- unless ( $registered->{$class} ) {
- eval "require $class";
- push( @{ $self->dispatch_types }, $class->new ) unless $@;
- $registered->{$class} = 1;
- }
+ foreach my $key ( keys %{ $action->attributes } ) {
+ my $class = "Catalyst::DispatchType::$key";
+ unless ( $registered->{$class} ) {
+ eval "require $class";
+ push( @{ $self->dispatch_types }, $class->new ) unless $@;
+ $registered->{$class} = 1;
+ }
}
# Pass the action to our dispatch types so they can register it if reqd.
$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) {
Catalyst::ActionContainer->new( { part => '/', actions => {} } );
$self->tree( Tree::Simple->new( $container, Tree::Simple->ROOT ) );
- $c->register_actions( $c );
+ $c->register_actions($c);
- foreach my $comp ( values %{$c->components} ) {
- $comp->register_actions( $c ) if $comp->can('register_actions');
+ foreach my $comp ( values %{ $c->components } ) {
+ $comp->register_actions($c) if $comp->can('register_actions');
}
# Postload action types
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 };