use Catalyst::Utils;
use Catalyst::Action;
use Catalyst::ActionContainer;
+use Catalyst::DispatchType::Regex;
+use Catalyst::DispatchType::Default;
use Text::ASCIITable;
use Tree::Simple;
use Tree::Simple::Visitor::FindByPath;
# Stringify to class
use overload '""' => sub { return ref shift }, fallback => 1;
-__PACKAGE__->mk_accessors(qw/actions tree/);
+__PACKAGE__->mk_accessors(qw/actions tree dispatch_types/);
=head1 NAME
# Execute the action or last default
my $mkay = $autorun ? $c->state ? 1 : 0 : 1;
- if ( ( my $action = $c->req->action ) && $mkay ) {
+ if ( $mkay ) {
unless ($error) {
$c->action->execute($c);
$error++ if scalar @{ $c->error };
my @path = split /\//, $c->req->path;
$c->req->args( \my @args );
- while (@path) {
+ DESCEND: while (@path) {
$path = join '/', @path;
if ( my $result = ${ $c->get_action($path) }[0] ) {
$c->req->match($path);
$c->action($result->[0]);
$c->namespace($result->[0]->prefix);
- last;
+ last DESCEND;
}
- 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('');
+ unless ( $c->action ) {
+ foreach my $type (@{$self->dispatch_types}) {
+ last DESCEND if $type->prepare_action($c, $path);
+ #last DESCEND if $c->action;
+ }
}
+
+ unshift @args, pop @path;
}
$c->log->debug( 'Arguments are "' . join( '/', @args ) . '"' )
}
elsif ( my $p = $self->actions->{plain}->{$action} ) { return [ [$p] ] }
- elsif ( my $r = $self->actions->{regex}->{$action} ) { return [ [$r] ] }
+ #elsif ( my $r = $self->actions->{regex}->{$action} ) { return [ [$r] ] }
- else {
+ #else {
- for my $i ( 0 .. $#{ $self->actions->{compiled} } ) {
- my $name = $self->actions->{compiled}->[$i]->[0];
- my $regex = $self->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 [
- [ $self->actions->{regex}->{$name}, $name, \@snippets ] ];
- }
+ # if ( my @snippets = ( $action =~ $regex ) ) {
+ # return [
+ # [ $self->actions->{regex}->{$name}, $name, \@snippets ] ];
+ # }
- }
- }
+ # }
+ #}
return [];
}
Catalyst::Utils::class2prefix( $namespace, $c->config->{case_sensitive} )
|| '';
my %flags;
+ my %attributes;
for my $attr ( @{$attrs} ) {
if ( $attr =~ /^(Local|Relative)$/ ) { $flags{local}++ }
elsif ( $attr =~ /^(Regex|Regexp)\(\s*(.+)\s*\)$/i ) {
push @{ $flags{regex} }, $2;
}
+ if ( my ($key, $value) = ($attr =~ /^(.*?)(?:\(\s*(.+)\s*\))?$/) ) {
+ if ( defined $value ) {
+ ($value =~ s/^'(.*)'$/$1/) || ($value =~ s/^"(.*)"/$1/);
+ }
+ push(@{$attributes{$key}}, $value);
+ }
}
if ( $flags{private} && ( keys %flags > 1 ) ) {
my $action = Catalyst::Action->new(
{
- code => $code,
- reverse => $reverse,
- namespace => $namespace,
- prefix => $prefix,
+ code => $code,
+ reverse => $reverse,
+ namespace => $namespace,
+ prefix => $prefix,
+ attributes => \%attributes,
}
);
push @{ $self->actions->{compiled} }, [ $regex, qr#$regex# ];
$self->actions->{regex}->{$regex} = $action;
}
+
+ foreach my $type ( @{ $self->dispatch_types } ) {
+ $type->register_action($c, $action);
+ }
}
=item $self->setup_actions( $class, $component )
}
);
+ $self->dispatch_types([
+ map { "Catalyst::DispatchType::$_"->new }
+ qw/Regex Default/ ]);
+
# We use a tree
my $container = Catalyst::ActionContainer->new(
{ part => '/', actions => {} } );