X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst%2FDispatcher.pm;h=355039282a93ac279f7f7b4a3e8cfb5b0f3a5406;hp=eb9213701ee54cb3b3e9dcf98e7f6ac97060fd70;hb=812a28c90c5b43bdf5ce87f1b2a688725e552429;hpb=699e124751a09296d6d4e9cbc49ab0a6acf5199a

diff --git a/lib/Catalyst/Dispatcher.pm b/lib/Catalyst/Dispatcher.pm
index eb92137..3550392 100644
--- a/lib/Catalyst/Dispatcher.pm
+++ b/lib/Catalyst/Dispatcher.pm
@@ -2,24 +2,24 @@ package Catalyst::Dispatcher;
 
 use strict;
 use base 'Class::Data::Inheritable';
-use Memoize;
+use Catalyst::Utils;
 use Text::ASCIITable;
-use Text::ASCIITable::Wrap 'wrap';
 use Tree::Simple;
 use Tree::Simple::Visitor::FindByPath;
 
 __PACKAGE__->mk_classdata($_) for qw/actions tree/;
 
+# These are the core structures
 __PACKAGE__->actions(
     { plain => {}, private => {}, regex => {}, compiled => [], reverse => {} }
 );
-__PACKAGE__->tree( Tree::Simple->new( 0, Tree::Simple->ROOT ) );
 
-memoize('_class2prefix');
+# We use a tree
+__PACKAGE__->tree( Tree::Simple->new( 0, Tree::Simple->ROOT ) );
 
 =head1 NAME
 
-Catalyst::Dispatch - The Catalyst Dispatcher
+Catalyst::Dispatcher - The Catalyst Dispatcher
 
 =head1 SYNOPSIS
 
