fix url_for bug where routes with custom names would not match in the…

… same order as routes with automatically generated names (closes #920)
mojolicious · Feb 26, 2016 · ae4609a · ae4609a
1 parent 5ae4a30
commit ae4609a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/Changes b/Changes
@@ -4,6 +4,8 @@
   - Improved check_box and radio_button helpers with support for "on" default
     values.
   - Improved val method in Mojo::DOM with support for "on" default values.
+  - Fixed url_for bug where routes with custom names would not match in the same
+    order as routes with automatically generated names.
   - Fixed Windows bug in "util.t".
 
 6.48  2016-02-24

diff --git a/lib/Mojolicious/Routes/Route.pm b/lib/Mojolicious/Routes/Route.pm
@@ -210,15 +210,15 @@ sub _generate_route {
 sub _index {
   my $self = shift;
 
-  my %index;
+  my (%auto, %custom);
   my @children = (@{$self->children});
   while (my $child = shift @children) {
-    if ($child->has_custom_name) { $index{$child->name} = $child }
-    else                         { $index{$child->name} ||= $child }
+    if   ($child->has_custom_name) { $custom{$child->name} ||= $child }
+    else                           { $auto{$child->name}   ||= $child }
     push @children, @{$child->children};
   }
 
-  return \%index;
+  return {%auto, %custom};
 }
 
 1;

diff --git a/t/mojolicious/routes.t b/t/mojolicious/routes.t
@@ -10,7 +10,7 @@ my $r = Mojolicious::Routes->new;
 $r->route('/clean')->to(clean => 1)->name('very_clean');
 
 # /clean/too
-$r->route('/clean/too')->to(something => 1);
+$r->route('/clean/too')->to(something => 1)->name('very_clean');
 
 # /0
 $r->route('0')->to(null => 1);