X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FDispatcher.pm;h=02b312245e92f3b6430450cfdc70bcaad0a77844;hb=cfd04b0cabf99346090fe4e3312e393364e571ef;hp=b327adeffddc48605d80f2734c2dd803413cd706;hpb=805d0f30e1e7d43532004b3af625e8b8cc65f2b3;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Dispatcher.pm b/lib/Catalyst/Dispatcher.pm
index b327ade..02b3122 100644
--- 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;
@@ -51,9 +52,7 @@ sub dispatch {
 
     unless ($namespace) {
         if ( my $result = $c->get_action($action) ) {
-            $namespace =
-              Catalyst::Utils::class2prefix( $result->[0]->[0]->namespace,
-                $c->config->{case_sensitive} );
+            $namespace = $result->[0]->[0]->prefix;
         }
     }
 
@@ -61,6 +60,17 @@ sub dispatch {
     my $results = $c->get_action( $action, $default, $default ? 1 : 0 );
     $namespace ||= '/';
 
+    my @containers = $self->get_containers( $namespace );
+    my %actions;
+    foreach my $name (qw/begin auto end/) {
+        $actions{$name} = [
+            map { $_->{$name} }
+            grep { exists $_->{$name} }
+            map { $_->actions }
+            @containers
+        ];
+    }
+
     if ( @{$results} ) {
 
         # Errors break the normal flow and the end action is instantly run
@@ -68,17 +78,17 @@ sub dispatch {
 
         # Execute last begin
         $c->state(1);
-        if ( my $begin = @{ $c->get_action( 'begin', $namespace, 1 ) }[-1] ) {
-            $begin->[0]->execute($c);
+        if ( my $begin = @{ $actions{begin}  }[-1] ) {
+            $begin->execute($c);
             $error++ if scalar @{ $c->error };
         }
 
         # Execute the auto chain
         my $autorun = 0;
-        for my $auto ( @{ $c->get_action( 'auto', $namespace, 1 ) } ) {
+        for my $auto ( @{ $actions{auto} } ) {
             last if $error;
             $autorun++;
-            $auto->[0]->execute($c);
+            $auto->execute($c);
             $error++ if scalar @{ $c->error };
             last unless $c->state;
         }
@@ -97,8 +107,8 @@ sub dispatch {
         }
 
         # Execute last end
-        if ( my $end = @{ $c->get_action( 'end', $namespace, 1 ) }[-1] ) {
-            $end->[0]->execute($c);
+        if ( my $end = @{ $actions{end} }[-1] ) {
+            $end->execute($c);
         }
     }
 
@@ -130,38 +140,33 @@ sub forward {
     my $caller = ( caller(1) )[0]->isa('Catalyst::Dispatcher')
       && ( ( caller(2) )[3] =~ /::detach$/ ) ? caller(3) : caller(1);
 
-    my $namespace = '/';
     my $arguments = ( ref( $_[-1] ) eq 'ARRAY' ) ? pop(@_) : $c->req->args;
 
     my $results = [];
 
-    if ( $command =~ /^\// ) {
-        if ( $command =~ /^\/(\w+)$/ ) {
-            $results = $c->get_action( $1, $namespace );
-        }
-        else {
-            my $command_copy = $command;
-            my @extra_args;
-          DESCEND: while ( $command_copy =~ s/^\/(.*)\/(\w+)$/\/$1/ ) {
-                my $tail = $2;
-                $results = $c->get_action( $tail, $1 );
-                if ( @{$results} ) {
-                    $command   = $tail;
-                    $namespace = $command_copy;
-                    push( @{$arguments}, @extra_args );
-                    last DESCEND;
-                }
-                unshift( @extra_args, $tail );
-            }
-        }
-        $command =~ s/^\///;
+    my $command_copy = $command;
+
+    unless ( $command_copy =~ s/^\/// ) {
+        my $namespace =
+          Catalyst::Utils::class2prefix( $caller, $c->config->{case_sensitive} ) || '';
+        $command_copy = "${namespace}/${command}";
     }
 
+    unless ( $command_copy =~ /\// ) {
+        $results = $c->get_action( $command_copy, '/' );
+    }
     else {
-        $namespace =
-          Catalyst::Utils::class2prefix( $caller, $c->config->{case_sensitive} )
-          || '/';
-        $results = $c->get_action( $command, $namespace );
+        my @extra_args;
+      DESCEND: while ( $command_copy =~ s/^(.*)\/(\w+)$/$1/ ) {
+            my $tail = $2;
+            $results = $c->get_action( $tail, $1 );
+            if ( @{$results} ) {
+                $command = $tail;
+                push( @{$arguments}, @extra_args );
+                last DESCEND;
+            }
+            unshift( @extra_args, $tail );
+        }
     }
 
     unless ( @{$results} ) {
@@ -183,6 +188,7 @@ qq/Couldn't forward to command "$command". Invalid action or component./;
                     code      => $code,
                     reverse   => "$class->$method",
                     namespace => $class,
+                    prefix    => $class,
                 }
             );
             $results = [ [$action] ];
@@ -269,54 +275,14 @@ sub get_action {
     $inherit   ||= 0;
 
     if ($namespace) {
-        $namespace = '' if $namespace eq '/';
-        my $parent = $self->tree;
-        my @results;
-
-        if ($inherit) {
-            my $result =
-              $self->actions->{private}->{ $parent->getUID }->{$action};
-            push @results, [$result] if $result;
-            my $visitor = Tree::Simple::Visitor::FindByPath->new;
 
-          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 {
+        my @match = $self->get_containers( $namespace );
 
-            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 ($inherit ? @match: $match[-1]) {
+            my $node = $child->actions;
+            push(@results, [ $node->{$action} ]) if defined $node->{$action};
         }
         return \@results;
     }
@@ -340,6 +306,34 @@ sub get_action {
     return [];
 }
 
+=item $self->get_containers( $namespace )
+
+=cut
+
+sub get_containers {
+    my ( $self, $namespace ) = @_;
+
+    return ($self->tree->getNodeValue) if $namespace eq '/';
+
+    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 $extra = $path[(scalar @match) - 1];
+        last unless $extra;
+        $visitor->setSearchPath($extra);
+        $match[-1]->accept($visitor);
+        push(@match, $visitor->getResult) if defined $visitor->getResult;
+    }
+
+    return map { $_->getNodeValue } @match;
+}
+
 =item $self->set_action( $c, $action, $code, $namespace, $attrs )
 
 =cut
@@ -376,19 +370,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;
@@ -398,11 +396,11 @@ sub set_action {
             code      => $code,
             reverse   => $reverse,
             namespace => $namespace,
+            prefix    => $prefix,
         }
     );
 
-    my $uid = $parent->getUID;
-    $self->actions->{private}->{$uid}->{$method} = $action;
+    $parent->getNodeValue->actions->{$method} = $action;
 
     my @path;
     for my $path ( @{ $flags{path} } ) {
@@ -461,7 +459,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 } ) {
 
@@ -515,10 +515,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 );
         }