@@ -43,14 +43,18 @@ sub dispatch {
     my $namespace = '';
     $namespace = ( join( '/', @{ $c->req->args } ) || '/' )
       if $action eq 'default';
+
     unless ($namespace) {
         if ( my $result = $c->get_action($action) ) {
-            $namespace = _class2prefix( $result->[0]->[0]->[0] );
+            $namespace =
+              Catalyst::Utils::class2prefix( $result->[0]->[0]->[0] );
         }
     }
+
     my $default = $action eq 'default' ? $namespace : undef;
     my $results = $c->get_action( $action, $default );
     $namespace ||= '/';
+
     if ( @{$results} ) {
 
         # Execute last begin
@@ -61,14 +65,17 @@ sub dispatch {
         }
 
         # Execute the auto chain
+        my $auto = 0;
         for my $auto ( @{ $c->get_action( 'auto', $namespace ) } ) {
             $c->execute( @{ $auto->[0] } );
             return if scalar @{ $c->error };
             last unless $c->state;
+            $auto++;
         }
 
         # Execute the action or last default
-        if ( ( my $action = $c->req->action ) && $c->state ) {
+        my $mkay = $auto ? $c->state ? 1 : 0 : 1;
+        if ( ( my $action = $c->req->action ) && $mkay ) {
             if ( my $result = @{ $c->get_action( $action, $default ) }[-1] ) {
                 $c->execute( @{ $result->[0] } );
             }
@@ -80,6 +87,7 @@ sub dispatch {
             return if scalar @{ $c->error };
         }
     }
+
     else {
         my $path  = $c->req->path;
         my $error = $path
@@ -105,41 +113,71 @@ If you define a class without method it will default to process().
 sub forward {
     my $c       = shift;
     my $command = shift;
+
     unless ($command) {
         $c->log->debug('Nothing to forward to') if $c->debug;
         return 0;
     }
+
     my $caller    = caller(0);
     my $namespace = '/';
+
     if ( $command =~ /^\// ) {
-        $command =~ /^(.*)\/(\w+)$/;
+        $command =~ /^\/(.*)\/(\w+)$/;
         $namespace = $1 || '/';
-        $command = $2;
+        $command   = $2 || $command;
+        $command =~ s/^\///;
     }
-    else { $namespace = _class2prefix($caller) || '/' }
+
+    else { $namespace = Catalyst::Utils::class2prefix($caller) || '/' }
+
     my $results = $c->get_action( $command, $namespace );
+
     unless ( @{$results} ) {
-        my $class = $command;
-        if ( $class =~ /[^\w\:]/ ) {
-            $c->log->debug(qq/Couldn't forward to "$class"/) if $c->debug;
+        my $class = $command || '';
+        my $path = $class . '.pm';
+        $path =~ s/::/\//g;
+
+        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;
         }
+
+        unless ( UNIVERSAL::isa( $class, 'Catalyst::Base' ) ) {
+            my $error =
+              qq/Can't forward to "$class". Class is not a Catalyst component./;
+            $c->error($error);
+            $c->log->debug($error) if $c->debug;
+            return 0;
+        }
+
         my $method = shift || 'process';
+
         if ( my $code = $class->can($method) ) {
             $c->actions->{reverse}->{"$code"} = "$class->$method";
             $results = [ [ [ $class, $code ] ] ];
         }
+
         else {
-            $c->log->debug(qq/Couldn't forward to "$class->$method"/)
+            my $error =
+              qq/Couldn't forward to "$class". Does not implement "$method"/;
+            $c->error($error);
+            $c->log->debug($error)
               if $c->debug;
             return 0;
         }
+
     }
+
     for my $result ( @{$results} ) {
         $c->execute( @{ $result->[0] } );
         return if scalar @{ $c->error };
         last unless $c->state;
     }
+
     return $c->state;
 }
 
@@ -153,15 +191,18 @@ sub get_action {
     my ( $c, $action, $namespace ) = @_;
     return [] unless $action;
     $namespace ||= '';
+
     if ($namespace) {
         $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;
+
             for my $part ( split '/', $namespace ) {
                 $visitor->setSearchPath($part);
                 $parent->accept($visitor);
@@ -171,8 +212,11 @@ sub get_action {
                 push @results, [$match] if $match;
                 $parent = $child if $child;
             }
+
         }
+
         else {
+
             if ($namespace) {
                 my $visitor = Tree::Simple::Visitor::FindByPath->new;
                 $visitor->setSearchPath( split '/', $namespace );
@@ -183,29 +227,30 @@ sub get_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] ] }
+
     else {
+
         for my $i ( 0 .. $#{ $c->actions->{compiled} } ) {
             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 ] ];
             }
+
         }
     }
     return [];
@@ -220,7 +265,7 @@ Set an action in a given namespace.
 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} ) {
@@ -231,22 +276,33 @@ sub set_action {
         elsif ( $attr =~ /^(Regex|Regexp)\((.+)\)$/i ) { $flags{regex} = $2 }
     }
 
+    if ( $flags{private} && ( keys %flags > 1 ) ) {
+        $c->log->debug( 'Bad action definition "'
+              . join( ' ', @{$attrs} )
+              . qq/" for "$namespace->$method"/ )
+          if $c->debug;
+        return;
+    }
     return unless keys %flags;
 
     my $parent  = $c->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) );
             $visitor->setSearchPath($part);
             $parent->accept($visitor);
             $child = $visitor->getResult;
         }
+
         $parent = $child;
     }
+
     my $uid = $parent->getUID;
     $c->actions->{private}->{$uid}->{$method} = [ $namespace, $code ];
     my $forward = $prefix ? "$prefix/$method" : $method;
@@ -257,6 +313,7 @@ sub set_action {
         if ( $flags{path} =~ /^'(.*)'$/ ) { $flags{path} = $1 }
         if ( $flags{path} =~ /^"(.*)"$/ ) { $flags{path} = $1 }
     }
