Fixed TimeZone issues in action-pack and active-support #704

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@776 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

actionpack/lib/action_view/helpers/form_options_helper.rb

@@ -185,6 +185,9 @@ def country_options_for_select(selected = nil, priority_countries = nil)
       # (long) list. (You can use TimeZone.us_zones as a convenience for
       # obtaining a list of the US time zones.)
       #
+      # The +selected+ parameter must be either +nil+, or a string that names
+      # a TimeZone.
+      #
       # By default, +model+ is the TimeZone constant (which can be obtained
       # in ActiveRecord as a value object). The only requirement is that the
       # +model+ parameter be an object that responds to #all, and returns
@@ -195,16 +198,17 @@ def country_options_for_select(selected = nil, priority_countries = nil)
       def time_zone_options_for_select(selected = nil, priority_zones = nil, model = TimeZone)
         zone_options = ""
 
+        zones = model.all
+        convert_zones = lambda { |list| list.map { |z| [ z.to_s, z.name ] } }
+
         if priority_zones
-          zone_options += options_for_select(priority_zones, selected)
+          zone_options += options_for_select(convert_zones[priority_zones], selected)
           zone_options += "<option>-------------</option>\n"
 
-          zones = model.all.reject { |z| priority_zones.include?( z ) }
-          zone_options += options_for_select(zones, selected)
-        else
-          zone_options += options_for_select(model.all, selected)
+          zones = zones.reject { |z| priority_zones.include?( z ) }
         end
 
+        zone_options += options_for_select(convert_zones[zones], selected)
         zone_options
       end
 
@@ -292,4 +296,4 @@ def add_blank_option(option_tags, add_blank)
         end
     end
   end
-end
+end

activesupport/lib/active_support/values/time_zone.rb

@@ -37,8 +37,14 @@ def now
     adjust(Time.now)
   end
 
+  # Return the current date in this time zone.
+  def today
+    now.to_date
+  end
+
   # Adjust the given time to the time zone represented by +self+.
   def adjust(time)
+    time = time.to_time
     offset = time.utc_offset
     time + utc_offset - offset
   end
@@ -152,4 +158,4 @@ def us_zones
       all.find_all { |z| z.name =~ US_ZONES }
     end
   end
-end
+end