From c324918309654a1134d7220bf48ebf1fcecff6b2 Mon Sep 17 00:00:00 2001
From: jake varghese <jakev@jake-vargheses-computer.local>
Date: Thu, 7 Aug 2008 16:52:50 -0500
Subject: [PATCH] Added support for options[:html] for select form helper

---
 .../lib/action_view/helpers/form_options_helper.rb |    3 ++-
 .../test/template/form_options_helper_test.rb      |   20 +++++++++++++++++++-
 2 files changed, 21 insertions(+), 2 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..3d82ee7 100644
--- a/actionpack/lib/action_view/helpers/form_options_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_options_helper.rb
@@ -96,7 +96,8 @@ module ActionView
       # By default, <tt>post.person_id</tt> is the selected option.  Specify <tt>:selected => value</tt> to use a different selection
       # or <tt>:selected => nil</tt> to leave all options unselected.
       def select(object, method, choices, options = {}, html_options = {})
-        InstanceTag.new(object, method, self, options.delete(:object)).to_select_tag(choices, options, html_options)
+				options[:html] ||= html_options
+        InstanceTag.new(object, method, self, options.delete(:object)).to_select_tag(choices, options, options.delete(:html))
       end
 
       # Returns <tt><select></tt> and <tt><option></tt> tags for the collection of existing return values of
diff --git a/actionpack/test/template/form_options_helper_test.rb b/actionpack/test/template/form_options_helper_test.rb
index a33eb85..323672a 100644
--- a/actionpack/test/template/form_options_helper_test.rb
+++ b/actionpack/test/template/form_options_helper_test.rb
@@ -342,7 +342,25 @@ uses_mocha "FormOptionsHelperTest" do
         "<select id=\"post_category\" name=\"post[category]\"><option value=\"abe\">abe</option>\n<option value=\"&lt;mus&gt;\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
         select("post", "category", %w( abe <mus> hest ), :selected => nil)
       )
-    end
+    end 
+
+		def test_select_with_options_html
+			@post = Post.new
+			@post.category = "<mus>"
+			assert_dom_equal(
+			"<select title=\"Super Slick Select\" id=\"post_category\" name=\"post[category]\" class=\"select_class\"><option value=\"abe\">abe</option>\n<option value=\"&lt;mus&gt;\" selected=\"selected\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
+			select("post", "category", %w( abe <mus> hest), {:html => {:title => "Super Slick Select", :class => "select_class"}})
+			)
+		end
+		
+		def test_select_with_html_options
+			@post = Post.new
+			@post.category = "<mus>"
+			assert_dom_equal(
+			"<select title=\"Super Slick Select\" id=\"post_category\" name=\"post[category]\" class=\"select_class\"><option value=\"abe\">abe</option>\n<option value=\"&lt;mus&gt;\" selected=\"selected\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
+			select("post", "category", %w( abe <mus> hest), {}, {:title => "Super Slick Select", :class => "select_class"})
+			)
+		end
 
     def test_collection_select
       @posts = [
-- 
1.5.3.7