package Catalyst::Dispatcher;
use strict;
-use base 'Class::Data::Inheritable';
+use base 'Class::Accessor::Fast';
use Catalyst::Exception;
use Catalyst::Utils;
+use Catalyst::Action;
+use Catalyst::ActionContainer;
use Text::ASCIITable;
use Tree::Simple;
use Tree::Simple::Visitor::FindByPath;
-__PACKAGE__->mk_classdata($_) for qw/actions tree/;
+# Stringify to class
+use overload '""' => sub { return ref shift }, fallback => 1;
+
+__PACKAGE__->mk_accessors(qw/actions tree/);
=head1 NAME
=over 4
-=item $c->detach( $command [, \@arguments ] )
-
-Like C<forward> but doesn't return.
+=item $self->detach( $c, $command [, \@arguments ] )
=cut
sub detach {
- my ( $c, $command, @args ) = @_;
+ my ( $self, $c, $command, @args ) = @_;
$c->forward( $command, @args ) if $command;
- die $Catalyst::Engine::DETACH;
+ die $Catalyst::DETACH;
}
-=item $c->dispatch
-
-Dispatch request to actions.
+=item $self->dispatch($c)
=cut
sub dispatch {
- my $c = shift;
- my $action = $c->req->action;
- my $namespace = '';
- $namespace = ( join( '/', @{ $c->req->args } ) || '/' )
- if $action eq 'default';
-
- unless ($namespace) {
- if ( my $result = $c->get_action($action) ) {
- $namespace = Catalyst::Utils::class2prefix( $result->[0]->[0]->[0],
- $c->config->{case_sensitive} );
+ my ( $self, $c ) = @_;
+
+ if ( $c->action ) {
+
+ my @containers = $self->get_containers( $c->namespace );
+ my %actions;
+ foreach my $name (qw/begin auto end/) {
+ $actions{$name} = [
+ map { $_->{$name} }
+ grep { exists $_->{$name} }
+ map { $_->actions }
+ @containers
+ ];
}
- }
-
- my $default = $action eq 'default' ? $namespace : undef;
- my $results = $c->get_action( $action, $default, $default ? 1 : 0 );
- $namespace ||= '/';
- if ( @{$results} ) {
+ # Errors break the normal flow and the end action is instantly run
+ my $error = 0;
# Execute last begin
$c->state(1);
- if ( my $begin = @{ $c->get_action( 'begin', $namespace, 1 ) }[-1] ) {
- $c->execute( @{ $begin->[0] } );
- return if scalar @{ $c->error };
+ if ( my $begin = @{ $actions{begin} }[-1] ) {
+ $begin->execute($c);
+ $error++ if scalar @{ $c->error };
}
# Execute the auto chain
my $autorun = 0;
- for my $auto ( @{ $c->get_action( 'auto', $namespace, 1 ) } ) {
+ for my $auto ( @{ $actions{auto} } ) {
+ last if $error;
$autorun++;
- $c->execute( @{ $auto->[0] } );
- return if scalar @{ $c->error };
+ $auto->execute($c);
+ $error++ if scalar @{ $c->error };
last unless $c->state;
}
# Execute the action or last default
my $mkay = $autorun ? $c->state ? 1 : 0 : 1;
if ( ( my $action = $c->req->action ) && $mkay ) {
- if ( my $result = @{ $c->get_action( $action, $default, 1 ) }[-1] )
- {
- $c->execute( @{ $result->[0] } );
+ unless ($error) {
+ $c->action->execute($c);
+ $error++ if scalar @{ $c->error };
}
}
# Execute last end
- if ( my $end = @{ $c->get_action( 'end', $namespace, 1 ) }[-1] ) {
- $c->execute( @{ $end->[0] } );
- return if scalar @{ $c->error };
+ if ( my $end = @{ $actions{end} }[-1] ) {
+ $end->execute($c);
}
}
}
}
-=item $c->forward( $command [, \@arguments ] )
-
-Forward processing to a private action or a method from a class.
-If you define a class without method it will default to process().
-also takes an optional arrayref containing arguments to be passed
-to the new function. $c->req->args will be reset upon returning
-from the function.
-
- $c->forward('/foo');
- $c->forward('index');
- $c->forward(qw/MyApp::Model::CDBI::Foo do_stuff/);
- $c->forward('MyApp::View::TT');
+=item $self->forward( $c, $command [, \@arguments ] )
=cut
sub forward {
+ my $self = shift;
my $c = shift;
my $command = shift;
}
# Relative forwards from detach
- my $caller = ( caller(0) )[0]->isa('Catalyst::Dispatcher')
- && ( ( caller(1) )[3] =~ /::detach$/ ) ? caller(1) : caller(0);
+ my $caller = ( caller(1) )[0]->isa('Catalyst::Dispatcher')
+ && ( ( caller(2) )[3] =~ /::detach$/ ) ? caller(3) : caller(1);
- my $namespace = '/';
my $arguments = ( ref( $_[-1] ) eq 'ARRAY' ) ? pop(@_) : $c->req->args;
- if ( $command =~ /^\// ) {
- $command =~ /^\/(.*)\/(\w+)$/;
- $namespace = $1 || '/';
- $command = $2 || $command;
- $command =~ s/^\///;
+ my $results = [];
+
+ my $command_copy = $command;
+
+ unless ( $command_copy =~ s/^\/// ) {
+ my $namespace =
+ Catalyst::Utils::class2prefix( $caller, $c->config->{case_sensitive} ) || '';
+ $command_copy = "${namespace}/${command}";
}
+ unless ( $command_copy =~ /\// ) {
+ $results = $c->get_action( $command_copy, '/' );
+ }
else {
- $namespace =
- Catalyst::Utils::class2prefix( $caller, $c->config->{case_sensitive} )
- || '/';
+ my @extra_args;
+ DESCEND: while ( $command_copy =~ s/^(.*)\/(\w+)$/$1/ ) {
+ my $tail = $2;
+ $results = $c->get_action( $tail, $1 );
+ if ( @{$results} ) {
+ $command = $tail;
+ push( @{$arguments}, @extra_args );
+ last DESCEND;
+ }
+ unshift( @extra_args, $tail );
+ }
}
- my $results = $c->get_action( $command, $namespace );
-
unless ( @{$results} ) {
- unless ( defined( $c->components->{$command} ) ) {
+ unless ( $c->components->{$command} ) {
my $error =
qq/Couldn't forward to command "$command". Invalid action or component./;
$c->error($error);
my $method = shift || 'process';
if ( my $code = $c->components->{$class}->can($method) ) {
- $c->actions->{reverse}->{"$code"} = "$class->$method";
- $results = [ [ [ $class, $code ] ] ];
+ my $action = Catalyst::Action->new(
+ {
+ code => $code,
+ reverse => "$class->$method",
+ namespace => $class,
+ prefix => $class,
+ }
+ );
+ $results = [ [$action] ];
}
else {
local $c->request->{arguments} = [ @{$arguments} ];
for my $result ( @{$results} ) {
- $c->execute( @{ $result->[0] } );
+ $result->[0]->execute($c);
return if scalar @{ $c->error };
last unless $c->state;
}
return $c->state;
}
-=item $c->get_action( $action, $namespace, $inherit )
+=item $self->prepare_action($c)
+
+=cut
+
+sub prepare_action {
+ my ( $self, $c ) = @_;
+ my $path = $c->req->path;
+ my @path = split /\//, $c->req->path;
+ $c->req->args( \my @args );
+
+ while (@path) {
+ $path = join '/', @path;
+ if ( my $result = ${ $c->get_action($path) }[0] ) {
+
+ # It's a regex
+ if ($#$result) {
+ my $match = $result->[1];
+ my @snippets = @{ $result->[2] };
+ $c->log->debug(
+ qq/Requested action is "$path" and matched "$match"/)
+ if $c->debug;
+ $c->log->debug(
+ 'Snippets are "' . join( ' ', @snippets ) . '"' )
+ if ( $c->debug && @snippets );
+ $c->req->action($match);
+ $c->req->snippets( \@snippets );
+ }
+
+ else {
+ $c->req->action($path);
+ $c->log->debug(qq/Requested action is "$path"/) if $c->debug;
+ }
+
+ $c->req->match($path);
+ $c->action($result->[0]);
+ $c->namespace($result->[0]->prefix);
+ last;
+ }
+ unshift @args, pop @path;
+ }
+
+ unless ( $c->req->action ) {
+ my $result = @{$c->get_action('default', $c->req->path, 1) || []}[-1];
+ if ($result) {
+ $c->action( $result->[0] );
+ $c->namespace( $c->req->path );
+ $c->req->action('default');
+ $c->req->match('');
+ }
+ }
+
+ $c->log->debug( 'Arguments are "' . join( '/', @args ) . '"' )
+ if ( $c->debug && @args );
+}
-Get an action in a given namespace.
+=item $self->get_action( $c, $action, $namespace, $inherit )
=cut
sub get_action {
- my ( $c, $action, $namespace, $inherit ) = @_;
+ my ( $self, $c, $action, $namespace, $inherit ) = @_;
return [] unless $action;
$namespace ||= '';
$inherit ||= 0;
if ($namespace) {
- $namespace = '' if $namespace eq '/';
- my $parent = $c->tree;
- my @results;
-
- if ($inherit) {
- my $result = $c->actions->{private}->{ $parent->getUID }->{$action};
- push @results, [$result] if $result;
- my $visitor = Tree::Simple::Visitor::FindByPath->new;
-
- for my $part ( split '/', $namespace ) {
- $visitor->setSearchPath($part);
- $parent->accept($visitor);
- my $child = $visitor->getResult;
- my $uid = $child->getUID if $child;
- my $match = $c->actions->{private}->{$uid}->{$action} if $uid;
- push @results, [$match] if $match;
- $parent = $child if $child;
- }
-
- }
-
- else {
- if ($namespace) {
- my $visitor = Tree::Simple::Visitor::FindByPath->new;
- $visitor->setSearchPath( split '/', $namespace );
- $parent->accept($visitor);
- my $child = $visitor->getResult;
- my $uid = $child->getUID if $child;
- my $match = $c->actions->{private}->{$uid}->{$action}
- if $uid;
- push @results, [$match] if $match;
- }
+ my @match = $self->get_containers( $namespace );
- else {
- my $result =
- $c->actions->{private}->{ $parent->getUID }->{$action};
- push @results, [$result] if $result;
- }
+ my @results;
+ foreach my $child ($inherit ? @match: $match[-1]) {
+ my $node = $child->actions;
+ push(@results, [ $node->{$action} ]) if defined $node->{$action};
}
return \@results;
}
- elsif ( my $p = $c->actions->{plain}->{$action} ) { return [ [$p] ] }
- elsif ( my $r = $c->actions->{regex}->{$action} ) { return [ [$r] ] }
+ elsif ( my $p = $self->actions->{plain}->{$action} ) { return [ [$p] ] }
+ elsif ( my $r = $self->actions->{regex}->{$action} ) { return [ [$r] ] }
else {
- for my $i ( 0 .. $#{ $c->actions->{compiled} } ) {
- my $name = $c->actions->{compiled}->[$i]->[0];
- my $regex = $c->actions->{compiled}->[$i]->[1];
+ for my $i ( 0 .. $#{ $self->actions->{compiled} } ) {
+ my $name = $self->actions->{compiled}->[$i]->[0];
+ my $regex = $self->actions->{compiled}->[$i]->[1];
if ( my @snippets = ( $action =~ $regex ) ) {
- return [ [ $c->actions->{regex}->{$name}, $name, \@snippets ] ];
+ return [
+ [ $self->actions->{regex}->{$name}, $name, \@snippets ] ];
}
}
return [];
}
-=item $c->set_action( $action, $code, $namespace, $attrs )
+=item $self->get_containers( $namespace )
+
+=cut
+
+sub get_containers {
+ my ( $self, $namespace ) = @_;
+
+ return ($self->tree->getNodeValue) if $namespace eq '/';
-Set an action in a given namespace.
+ my $visitor = Tree::Simple::Visitor::FindByPath->new;
+ my @path = split('/', $namespace);
+ $visitor->setSearchPath( @path );
+ $self->tree->accept($visitor);
+
+ my @match = $visitor->getResults;
+ @match = ($self->tree) unless @match;
+
+ if (!defined $visitor->getResult) {
+ my $extra = $path[(scalar @match) - 1];
+ last unless $extra;
+ $visitor->setSearchPath($extra);
+ $match[-1]->accept($visitor);
+ push(@match, $visitor->getResult) if defined $visitor->getResult;
+ }
+
+ return map { $_->getNodeValue } @match;
+}
+
+=item $self->set_action( $c, $action, $code, $namespace, $attrs )
=cut
sub set_action {
- my ( $c, $method, $code, $namespace, $attrs ) = @_;
+ my ( $self, $c, $method, $code, $namespace, $attrs ) = @_;
my $prefix =
Catalyst::Utils::class2prefix( $namespace, $c->config->{case_sensitive} )
for my $attr ( @{$attrs} ) {
if ( $attr =~ /^(Local|Relative)$/ ) { $flags{local}++ }
elsif ( $attr =~ /^(Global|Absolute)$/ ) { $flags{global}++ }
- elsif ( $attr =~ /^Path\(\s*(.+)\s*\)$/i ) { $flags{path} = $1 }
- elsif ( $attr =~ /^Private$/i ) { $flags{private}++ }
+ elsif ( $attr =~ /^Path\(\s*(.+)\s*\)$/i ) {
+ push @{ $flags{path} }, $1;
+ }
+ elsif ( $attr =~ /^Private$/i ) { $flags{private}++ }
elsif ( $attr =~ /^(Regex|Regexp)\(\s*(.+)\s*\)$/i ) {
- $flags{regex} = $2;
+ push @{ $flags{regex} }, $2;
}
}
}
return unless keys %flags;
- my $parent = $c->tree;
+ my $parent = $self->tree;
my $visitor = Tree::Simple::Visitor::FindByPath->new;
- for my $part ( split '/', $prefix ) {
- $visitor->setSearchPath($part);
- $parent->accept($visitor);
- my $child = $visitor->getResult;
-
- unless ($child) {
- $child = $parent->addChild( Tree::Simple->new($part) );
+ if ($prefix) {
+ for my $part ( split '/', $prefix ) {
$visitor->setSearchPath($part);
$parent->accept($visitor);
- $child = $visitor->getResult;
+ my $child = $visitor->getResult;
+
+ unless ($child) {
+ my $container = Catalyst::ActionContainer->new(
+ { part => $part, actions => {} });
+ $child = $parent->addChild( Tree::Simple->new($container) );
+ $visitor->setSearchPath($part);
+ $parent->accept($visitor);
+ $child = $visitor->getResult;
+ }
+
+ $parent = $child;
}
-
- $parent = $child;
}
- my $uid = $parent->getUID;
- $c->actions->{private}->{$uid}->{$method} = [ $namespace, $code ];
- my $forward = $prefix ? "$prefix/$method" : $method;
-
- if ( $flags{path} ) {
- $flags{path} =~ s/^\w+//;
- $flags{path} =~ s/\w+$//;
- if ( $flags{path} =~ /^\s*'(.*)'\s*$/ ) { $flags{path} = $1 }
- if ( $flags{path} =~ /^\s*"(.*)"\s*$/ ) { $flags{path} = $1 }
- }
+ my $reverse = $prefix ? "$prefix/$method" : $method;
- if ( $flags{regex} ) {
- $flags{regex} =~ s/^\w+//;
- $flags{regex} =~ s/\w+$//;
- if ( $flags{regex} =~ /^\s*'(.*)'\s*$/ ) { $flags{regex} = $1 }
- if ( $flags{regex} =~ /^\s*"(.*)"\s*$/ ) { $flags{regex} = $1 }
- }
+ my $action = Catalyst::Action->new(
+ {
+ code => $code,
+ reverse => $reverse,
+ namespace => $namespace,
+ prefix => $prefix,
+ }
+ );
- my $reverse = $prefix ? "$prefix/$method" : $method;
+ $parent->getNodeValue->actions->{$method} = $action;
- if ( $flags{local} || $flags{global} || $flags{path} ) {
- my $path = $flags{path} || $method;
- my $absolute = 0;
+ my @path;
+ for my $path ( @{ $flags{path} } ) {
+ $path =~ s/^\w+//;
+ $path =~ s/\w+$//;
+ if ( $path =~ /^\s*'(.*)'\s*$/ ) { $path = $1 }
+ if ( $path =~ /^\s*"(.*)"\s*$/ ) { $path = $1 }
+ push @path, $path;
+ }
+ $flags{path} = \@path;
+
+ my @regex;
+ for my $regex ( @{ $flags{regex} } ) {
+ $regex =~ s/^\w+//;
+ $regex =~ s/\w+$//;
+ if ( $regex =~ /^\s*'(.*)'\s*$/ ) { $regex = $1 }
+ if ( $regex =~ /^\s*"(.*)"\s*$/ ) { $regex = $1 }
+ push @regex, $regex;
+ }
+ $flags{regex} = \@regex;
- if ( $path =~ /^\/(.+)/ ) {
- $path = $1;
- $absolute = 1;
- }
+ if ( $flags{local} || $flags{global} ) {
+ push( @{ $flags{path} }, $prefix ? "/$prefix/$method" : "/$method" )
+ if $flags{local};
- $absolute = 1 if $flags{global};
- my $name = $absolute ? $path : $prefix ? "$prefix/$path" : $path;
- $c->actions->{plain}->{$name} = [ $namespace, $code ];
+ push( @{ $flags{path} }, "/$method" ) if $flags{global};
}
- if ( my $regex = $flags{regex} ) {
- push @{ $c->actions->{compiled} }, [ $regex, qr#$regex# ];
- $c->actions->{regex}->{$regex} = [ $namespace, $code ];
+ for my $path ( @{ $flags{path} } ) {
+ if ( $path =~ /^\// ) { $path =~ s/^\/// }
+ else { $path = $prefix ? "$prefix/$path" : $path }
+ $self->actions->{plain}->{$path} = $action;
}
- $c->actions->{reverse}->{"$code"} = $reverse;
+ for my $regex ( @{ $flags{regex} } ) {
+ push @{ $self->actions->{compiled} }, [ $regex, qr#$regex# ];
+ $self->actions->{regex}->{$regex} = $action;
+ }
}
-=item $class->setup_actions($component)
-
-Setup actions for a component.
+=item $self->setup_actions( $class, $component )
=cut
sub setup_actions {
- my $self = shift;
+ my ( $self, $class ) = @_;
# These are the core structures
$self->actions(
plain => {},
private => {},
regex => {},
- compiled => [],
- reverse => {}
+ compiled => []
}
);
# We use a tree
- $self->tree( Tree::Simple->new( 0, Tree::Simple->ROOT ) );
+ my $container = Catalyst::ActionContainer->new(
+ { part => '/', actions => {} } );
+ $self->tree( Tree::Simple->new( $container, Tree::Simple->ROOT ) );
- for my $comp ( keys %{ $self->components } ) {
+ for my $comp ( keys %{ $class->components } ) {
# We only setup components that inherit from Catalyst::Base
next unless $comp->isa('Catalyst::Base');
if ( *{$sym}{CODE} && *{$sym}{CODE} == $code ) {
$name = *{$sym}{NAME};
- $self->set_action( $name, $code, $comp, $attrs );
+ $class->set_action( $name, $code, $comp, $attrs );
last;
}
}
- return unless $self->debug;
+ return unless $class->debug;
my $actions = $self->actions;
my $privates = Text::ASCIITable->new;
my ( $walker, $parent, $prefix ) = @_;
$prefix .= $parent->getNodeValue || '';
$prefix .= '/' unless $prefix =~ /\/$/;
- my $uid = $parent->getUID;
+ my $node = $parent->getNodeValue->actions;
- for my $action ( keys %{ $actions->{private}->{$uid} } ) {
- my ( $class, $code ) = @{ $actions->{private}->{$uid}->{$action} };
- $privates->addRow( "$prefix$action", $class );
+ for my $action ( keys %{ $node } ) {
+ my $action_obj = $node->{$action};
+ $privates->addRow( "$prefix$action", $action_obj->namespace );
}
$walker->( $walker, $_, $prefix ) for $parent->getAllChildren;
};
$walker->( $walker, $self->tree, '' );
- $self->log->debug( "Loaded private actions:\n" . $privates->draw )
+ $class->log->debug( "Loaded private actions:\n" . $privates->draw )
if ( @{ $privates->{tbl_rows} } );
my $publics = Text::ASCIITable->new;
$publics->setColWidth( 'Private', 37, 1 );
for my $plain ( sort keys %{ $actions->{plain} } ) {
- my ( $class, $code ) = @{ $actions->{plain}->{$plain} };
- my $reverse = $self->actions->{reverse}->{$code};
- $reverse = $reverse ? "/$reverse" : $code;
- $publics->addRow( "/$plain", $reverse );
+ my $action = $actions->{plain}->{$plain};
+ $publics->addRow( "/$plain", "/$action" );
}
- $self->log->debug( "Loaded public actions:\n" . $publics->draw )
+ $class->log->debug( "Loaded public actions:\n" . $publics->draw )
if ( @{ $publics->{tbl_rows} } );
my $regexes = Text::ASCIITable->new;
$regexes->setColWidth( 'Private', 37, 1 );
for my $regex ( sort keys %{ $actions->{regex} } ) {
- my ( $class, $code ) = @{ $actions->{regex}->{$regex} };
- my $reverse = $self->actions->{reverse}->{$code};
- $reverse = $reverse ? "/$reverse" : $code;
- $regexes->addRow( $regex, $reverse );
+ my $action = $actions->{regex}->{$regex};
+ $regexes->addRow( $regex, "/$action" );
}
- $self->log->debug( "Loaded regex actions:\n" . $regexes->draw )
+ $class->log->debug( "Loaded regex actions:\n" . $regexes->draw )
if ( @{ $regexes->{tbl_rows} } );
}