Changeset 8730

Timestamp:

01/25/08 23:55:07 (8 months ago)

Author:

gbuesing

Message:

Time#- coerces TimeWithZone argument to a Time instance so that difference in seconds can be calculated. Closes #10914 [Geoff Buesing, yyyc514]

Files:

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

trunk/activesupport/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Time#- coerces TimeWithZone argument to a Time instance so that difference in seconds can be calculated. Closes #10914 [Geoff Buesing, yyyc514]
-
-* Adding UTC zone to TimeZone; TimeWithZone no longer has to fake UTC zone with nil [Geoff Buesing]

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

@@ -13 +13 @@
-            alias_method :minus_without_duration, :-
-            alias_method :-, :minus_with_duration
+            
+            alias_method :minus_without_coercion, :-
+            alias_method :-, :minus_with_coercion
-            
-            alias_method :compare_without_coercion, :<=>
@@ -219 +222 @@
-        end
-        
+        # Time#- can also be used to determine the number of seconds between two Time instances.
+        # We're layering on additional behavior so that ActiveSupport::TimeWithZone instances
+        # are coerced into values that Time#- will recognize
+        def minus_with_coercion(other)
+          other = other.comparable_time if other.respond_to?(:comparable_time)
+          minus_without_coercion(other)
+        end
+        
-        # Layers additional behavior on Time#<=> so that DateTime and ActiveSupport::TimeWithZone instances
-        # can be chronologically compared with a Time

trunk/activesupport/test/core_ext/time_ext_test.rb

@@ -455 +455 @@
-    assert_equal(-1, Time.utc(2000) <=> ActiveSupport::TimeWithZone.new( Time.utc(2000, 1, 1, 0, 0, 1), TimeZone['UTC'] ))
-  end
+  
+  def test_minus_with_time_with_zone
+    assert_equal  86_400.0, Time.utc(2000, 1, 2) - ActiveSupport::TimeWithZone.new( Time.utc(2000, 1, 1), TimeZone['UTC'] )
+  end
-
-  protected

trunk/activesupport/test/core_ext/time_with_zone_test.rb

@@ -121 +121 @@
-    def test_minus_with_duration
-      assert_equal Time.utc(1999, 12, 26, 19, 0 ,0), (@twz - 5.days).time
+    end
+    
+    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)
+    end
+    
+    def test_minus_with_time_with_zone
+      twz1 = ActiveSupport::TimeWithZone.new( Time.utc(2000, 1, 1), TimeZone['UTC'] )
+      twz2 = ActiveSupport::TimeWithZone.new( Time.utc(2000, 1, 2), TimeZone['UTC'] )
+      assert_equal  86_400.0,  twz2 - twz1
-    end
-