Changeset 5388

Timestamp:

11/02/06 01:52:11 (2 years ago)

Author:

bitsweat

Message:

next_week respects DST changes. Closes #5617, closes #2353, closes #2509, references #4551.

Files:

• trunk/activesupport/CHANGELOG (modified) (1 diff)
• trunk/activesupport/lib/active_support/core_ext/time/calculations.rb (modified) (4 diffs)
• trunk/activesupport/test/core_ext/time_ext_test.rb (modified) (4 diffs)

trunk/activesupport/CHANGELOG

@@ -3 +3 @@
-* Update dependencies to allow constants to be defined alongside their siblings. A common case for this is AR model classes with STI; user.rb might define User, Administrator and Guest for example. [Nicholas Seckar]
-
- [marclove
+, #5617, #2353, #2509, #4551 [marclove, rabiedenharn, rails@roetzel.de, jsolson@damogran.org, drbrain@segment7.net
-
-* Expose methods added to Enumerable in the documentation, such as group_by. Closes #6170. [sergeykojin@gmail.com, Marcel Molina Jr.]

trunk/activesupport/lib/active_support/core_ext/time/calculations.rb

@@ -26 +26 @@
-        # Seconds since midnight: Time.now.seconds_since_midnight
-        def seconds_since_midnight
-hour.hours + self.min.minutes + self.sec
+to_i - self.change(:hour => 0).to_i
-        end
-            
@@ -57 +57 @@
-        # Do not use this method in combination with x.months, use months_ago instead!
-        def ago(seconds)
-conds.until(self
+lf.since(-seconds
-        end
-
@@ -63 +63 @@
-        #the Numeric extension. Do not use this method in combination with x.months, use months_since instead!
-        def since(seconds)
-
+
+
+
+
-        end
-        alias :in :since
@@ -136 +139 @@
-        def next_week(day = :monday)
-          days_into_week = { :monday => 0, :tuesday => 1, :wednesday => 2, :thursday => 3, :friday => 4, :saturday => 5, :sunday => 6}
-
-
-
+
-        end
-        

trunk/activesupport/test/core_ext/time_ext_test.rb

@@ -8 +8 @@
-    assert_equal 86399,Time.local(2005,1,1,23,59,59).seconds_since_midnight
-    assert_equal 60.00001,Time.local(2005,1,1,0,1,0,10).seconds_since_midnight
+  end
+
+  def test_seconds_since_midnight_at_daylight_savings_time_start
+    # dt: US: 2005 April 3rd 2:00am ST => April 3rd 3:00am DT
+    assert_equal 3600+59*60+59,  Time.local(2005,4,3,1,59,59).seconds_since_midnight, 'just before DST start'
+    assert_equal 3600+59*60+59+2,Time.local(2005,4,3,3, 0, 1).seconds_since_midnight, 'just after DST start'
+  end
+
+  def test_seconds_since_midnight_at_daylight_savings_time_end
+    # st: US: 2005 October 30th 2:00am DT => October 30th 1:00am ST
+    # avoid setting a time between 1:00 and 2:00 since that requires specifying whether DST is active
+    assert_equal 3599, Time.local(2005,10,30,0,59,59).seconds_since_midnight, 'just before DST end'
+    assert_equal 3*3600+1, Time.local(2005,10,30,2, 0, 1).seconds_since_midnight, 'just after DST end'
+
+    # now set a time between 1:00 and 2:00 by specifying whether DST is active
+    # uses: Time.local( sec, min, hour, day, month, year, wday, yday, isdst, tz )
+    assert_equal 1*3600+30*60, Time.local(0,30,1,30,10,2005,0,0,true,'EST5EDT').seconds_since_midnight, 'before DST end'
+    assert_equal 2*3600+30*60, Time.local(0,30,1,30,10,2005,0,0,false,'EST5EDT').seconds_since_midnight, 'after DST end'
-  end
-
@@ -89 +107 @@
-  end
-
+  def test_daylight_savings_time_crossings_backward_start
+    # dt: US: 2005 April 3rd 4:18am
+    assert_equal Time.local(2005,4,2,4,18,0), Time.local(2005,4,3,4,18,0).ago(86400), 'dt-1.day=>st'
+    assert_equal Time.local(2005,4,1,4,18,0), Time.local(2005,4,2,4,18,0).ago(86400), 'st-1.day=>st'
+  end
+
+  def test_daylight_savings_time_crossings_backward_end
+    # st: US: 2005 October 30th 4:03am
+    assert_equal Time.local(2005,10,29,4,3), Time.local(2005,10,30,4,3,0).ago(86400), 'st-1.day=>dt'
+    assert_equal Time.local(2005,10,28,4,3), Time.local(2005,10,29,4,3,0).ago(86400), 'dt-1.day=>dt'
+  end
+
-  def test_since
-    assert_equal Time.local(2005,2,22,10,10,11), Time.local(2005,2,22,10,10,10).since(1)
@@ -94 +124 @@
-    assert_equal Time.local(2005,2,24,10,10,10), Time.local(2005,2,22,10,10,10).since(86400*2)
-    assert_equal Time.local(2005,2,24,11,10,35), Time.local(2005,2,22,10,10,10).since(86400*2 + 3600 + 25)
+  end
+
+  def test_daylight_savings_time_crossings_forward_start
+    # st: US: 2005 April 2nd 7:27pm
+    assert_equal Time.local(2005,4,3,19,27,0), Time.local(2005,4,2,19,27,0).since(86400), 'st+1.day=>dt'
+    assert_equal Time.local(2005,4,4,19,27,0), Time.local(2005,4,3,19,27,0).since(86400), 'dt+1.day=>dt'
+  end
+
+  def test_daylight_savings_time_crossings_forward_end
+    # dt: US: 2005 October 30th 12:45am
+    assert_equal Time.local(2005,10,31,1,45,0), Time.local(2005,10,30,1,45,0).since(86400), 'dt+1.day=>st'
+    assert_equal Time.local(2005,11, 1,1,45,0), Time.local(2005,10,31,1,45,0).since(86400), 'st+1.day=>st'
-  end
-
@@ -149 +191 @@
-    assert_equal Time.local(2006,10,30), Time.local(2006,10,23,0,0,0).next_week
-    assert_equal Time.local(2006,11,1), Time.local(2006,10,23,0,0,0).next_week(:wednesday)
+  end
+
+  def test_next_week_near_daylight_start
+    assert_equal Time.local(2006,4,3), Time.local(2006,4,2,23,1,0).next_week, 'just crossed standard => daylight'
+  end
+
+  def test_next_week_near_daylight_end
+    assert_equal Time.local(2006,10,30), Time.local(2006,10,29,23,1,0).next_week, 'just crossed daylight => standard'
-  end
-