From 1cc991bef8687bd2d8ff0473c08709f7ee916885 Mon Sep 17 00:00:00 2001
From: Brian McManus <bdmac97@gmail.com>
Date: Wed, 27 Mar 2013 14:03:49 -0700
Subject: Revert grep to select since they are not the same

A previous commit swapped out a call to select for a call to grep in
time_zone_options_for_select. This behavior actually causes the
regexp priority option to stop working.

ActiveSupport::TimeZone overrides the =~ operator which is what the
select block was using previously. Enumerable#grep
checks pattern === element and in this case that would be /US/ ===
ActiveSupport::TimeZone which does not work because
ActiveSupport::TimeZone does not supply an implicit converting to_str
method, only an explicit to_s method.

It would be impossible to provide a to_str method that behaves
identically to the =~ method provided on ActiveSupport::TimeZone
so the only option is to revert back to using select with =~.
---
 actionpack/lib/action_view/helpers/form_options_helper.rb | 2 +-
 actionpack/test/template/form_options_helper_test.rb      | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/actionpack/lib/action_view/helpers/form_options_helper.rb b/actionpack/lib/action_view/helpers/form_options_helper.rb
index 377819a80c..c7edf3dd7e 100644
--- a/actionpack/lib/action_view/helpers/form_options_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_options_helper.rb
@@ -565,7 +565,7 @@ module ActionView
 
         if priority_zones
           if priority_zones.is_a?(Regexp)
-            priority_zones = zones.grep(priority_zones)
+            priority_zones = zones.select { |z| z =~ priority_zones }
           end
 
           zone_options.safe_concat options_for_select(convert_zones[priority_zones], selected)
diff --git a/actionpack/test/template/form_options_helper_test.rb b/actionpack/test/template/form_options_helper_test.rb
index 29d63d9653..de806d7bdb 100644
--- a/actionpack/test/template/form_options_helper_test.rb
+++ b/actionpack/test/template/form_options_helper_test.rb
@@ -1095,12 +1095,11 @@ class FormOptionsHelperTest < ActionView::TestCase
   def test_time_zone_select_with_priority_zones_as_regexp
     @firm = Firm.new("D")
 
-    priority_zones = /A|D/
     @fake_timezones.each_with_index do |tz, i|
-      priority_zones.stubs(:===).with(tz).returns(i.zero? || i == 3)
+      tz.stubs(:=~).returns(i.zero? || i == 3)
     end
 
-    html = time_zone_select("firm", "time_zone", priority_zones)
+    html = time_zone_select("firm", "time_zone", /A|D/)
     assert_dom_equal "<select id=\"firm_time_zone\" name=\"firm[time_zone]\">" +
                  "<option value=\"A\">A</option>\n" +
                  "<option value=\"D\" selected=\"selected\">D</option>" +
-- 
cgit v1.2.3


From 53d68bd964af17484898c5cd5e21a8ce9c359143 Mon Sep 17 00:00:00 2001
From: Brian McManus <bdmac97@gmail.com>
Date: Wed, 27 Mar 2013 14:08:18 -0700
Subject: Add regression test for TZ grep

Added a regression test that will fail if anyone tries to change
time_zone_select to use grep again thinking it will work when it does
not.
---
 actionpack/test/template/form_options_helper_test.rb | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/actionpack/test/template/form_options_helper_test.rb b/actionpack/test/template/form_options_helper_test.rb
index de806d7bdb..0b45d01593 100644
--- a/actionpack/test/template/form_options_helper_test.rb
+++ b/actionpack/test/template/form_options_helper_test.rb
@@ -1110,6 +1110,26 @@ class FormOptionsHelperTest < ActionView::TestCase
                  "</select>",
                  html
   end
+  
+  def test_time_zone_select_with_priority_zones_as_regexp_using_grep_finds_no_zones
+    @firm = Firm.new("D")
+  
+    priority_zones = /A|D/
+    @fake_timezones.each_with_index do |tz, i|
+      priority_zones.stubs(:===).with(tz).raises(Exception)
+    end
+  
+    html = time_zone_select("firm", "time_zone", priority_zones)
+    assert_dom_equal "<select id=\"firm_time_zone\" name=\"firm[time_zone]\">" +
+                 "<option value=\"\" disabled=\"disabled\">-------------</option>\n" +
+                 "<option value=\"A\">A</option>\n" +
+                 "<option value=\"B\">B</option>\n" +
+                 "<option value=\"C\">C</option>\n" +
+                 "<option value=\"D\" selected=\"selected\">D</option>\n" +
+                 "<option value=\"E\">E</option>" +
+                 "</select>",
+                 html
+  end
 
   def test_time_zone_select_with_default_time_zone_and_nil_value
      @firm = Firm.new()
-- 
cgit v1.2.3