diff options
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/CHANGELOG | 2 | ||||
| -rw-r--r-- | activesupport/lib/active_support/time_with_zone.rb | 17 | ||||
| -rw-r--r-- | activesupport/test/core_ext/time_with_zone_test.rb | 22 |
3 files changed, 37 insertions, 4 deletions
diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG index d1ad138f50..589ae8a365 100644 --- a/activesupport/CHANGELOG +++ b/activesupport/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* TimeWithZone #+ and #- behave consistently with numeric arguments regardless of whether wrapped time is a Time or DateTime; consistenty answers false to #acts_like?(:date) [Geoff Buesing] + * Add String#squish and String#squish! to remove consecutive chunks of whitespace. #11123 [jordi, Henrik N] * Serialize BigDecimals as Floats when using to_yaml. #8746 [ernesto.jimenez] diff --git a/activesupport/lib/active_support/time_with_zone.rb b/activesupport/lib/active_support/time_with_zone.rb index 15cd95772c..377eee949f 100644 --- a/activesupport/lib/active_support/time_with_zone.rb +++ b/activesupport/lib/active_support/time_with_zone.rb @@ -129,10 +129,21 @@ module ActiveSupport utc == other end - # Need to override #- to intercept situation where a Time or Time With Zone object is passed in + # If wrapped #time is a DateTime, use DateTime#since instead of #+ + # Otherwise, just pass on to #method_missing + def +(other) + time.acts_like?(:date) ? method_missing(:since, other) : method_missing(:+, other) + end + + # If a time-like object is passed in, compare it with #utc + # Else if wrapped #time is a DateTime, use DateTime#ago instead of #- # Otherwise, just pass on to method missing def -(other) - other.acts_like?(:time) ? utc - other : method_missing(:-, other) + if other.acts_like?(:time) + utc - other + else + time.acts_like?(:date) ? method_missing(:ago, other) : method_missing(:-, other) + end end def to_a @@ -176,6 +187,8 @@ module ActiveSupport # Ensure proxy class responds to all methods that underlying time instance responds to def respond_to?(sym) + # consistently respond false to acts_like?(:date), regardless of whether #time is a Time or DateTime + return false if sym.to_s == 'acts_like_date?' super || time.respond_to?(sym) end diff --git a/activesupport/test/core_ext/time_with_zone_test.rb b/activesupport/test/core_ext/time_with_zone_test.rb index 38646caa79..3421b85e60 100644 --- a/activesupport/test/core_ext/time_with_zone_test.rb +++ b/activesupport/test/core_ext/time_with_zone_test.rb @@ -121,17 +121,29 @@ uses_tzinfo 'TimeWithZoneTest' do assert @twz.eql?( ActiveSupport::TimeWithZone.new(Time.utc(2000), TimeZone["Hawaii"]) ) end - def test_plus + def test_plus_with_integer assert_equal Time.utc(1999, 12, 31, 19, 0 ,5), (@twz + 5).time end + def test_plus_with_integer_when_self_wraps_datetime + datetime = DateTime.civil(2000, 1, 1, 0) + twz = ActiveSupport::TimeWithZone.new(datetime, @time_zone) + assert_equal DateTime.civil(1999, 12, 31, 19, 0 ,5), (twz + 5).time + end + def test_plus_with_duration assert_equal Time.utc(2000, 1, 5, 19, 0 ,0), (@twz + 5.days).time end - def test_minus + def test_minus_with_integer assert_equal Time.utc(1999, 12, 31, 18, 59 ,55), (@twz - 5).time end + + def test_minus_with_integer_when_self_wraps_datetime + datetime = DateTime.civil(2000, 1, 1, 0) + twz = ActiveSupport::TimeWithZone.new(datetime, @time_zone) + assert_equal DateTime.civil(1999, 12, 31, 18, 59 ,55), (twz - 5).time + end def test_minus_with_duration assert_equal Time.utc(1999, 12, 26, 19, 0 ,0), (@twz - 5.days).time @@ -174,6 +186,12 @@ uses_tzinfo 'TimeWithZoneTest' do def test_acts_like_time assert @twz.acts_like?(:time) + assert ActiveSupport::TimeWithZone.new(DateTime.civil(2000), @time_zone).acts_like?(:time) + end + + def test_acts_like_date + assert_equal false, @twz.acts_like?(:date) + assert_equal false, ActiveSupport::TimeWithZone.new(DateTime.civil(2000), @time_zone).acts_like?(:date) end def test_is_a |