Skip to content
This repository
Browse code

Merge [5388] from trunk.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5389 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit ce0653b1c6241f4cba179533d1370598beec3ce1 1 parent 229e197
Jeremy Kemper jeremy authored
2  activesupport/CHANGELOG
@@ -2,7 +2,7 @@
2 2
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]
4 4
5   -* next_week respects DST changes. #6483 [marclove]
  5 +* next_week respects DST changes. #6483, #5617, #2353, #2509, #4551 [marclove, rabiedenharn, rails@roetzel.de, jsolson@damogran.org, drbrain@segment7.net]
6 6
7 7 * Expose methods added to Enumerable in the documentation, such as group_by. Closes #6170. [sergeykojin@gmail.com, Marcel Molina Jr.]
8 8
13 activesupport/lib/active_support/core_ext/time/calculations.rb
@@ -25,7 +25,7 @@ def days_in_month(month, year=nil)
25 25
26 26 # Seconds since midnight: Time.now.seconds_since_midnight
27 27 def seconds_since_midnight
28   - self.hour.hours + self.min.minutes + self.sec + (self.usec/1.0e+6)
  28 + self.to_i - self.change(:hour => 0).to_i + (self.usec/1.0e+6)
29 29 end
30 30
31 31 # Returns a new Time where one or more of the elements have been changed according to the +options+ parameter. The time options
@@ -56,13 +56,16 @@ def advance(options)
56 56 # Returns a new Time representing the time a number of seconds ago, this is basically a wrapper around the Numeric extension
57 57 # Do not use this method in combination with x.months, use months_ago instead!
58 58 def ago(seconds)
59   - seconds.until(self)
  59 + self.since(-seconds)
60 60 end
61 61
62 62 # Returns a new Time representing the time a number of seconds since the instance time, this is basically a wrapper around
63 63 #the Numeric extension. Do not use this method in combination with x.months, use months_since instead!
64 64 def since(seconds)
65   - seconds.since(self)
  65 + initial_dst = self.dst? ? 1 : 0
  66 + f = seconds.since(self)
  67 + final_dst = f.dst? ? 1 : 0
  68 + (seconds.abs >= 86400 && initial_dst != final_dst) ? f + (initial_dst - final_dst).hours : f
66 69 end
67 70 alias :in :since
68 71
@@ -135,9 +138,7 @@ def beginning_of_week
135 138 # Returns a new Time representing the start of the given day in next week (default is Monday).
136 139 def next_week(day = :monday)
137 140 days_into_week = { :monday => 0, :tuesday => 1, :wednesday => 2, :thursday => 3, :friday => 4, :saturday => 5, :sunday => 6}
138   - # Adjust in case of switches to or from daylight savings time
139   - week_from_today = self.since(1.week) + (self.since(1.week) <=> self).hour
140   - week_from_today.beginning_of_week.since(days_into_week[day].day).change(:hour => 0)
  141 + since(1.week).beginning_of_week.since(days_into_week[day].day).change(:hour => 0)
141 142 end
142 143
143 144 # Returns a new Time representing the start of the day (0:00)
50 activesupport/test/core_ext/time_ext_test.rb
@@ -9,6 +9,24 @@ def test_seconds_since_midnight
9 9 assert_equal 60.00001,Time.local(2005,1,1,0,1,0,10).seconds_since_midnight
10 10 end
11 11
  12 + def test_seconds_since_midnight_at_daylight_savings_time_start
  13 + # dt: US: 2005 April 3rd 2:00am ST => April 3rd 3:00am DT
  14 + assert_equal 3600+59*60+59, Time.local(2005,4,3,1,59,59).seconds_since_midnight, 'just before DST start'
  15 + assert_equal 3600+59*60+59+2,Time.local(2005,4,3,3, 0, 1).seconds_since_midnight, 'just after DST start'
  16 + end
  17 +
  18 + def test_seconds_since_midnight_at_daylight_savings_time_end
  19 + # st: US: 2005 October 30th 2:00am DT => October 30th 1:00am ST
  20 + # avoid setting a time between 1:00 and 2:00 since that requires specifying whether DST is active
  21 + assert_equal 3599, Time.local(2005,10,30,0,59,59).seconds_since_midnight, 'just before DST end'
  22 + assert_equal 3*3600+1, Time.local(2005,10,30,2, 0, 1).seconds_since_midnight, 'just after DST end'
  23 +
  24 + # now set a time between 1:00 and 2:00 by specifying whether DST is active
  25 + # uses: Time.local( sec, min, hour, day, month, year, wday, yday, isdst, tz )
  26 + assert_equal 1*3600+30*60, Time.local(0,30,1,30,10,2005,0,0,true,'EST5EDT').seconds_since_midnight, 'before DST end'
  27 + assert_equal 2*3600+30*60, Time.local(0,30,1,30,10,2005,0,0,false,'EST5EDT').seconds_since_midnight, 'after DST end'
  28 + end
  29 +
