fixed select_field helper to be nondestructive

mojolicious · Jan 17, 2014 · 9d8e446 · 9d8e446
1 parent c3ae16e
commit 9d8e446
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/Changes b/Changes
@@ -11,6 +11,7 @@
   - Improved Mojo::IOLoop::Server to use address and port for descriptor
     inheritance.
   - Improved list of available commands to be alphabetical. (jberger)
+  - Fixed select_field helper to be nondestructive.
 
 4.67  2014-01-11
   - Added history and max_history_size attributes to Mojo::Log.

diff --git a/lib/Mojolicious/Plugin/TagHelpers.pm b/lib/Mojolicious/Plugin/TagHelpers.pm
@@ -167,9 +167,9 @@ sub _select_field {
 
     # "optgroup" tag
     if (blessed $group && $group->isa('Mojo::Collection')) {
-      my ($label, $values) = splice @$group, 0, 2;
+      my ($label, $values, %attrs) = @$group;
       my $content = join '', map { _option(\%values, $_) } @$values;
-      $groups .= _tag('optgroup', label => $label, @$group, sub {$content});
+      $groups .= _tag('optgroup', label => $label, %attrs, sub {$content});
     }
 
     # "option" tag

diff --git a/t/mojolicious/tag_helper_lite_app.t b/t/mojolicious/tag_helper_lite_app.t
@@ -41,6 +41,19 @@ post '/no_snowman';
 
 my $t = Test::Mojo->new;
 
+# Reuse values
+my $values = [app->c(EU => [qw(de en)])];
+is app->select_field(country => $values),
+    '<select name="country"><optgroup label="EU">'
+  . '<option value="de">de</option>'
+  . '<option value="en">en</option>'
+  . '</optgroup></select>', 'right result';
+is app->select_field(country => $values),
+    '<select name="country"><optgroup label="EU">'
+  . '<option value="de">de</option>'
+  . '<option value="en">en</option>'
+  . '</optgroup></select>', 'right result';
+
 # Basic tags
 $t->options_ok('/tags')->status_is(200)->content_is(<<EOF);
 <foo />