- Dispatcher refactor, part trois

[catagits/Catalyst-Runtime.git] / lib / Catalyst / Dispatcher.pm

diff --git a/lib/Catalyst/Dispatcher.pm b/lib/Catalyst/Dispatcher.pm
index 504e905..23e15a0 100644 (file)
--- 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;
@@ -264,78 +265,42 @@ sub get_action {
     $inherit   ||= 0;
 
     if ($namespace) {
-        $namespace = '' if $namespace eq '/';
+
         my $parent = $self->tree;
-        my @results;
+        my @match;
 
-        if ($inherit) {
-            #my $result =
-            #  $self->actions->{private}->{ $parent->getUID }->{$action};
-            #push @results, [$result] if $result;
-            my $visitor = Tree::Simple::Visitor::FindByPath->new;
+        if ($namespace ne '/') {
 
-            #warn "${namespace} ${action}";
-            my @path = split(/\//, $namespace);
+            my $visitor = Tree::Simple::Visitor::FindByPath->new;
+            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 ($inherit) {
 
-            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;
-            }
+                @match = $visitor->getResults;
+                @match = ($parent) unless @match;
 
-            foreach my $child (@match) {
-                my $node = $self->actions->{private}->{$child->getUID};
-                next unless $node;
-                push(@results, [ $node->{$action} ]) if defined $node->{$action};
+                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;
+                }
+            } else {
+                @match = ($visitor->getResult) if $visitor->getResult;
             }
 
-          #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 {
+        @match = ($parent) unless @match;
 
-            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 (@match) {
+            my $node = $child->getNodeValue->actions;
+            push(@results, [ $node->{$action} ]) if defined $node->{$action};
         }
         return \@results;
     }
@@ -395,19 +360,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;
@@ -420,8 +389,7 @@ sub set_action {
         }
     );
 
-    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 );
         }