From a2a64b058366415b7c90f98da063eb5cbea8f79d Mon Sep 17 00:00:00 2001
From: Jon Crawford <mail@joncrawford.com>
Date: Fri, 5 Sep 2008 01:50:38 -0500
Subject: [PATCH] Added optgroups_with_options_for_select helper to form_options_helper for wrapping option tags in optgroups.

---
 .../lib/action_view/helpers/form_options_helper.rb |   46 +++++++++++++++++++-
 .../test/template/form_options_helper_test.rb      |   29 ++++++++++++
 2 files changed, 74 insertions(+), 1 deletions(-)

diff --git a/actionpack/lib/action_view/helpers/form_options_helper.rb b/actionpack/lib/action_view/helpers/form_options_helper.rb
index 9aae945..2873d08 100644
--- a/actionpack/lib/action_view/helpers/form_options_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_options_helper.rb
@@ -268,7 +268,51 @@ module ActionView
           options_for_select += '</optgroup>'
         end
       end
-
+      
+      # Returns a string of <tt><option></tt> tags, like <tt>options_from_collection_for_select</tt>, but
+      # wraps them with <tt><optgroup></tt> tags.
+      #
+      # Parameters:
+      # * +labels+ - An array of strings representing the <tt><optgroup></tt> text.
+      # * +options+ - An array of arrays each containing the options for a corresponding optgroup.
+      # * +selected_key+ - A value equal to the +value+ attribute for one of the <tt><option></tt> tags,
+      #   which will have the +selected+ attribute set. Corresponds to the return value of one of the calls
+      #   to +option_key_method+. If +nil+, no selection is made.
+      # * +prompt+ - set to true or a prompt string. When the select element doesn’t have a value yet, this
+      #    prepends an option with a generic prompt — "Please select" — or the given prompt string.
+      #
+      #
+      # Sample usage:
+      #   labels = ['North America','Europe']
+      #   groups = [['United States','Canada'],['Denmark','Germany','France']]
+      #   optgroups_with_options_for_select(labels,groups)
+      #
+      # Possible output:
+      #   <optgroup label="North America">
+      #     <option value="United States">United States</option>
+      #     <option value="Canada">Canada</option>
+      #   </optgroup>
+      #   <optgroup label="Europe">
+      #     <option value="Denmark">Denmark</option>
+      #     <option value="Germany">Germany</option>
+      #     <option value="France">France</option>
+      #   </optgroup>
+      #
+      # <b>Note:</b> Only the <tt><optgroup></tt> and <tt><option></tt> tags are returned, so you still have to
+      # wrap the output in an appropriate <tt><select></tt> tag.
+      def optgroups_with_options_for_select(labels, groups, selected_key = nil, prompt = nil)
+        return "<option>Error: Sizes don't match.</option>" if labels.size != groups.size
+        str = String.new
+        unless prompt.nil?
+           prompt.kind_of?(String) ? prompt : 'Please select'
+           str += content_tag :option, prompt, :value => ""
+        end
+        (0..labels.size-1).each do |i|
+           str += content_tag :optgroup, options_for_select(groups[i], selected_key), :label => labels[i]
+        end
+        str
+      end
+      
       # Returns a string of option tags for pretty much any time zone in the
       # world. Supply a TimeZone name as +selected+ to have it marked as the
       # selected option tag. You can also supply an array of TimeZone objects
diff --git a/actionpack/test/template/form_options_helper_test.rb b/actionpack/test/template/form_options_helper_test.rb
index a33eb85..507f962 100644
--- a/actionpack/test/template/form_options_helper_test.rb
+++ b/actionpack/test/template/form_options_helper_test.rb
@@ -141,6 +141,35 @@ uses_mocha "FormOptionsHelperTest" do
         option_groups_from_collection_for_select(@continents, "countries", "continent_name", "country_id", "country_name", "dk")
       )
     end
