Changeset 8732

Timestamp:

01/26/08 00:34:44 (8 months ago)

Author:

gbuesing

Message:

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

Files:

• trunk/activesupport/CHANGELOG (modified) (1 diff)
• trunk/activesupport/lib/active_support/time_with_zone.rb (modified) (1 diff)
• trunk/activesupport/test/core_ext/time_with_zone_test.rb (modified) (1 diff)

trunk/activesupport/CHANGELOG

@@ -1 +1 @@
-*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]

trunk/activesupport/lib/active_support/time_with_zone.rb

@@ -107 +107 @@
-      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

trunk/activesupport/test/core_ext/time_with_zone_test.rb

@@ -125 +125 @@
-    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
-