Wrap time ranges with timezones, closes #8807

(cherry picked from commit e2e513621d732abb8efff9120bd9a444836720d6)
(cherry picked from commit dcdde7da481e11660634278a8004175a1ce20f39)

Backport of #6183, original issue was #6179

Conflicts:
	activesupport/lib/active_support/core_ext/time/calculations.rb
	activesupport/test/core_ext/time_ext_test

Signed-off-by: Andrew White <andyw@pixeltrix.co.uk>

2 files changed, 17 insertions, 11 deletions

diff --git a/activesupport/lib/active_support/core_ext/time/calculations.rb b/activesupport/lib/active_support/core_ext/time/calculations.rb
index 34d4d88bd3..9146d82bd8 100644
--- a/activesupport/lib/active_support/core_ext/time/calculations.rb
+++ b/activesupport/lib/active_support/core_ext/time/calculations.rb
@@ -217,7 +217,7 @@ class Time
 
   # Returns a new Time representing the end of the day, 23:59:59.999999 (.999999999 in ruby1.9)
   def end_of_day
-    change(:hour => 23, :min => 59, :sec => 59, :usec => 999999.999)
+    change(:hour => 23, :min => 59, :sec => 59, :usec => Rational(999999999, 1000))
   end
 
   # Returns a new Time representing the start of the hour (x:00)
@@ -228,11 +228,7 @@ class Time
 
   # Returns a new Time representing the end of the hour, x:59:59.999999 (.999999999 in ruby1.9)
   def end_of_hour
-    change(
-      :min => 59,
-      :sec => 59,
-      :usec => 999999.999
-    )
+    change(:min => 59, :sec => 59, :usec => Rational(999999999, 1000))
   end
 
   # Returns a new Time representing the start of the month (1st of the month, 0:00)
@@ -246,7 +242,7 @@ class Time
   def end_of_month
     #self - ((self.mday-1).days + self.seconds_since_midnight)
     last_day = ::Time.days_in_month(month, year)
-    change(:day => last_day, :hour => 23, :min => 59, :sec => 59, :usec => 999999.999)
+    change(:day => last_day, :hour => 23, :min => 59, :sec => 59, :usec => Rational(999999999, 1000))
   end
   alias :at_end_of_month :end_of_month
 
@@ -270,7 +266,7 @@ class Time
 
   # Returns a new Time representing the end of the year (end of the 31st of december)
   def end_of_year
-    change(:month => 12, :day => 31, :hour => 23, :min => 59, :sec => 59, :usec => 999999.999)
+    change(:month => 12, :day => 31, :hour => 23, :min => 59, :sec => 59, :usec => Rational(999999999, 1000))
   end
   alias :at_end_of_year :end_of_year
 
diff --git a/activesupport/lib/active_support/time_with_zone.rb b/activesupport/lib/active_support/time_with_zone.rb
index a3c378f057..f39b58a980 100644
--- a/activesupport/lib/active_support/time_with_zone.rb
+++ b/activesupport/lib/active_support/time_with_zone.rb
@@ -329,8 +329,7 @@ module ActiveSupport
 
     # Send the missing method to +time+ instance, and wrap result in a new TimeWithZone with the existing +time_zone+.
     def method_missing(sym, *args, &block)
-      result = time.__send__(sym, *args, &block)
-      result.acts_like?(:time) ? self.class.new(nil, time_zone, result) : result
+      wrap_with_time_zone time.__send__(sym, *args, &block)
     end
 
     private
@@ -348,11 +347,22 @@ module ActiveSupport
       end
 
       def transfer_time_values_to_utc_constructor(time)
-        ::Time.utc_time(time.year, time.month, time.day, time.hour, time.min, time.sec, time.respond_to?(:usec) ? time.usec : 0)
+        usec = time.respond_to?(:nsec) ? Rational(time.nsec, 1000) : (time.respond_to?(:usec) ? time.usec : 0)
+        ::Time.utc_time(time.year, time.month, time.day, time.hour, time.min, time.sec, usec)
       end
 
       def duration_of_variable_length?(obj)
         ActiveSupport::Duration === obj && obj.parts.any? {|p| p[0].in?([:years, :months, :days]) }
       end
+
+      def wrap_with_time_zone(time)
+        if time.acts_like?(:time)
+          self.class.new(nil, time_zone, time)
+        elsif time.is_a?(Range)
+          wrap_with_time_zone(time.begin)..wrap_with_time_zone(time.end)
+        else
+          time
+        end
+      end
   end
 end