Changeset 5940

Timestamp:

01/15/07 06:54:50 (2 years ago)

Author:

nzkoz

Message:

Make 1.months and friends accurate by introducing a Duration class. #6835 [eventualbuddha]

Files:

• trunk/activesupport/CHANGELOG (modified) (1 diff)
• trunk/activesupport/lib/active_support.rb (modified) (1 diff)
• trunk/activesupport/lib/active_support/core_ext/date.rb (modified) (1 diff)
• trunk/activesupport/lib/active_support/core_ext/date/calculations.rb (added)
• trunk/activesupport/lib/active_support/core_ext/numeric/time.rb (modified) (2 diffs)
• trunk/activesupport/lib/active_support/core_ext/time/calculations.rb (modified) (2 diffs)
• trunk/activesupport/lib/active_support/duration.rb (added)
• trunk/activesupport/test/core_ext/duration_test.rb (added)
• trunk/activesupport/test/core_ext/numeric_ext_test.rb (modified) (1 diff)

trunk/activesupport/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Make 1.months and friends accurate by introducing a Duration class.  #6835 [eventualbuddha]
-
-* Document Inflector.ordinalize and merge docs from String inflections.  #7023 [smeade]

trunk/activesupport/lib/active_support.rb

@@ -39 +39 @@
-
-require 'active_support/values/time_zone'
+require 'active_support/duration'
-
-require 'active_support/json'

trunk/activesupport/lib/active_support/core_ext/date.rb

@@ -1 +1 @@
-require 'date'
+require File.dirname(__FILE__) + '/date/calculations'
-require File.dirname(__FILE__) + '/date/conversions'
-
-class Date#:nodoc:
+  include ActiveSupport::CoreExtensions::Date::Calculations
-  include ActiveSupport::CoreExtensions::Date::Conversions
-end

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

@@ -4 +4 @@
-      # Enables the use of time calculations and declarations, like 45.minutes + 2.hours + 4.years.
-      #
-
-
+
+
+
+
+
+
+
+
+
+
+
-      # 
-
+
+
+
+
+
+
+
+
+
+
+
-      # Date[http://stdlib.rubyonrails.org/libdoc/date/rdoc/index.html] and 
-      # Time[http://stdlib.rubyonrails.org/libdoc/time/rdoc/index.html] should be used for precision
@@ -13 +32 @@
-      module Time
-        def seconds
-self
+ActiveSupport::Duration.new(self, [[:seconds, self]])
-        end
-        alias :second :seconds
-
-        def minutes
-self * 60
+ActiveSupport::Duration.new(self * 60, [[:seconds, self * 60]])
-        end
-        alias :minute :minutes  
-        
-        def hours
-self * 60.minutes
+ActiveSupport::Duration.new(self * 3600, [[:seconds, self * 3600]])
-        end
-        alias :hour :hours
-        
-        def days
-self * 24.hours
+ActiveSupport::Duration.new(self * 24.hours, [[:days, self]])
-        end
-        alias :day :days
-
-        def weeks
-self * 7.days
+ActiveSupport::Duration.new(self * 7.days, [[:days, self * 7]])
-        end
-        alias :week :weeks
-        
-        def fortnights
-self * 2.weeks
+ActiveSupport::Duration.new(self * 2.weeks, [[:days, self * 14]])
-        end
-        alias :fortnight :fortnights
-        
-        def months
-self * 30.days
+ActiveSupport::Duration.new(self * 30.days, [[:months, self]])
-        end
-        alias :month :months
-
-        def years
-(self * 365.25.days).to_i
+ActiveSupport::Duration.new(self * 365.25.days, [[:years, self]])
-        end
-        alias :year :years

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

@@ -6 +6 @@
-        def self.included(base) #:nodoc:
-          base.extend(ClassMethods)
+          
+          base.send(:alias_method, :plus_without_duration, :+)
+          base.send(:alias_method, :+, :plus_with_duration)
+          base.send(:alias_method, :minus_without_duration, :-)
+          base.send(:alias_method, :-, :minus_with_duration)
-        end
-
@@ -191 +196 @@
-          self.since(1.day)
-        end
+        
+        def plus_with_duration(other) #:nodoc:
+          if ActiveSupport::Duration === other
+            other.since(self)
+          else
+            plus_without_duration(other)
+          end
+        end
+
+        def minus_with_duration(other) #:nodoc:
+          if ActiveSupport::Duration === other
+            other.until(self)
+          else
+            minus_without_duration(other)
+          end
+        end
-      end
-    end

trunk/activesupport/test/core_ext/numeric_ext_test.rb

@@ -35 +35 @@
-    end
-  end
+  
+  def test_irregular_durations
+    assert_equal @now.advance(:days => 3000), 3000.days.since(@now)
+    assert_equal @now.advance(:months => 1), 1.month.since(@now)
+    assert_equal @now.advance(:months => -1), 1.month.until(@now)
+    assert_equal @now.advance(:years => 20), 20.years.since(@now)
+  end
+  
+  def test_duration_addition
+    assert_equal @now.advance(:days => 1, :months => 1), (1.day + 1.month).since(@now)
+    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)
+  end
+  
+  def test_time_plus_duration
+    assert_equal @now + 8, @now + 8.seconds
+    assert_equal @now + 22.9, @now + 22.9.seconds
+    assert_equal @now.advance(:days => 15), @now + 15.days
+    assert_equal @now.advance(:months => 1), @now + 1.month
+  end
+  
+  def test_chaining_duration_operations
+    assert_equal @now.advance(:days => 2, :months => -3), @now + 2.days - 3.months
+    assert_equal @now.advance(:days => 1, :months => 2), @now + 1.day + 2.months
+  end
+  
+  def test_duration_after_convertion_is_no_longer_accurate
+    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)
+  end
+end
+
+class NumericExtDateTest < Test::Unit::TestCase
+  def setup
+    @today = Date.today
+  end
+
+  def test_date_plus_duration
+    assert_equal @today + 1, @today + 1.day
+    assert_equal @today >> 1, @today + 1.month
+    assert_raises(ArgumentError) { @today + 1.second }
+  end
+  
+  def test_chaining_duration_operations
+    assert_equal @today.advance(:days => 2, :months => -3), @today + 2.days - 3.months
+    assert_equal @today.advance(:days => 1, :months => 2), @today + 1.day + 2.months
+  end
-end
-