Ticket #7706: active_support_time_calculations_fallback_to_datetime.diff

test/core_ext/time_ext_test.rb

@@ -314 +314 @@
-    assert_equal 31, Time.days_in_month(12, 2005)
-  end
-
+  def test_time_with_datetime_fallback
+    assert_equal Time.time_with_datetime_fallback(:utc, 2005, 2, 21, 17, 44, 30), Time.utc(2005, 2, 21, 17, 44, 30)
+    assert_equal Time.time_with_datetime_fallback(:local, 2005, 2, 21, 17, 44, 30), Time.local(2005, 2, 21, 17, 44, 30)
+    assert_equal Time.time_with_datetime_fallback(:utc, 2039, 2, 21, 17, 44, 30), DateTime.civil(2039, 2, 21, 17, 44, 30, 0, 0)
+    assert_equal Time.time_with_datetime_fallback(:local, 2039, 2, 21, 17, 44, 30), DateTime.civil(2039, 2, 21, 17, 44, 30, DateTime.now.offset, 0)
+    assert_equal Time.time_with_datetime_fallback(:utc, 1900, 2, 21, 17, 44, 30), DateTime.civil(1900, 2, 21, 17, 44, 30, 0, 0)
+    assert_equal Time.time_with_datetime_fallback(:local, 1900, 2, 21, 17, 44, 30), DateTime.civil(1900, 2, 21, 17, 44, 30, DateTime.now.offset, 0)
+    assert_equal Time.time_with_datetime_fallback(:utc, 2005), Time.utc(2005)
+    assert_equal Time.time_with_datetime_fallback(:utc, 2039), DateTime.civil(2039, 1, 1, 0, 0, 0, 0, 0)
+    assert_equal Time.time_with_datetime_fallback(:utc, 2005, 2, 21, 17, 44, 30, 1), Time.utc(2005, 2, 21, 17, 44, 30, 1) #with usec
+    assert_equal Time.time_with_datetime_fallback(:utc, 2039, 2, 21, 17, 44, 30, 1), DateTime.civil(2039, 2, 21, 17, 44, 30, 0, 0)
+  end
+
+  def test_utc_time
+    assert_equal Time.utc_time(2005, 2, 21, 17, 44, 30), Time.utc(2005, 2, 21, 17, 44, 30)
+    assert_equal Time.utc_time(2039, 2, 21, 17, 44, 30), DateTime.civil(2039, 2, 21, 17, 44, 30, 0, 0)
+    assert_equal Time.utc_time(1901, 2, 21, 17, 44, 30), DateTime.civil(1901, 2, 21, 17, 44, 30, 0, 0)
+  end
+
+  def test_local_time
+    assert_equal Time.local_time(2005, 2, 21, 17, 44, 30), Time.local(2005, 2, 21, 17, 44, 30)
+    assert_equal Time.local_time(2039, 2, 21, 17, 44, 30), DateTime.civil(2039, 2, 21, 17, 44, 30, DateTime.now.offset, 0)
+    assert_equal Time.local_time(1901, 2, 21, 17, 44, 30), DateTime.civil(1901, 2, 21, 17, 44, 30, DateTime.now.offset, 0)
+  end
+
-  def test_next_month_on_31st
-    assert_equal Time.local(2005, 9, 30), Time.local(2005, 8, 31).next_month
-  end

lib/active_support/core_ext/time/calculations.rb

@@ -26 +26 @@
-              month % 2 == 0 ? 31 : 30
-            end
-          end
+
+          # Returns a new Time if requested year can be accomodated by Ruby's Time class
+          # (i.e., if year is within either 1970..2038 or 1902..2038, depending on system architecture);
+          # otherwise returns a DateTime
+          def time_with_datetime_fallback(utc_or_local, year, month=1, day=1, hour=0, min=0, sec=0, usec=0)
+            ::Time.send(utc_or_local, year, month, day, hour, min, sec, usec)
+          rescue
+            offset = if utc_or_local.to_sym == :utc then 0 else ::DateTime.now.offset end
+            ::DateTime.civil(year, month, day, hour, min, sec, offset, 0)
+          end
+          
+          # wraps class method time_with_datetime_fallback with utc_or_local == :utc
+          def utc_time(*args)
+            time_with_datetime_fallback(:utc, *args)
+          end
+          
+          # wraps class method time_with_datetime_fallback with utc_or_local == :local
+          def local_time(*args)
+            time_with_datetime_fallback(:local, *args)
+          end          
-        end
-
-        # Seconds since midnight: Time.now.seconds_since_midnight
@@ -38 +58 @@
-        # minute is passed, then sec and usec is set to 0.
-        def change(options)
-          ::Time.send(
- : :local
+_time : :local_time
-            options[:year]  || self.year, 
-            options[:month] || self.month, 
-            options[:mday]  || self.mday,