+
     if ( $flags{regex} ) {
         $flags{regex} =~ s/^\w+//;
         $flags{regex} =~ s/\w+$//;
@@ -267,16 +324,19 @@ sub set_action {
     my $reverse = $prefix ? "$prefix/$method" : $method;
 
     if ( $flags{local} || $flags{global} || $flags{path} ) {
-        my $path = $flags{path} || $method;
+        my $path     = $flags{path} || $method;
         my $absolute = 0;
+
         if ( $path =~ /^\/(.+)/ ) {
             $path     = $1;
             $absolute = 1;
         }
+
         $absolute = 1 if $flags{global};
         my $name = $absolute ? $path : $prefix ? "$prefix/$path" : $path;
         $c->actions->{plain}->{$name} = [ $namespace, $code ];
     }
+
     if ( my $regex = $flags{regex} ) {
         push @{ $c->actions->{compiled} }, [ $regex, qr#$regex# ];
         $c->actions->{regex}->{$regex} = [ $namespace, $code ];
@@ -293,14 +353,17 @@ Setup actions for a component.
 
 sub setup_actions {
     my ( $self, $comps ) = @_;
+
     for my $comp (@$comps) {
         $comp = ref $comp || $comp;
-        for my $action ( @{ $comp->_cache } ) {
+
+        for my $action ( @{ Catalyst::Utils::reflect_actions($comp) } ) {
             my ( $code, $attrs ) = @{$action};
             my $name = '';
             no strict 'refs';
             my @cache = ( $comp, @{"$comp\::ISA"} );
             my %namespaces;
+
             while ( my $namespace = shift @cache ) {
                 $namespaces{$namespace}++;
                 for my $isa ( @{"$comp\::ISA"} ) {
@@ -309,80 +372,81 @@ sub setup_actions {
                     $namespaces{$isa}++;
                 }
             }
+
             for my $namespace ( keys %namespaces ) {
+
                 for my $sym ( values %{ $namespace . '::' } ) {
+
                     if ( *{$sym}{CODE} && *{$sym}{CODE} == $code ) {
+
                         $name = *{$sym}{NAME};
                         $self->set_action( $name, $code, $comp, $attrs );
                         last;
                     }
+
                 }
+
             }
+
         }
+
     }
+
     my $actions  = $self->actions;
     my $privates = Text::ASCIITable->new;
     $privates->setCols( 'Private', 'Class' );
     $privates->setColWidth( 'Private', 36, 1 );
     $privates->setColWidth( 'Class',   37, 1 );
+
     my $walker = sub {
         my ( $walker, $parent, $prefix ) = @_;
         $prefix .= $parent->getNodeValue || '';
         $prefix .= '/' unless $prefix =~ /\/$/;
         my $uid = $parent->getUID;
+
         for my $action ( keys %{ $actions->{private}->{$uid} } ) {
             my ( $class, $code ) = @{ $actions->{private}->{$uid}->{$action} };
-            $privates->addRow( wrap( "$prefix$action", 36 ),
-                wrap( $class, 37 ) );
+            $privates->addRow( "$prefix$action", $class );
         }
+
         $walker->( $walker, $_, $prefix ) for $parent->getAllChildren;
     };
+
     $walker->( $walker, $self->tree, '' );
     $self->log->debug( 'Loaded private actions', $privates->draw )
       if ( @{ $privates->{tbl_rows} } && $self->debug );
+
     my $publics = Text::ASCIITable->new;
     $publics->setCols( 'Public', 'Private' );
     $publics->setColWidth( 'Public',  36, 1 );
     $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( wrap( "/$plain", 36 ), wrap( $reverse, 37 ) );
+        $publics->addRow( "/$plain", $reverse );
     }
+
     $self->log->debug( 'Loaded public actions', $publics->draw )
       if ( @{ $publics->{tbl_rows} } && $self->debug );
+
     my $regexes = Text::ASCIITable->new;
     $regexes->setCols( 'Regex', 'Private' );
     $regexes->setColWidth( 'Regex',   36, 1 );
     $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( wrap( $regex, 36 ), wrap( $reverse, 37 ) );
+        $regexes->addRow( $regex, $reverse );
     }
+
     $self->log->debug( 'Loaded regex actions', $regexes->draw )
       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