fixed path generation bug in Mojolicious::Routes::Pattern (closes #456)

mojolicious · Feb 21, 2013 · 1d4a435 · 1d4a435
1 parent e4874cb
commit 1d4a435
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/Changes b/Changes
@@ -3,6 +3,7 @@
   - Improved portability of Mojo::Asset::File tests.
   - Improved documentation.
   - Improved tests. (jberger, sri)
+  - Fixed path generation bug in Mojolicious::Routes::Pattern. (jberger)
   - Fixed small domain detection bug in Mojo::UserAgent::CookieJar.
     (dione, sri)
   - Fixed comment lines in Mojo::Template to cover the whole line.

diff --git a/lib/Mojolicious/Routes/Pattern.pm b/lib/Mojolicious/Routes/Pattern.pm
@@ -36,8 +36,10 @@ sub render {
   my $format = ($values ||= {})->{format};
   $values = {%{$self->defaults}, %$values};
 
-  my $string   = '';
-  my $optional = 1;
+  # Placeholders can only be optional without a format
+  my $optional = !$format;
+
+  my $string = '';
   for my $token (reverse @{$self->tree}) {
     my $op       = $token->[0];
     my $rendered = '';

diff --git a/t/mojolicious/routes.t b/t/mojolicious/routes.t
@@ -248,6 +248,7 @@ $m->match($r, $c);
 is $m->stack->[0]{foo}, 11, 'right value';
 is @{$m->stack}, 1, 'right number of elements';
 is $m->path_for, '/alternatives', 'right path';
+is $m->path_for(format => 'txt'), '/alternatives/11.txt', 'right path';
 $m = Mojolicious::Routes::Match->new(GET => '/alternatives/0');
 $m->match($r, $c);
 is $m->stack->[0]{foo}, 0, 'right value';
@@ -273,6 +274,8 @@ $m = Mojolicious::Routes::Match->new(GET => '/alternatives/00');
 $m->match($r, $c);
 is @{$m->stack}, 0, 'right number of elements';
 is $m->path_for('alternativesfoo'), '/alternatives', 'right path';
+is $m->path_for('alternativesfoo', format => 'txt'), '/alternatives/11.txt',
+  'right path';
 
 # Alternatives without default
 $m = Mojolicious::Routes::Match->new(GET => '/alternatives2');