merge arguments in subroutes by pushing

vti · Dec 26, 2016 · 5d5ebb5 · 5d5ebb5
1 parent eb8bfc7
commit 5d5ebb5
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 4 deletions.
diff --git a/lib/Routes/Tiny/Pattern.pm b/lib/Routes/Tiny/Pattern.pm
@@ -15,6 +15,11 @@ sub new {
     my $self = {};
     bless $self, $class;
 
+    if (my $arguments = delete $params{'+arguments'}) {
+        $self->{arguments_push} = 1;
+        $params{arguments} = $arguments;
+    }
+
     $self->{name}           = $params{name};
     $self->{defaults}       = $params{defaults};
     $self->{arguments}      = $params{arguments};
@@ -72,10 +77,28 @@ sub match {
         }
     }
 
-    my $arguments = {
-        %{ $args{arguments} || {} },
-        %{ $self->arguments || {} }
-    };
+    my $arguments;
+    if ($self->{arguments_push}) {
+        %$arguments = %{ $self->arguments };
+
+        foreach my $key (keys %{ $args{arguments} || {} }) {
+            my $value = $args{arguments}->{$key};
+
+            if (exists $arguments->{$key}) {
+                $arguments->{$key} = [$arguments->{$key}] unless ref $arguments->{$key} eq 'ARRAY';
+                unshift @{ $arguments->{$key} }, ref $value eq 'ARRAY' ? @$value : $value;
+            }
+            else {
+                $arguments->{$key} = $value;
+            }
+        }
+    }
+    else {
+        $arguments = {
+            %{ $args{arguments} || {} },
+            %{ $self->arguments || {} }
+        };
+    }
 
     my $match = $self->_build_match(
         name      => $self->name,

diff --git a/t/subroutes.t b/t/subroutes.t
@@ -134,4 +134,25 @@ subtest 'merges arguments' => sub {
       };
 };
 
+subtest 'merges arguments pushing' => sub {
+    my $last = Routes::Tiny->new;
+    $last->add_route('/last/:id/', '+arguments' => {foo => 'bar3', bar => 'baz'});
+
+    my $second = Routes::Tiny->new;
+    $second->mount('/second/:parent_id/', $last, '+arguments' => {second => 'argument', foo => 'bar2'});
+
+    my $top = Routes::Tiny->new;
+    $top->mount('/top/:topic', $second, arguments => {top => 'argument', foo => 'bar'});
+
+    my $match = $top->match('/top/rainbows/second/5/last/7/');
+
+    is_deeply $match->arguments,
+      {
+        top    => 'argument',
+        second => 'argument',
+        foo    => ['bar', 'bar2', 'bar3'],
+        bar    => 'baz',
+      };
+};
+
 done_testing;