fixed path generation bug in Mojolicious::Routes::Match

mojolicious · May 17, 2014 · 1c86c3e · 1c86c3e
1 parent 2f52d22
commit 1c86c3e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/Changes b/Changes
@@ -1,5 +1,5 @@
 
-5.0  2014-05-16
+5.0  2014-05-17
   - Code name "Tiger Face", this is a major release.
   - Changed heuristics for number detection in Mojo::JSON to better line up
     with user expectations.
@@ -17,6 +17,7 @@
   - Improved Mojo::Parameters to consistently accept arrays.
   - Fixed Mojo::IOLoop::Server to work correctly with newer versions of
     IO::Socket::SSL. (noxxi)
+  - Fixed path generation bug in Mojolicious::Routes::Match.
   - Fixed warnings in Mojo::IOLoop::Delay.
 
 4.99  2014-05-12

diff --git a/lib/Mojolicious/Routes/Match.pm b/lib/Mojolicious/Routes/Match.pm
@@ -24,7 +24,7 @@ sub path_for {
   %values = (%$captures, format => undef, %values);
   my $pattern = $endpoint->pattern;
   $values{format}
-    = defined $captures->{format}
+    //= defined $captures->{format}
     ? $captures->{format}
     : $pattern->defaults->{format}
     if $pattern->constraints->{format};

diff --git a/t/mojolicious/routes.t b/t/mojolicious/routes.t
@@ -538,6 +538,7 @@ is_deeply $m->stack, [], 'empty stack';
 $m = Mojolicious::Routes::Match->new(root => $r);
 $m->match($c => {method => 'GET', path => '/format2.txt.txt'});
 is_deeply $m->stack, [], 'empty stack';
+is $m->path_for('format2', format => 'txt'), '/format2.txt', 'right path';
 
 # Format with constraint alternatives
 $m = Mojolicious::Routes::Match->new(root => $r);