Simplify dispatcher guts to use hashes

diff --git a/lib/Catalyst/ActionContainer.pm b/lib/Catalyst/ActionContainer.pm
index 6b3f282..bb21c09 100644 (file)
--- a/lib/Catalyst/ActionContainer.pm
+++ b/lib/Catalyst/ActionContainer.pm
@@ -12,6 +12,14 @@ use overload (
 
 );
 
+sub new {
+    my ( $class, $fields ) = @_;
+
+    $fields = { part => $fields, actions => {} } unless ref $fields;
+
+    $class->SUPER::new($fields);
+}
+
 =head1 NAME
 
 Catalyst::ActionContainer - Catalyst Action Container
@@ -39,6 +47,18 @@ sub get_action {
     return;
 }
 
+=head2 add_action($action, [ $name ])
+
+Adds an action, optionally providing a name to override $action->name
+
+=cut
+
+sub add_action {
+    my ( $self, $action, $name ) = @_;
+    my $name ||= $action->name;
+    $self->actions->{$name} = $action;
+}
+
 =head2 actions
 
 Accessor to the actions hashref, containing all actions in this container.

diff --git a/lib/Catalyst/Dispatcher.pm b/lib/Catalyst/Dispatcher.pm
index 2933de9..a687dd8 100644 (file)
--- a/lib/Catalyst/Dispatcher.pm
+++ b/lib/Catalyst/Dispatcher.pm
@@ -19,7 +19,7 @@ __PACKAGE__->mk_accessors(
     qw/tree dispatch_types registered_dispatch_types
       method_action_class action_container_class
       preload_dispatch_types postload_dispatch_types
-         action_hash
+      action_hash container_hash
       /
 );
 
@@ -59,7 +59,14 @@ sub new {
     # set the default pre- and and postloads
     $obj->preload_dispatch_types( \@PRELOAD );
     $obj->postload_dispatch_types( \@POSTLOAD );
-       $obj->action_hash({});
+    $obj->action_hash(    {} );
+    $obj->container_hash( {} );
+
+    # Create the root node of the tree
+    my $container =
+      Catalyst::ActionContainer->new( { part => '/', actions => {} } );
+    $obj->tree( Tree::Simple->new( $container, Tree::Simple->ROOT ) );
+
     return $obj;
 }
 
@@ -273,7 +280,7 @@ sub get_action {
     $namespace ||= '';
     $namespace = '' if $namespace eq '/';
 
-       return $self->action_hash->{ "$namespace/$name" };
+    return $self->action_hash->{"$namespace/$name"};
 }
 
 =head2 $self->get_actions( $c, $action, $namespace )
@@ -299,40 +306,18 @@ Return all the action containers for a given namespace, inclusive
 
 sub get_containers {
     my ( $self, $namespace ) = @_;
+    $namespace ||= '';
+    $namespace = '' if $namespace eq '/';
 
-    # If the namespace is / just return the root ActionContainer
-
-    return ( $self->tree->getNodeValue )
-      if ( !$namespace || ( $namespace eq '/' ) );
-
-    # Use a visitor to recurse down the tree finding the ActionContainers
-    # for each namespace in the chain.
-
-    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;
+    my @containers;
 
-    if ( !defined $visitor->getResult ) {
+    do {
+        push @containers, $self->container_hash->{$namespace};
+    } while ( $namespace =~ s#/[^/]+$## );
 
-        # If we don't manage to match, the visitor doesn't return the last
-        # node is matched, so foo/bar/baz would only find the 'foo' node,
-        # not the foo and foo/bar nodes as it should. This does another
-        # single-level search to see if that's the case, and the 'last unless'
-        # should catch any failures - or short-circuit this if this *is* a
-        # bug in the visitor and gets fixed.
+    return reverse grep { defined } @containers, $self->container_hash->{''};
 
-        if ( my $extra = $path[ ( scalar @match ) - 1 ] ) {
-            $visitor->setSearchPath($extra);
-            $match[-1]->accept($visitor);
-            push( @match, $visitor->getResult ) if defined $visitor->getResult;
-        }
-    }
-
-    return map { $_->getNodeValue } @match;
+    my @parts = split '/', $namespace;
 }
 
 =head2 $self->register( $c, $action )
@@ -368,52 +353,43 @@ sub register {
     return unless $reg + $priv;
 
     my $namespace = $action->namespace;
-       my $name = $action->name;
+    my $name      = $action->name;
 
-       my $node = $self->find_or_create_namespace_node( $namespace );
+    my $container = $self->find_or_create_action_container($namespace);
 
     # Set the method value
-    $node->getNodeValue->actions->{ $name } = $action;
-
-       my $path = "$namespace/$name";
-
-       if ( exists $self->action_hash->{$path} and $self->action_hash->{$path} != $action ) {
-               warn "inconsistency: $path is already registered";
-       }
+    $container->add_action($action);
 
-       $self->action_hash->{$path} = $action;
+    $self->action_hash->{"$namespace/$name"} = $action;
+    $self->container_hash->{$namespace} = $container;
 }
 
-sub find_or_create_namespace_node {
-       my ( $self, $namespace ) = @_;
-       
-    my $tree  ||= $self->tree;
+sub find_or_create_action_container {
+    my ( $self, $namespace ) = @_;
+
+    my $tree ||= $self->tree;
 
-       return $tree unless $namespace;
+    return $tree->getNodeValue unless $namespace;
 
-       my @namespace = split '/', $namespace;
-       return $self->_find_or_create_namespace_node( $tree, @namespace );
+    my @namespace = split '/', $namespace;
+    return $self->_find_or_create_namespace_node( $tree, @namespace )
+      ->getNodeValue;
 }
 
 sub _find_or_create_namespace_node {
-       my ( $self, $parent, $part, @namespace ) = @_;
-
-       return $parent unless $part;
+    my ( $self, $parent, $part, @namespace ) = @_;
 
-       my $child = ( grep { $_->getNodeValue->part eq $part } $parent->getAllChildren )[0];
+    return $parent unless $part;
 
-       unless ($child) {
-               # Create a new tree node and an ActionContainer to form
-               # its value.
+    my $child =
+      ( grep { $_->getNodeValue->part eq $part } $parent->getAllChildren )[0];
 
-               my $container =
-                 Catalyst::ActionContainer->new(
-                       { part => $part, actions => {} } );
-
-               $parent->addChild( $child = Tree::Simple->new($container) );
-       }
+    unless ($child) {
+        my $container = Catalyst::ActionContainer->new($part);
+        $parent->addChild( $child = Tree::Simple->new($container) );
+    }
 
-       $self->_find_or_create_namespace_node( $child, @namespace );
+    $self->_find_or_create_namespace_node( $child, @namespace );
 }
 
 =head2 $self->setup_actions( $class, $context )
@@ -433,11 +409,6 @@ sub setup_actions {
       $self->do_load_dispatch_types( @{ $self->preload_dispatch_types } );
     @{ $self->registered_dispatch_types }{@classes} = (1) x @classes;
 
-    # Create the root node of the tree
-    my $container =
-      Catalyst::ActionContainer->new( { part => '/', actions => {} } );
-    $self->tree( Tree::Simple->new( $container, Tree::Simple->ROOT ) );
-
     foreach my $comp ( values %{ $c->components } ) {
         $comp->register_actions($c) if $comp->can('register_actions');
     }
@@ -496,7 +467,7 @@ sub do_load_dispatch_types {
         push @loaded, $class;
     }
 
-       return @loaded;
+    return @loaded;
 }
 
 =head1 AUTHOR