remove visitor from actioncontainer node creation stuff

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

diff --git a/lib/Catalyst/Dispatcher.pm b/lib/Catalyst/Dispatcher.pm
index f1ccb80..f78ad16 100644 (file)
--- a/lib/Catalyst/Dispatcher.pm
+++ b/lib/Catalyst/Dispatcher.pm
@@ -372,35 +372,42 @@ sub register {
     return unless $reg + $priv;
 
     my $namespace = $action->namespace;
-    my $parent    = $self->tree;
-    my $visitor   = Tree::Simple::Visitor::FindByPath->new;
-
-    if ($namespace) {
-        for my $part ( split '/', $namespace ) {
-            $visitor->setSearchPath($part);
-            $parent->accept($visitor);
-            my $child = $visitor->getResult;
-
-            unless ($child) {
-
-                # Create a new tree node and an ActionContainer to form
-                # its value.
-
-                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;
-        }
-    }
+       my $node = $self->find_or_create_namespace_node( $namespace );
 
     # Set the method value
-    $parent->getNodeValue->actions->{ $action->name } = $action;
+    $node->getNodeValue->actions->{ $action->name } = $action;
+}
+
+sub find_or_create_namespace_node {
+       my ( $self, $namespace ) = @_;
+       
+    my $tree  ||= $self->tree;
+
+       return $tree unless $namespace;
+
+       my @namespace = split '/', $namespace;
+       return $self->_find_or_create_namespace_node( $tree, @namespace );
+}
+
+sub _find_or_create_namespace_node {
+       my ( $self, $parent, $part, @namespace ) = @_;
+
+       return $parent unless $part;
+
+       my $child = ( grep { $_->getNodeValue->part eq $part } $parent->getAllChildren )[0];
+
+       unless ($child) {
+               # Create a new tree node and an ActionContainer to form
+               # its value.
+
+               my $container =
+                 Catalyst::ActionContainer->new(
+                       { part => $part, actions => {} } );
+
+               $parent->addChild( $child = Tree::Simple->new($container) );
+       }
+
+       $self->_find_or_create_namespace_node( $child, @namespace );
 }
 
 =head2 $self->setup_actions( $class, $context )