12 30 def test_begining_of_week
13 31 assert_equal Time.local(2005,1,31), Time.local(2005,2,4,10,10,10).beginning_of_week
14 32 assert_equal Time.local(2005,11,28), Time.local(2005,11,28,0,0,0).beginning_of_week #monday
@@ -88,6 +106,18 @@ def test_ago
88 106 assert_equal Time.local(2005,2,20,9,9,45), Time.local(2005,2,22,10,10,10).ago(86400*2 + 3600 + 25)
89 107 end
90 108
  109 + def test_daylight_savings_time_crossings_backward_start
  110 + # dt: US: 2005 April 3rd 4:18am
  111 + assert_equal Time.local(2005,4,2,4,18,0), Time.local(2005,4,3,4,18,0).ago(86400), 'dt-1.day=>st'
  112 + assert_equal Time.local(2005,4,1,4,18,0), Time.local(2005,4,2,4,18,0).ago(86400), 'st-1.day=>st'
  113 + end
  114 +
  115 + def test_daylight_savings_time_crossings_backward_end
  116 + # st: US: 2005 October 30th 4:03am
  117 + assert_equal Time.local(2005,10,29,4,3), Time.local(2005,10,30,4,3,0).ago(86400), 'st-1.day=>dt'
  118 + assert_equal Time.local(2005,10,28,4,3), Time.local(2005,10,29,4,3,0).ago(86400), 'dt-1.day=>dt'
  119 + end
  120 +
91 121 def test_since
92 122 assert_equal Time.local(2005,2,22,10,10,11), Time.local(2005,2,22,10,10,10).since(1)
93 123 assert_equal Time.local(2005,2,22,11,10,10), Time.local(2005,2,22,10,10,10).since(3600)
@@ -95,6 +125,18 @@ def test_since
95 125 assert_equal Time.local(2005,2,24,11,10,35), Time.local(2005,2,22,10,10,10).since(86400*2 + 3600 + 25)
96 126 end
97 127
  128 + def test_daylight_savings_time_crossings_forward_start
  129 + # st: US: 2005 April 2nd 7:27pm
  130 + assert_equal Time.local(2005,4,3,19,27,0), Time.local(2005,4,2,19,27,0).since(86400), 'st+1.day=>dt'
  131 + assert_equal Time.local(2005,4,4,19,27,0), Time.local(2005,4,3,19,27,0).since(86400), 'dt+1.day=>dt'
  132 + end
  133 +
  134 + def test_daylight_savings_time_crossings_forward_end
  135 + # dt: US: 2005 October 30th 12:45am
  136 + assert_equal Time.local(2005,10,31,1,45,0), Time.local(2005,10,30,1,45,0).since(86400), 'dt+1.day=>st'
  137 + assert_equal Time.local(2005,11, 1,1,45,0), Time.local(2005,10,31,1,45,0).since(86400), 'st+1.day=>st'
  138 + end
  139 +
98 140 def test_yesterday
99 141 assert_equal Time.local(2005,2,21,10,10,10), Time.local(2005,2,22,10,10,10).yesterday
100 142 assert_equal Time.local(2005,2,28,10,10,10), Time.local(2005,3,2,10,10,10).yesterday.yesterday
@@ -150,6 +192,14 @@ def test_next_week
150 192 assert_equal Time.local(2006,11,1), Time.local(2006,10,23,0,0,0).next_week(:wednesday)
151 193 end
152 194
  195 + def test_next_week_near_daylight_start
  196 + assert_equal Time.local(2006,4,3), Time.local(2006,4,2,23,1,0).next_week, 'just crossed standard => daylight'
  197 + end
  198 +
  199 + def test_next_week_near_daylight_end
  200 + assert_equal Time.local(2006,10,30), Time.local(2006,10,29,23,1,0).next_week, 'just crossed daylight => standard'
  201 + end
  202 +
153 203 def test_to_s
154 204 time = Time.local(2005, 2, 21, 17, 44, 30)
155 205 assert_equal "2005-02-21 17:44:30", time.to_s(:db)

0 comments on commit ce0653b

Please sign in to comment.
Something went wrong with that request. Please try again.