X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FDispatcher.pm;h=1b8dfa721f92aab5e4660bd2fafe06a2fd28f859;hb=51f97d147ab4a19a44b578d5f294c6bbfeccba72;hp=504e9056864bd116df7d88e7bac7ff7a36572b9d;hpb=d1b0d31de6cde4caff6a36001f179564847d570e;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Dispatcher.pm b/lib/Catalyst/Dispatcher.pm
index 504e905..1b8dfa7 100644
--- a/lib/Catalyst/Dispatcher.pm
+++ b/lib/Catalyst/Dispatcher.pm
@@ -5,6 +5,7 @@ use base 'Class::Accessor::Fast';
 use Catalyst::Exception;
 use Catalyst::Utils;
 use Catalyst::Action;
+use Catalyst::ActionContainer;
 use Text::ASCIITable;
 use Tree::Simple;
 use Tree::Simple::Visitor::FindByPath;
@@ -44,41 +45,36 @@ sub detach {
 
 sub dispatch {
     my ( $self, $c ) = @_;
-    my $action    = $c->req->action;
-    my $namespace = '';
-    $namespace = ( join( '/', @{ $c->req->args } ) || '/' )
-      if $action eq 'default';
-
-    unless ($namespace) {
-        if ( my $result = $c->get_action($action) ) {
-            $namespace =
-              Catalyst::Utils::class2prefix( $result->[0]->[0]->namespace,
-                $c->config->{case_sensitive} );
-        }
-    }
-
-    my $default = $action eq 'default' ? $namespace : undef;
-    my $results = $c->get_action( $action, $default, $default ? 1 : 0 );
-    $namespace ||= '/';
 
-    if ( @{$results} ) {
+    if ( $c->action ) {
+
+        my @containers = $self->get_containers( $c->namespace );
+        my %actions;
+        foreach my $name (qw/begin auto end/) {
+            $actions{$name} = [
+                map { $_->{$name} }
+                grep { exists $_->{$name} }
+                map { $_->actions }
+                @containers
+            ];
+        }
 
         # Errors break the normal flow and the end action is instantly run
         my $error = 0;
 
         # Execute last begin
         $c->state(1);
-        if ( my $begin = @{ $c->get_action( 'begin', $namespace, 1 ) }[-1] ) {
-            $begin->[0]->execute($c);
+        if ( my $begin = @{ $actions{begin} }[-1] ) {
+            $begin->execute($c);
             $error++ if scalar @{ $c->error };
         }
 
         # Execute the auto chain
         my $autorun = 0;
-        for my $auto ( @{ $c->get_action( 'auto', $namespace, 1 ) } ) {
+        for my $auto ( @{ $actions{auto} } ) {
             last if $error;
             $autorun++;
-            $auto->[0]->execute($c);
+            $auto->execute($c);
             $error++ if scalar @{ $c->error };
             last unless $c->state;
         }
@@ -87,18 +83,14 @@ sub dispatch {
         my $mkay = $autorun ? $c->state ? 1 : 0 : 1;
         if ( ( my $action = $c->req->action ) && $mkay ) {
             unless ($error) {
-                if ( my $result =
-                    @{ $c->get_action( $action, $default, 1 ) }[-1] )
-                {
-                    $result->[0]->execute($c);
-                    $error++ if scalar @{ $c->error };
-                }
+                $c->action->execute($c);
+                $error++ if scalar @{ $c->error };
             }
         }
 
         # Execute last end
-        if ( my $end = @{ $c->get_action( 'end', $namespace, 1 ) }[-1] ) {
-            $end->[0]->execute($c);
+        if ( my $end = @{ $actions{end} }[-1] ) {
+            $end->execute($c);
         }
     }
 
@@ -178,6 +170,7 @@ qq/Couldn't forward to command "$command". Invalid action or component./;
                     code      => $code,
                     reverse   => "$class->$method",
                     namespace => $class,
+                    prefix    => $class,
                 }
             );
             $results = [ [$action] ];
@@ -239,14 +232,21 @@ sub prepare_action {
             }
 
             $c->req->match($path);
+            $c->action($result->[0]);
+            $c->namespace($result->[0]->prefix);
             last;
         }
         unshift @args, pop @path;
     }
 
     unless ( $c->req->action ) {
-        $c->req->action('default');
-        $c->req->match('');
+        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('');
+        }
     }
 
     $c->log->debug( 'Arguments are "' . join( '/', @args ) . '"' )
@@ -264,78 +264,14 @@ sub get_action {
     $inherit   ||= 0;
 
     if ($namespace) {
-        $namespace = '' if $namespace eq '/';
-        my $parent = $self->tree;
-        my @results;
-
-        if ($inherit) {
-            #my $result =
-            #  $self->actions->{private}->{ $parent->getUID }->{$action};
-            #push @results, [$result] if $result;
-            my $visitor = Tree::Simple::Visitor::FindByPath->new;
-
-            #warn "${namespace} ${action}";
-            my @path = split(/\//, $namespace);
-            $visitor->setSearchPath( @path );
-            $parent->accept($visitor);
 
-            #warn join(', ', map { $_->getNodeValue } $visitor->getResults);
-
-            my @match = $visitor->getResults;
-            @match = ($parent) unless @match;
-
-            if (!defined $visitor->getResult) {
-                my $extra = $path[(scalar @match) - 1];
-                last unless $extra;
-                $visitor->setSearchPath($extra);
-                $match[-1]->accept($visitor);
-                push(@match, $visitor->getResult) if defined $visitor->getResult;
-            }
-
-            foreach my $child (@match) {
-                my $node = $self->actions->{private}->{$child->getUID};
-                next unless $node;
-                push(@results, [ $node->{$action} ]) if defined $node->{$action};
-            }
-
-          #SEARCH:
-          #  for my $part ( split '/', $namespace ) {
-          #      $visitor->setSearchPath($part);
-          #      $parent->accept($visitor);
-          #      my $child = $visitor->getResult;
-          #      my $uid   = $child->getUID if $child;
-          #      my $match = $self->actions->{private}->{$uid}->{$action}
-          #        if $uid;
-          #      push @results, [$match] if $match;
-          #      if ($child) {
-          #          $parent = $child;
-          #      }
-          #      else {
-          #          last SEARCH;
-          #      }
-          #  }
-
-        }
-
-        else {
+        my @match = $self->get_containers( $namespace );
 
-            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 = $self->actions->{private}->{$uid}->{$action}
-                  if $uid;
-                push @results, [$match] if $match;
-            }
-
-            else {
-                my $result =
-                  $self->actions->{private}->{ $parent->getUID }->{$action};
-                push @results, [$result] if $result;
-            }
+        my @results;
 
+        foreach my $child ($inherit ? @match: $match[-1]) {
+            my $node = $child->actions;
+            push(@results, [ $node->{$action} ]) if defined $node->{$action};
         }
         return \@results;
     }
@@ -359,6 +295,34 @@ sub get_action {
     return [];
 }
 
+=item $self->get_containers( $namespace )
+
+=cut
+
+sub get_containers {
+    my ( $self, $namespace ) = @_;
+
+    return ($self->tree->getNodeValue) if $namespace eq '/';
+
+    my $visitor = Tree::Simple::Visitor::FindByPath->new;
+    my @path = split('/', $namespace);
+    $visitor->setSearchPath( @path );
+    $self->tree->accept($visitor);
+
+    my @match = $visitor->getResults;
+    @match = ($self->tree) unless @match;
+
+    if (!defined $visitor->getResult) {
+        my $extra = $path[(scalar @match) - 1];
+        last unless $extra;
+        $visitor->setSearchPath($extra);
+        $match[-1]->accept($visitor);
+        push(@match, $visitor->getResult) if defined $visitor->getResult;
+    }
+
+    return map { $_->getNodeValue } @match;
+}
+
 =item $self->set_action( $c, $action, $code, $namespace, $attrs )
 
 =cut
@@ -395,19 +359,23 @@ sub set_action {
     my $parent  = $self->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) );
+    if ($prefix) {
+        for my $part ( split '/', $prefix ) {
             $visitor->setSearchPath($part);
             $parent->accept($visitor);
-            $child = $visitor->getResult;
+            my $child = $visitor->getResult;
+    
+            unless ($child) {
+                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;
         }
-
-        $parent = $child;
     }
 
     my $reverse = $prefix ? "$prefix/$method" : $method;
@@ -417,11 +385,11 @@ sub set_action {
             code      => $code,
             reverse   => $reverse,
             namespace => $namespace,
+            prefix    => $prefix,
         }
     );
 
-    my $uid = $parent->getUID;
-    $self->actions->{private}->{$uid}->{$method} = $action;
+    $parent->getNodeValue->actions->{$method} = $action;
 
     my @path;
     for my $path ( @{ $flags{path} } ) {
@@ -480,7 +448,9 @@ sub setup_actions {
     );
 
     # We use a tree
-    $self->tree( Tree::Simple->new( 0, Tree::Simple->ROOT ) );
+    my $container = Catalyst::ActionContainer->new(
+                        { part => '/', actions => {} } );
+    $self->tree( Tree::Simple->new( $container, Tree::Simple->ROOT ) );
 
     for my $comp ( keys %{ $class->components } ) {
 
@@ -534,10 +504,10 @@ sub setup_actions {
         my ( $walker, $parent, $prefix ) = @_;
         $prefix .= $parent->getNodeValue || '';
         $prefix .= '/' unless $prefix =~ /\/$/;
-        my $uid = $parent->getUID;
+        my $node = $parent->getNodeValue->actions;
 
-        for my $action ( keys %{ $actions->{private}->{$uid} } ) {
-            my $action_obj = $actions->{private}->{$uid}->{$action};
+        for my $action ( keys %{ $node } ) {
+            my $action_obj = $node->{$action};
             $privates->addRow( "$prefix$action", $action_obj->namespace );
         }