Changeset 6901

Timestamp:

05/30/07 06:21:08 (1 year ago)

Author:

bitsweat

Message:

Time durations use since instead of + for accuracy. Closes #8513.

Files:

• trunk/activesupport/CHANGELOG (modified) (1 diff)
• trunk/activesupport/lib/active_support/core_ext/date_time/calculations.rb (modified) (1 diff)
• trunk/activesupport/lib/active_support/duration.rb (modified) (1 diff)
• trunk/activesupport/test/core_ext/date_time_ext_test.rb (modified) (1 diff)
• trunk/activesupport/test/core_ext/numeric_ext_test.rb (modified) (6 diffs)

trunk/activesupport/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Time durations use since instead of + for accuracy.  #8513 [Geoff Buesing]
-
-* escape <'s and >'s in JSON strings. #8371 [Rick]

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

@@ -46 +46 @@
-        # Do not use this method in combination with x.months, use months_since instead!
-        def since(seconds)
-
+.round
-        end
-        alias :in :since

trunk/activesupport/lib/active_support/duration.rb

@@ -68 +68 @@
-        if t.acts_like?(:time)
-          if type == :seconds
- + 
+.since
-          else
-            t.advance(type => sign * number)

trunk/activesupport/test/core_ext/date_time_ext_test.rb

@@ -113 +113 @@
-    assert_equal DateTime.civil(2005,2,24,10,10,10), DateTime.civil(2005,2,22,10,10,10).since(86400*2)
-    assert_equal DateTime.civil(2005,2,24,11,10,35), DateTime.civil(2005,2,22,10,10,10).since(86400*2 + 3600 + 25)
+    assert_equal DateTime.civil(2005,2,22,10,10,11), DateTime.civil(2005,2,22,10,10,10).since(1.333)
+    assert_equal DateTime.civil(2005,2,22,10,10,12), DateTime.civil(2005,2,22,10,10,10).since(1.667)
-  end
-

trunk/activesupport/test/core_ext/numeric_ext_test.rb

@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../abstract_unit'
-
-
+AndDateTime
-  def setup
-    @now = Time.now
+    @dtnow = DateTime.now
-    @seconds = {
-      1.minute   => 60,
@@ -41 +42 @@
-    assert_equal @now.advance(:months => -1), 1.month.until(@now)
-    assert_equal @now.advance(:years => 20), 20.years.since(@now)
+    assert_equal @dtnow.advance(:days => 3000), 3000.days.since(@dtnow)
+    assert_equal @dtnow.advance(:months => 1), 1.month.since(@dtnow)
+    assert_equal @dtnow.advance(:months => -1), 1.month.until(@dtnow)
+    assert_equal @dtnow.advance(:years => 20), 20.years.since(@dtnow)
-  end
-  
@@ -47 +52 @@
-    assert_equal @now.advance(:days => 7), (1.week + 5.seconds - 5.seconds).since(@now)
-    assert_equal @now.advance(:years => 2), (4.years - 2.years).since(@now)
+    assert_equal @dtnow.advance(:days => 1, :months => 1), (1.day + 1.month).since(@dtnow)
+    assert_equal @dtnow.advance(:days => 7), (1.week + 5.seconds - 5.seconds).since(@dtnow)
+    assert_equal @dtnow.advance(:years => 2), (4.years - 2.years).since(@dtnow)    
-  end
-  
@@ -54 +62 @@
-    assert_equal @now.advance(:days => 15), @now + 15.days
-    assert_equal @now.advance(:months => 1), @now + 1.month
+    assert_equal @dtnow.since(8), @dtnow + 8.seconds
+    assert_equal @dtnow.since(22.9), @dtnow + 22.9.seconds
+    assert_equal @dtnow.advance(:days => 15), @dtnow + 15.days
+    assert_equal @dtnow.advance(:months => 1), @dtnow + 1.month
-  end
-  
@@ -59 +71 @@
-    assert_equal @now.advance(:days => 2).advance(:months => -3), @now + 2.days - 3.months
-    assert_equal @now.advance(:days => 1).advance(:months => 2), @now + 1.day + 2.months
+    assert_equal @dtnow.advance(:days => 2).advance(:months => -3), @dtnow + 2.days - 3.months
+    assert_equal @dtnow.advance(:days => 1).advance(:months => 2), @dtnow + 1.day + 2.months    
-  end
-  
@@ -64 +78 @@
-    assert_equal 30.days.to_i.since(@now), 1.month.to_i.since(@now)
-    assert_equal 365.25.days.to_f.since(@now), 1.year.to_f.since(@now)
+    assert_equal 30.days.to_i.since(@dtnow), 1.month.to_i.since(@dtnow)
+    assert_equal 365.25.days.to_f.since(@dtnow), 1.year.to_f.since(@dtnow)    
-  end
-end