use strict;
use base 'Class::Data::Inheritable';
-use Memoize;
+use Catalyst::Utils;
use Text::ASCIITable;
use Tree::Simple;
use Tree::Simple::Visitor::FindByPath;
# We use a tree
__PACKAGE__->tree( Tree::Simple->new( 0, Tree::Simple->ROOT ) );
-memoize('_class2prefix');
-
=head1 NAME
-Catalyst::Dispatch - The Catalyst Dispatcher
+Catalyst::Dispatcher - The Catalyst Dispatcher
=head1 SYNOPSIS
unless ($namespace) {
if ( my $result = $c->get_action($action) ) {
- $namespace = _class2prefix( $result->[0]->[0]->[0] );
+ $namespace =
+ Catalyst::Utils::class2prefix( $result->[0]->[0]->[0] );
}
}
$command =~ s/^\///;
}
- else { $namespace = _class2prefix($caller) || '/' }
+ else { $namespace = Catalyst::Utils::class2prefix($caller) || '/' }
my $results = $c->get_action( $command, $namespace );
unless ( @{$results} ) {
my $class = $command || '';
+ my $path = $class . '.pm';
+ $path =~ s/::/\//g;
- if ( $class =~ /[^\w\:]/ ) {
- my $error = qq/Couldn't forward to "$class"/;
+ unless ( $INC{ $path } ) {
+ my $error = qq/Couldn't forward to "$class". Invalid or not loaded./;
$c->error($error);
$c->log->debug($error) if $c->debug;
return 0;
}
else {
- my $error = qq/Couldn't forward to "$class"/;
+ my $error = qq/Couldn't forward to "$class". Does not implement "$method"/;
$c->error($error);
$c->log->debug($error)
if $c->debug;
my $name = $c->actions->{compiled}->[$i]->[0];
my $regex = $c->actions->{compiled}->[$i]->[1];
- if ( $action =~ $regex ) {
- my @snippets;
- for my $i ( 1 .. 9 ) {
- no strict 'refs';
- last unless ${$i};
- push @snippets, ${$i};
- }
+ if ( my @snippets = ( $action =~ $regex ) ) {
return [ [ $c->actions->{regex}->{$name}, $name, \@snippets ] ];
}
sub set_action {
my ( $c, $method, $code, $namespace, $attrs ) = @_;
- my $prefix = _class2prefix($namespace) || '';
+ my $prefix = Catalyst::Utils::class2prefix($namespace) || '';
my %flags;
for my $attr ( @{$attrs} ) {
if ( @{ $regexes->{tbl_rows} } && $self->debug );
}
-sub _prefix {
- my ( $class, $name ) = @_;
- my $prefix = _class2prefix($class);
- $name = "$prefix/$name" if $prefix;
- return $name;
-}
-
-sub _class2prefix {
- my $class = shift || '';
- my $prefix;
- if ( $class =~ /^.*::([MVC]|Model|View|Controller)?::(.*)$/ ) {
- $prefix = lc $2;
- $prefix =~ s/\:\:/\//g;
- }
- return $prefix;
-}
-
=back
=head1 AUTHOR