3.2.19.github9

Force a period when local times are ambiguous

RAILS_VERSION

@@ -1 +1 @@
-3.2.19.github7
+3.2.19.github9

actionmailer/lib/action_mailer/base.rb

@@ -2,7 +2,6 @@ require 'mail'
 require 'action_mailer/collector'
 require 'active_support/core_ext/array/wrap'
 require 'active_support/core_ext/object/blank'
-require 'active_support/core_ext/proc'
 require 'active_support/core_ext/string/inflections'
 require 'active_support/core_ext/hash/except'
 require 'active_support/core_ext/module/anonymous'
@@ -627,7 +626,7 @@ module ActionMailer #:nodoc:
 
       # Call all the procs (if any)
       default_values = self.class.default.merge(self.class.default) do |k,v|
-        v.respond_to?(:call) ? v.bind(self).call : v
+        v.respond_to?(:call) ? instance_eval(&v) : v
       end
 
       # Handle defaults

activesupport/lib/active_support/core_ext/proc.rb

@@ -1,14 +0,0 @@
-require "active_support/core_ext/kernel/singleton_class"
-
-class Proc #:nodoc:
-  def bind(object)
-    block, time = self, Time.now
-    object.class_eval do
-      method_name = "__bind_#{time.to_i}_#{time.usec}"
-      define_method(method_name, &block)
-      method = instance_method(method_name)
-      remove_method(method_name)
-      method
-    end.bind(object)
-  end
-end

activesupport/lib/active_support/rescuable.rb

@@ -1,6 +1,5 @@
 require 'active_support/concern'
 require 'active_support/core_ext/class/attribute'
-require 'active_support/core_ext/proc'
 require 'active_support/core_ext/string/inflections'
 require 'active_support/core_ext/array/extract_options'
 
@@ -108,7 +107,11 @@ module ActiveSupport
       when Symbol
         method(rescuer)
       when Proc
-        rescuer.bind(self)
+        if rescuer.arity == 0
+          Proc.new { instance_exec(&rescuer) }
+        else
+          Proc.new { |_exception| instance_exec(_exception, &rescuer) }
+        end
       end
     end
   end

activesupport/lib/active_support/time_with_zone.rb

@@ -338,7 +338,7 @@ module ActiveSupport
         # so transfer time values to a utc constructor if necessary
         @time = transfer_time_values_to_utc_constructor(@time) unless @time.utc?
         begin
-          @time_zone.period_for_local(@time)
+          @time_zone.period_for_local(@time) { |periods| periods.first }
         rescue ::TZInfo::PeriodNotFound
           # time is in the "spring forward" hour gap, so we're moving the time forward one hour and trying again
           @time += 1.hour

activesupport/lib/active_support/values/time_zone.rb

@@ -309,8 +309,8 @@ module ActiveSupport
     end
 
     # Adjust the given time to the simultaneous time in UTC. Returns a Time.utc() instance.
-    def local_to_utc(time, dst=true)
-      tzinfo.local_to_utc(time, dst)
+    def local_to_utc(time, dst=true, &block)
+      tzinfo.local_to_utc(time, dst, &block)
     end
 
     # Available so that TimeZone instances respond like TZInfo::Timezone instances
@@ -319,8 +319,8 @@ module ActiveSupport
     end
 
     # Available so that TimeZone instances respond like TZInfo::Timezone instances
-    def period_for_local(time, dst=true)
-      tzinfo.period_for_local(time, dst)
+    def period_for_local(time, dst=true, &block)
+      tzinfo.period_for_local(time, dst, &block)
     end
 
     def self.find_tzinfo(name)

activesupport/test/core_ext/proc_test.rb

@@ -1,12 +0,0 @@
-require 'abstract_unit'
-require 'active_support/core_ext/proc'
-
-class ProcTests < Test::Unit::TestCase
-  def test_bind_returns_method_with_changed_self
-    block = Proc.new { self }
-    assert_equal self, block.call
-    bound_block = block.bind("hello")
-    assert_not_equal block, bound_block
-    assert_equal "hello", bound_block.call
-  end
-end

activesupport/test/time_zone_test.rb

@@ -136,6 +136,17 @@ class TimeZoneTest < Test::Unit::TestCase
     assert_equal 'EDT', twz.zone
   end
 
+  def test_local_handles_non_dst_clock_set_back
+    # If the clocks are set back during a transition from one non-DST observance
+    # to another, the time of the transition will be ambiguous. The earlier
+    # observance will be selected to mirror behaviour of DST to non-DST transitions.
+    # Such a transition occurred at 02:00 local time in Moscow on 26 October 2014.
+    zone = ActiveSupport::TimeZone['Moscow']
+    twz = zone.local(2014,10,26,1)
+    assert_equal Time.utc(2014,10,26,1), twz.time
+    assert_equal Time.utc(2014,10,25,21), twz.utc
+  end
+
   def test_at
     zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)']
     secs = 946684800.0