fixed small route rendering bug

mojolicious · Aug 22, 2011 · 76bc38c · 76bc38c
1 parent 0c45a0a
commit 76bc38c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/Changes b/Changes
@@ -5,6 +5,7 @@ This file documents the revision history for Perl extension Mojolicious.
         - Made tag helper a little smarter.
         - Made camelize a little smarter.
         - Improved documentation.
+        - Fixed small route rendering bug.
 
 1.86    2011-08-21 00:00:00
         - Deprecated camel case command modules and lowercased all the

diff --git a/lib/Mojolicious/Routes/Pattern.pm b/lib/Mojolicious/Routes/Pattern.pm
@@ -83,9 +83,8 @@ sub render {
       $rendered = $values->{$name};
       $rendered = '' unless defined $rendered;
       my $default = $self->defaults->{$name};
-      $default = '' unless defined $default;
-      $optional = 0 unless $default eq $rendered;
-      $rendered = '' if $optional && $default eq $rendered;
+      if (!defined $default || ($default ne $rendered)) { $optional = 0 }
+      elsif ($optional) { $rendered = '' }
     }
 
     $string = "$rendered$string";

diff --git a/t/mojolicious/routes.t b/t/mojolicious/routes.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 use Mojo::Base -strict;
 
-use Test::More tests => 339;
+use Test::More tests => 340;
 
 # "They're not very heavy, but you don't hear me not complaining."
 use_ok 'Mojolicious::Routes';
@@ -250,7 +250,7 @@ $m = Mojolicious::Routes::Match->new(get => '/alternatives2/tset')->match($r);
 is @{$m->stack}, 0, 'right number of elements';
 $m = Mojolicious::Routes::Match->new(get => '/alternatives2/00')->match($r);
 is @{$m->stack}, 0, 'right number of elements';
-is $m->path_for('alternatives2foo'), '/alternatives2', 'right path';
+is $m->path_for('alternatives2foo'), '/alternatives2/', 'right path';
 is $m->path_for('alternatives2foo', foo => 0), '/alternatives2/0',
   'right path';
 
@@ -422,6 +422,7 @@ is $m->stack->[0]->{controller}, 'wild',        'right value';
 is $m->stack->[0]->{action},     'card',        'right value';
 is $m->stack->[0]->{wildcard},   'hello/there', 'right value';
 is $m->path_for, '/wildcards/1/hello/there', 'right path';
+is $m->path_for(wildcard => ''), '/wildcards/1/', 'right path';
 is @{$m->stack}, 1, 'right number of elements';
 $m =
   Mojolicious::Routes::Match->new(get => '/wildcards/2/hello/there')