use Tree::Simple;
use Tree::Simple::Visitor::FindByPath;
use Catalyst::Request;
+use Catalyst::Request::Upload;
use Catalyst::Response;
require Module::Pluggable::Fast;
if ( my $location = $c->response->redirect ) {
$c->log->debug(qq/Redirecting to "$location"/) if $c->debug;
$c->response->header( Location => $location );
- $c->response->status(302) if $c->response->status !~ /3\d\d$/;
+ $c->response->status(302) if $c->response->status !~ /^3\d\d$/;
}
if ( $#{ $c->error } >= 0 ) {
return 0;
}
my $caller = caller(0);
- my $global = $command =~ /^\// ? 0 : 1;
my $namespace = '/';
if ( $command =~ /^\// ) {
$command =~ /^(.*)\/(\w+)$/;
$command = $2;
}
else { $namespace = _class2prefix($caller) || '/' }
- my $results = $c->get_action( $command, $namespace, $global );
+ my $results = $c->get_action( $command, $namespace );
unless ( @{$results} ) {
my $class = $command;
if ( $class =~ /[^\w\:]/ ) {
return $c->state;
}
-=item $c->get_action( $action, $namespace, $global )
+=item $c->get_action( $action, $namespace )
Get an action in a given namespace.
=cut
sub get_action {
- my ( $c, $action, $namespace, $global ) = @_;
+ my ( $c, $action, $namespace ) = @_;
return [] unless $action;
$namespace ||= '';
if ($namespace) {
- if ($global) {
- my @results;
- for my $uid ( keys %{ $c->actions->{private} } ) {
- if ( my $result = $c->actions->{private}->{$uid}->{$action} ) {
- push @results, [$result];
- }
- }
- return \@results;
- }
- else {
- $namespace = '' if $namespace eq '/';
- my $parent = $c->tree;
- my @results;
+ $namespace = '' if $namespace eq '/';
+ my $parent = $c->tree;
+ my @results;
+ my %allowed = ( begin => 1, auto => 1, default => 1, end => 1 );
+ if ( $allowed{$action} ) {
my $result = $c->actions->{private}->{ $parent->getUID }->{$action};
push @results, [$result] if $result;
my $visitor = Tree::Simple::Visitor::FindByPath->new;
push @results, [$match] if $match;
$parent = $child if $child;
}
- return \@results;
}
+ 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;
+ }
+ else {
+ my $result =
+ $c->actions->{private}->{ $parent->getUID }->{$action};
+ push @results, [$result] if $result;
+ }
+ }
+ return \@results;
}
elsif ( my $p = $c->actions->{plain}->{$action} ) { return [ [$p] ] }
elsif ( my $r = $c->actions->{regex}->{$action} ) { return [ [$r] ] }