From: Matt S Trout <mst@shadowcat.co.uk>
Date: Sat, 3 Jun 2006 12:41:03 +0000 (+0000)
Subject: multimethod dispatch
X-Git-Tag: 5.7099_04~547
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=0bd5f8a2e3fb6c7ad7faeb128cc2991a1bb3ce98

multimethod dispatch
---

diff --git a/Changes b/Changes
index 191c627..d7c06b5 100644
--- a/Changes
+++ b/Changes
@@ -1,5 +1,6 @@
 This file documents the revision history for Perl extension Catalyst.
 
+        - checked and tested :Args multimethod dispatch
         - added ability to set action attributes from controller config
         - added merge_config_hashes() as a convenience method
         - Swapped out CGI::Cookie in favour of CGI::Simple::Cookie
diff --git a/lib/Catalyst/DispatchType/Path.pm b/lib/Catalyst/DispatchType/Path.pm
index 7f32b61..ac28382 100644
--- a/lib/Catalyst/DispatchType/Path.pm
+++ b/lib/Catalyst/DispatchType/Path.pm
@@ -26,10 +26,11 @@ Debug output for Path dispatch points
 sub list {
     my ( $self, $c ) = @_;
     my $paths = Text::SimpleTable->new( [ 35, 'Path' ], [ 36, 'Private' ] );
-    for my $path ( sort keys %{ $self->{paths} } ) {
-        my $action = $self->{paths}->{$path};
-        $path = "/$path" unless $path eq '/';
-        $paths->row( "$path", "/$action" );
+    foreach my $path ( sort keys %{ $self->{paths} } ) {
+        foreach my $action ( @{ $self->{paths}->{$path} } ) {
+            $path = "/$path" unless $path eq '/';
+            $paths->row( "$path", "/$action" );
+        }
     }
     $c->log->debug( "Loaded Path actions:\n" . $paths->draw )
       if ( keys %{ $self->{paths} } );
@@ -45,8 +46,9 @@ sub match {
     my ( $self, $c, $path ) = @_;
 
     $path ||= '/';
-    if ( my $action = $self->{paths}->{$path} ) {
-        return 0 unless $action->match($c);
+
+    foreach my $action ( @{ $self->{paths}->{$path} || [] } ) {
+        next unless $action->match($c);
         $c->req->action($path);
         $c->req->match($path);
         $c->action($action);
@@ -86,7 +88,9 @@ sub register_path {
     $path = '/' unless length $path;
     $path = URI->new($path)->canonical;
 
-    $self->{paths}{$path} = $action;
+    unshift( @{ $self->{paths}{$path} ||= [] }, $action);
+
+    return 1;
 }
 
 =head1 AUTHOR
diff --git a/t/live_priorities.t b/t/live_priorities.t
index 624aea2..785ae5d 100644
--- a/t/live_priorities.t
+++ b/t/live_priorities.t
@@ -6,7 +6,7 @@ use warnings;
 use FindBin;
 use lib "$FindBin::Bin/lib";
 
-use Test::More tests => 22;
+use Test::More tests => 28;
 use Catalyst::Test 'TestApp';
 use Data::Dumper;
 
@@ -29,6 +29,11 @@ my @tests = (
     'index vs. Local',      { path => '/loc_vs_index',   expect => 'index' },
     'index vs. LocalRegex', { path => '/locre_vs_index', expect => 'index' },
     'index vs. Path',       { path => '/path_vs_index',  expect => 'index' },
+
+    'multimethod zero',     { path => '/multimethod',    expect => 'zero' },
+    'multimethod one',      { path => '/multimethod/1',  expect => 'one 1' },
+    'multimethod two',      { path => '/multimethod/1/2',
+                                                         expect => 'two 1 2' },
 );
 
 while ( @tests ) {