Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

TimeWithZone#- added, so that #- can handle a Time or TimeWithZone a…

…rgument correctly

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8732 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit 8ef3dfff7a48bd0609ba4067c54910880fc6ef88 1 parent c95365a
@gbuesing gbuesing authored
View
2  activesupport/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* TimeWithZone#- added, so that #- can handle a Time or TimeWithZone argument correctly [Geoff Buesing]
+
* with_timezone test helper renamed with_env_tz, to distinguish between setting ENV['TZ'] and setting Time.zone in tests [Geoff Buesing]
* Time#- coerces TimeWithZone argument to a Time instance so that difference in seconds can be calculated. Closes #10914 [Geoff Buesing, yyyc514]
View
6 activesupport/lib/active_support/time_with_zone.rb
@@ -106,6 +106,12 @@ def strftime(format)
def <=>(other)
utc <=> other
end
+
+ # Need to override #- to intercept situation where a Time or Time With Zone object is passed in
+ # Otherwise, just pass on to method missing
+ def -(other)
+ other.acts_like?(:time) ? utc - other : method_missing(:-, other)
+ end
# A TimeProxy acts like a Time, so just return self
def to_time
View
1  activesupport/test/core_ext/time_with_zone_test.rb
@@ -124,6 +124,7 @@ def test_minus_with_duration
def test_minus_with_time
assert_equal 86_400.0, ActiveSupport::TimeWithZone.new( Time.utc(2000, 1, 2), TimeZone['UTC'] ) - Time.utc(2000, 1, 1)
+ assert_equal 86_400.0, ActiveSupport::TimeWithZone.new( Time.utc(2000, 1, 2), TimeZone['Hawaii'] ) - Time.utc(2000, 1, 1)
end
def test_minus_with_time_with_zone
Please sign in to comment.
Something went wrong with that request. Please try again.