+    
+    def test_optgroups_with_options_for_select
+      assert_dom_equal(
+        "<optgroup label=\"Hats\"><option value=\"Baseball Cap\">Baseball Cap</option>\n<option value=\"Cowboy Hat\">Cowboy Hat</option></optgroup>",
+        optgroups_with_options_for_select(["Hats"], [["Baseball Cap","Cowboy Hat"]])
+      )
+    end
+
+    def test_optgroups_with_options_for_select_with_selected
+      assert_dom_equal(
+          "<optgroup label=\"Hats\"><option value=\"Baseball Cap\">Baseball Cap</option>\n<option selected=\"selected\" value=\"Cowboy Hat\">Cowboy Hat</option></optgroup>",
+          optgroups_with_options_for_select(["Hats"], [["Baseball Cap","Cowboy Hat"]], "Cowboy Hat")
+      )
+    end
+
+    def test_optgroups_with_options_for_select_with_prompt
+       assert_dom_equal(
+          "<option value=\"\">Choose a product...</option><optgroup label=\"Hats\"><option value=\"Baseball Cap\">Baseball Cap</option>\n<option value=\"Cowboy Hat\">Cowboy Hat</option></optgroup>",
+          optgroups_with_options_for_select(["Hats"], [["Baseball Cap","Cowboy Hat"]], nil, "Choose a product...")
+        )
+    end
+
+    def test_optgroups_with_options_for_select_bad_arguments
+       assert_dom_equal(
+            "<option>Error: Sizes don't match.</option>",
+            optgroups_with_options_for_select(["Hats"], ["Baseball Cap","Cowboy Hat"])
+          )
+
+    end
 
     def test_time_zone_options_no_parms
       opts = time_zone_options_for_select
-- 
1.5.4.5


From 86e3dea5c329722a5bfcdfda1f9b31c7a94895b6 Mon Sep 17 00:00:00 2001
From: Jon Crawford <mail@joncrawford.com>
Date: Fri, 5 Sep 2008 10:18:04 -0500
Subject: [PATCH] Fixed typos in optgroups_with_options_for_select and added a test.

---
 .../lib/action_view/helpers/form_options_helper.rb |    6 +++---
 .../test/template/form_options_helper_test.rb      |    7 +++++++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/actionpack/lib/action_view/helpers/form_options_helper.rb b/actionpack/lib/action_view/helpers/form_options_helper.rb
index 2873d08..bab320b 100644
--- a/actionpack/lib/action_view/helpers/form_options_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_options_helper.rb
@@ -269,15 +269,15 @@ module ActionView
         end
       end
       
-      # Returns a string of <tt><option></tt> tags, like <tt>options_from_collection_for_select</tt>, but
+      # Returns a string of <tt><option></tt> tags, like <tt>options_for_select</tt>, but
       # wraps them with <tt><optgroup></tt> tags.
       #
       # Parameters:
       # * +labels+ - An array of strings representing the <tt><optgroup></tt> text.
       # * +options+ - An array of arrays each containing the options for a corresponding optgroup.
       # * +selected_key+ - A value equal to the +value+ attribute for one of the <tt><option></tt> tags,
-      #   which will have the +selected+ attribute set. Corresponds to the return value of one of the calls
-      #   to +option_key_method+. If +nil+, no selection is made.
+      #   which will have the +selected+ attribute set. Note: It is possible for this value to match multiple options
+      #   as you might have the same option in multiple groups.  Each will then get <tt>selected="selected"</tt>.
       # * +prompt+ - set to true or a prompt string. When the select element doesn’t have a value yet, this
       #    prepends an option with a generic prompt — "Please select" — or the given prompt string.
       #
diff --git a/actionpack/test/template/form_options_helper_test.rb b/actionpack/test/template/form_options_helper_test.rb
index 507f962..b784e7c 100644
--- a/actionpack/test/template/form_options_helper_test.rb
+++ b/actionpack/test/template/form_options_helper_test.rb
@@ -170,6 +170,13 @@ uses_mocha "FormOptionsHelperTest" do
           )
 
     end
+    
+    def test_optgroups_with_options_for_select_with_multiple_selected
+        assert_dom_equal(
+            "<optgroup label=\"Hats\"><option value=\"Baseball Cap\">Baseball Cap</option>\n<option selected=\"selected\" value=\"Cowboy\">Cowboy</option></optgroup><optgroup label=\"Boots\"><option value=\"Snow\">Snow</option>\n<option selected=\"selected\" value=\"Cowboy\">Cowboy</option></optgroup>",
+             optgroups_with_options_for_select(["Hats","Boots"], [["Baseball Cap","Cowboy"],["Snow","Cowboy"]],"Cowboy")
+           )
+    end
 
     def test_time_zone_options_no_parms
       opts = time_zone_options_for_select
-- 
1.5.4.5