use Catalyst::Utils;
use Catalyst::Action;
use Catalyst::ActionContainer;
+use Catalyst::DispatchType::Path;
use Catalyst::DispatchType::Regex;
use Catalyst::DispatchType::Default;
use Text::ASCIITable;
# appropriate name registered to the namespace
$actions{$name} = [
- map { $_->{$name} }
- grep { exists $_->{$name} }
- map { $_->actions }
- @containers
+ map { $_->{$name} }
+ grep { exists $_->{$name} }
+ map { $_->actions } @containers
];
}
# Execute the action or last default
my $mkay = $autorun ? $c->state ? 1 : 0 : 1;
- if ( $mkay ) {
+ if ($mkay) {
unless ($error) {
$c->action->execute($c);
$error++ if scalar @{ $c->error };
unless ( $command_copy =~ s/^\/// ) {
my $namespace =
- Catalyst::Utils::class2prefix( $caller, $c->config->{case_sensitive} ) || '';
+ Catalyst::Utils::class2prefix( $caller, $c->config->{case_sensitive} )
+ || '';
$command_copy = "${namespace}/${command}";
}
if ( my $code = $c->components->{$class}->can($method) ) {
my $action = Catalyst::Action->new(
{
+ name => $method,
code => $code,
reverse => "$class->$method",
namespace => $class,
my @path = split /\//, $c->req->path;
$c->req->args( \my @args );
+ push( @path, '/' ) unless @path; # Root action
+
DESCEND: 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;
- }
+ $path = '' if $path eq '/'; # Root action
- $c->req->match($path);
- $c->action($result->[0]);
- $c->namespace($result->[0]->prefix);
- last DESCEND;
- }
+ # Check out dispatch types to see if any will handle the path at
+ # this level
- unless ( $c->action ) {
- foreach my $type (@{$self->dispatch_types}) {
- last DESCEND if $type->prepare_action($c, $path);
- #last DESCEND if $c->action;
- }
+ foreach my $type ( @{ $self->dispatch_types } ) {
+ last DESCEND if $type->match( $c, $path );
}
+ # If not, move the last part path to args
+
unshift @args, pop @path;
}
sub get_action {
my ( $self, $c, $action, $namespace, $inherit ) = @_;
return [] unless $action;
- $namespace ||= '';
+ $namespace ||= '/';
$inherit ||= 0;
- if ($namespace) {
+ my @match = $self->get_containers($namespace);
- my @match = $self->get_containers( $namespace );
+ my @results;
- my @results;
-
- foreach my $child ($inherit ? @match: $match[-1]) {
- my $node = $child->actions;
- push(@results, [ $node->{$action} ]) if defined $node->{$action};
- }
- return \@results;
+ foreach my $child ( $inherit ? @match : $match[-1] ) {
+ my $node = $child->actions;
+ push( @results, [ $node->{$action} ] ) if defined $node->{$action};
}
-
- elsif ( my $p = $self->actions->{plain}->{$action} ) { return [ [$p] ] }
- #elsif ( my $r = $self->actions->{regex}->{$action} ) { return [ [$r] ] }
-
- #else {
-
- # 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 [
- # [ $self->actions->{regex}->{$name}, $name, \@snippets ] ];
- # }
-
- # }
- #}
- return [];
+ return \@results;
}
=item $self->get_containers( $namespace )
# If the namespace is / just return the root ActionContainer
- return ($self->tree->getNodeValue) if $namespace eq '/';
+ return ( $self->tree->getNodeValue )
+ if ( !$namespace || ( $namespace eq '/' ) );
# Use a visitor to recurse down the tree finding the ActionContainers
# for each namespace in the chain.
my $visitor = Tree::Simple::Visitor::FindByPath->new;
- my @path = split('/', $namespace);
- $visitor->setSearchPath( @path );
+ my @path = split( '/', $namespace );
+ $visitor->setSearchPath(@path);
$self->tree->accept($visitor);
my @match = $visitor->getResults;
- @match = ($self->tree) unless @match;
+ @match = ( $self->tree ) unless @match;
- if (!defined $visitor->getResult) {
+ if ( !defined $visitor->getResult ) {
# If we don't manage to match, the visitor doesn't return the last
# node is matched, so foo/bar/baz would only find the 'foo' node,
# should catch any failures - or short-circuit this if this *is* a
# bug in the visitor and gets fixed.
- my $extra = $path[(scalar @match) - 1];
+ my $extra = $path[ ( scalar @match ) - 1 ];
last unless $extra;
$visitor->setSearchPath($extra);
$match[-1]->accept($visitor);
- push(@match, $visitor->getResult) if defined $visitor->getResult;
+ push( @match, $visitor->getResult ) if defined $visitor->getResult;
}
return map { $_->getNodeValue } @match;
my $prefix =
Catalyst::Utils::class2prefix( $namespace, $c->config->{case_sensitive} )
|| '';
- my %flags;
my %attributes;
for my $attr ( @{$attrs} ) {
- if ( $attr =~ /^(Local|Relative)$/ ) { $flags{local}++ }
- elsif ( $attr =~ /^(Global|Absolute)$/ ) { $flags{global}++ }
- elsif ( $attr =~ /^Path\(\s*(.+)\s*\)$/i ) {
- push @{ $flags{path} }, $1;
- }
- elsif ( $attr =~ /^Private$/i ) { $flags{private}++ }
- elsif ( $attr =~ /^(Regex|Regexp)\(\s*(.+)\s*\)$/i ) {
- push @{ $flags{regex} }, $2;
- }
- if ( my ($key, $value) = ($attr =~ /^(.*?)(?:\(\s*(.+)\s*\))?$/) ) {
+
+ # Parse out :Foo(bar) into Foo => bar etc (and arrayify)
+
+ if ( my ( $key, $value ) = ( $attr =~ /^(.*?)(?:\(\s*(.+)\s*\))?$/ ) ) {
if ( defined $value ) {
- ($value =~ s/^'(.*)'$/$1/) || ($value =~ s/^"(.*)"/$1/);
+ ( $value =~ s/^'(.*)'$/$1/ ) || ( $value =~ s/^"(.*)"/$1/ );
}
- push(@{$attributes{$key}}, $value);
+ push( @{ $attributes{$key} }, $value );
}
}
- if ( $flags{private} && ( keys %flags > 1 ) ) {
+ if ( $attributes{Private} && ( keys %attributes > 1 ) ) {
$c->log->debug( 'Bad action definition "'
. join( ' ', @{$attrs} )
. qq/" for "$namespace->$method"/ )
if $c->debug;
return;
}
- return unless keys %flags;
+ return unless keys %attributes;
my $parent = $self->tree;
my $visitor = Tree::Simple::Visitor::FindByPath->new;
$visitor->setSearchPath($part);
$parent->accept($visitor);
my $child = $visitor->getResult;
-
+
unless ($child) {
# Create a new tree node and an ActionContainer to form
# its value.
- my $container = Catalyst::ActionContainer->new(
- { part => $part, actions => {} });
+ 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;
}
}
my $action = Catalyst::Action->new(
{
+ name => $method,
code => $code,
reverse => $reverse,
namespace => $namespace,
# Set the method value
$parent->getNodeValue->actions->{$method} = $action;
- 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 ( $flags{local} || $flags{global} ) {
- push( @{ $flags{path} }, $prefix ? "/$prefix/$method" : "/$method" )
- if $flags{local};
-
- push( @{ $flags{path} }, "/$method" ) if $flags{global};
- }
-
- for my $path ( @{ $flags{path} } ) {
- if ( $path =~ /^\// ) { $path =~ s/^\/// }
- else { $path = $prefix ? "$prefix/$path" : $path }
- $self->actions->{plain}->{$path} = $action;
- }
-
- for my $regex ( @{ $flags{regex} } ) {
- push @{ $self->actions->{compiled} }, [ $regex, qr#$regex# ];
- $self->actions->{regex}->{$regex} = $action;
- }
-
+ # Pass the action to our dispatch types so they can register it if reqd.
foreach my $type ( @{ $self->dispatch_types } ) {
- $type->register_action($c, $action);
+ $type->register( $c, $action );
}
}
}
);
- $self->dispatch_types([
- map { "Catalyst::DispatchType::$_"->new }
- qw/Regex Default/ ]);
+ $self->dispatch_types(
+ [ map { "Catalyst::DispatchType::$_"->new } qw/Path Regex Default/ ] );
# We use a tree
- my $container = Catalyst::ActionContainer->new(
- { part => '/', actions => {} } );
+ my $container =
+ Catalyst::ActionContainer->new( { part => '/', actions => {} } );
$self->tree( Tree::Simple->new( $container, Tree::Simple->ROOT ) );
for my $comp ( keys %{ $class->components } ) {
$prefix .= '/' unless $prefix =~ /\/$/;
my $node = $parent->getNodeValue->actions;
- for my $action ( keys %{ $node } ) {
+ for my $action ( keys %{$node} ) {
my $action_obj = $node->{$action};
$privates->addRow( "$prefix$action", $action_obj->namespace );
}
projects / catagits/Catalyst-Runtime.git / blobdiff