X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FDispatcher.pm;h=f78ad166faaf27523a172ece5d9a26d74e539ec5;hb=ffb820f8dcd7073ecb6a1ef8cf9b529be7784cd2;hp=e74a49d2e56d1b6dbdb1f6fe3ccdabd10031b466;hpb=4ab87e274ac0a05f98c10a4cdba467ba4398b0d3;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst/Dispatcher.pm b/lib/Catalyst/Dispatcher.pm index e74a49d..f78ad16 100644 --- 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 - / + / ); # Preload these action types @@ -43,22 +43,22 @@ application based on the attributes you set. =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; + return $obj; } =head2 $self->preload_dispatch_types @@ -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 ) @@ -416,17 +423,11 @@ sub setup_actions { $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; - } + my @classes = + $self->do_load_dispatch_types( @{ $self->preload_dispatch_types } ); + @{ $self->registered_dispatch_types }{@classes} = (1) x @classes; - # We use a tree + # Create the root node of the tree my $container = Catalyst::ActionContainer->new( { part => '/', actions => {} } ); $self->tree( Tree::Simple->new( $container, Tree::Simple->ROOT ) ); @@ -435,14 +436,7 @@ sub setup_actions { $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; @@ -479,6 +473,26 @@ sub setup_actions { $_->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