X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FDispatcher.pm;h=23e15a0128d7d85ae1d9ab2df8ed5ce520151e29;hb=b7aebc12ed41dfdc490edb1d94ae1b55dac0fc46;hp=eb4662c5e7ab92d30d33115634f950d767ab4a41;hpb=fbcc39ad23f2bbecf5d84c9ba581e6af86fcd460;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Dispatcher.pm b/lib/Catalyst/Dispatcher.pm
index eb4662c..23e15a0 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;
@@ -130,37 +131,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;
-                if ( $results = $c->get_action( $tail, $1 ) ) {
-                    $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} ) {
@@ -268,54 +265,42 @@ sub get_action {
     $inherit   ||= 0;
 
     if ($namespace) {
-        $namespace = '' if $namespace eq '/';
+
         my $parent = $self->tree;
-        my @results;
+        my @match;
+
+        if ($namespace ne '/') {
 
-        if ($inherit) {
-            my $result =
-              $self->actions->{private}->{ $parent->getUID }->{$action};
-            push @results, [$result] if $result;
             my $visitor = Tree::Simple::Visitor::FindByPath->new;
+            my @path = split('/', $namespace);
+            $visitor->setSearchPath( @path );
+            $parent->accept($visitor);
 
-          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;
+            if ($inherit) {
+
+                @match = $visitor->getResults;
+                @match = ($parent) 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;
                 }
+            } else {
+                @match = ($visitor->getResult) if $visitor->getResult;
             }
 
         }
 
-        else {
+        @match = ($parent) unless @match;
 
-            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 (@match) {
+            my $node = $child->getNodeValue->actions;
+            push(@results, [ $node->{$action} ]) if defined $node->{$action};
         }
         return \@results;
     }
@@ -354,10 +339,12 @@ sub set_action {
     for my $attr ( @{$attrs} ) {
         if    ( $attr =~ /^(Local|Relative)$/ )    { $flags{local}++ }
         elsif ( $attr =~ /^(Global|Absolute)$/ )   { $flags{global}++ }
-        elsif ( $attr =~ /^Path\(\s*(.+)\s*\)$/i ) { $flags{path} = $1 }
-        elsif ( $attr =~ /^Private$/i )            { $flags{private}++ }
+        elsif ( $attr =~ /^Path\(\s*(.+)\s*\)$/i ) {
+            push @{ $flags{path} }, $1;
+        }
+        elsif ( $attr =~ /^Private$/i ) { $flags{private}++ }
         elsif ( $attr =~ /^(Regex|Regexp)\(\s*(.+)\s*\)$/i ) {
-            $flags{regex} = $2;
+            push @{ $flags{regex} }, $2;
         }
     }
 
@@ -373,23 +360,25 @@ 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 $forward = $prefix ? "$prefix/$method" : $method;
-
     my $reverse = $prefix ? "$prefix/$method" : $method;
 
     my $action = Catalyst::Action->new(
@@ -400,38 +389,42 @@ sub set_action {
         }
     );
 
-    my $uid = $parent->getUID;
-    $self->actions->{private}->{$uid}->{$method} = $action;
+    $parent->getNodeValue->actions->{$method} = $action;
 
-    if ( $flags{path} ) {
-        $flags{path} =~ s/^\w+//;
-        $flags{path} =~ s/\w+$//;
-        if ( $flags{path} =~ /^\s*'(.*)'\s*$/ ) { $flags{path} = $1 }
-        if ( $flags{path} =~ /^\s*"(.*)"\s*$/ ) { $flags{path} = $1 }
+    my @path;
+    for my $path ( @{ $flags{path} } ) {
+        $path =~ s/^\w+//;
+        $path =~ s/\w+$//;
+        if ( $path =~ /^\s*'(.*)'\s*$/ ) { $path = $1 }
+        if ( $path =~ /^\s*"(.*)"\s*$/ ) { $path = $1 }
+        push @path, $path;
     }
-
-    if ( $flags{regex} ) {
-        $flags{regex} =~ s/^\w+//;
-        $flags{regex} =~ s/\w+$//;
-        if ( $flags{regex} =~ /^\s*'(.*)'\s*$/ ) { $flags{regex} = $1 }
-        if ( $flags{regex} =~ /^\s*"(.*)"\s*$/ ) { $flags{regex} = $1 }
+    $flags{path} = \@path;
+
+    my @regex;
+    for my $regex ( @{ $flags{regex} } ) {
+        $regex =~ s/^\w+//;
+        $regex =~ s/\w+$//;
+        if ( $regex =~ /^\s*'(.*)'\s*$/ ) { $regex = $1 }
+        if ( $regex =~ /^\s*"(.*)"\s*$/ ) { $regex = $1 }
+        push @regex, $regex;
     }
+    $flags{regex} = \@regex;
 
-    if ( $flags{local} || $flags{global} || $flags{path} ) {
-        my $path     = $flags{path} || $method;
-        my $absolute = 0;
+    if ( $flags{local} || $flags{global} ) {
+        push( @{ $flags{path} }, $prefix ? "/$prefix/$method" : "/$method" )
+          if $flags{local};
 
-        if ( $path =~ /^\/(.+)/ ) {
-            $path     = $1;
-            $absolute = 1;
-        }
+        push( @{ $flags{path} }, "/$method" ) if $flags{global};
+    }
 
-        $absolute = 1 if $flags{global};
-        my $name = $absolute ? $path : $prefix ? "$prefix/$path" : $path;
-        $self->actions->{plain}->{$name} = $action;
+    for my $path ( @{ $flags{path} } ) {
+        if ( $path =~ /^\// ) { $path =~ s/^\/// }
+        else { $path = $prefix ? "$prefix/$path" : $path }
+        $self->actions->{plain}->{$path} = $action;
     }
 
-    if ( my $regex = $flags{regex} ) {
+    for my $regex ( @{ $flags{regex} } ) {
         push @{ $self->actions->{compiled} }, [ $regex, qr#$regex# ];
         $self->actions->{regex}->{$regex} = $action;
     }
@@ -455,7 +448,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 } ) {
 
@@ -509,10 +504,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 );
         }