Changeset 6937

Timestamp:

06/04/07 22:00:53 (1 year ago)

Author:

bitsweat

Message:

Add Date#since, ago, beginning_of_day, and end_of_day. Date + seconds works now. Closes #8575.

Files:

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

trunk/activesupport/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Add Date#since, ago, beginning_of_day, and end_of_day. Date + seconds works now.  #8575 [Geoff Buesing]
-
-* String#to_time overflows to DateTime. Add String#to_datetime.  #8572 [Geoff Buesing]

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

@@ -24 +24 @@
-        end
-        
+        # Converts Date to a Time (or DateTime if necessary) with the time portion set to the beginning of the day (0:00)
+        # and then subtracts the specified number of seconds
+        def ago(seconds)
+          to_time.since(-seconds)
+        end
+
+        # Converts Date to a Time (or DateTime if necessary) with the time portion set to the beginning of the day (0:00)
+        # and then adds the specified number of seconds
+        def since(seconds)
+          to_time.since(seconds)
+        end
+        alias :in :since
+
+        # Converts Date to a Time (or DateTime if necessary) with the time portion set to the beginning of the day (0:00)
+        def beginning_of_day
+          to_time
+        end
+        alias :midnight :beginning_of_day
+        alias :at_midnight :beginning_of_day
+        alias :at_beginning_of_day :beginning_of_day
+
+        # Converts Date to a Time (or DateTime if necessary) with the time portion set to the end of the day (23:59:59)
+        def end_of_day
+          to_time.end_of_day
+        end
+        
-        def plus_with_duration(other) #:nodoc:
-          if ActiveSupport::Duration === other

trunk/activesupport/lib/active_support/duration.rb

@@ -66 +66 @@
-    def sum(sign, time = ::Time.now) #:nodoc:
-      parts.inject(time) do |t,(type,number)|
-
+ || t.acts_like?(:date)
-          if type == :seconds
-            t.since(sign * number)
@@ -72 +72 @@
-            t.advance(type => sign * number)
-          end
-        elsif t.acts_like?(:date)
-          raise ArgumentError, "Adding seconds to a Date does not make sense" if type == :seconds
-          t.advance(type => sign * number)
-        else
-          raise ArgumentError, "expected a time or date, got #{time.inspect}"

trunk/activesupport/test/core_ext/date_ext_test.rb

@@ -140 +140 @@
-    assert_equal Date.today + 1, Date.tomorrow
-  end
+  
+  def test_since
+    assert_equal Time.local(2005,2,21,0,0,45), Date.new(2005,2,21).since(45)
+  end
+  
+  def test_ago
+    assert_equal Time.local(2005,2,20,23,59,15), Date.new(2005,2,21).ago(45)
+  end
+  
+  def test_beginning_of_day
+    assert_equal Time.local(2005,2,21,0,0,0), Date.new(2005,2,21).beginning_of_day
+  end
+  
+  def test_end_of_day
+    assert_equal Time.local(2005,2,21,23,59,59), Date.new(2005,2,21).end_of_day
+  end
-end

trunk/activesupport/test/core_ext/numeric_ext_test.rb

@@ -91 +91 @@
-    assert_equal @today + 1, @today + 1.day
-    assert_equal @today >> 1, @today + 1.month
-
+
+
+
-  end
-