qw/tree dispatch_types registered_dispatch_types
method_action_class action_container_class
preload_dispatch_types postload_dispatch_types
- /
+ action_hash container_hash
+ /
);
# Preload these action types
=head1 METHODS
-=item new
+=head2 new
Construct a new dispatcher.
=cut
sub new {
- my $self = shift;
+ my $self = shift;
my $class = ref($self) || $self;
-
- my $obj = $class->SUPER::new( @_ );
-
+
+ my $obj = $class->SUPER::new(@_);
+
# set the default pre- and and postloads
- $obj->preload_dispatch_types( \@PRELOAD );
+ $obj->preload_dispatch_types( \@PRELOAD );
$obj->postload_dispatch_types( \@POSTLOAD );
- return $obj;
+ $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;
}
=head2 $self->preload_dispatch_types
$namespace ||= '';
$namespace = '' if $namespace eq '/';
- my @match = $self->get_containers($namespace);
-
- return unless @match;
-
- if ( my $action = $match[-1]->get_action($name) ) {
- return $action if $action->namespace eq $namespace;
- }
+ return $self->action_hash->{"$namespace/$name"};
}
=head2 $self->get_actions( $c, $action, $namespace )
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;
-
- if ( !defined $visitor->getResult ) {
+ my @containers;
- # 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.
+ do {
+ push @containers, $self->container_hash->{$namespace};
+ } while ( $namespace =~ s#/[^/]+$## );
- if ( my $extra = $path[ ( scalar @match ) - 1 ] ) {
- $visitor->setSearchPath($extra);
- $match[-1]->accept($visitor);
- push( @match, $visitor->getResult ) if defined $visitor->getResult;
- }
- }
+ return reverse grep { defined } @containers, $self->container_hash->{''};
- return map { $_->getNodeValue } @match;
+ my @parts = split '/', $namespace;
}
=head2 $self->register( $c, $action )
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;
- }
+ my $name = $action->name;
- $parent = $child;
- }
- }
+ my $container = $self->find_or_create_action_container($namespace);
# Set the method value
- $parent->getNodeValue->actions->{ $action->name } = $action;
+ $container->add_action($action);
+
+ $self->action_hash->{"$namespace/$name"} = $action;
+ $self->container_hash->{$namespace} = $container;
+}
+
+sub find_or_create_action_container {
+ my ( $self, $namespace ) = @_;
+
+ my $tree ||= $self->tree;
+
+ return $tree->getNodeValue unless $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 $child =
+ ( grep { $_->getNodeValue->part eq $part } $parent->getAllChildren )[0];
+
+ unless ($child) {
+ my $container = Catalyst::ActionContainer->new($part);
+ $parent->addChild( $child = Tree::Simple->new($container) );
+ }
+
+ $self->_find_or_create_namespace_node( $child, @namespace );
}
=head2 $self->setup_actions( $class, $context )
$self->method_action_class('Catalyst::Action');
$self->action_container_class('Catalyst::ActionContainer');
- # Preload action types
- for my $type ( @{$self->preload_dispatch_types} ) {
- my $class = ($type =~ /^\+(.*)$/) ? $1 : "Catalyst::DispatchType::${type}";
- eval "require $class";
- Catalyst::Exception->throw( message => qq/Couldn't load "$class"/ )
- if $@;
- push @{ $self->dispatch_types }, $class->new;
- $self->registered_dispatch_types->{$class} = 1;
- }
-
- # We use a tree
- my $container =
- Catalyst::ActionContainer->new( { part => '/', actions => {} } );
- $self->tree( Tree::Simple->new( $container, Tree::Simple->ROOT ) );
+ my @classes =
+ $self->do_load_dispatch_types( @{ $self->preload_dispatch_types } );
+ @{ $self->registered_dispatch_types }{@classes} = (1) x @classes;
foreach my $comp ( values %{ $c->components } ) {
$comp->register_actions($c) if $comp->can('register_actions');
}
- # Postload action types
- for my $type ( @{$self->postload_dispatch_types} ) {
- my $class = ($type =~ /^\+(.*)$/) ? $1 : "Catalyst::DispatchType::${type}";
- eval "require $class";
- Catalyst::Exception->throw( message => qq/Couldn't load "$class"/ )
- if $@;
- push @{ $self->dispatch_types }, $class->new;
- }
+ $self->do_load_dispatch_types( @{ $self->postload_dispatch_types } );
return unless $c->debug;
$_->list($c) for @{ $self->dispatch_types };
}
+sub do_load_dispatch_types {
+ my ( $self, @types ) = @_;
+
+ my @loaded;
+
+ # Preload action types
+ for my $type (@types) {
+ my $class =
+ ( $type =~ /^\+(.*)$/ ) ? $1 : "Catalyst::DispatchType::${type}";
+ eval "require $class";
+ Catalyst::Exception->throw( message => qq/Couldn't load "$class"/ )
+ if $@;
+ push @{ $self->dispatch_types }, $class->new;
+
+ push @loaded, $class;
+ }
+
+ return @loaded;
+}
+
=head1 AUTHOR
Sebastian Riedel, C<sri@cpan.org>