0
@@ -1,5 +1,7 @@
0
 *Edge*
0
 
0
+* Added Time, Date, DateTime and TimeWithZone #past?, #future? and #today? #720 [Clemens Kofler, Geoff Buesing]
0
+
0
 * Fixed Sri Jayawardenepura time zone to map to Asia/Colombo [Jamis Buck]
0
 
0
 * Added Inflector#parameterize for easy slug generation ("Donald E. Knuth".parameterize => "donald-e-knuth") #713 [Matt Darby]

0
@@ -172,7 +172,7 @@ module ActiveSupport
0
     end
0
 
0
     def today?
0
-      utc.today?
0
+      time.today?
0
     end
0
 
0
     def future?

0
@@ -211,17 +211,25 @@ class DateExtCalculationsTest < Test::Unit::TestCase
0
   end
0
 
0
   uses_mocha 'past?, today? and future?' do
0
-    def test_today_past_future
0
-      Date.stubs(:current).returns(Date.civil(2000, 1, 1))
0
-      t2 = Date.civil(2000, 1, 1)
0
-      t1, t3 = t2.yesterday, t2.tomorrow
0
-      t4, t5 = t2 - 1.second, t2 + 1.second
0
-
0
-      assert t1.past?
0
-      assert t2.today?
0
-      assert t3.future?
0
-      assert t4.past?
0
-      assert t5.today?
0
+    def test_today
0
+      Date.stubs(:current).returns(Date.new(2000, 1, 1))
0
+      assert_equal false, Date.new(1999, 12, 31).today?
0
+      assert_equal true, Date.new(2000,1,1).today?
0
+      assert_equal false, Date.new(2000,1,2).today?
0
+    end
0
+    
0
+    def test_past
0
+      Date.stubs(:current).returns(Date.new(2000, 1, 1))
0
+      assert_equal true, Date.new(1999, 12, 31).past?
0
+      assert_equal false, Date.new(2000,1,1).past?
0
+      assert_equal false, Date.new(2000,1,2).past?
0
+    end
0
+    
0
+    def test_future
0
+      Date.stubs(:current).returns(Date.new(2000, 1, 1))
0
+      assert_equal false, Date.new(1999, 12, 31).future?
0
+      assert_equal false, Date.new(2000,1,1).future?
0
+      assert_equal true, Date.new(2000,1,2).future?
0
     end
0
   end
0
 

0
@@ -207,16 +207,68 @@ class DateTimeExtCalculationsTest < Test::Unit::TestCase
0
     assert_match(/^2080-02-28T15:15:10-06:?00$/, DateTime.civil(2080, 2, 28, 15, 15, 10, -0.25).xmlschema)
0
   end
0
 
0
-  uses_mocha 'past?, today? and future?' do
0
-    def test_past_today_future
0
-      Date.stubs(:current).returns(Date.civil(2000, 1, 1))
0
-      DateTime.stubs(:current).returns(DateTime.civil(2000, 1, 1, 1, 0, 1))
0
-      t1, t2 = DateTime.civil(2000, 1, 1, 1, 0, 0), DateTime.civil(2000, 1, 1, 1, 0, 2)
0
-
0
-      assert t1.past?
0
-      assert t2.future?
0
-      assert t1.today?
0
-      assert t2.today?
0
+  uses_mocha 'Test DateTime past?, today? and future?' do    
0
+    def test_today_with_offset
0
+      Date.stubs(:current).returns(Date.new(2000, 1, 1))
0
+      assert_equal false, DateTime.civil(1999,12,31,23,59,59, Rational(-18000, 86400)).today?
0
+      assert_equal true,  DateTime.civil(2000,1,1,0,0,0, Rational(-18000, 86400)).today?
0
+      assert_equal true,  DateTime.civil(2000,1,1,23,59,59, Rational(-18000, 86400)).today?
0
+      assert_equal false, DateTime.civil(2000,1,2,0,0,0, Rational(-18000, 86400)).today?
0
+    end
0
+    
0
+    def test_today_without_offset
0
+      Date.stubs(:current).returns(Date.new(2000, 1, 1))
0
+      assert_equal false, DateTime.civil(1999,12,31,23,59,59).today?
0
+      assert_equal true,  DateTime.civil(2000,1,1,0).today?
0
+      assert_equal true,  DateTime.civil(2000,1,1,23,59,59).today?
0
+      assert_equal false, DateTime.civil(2000,1,2,0).today?
0
+    end
0
+    
0
+    def test_past_with_offset
0
+      DateTime.stubs(:current).returns(DateTime.civil(2005,2,10,15,30,45, Rational(-18000, 86400)))
0
+      assert_equal true,  DateTime.civil(2005,2,10,15,30,44, Rational(-18000, 86400)).past?
0
+      assert_equal false,  DateTime.civil(2005,2,10,15,30,45, Rational(-18000, 86400)).past?
0
+      assert_equal false,  DateTime.civil(2005,2,10,15,30,46, Rational(-18000, 86400)).past?
0
+    end
0
+    
0
+    def test_past_without_offset
0
+      DateTime.stubs(:current).returns(DateTime.civil(2005,2,10,15,30,45, Rational(-18000, 86400)))
0
+      assert_equal true,  DateTime.civil(2005,2,10,20,30,44).past?
0
+      assert_equal false,  DateTime.civil(2005,2,10,20,30,45).past?
0
+      assert_equal false,  DateTime.civil(2005,2,10,20,30,46).past?
0
+    end
0
+    
0
+    def test_future_with_offset
0
+      DateTime.stubs(:current).returns(DateTime.civil(2005,2,10,15,30,45, Rational(-18000, 86400)))
0
+      assert_equal false,  DateTime.civil(2005,2,10,15,30,44, Rational(-18000, 86400)).future?
0
+      assert_equal false,  DateTime.civil(2005,2,10,15,30,45, Rational(-18000, 86400)).future?
0
+      assert_equal true,  DateTime.civil(2005,2,10,15,30,46, Rational(-18000, 86400)).future?
0
+    end
0
+    
0
+    def test_future_without_offset
0
+      DateTime.stubs(:current).returns(DateTime.civil(2005,2,10,15,30,45, Rational(-18000, 86400)))
0
+      assert_equal false,  DateTime.civil(2005,2,10,20,30,44).future?
0
+      assert_equal false,  DateTime.civil(2005,2,10,20,30,45).future?
0
+      assert_equal true,  DateTime.civil(2005,2,10,20,30,46).future?
0
+    end
0
+  end
0
+  
0
+  uses_mocha 'TestDateTimeCurrent' do
0
+    def test_current_returns_date_today_when_zone_default_not_set
0
+      with_env_tz 'US/Eastern' do
0
+        Time.stubs(:now).returns Time.local(1999, 12, 31, 23, 59, 59)
0
+        assert_equal DateTime.new(1999, 12, 31, 23, 59, 59, Rational(-18000, 86400)), DateTime.current
0
+      end
0
+    end
0
+
0
+    def test_current_returns_time_zone_today_when_zone_default_set
0
+      Time.zone_default = ActiveSupport::TimeZone['Eastern Time (US & Canada)']
0
+      with_env_tz 'US/Eastern' do
0
+        Time.stubs(:now).returns Time.local(1999, 12, 31, 23, 59, 59)
0
+        assert_equal DateTime.new(1999, 12, 31, 23, 59, 59, Rational(-18000, 86400)), DateTime.current
0
+      end
0
+    ensure
0
+      Time.zone_default = nil
0
     end
0
   end
0
 

0
@@ -563,16 +563,71 @@ class TimeExtCalculationsTest < Test::Unit::TestCase
0
     assert_nothing_raised { Time.now.xmlschema }
0
   end
0
 
0
-  uses_mocha 'past?, today? and future?' do
0
-    def test_past_today_future
0
-      Date.stubs(:current).returns(Date.civil(2000, 1, 1))
0
-      Time.stubs(:current).returns(Time.local(2000, 1, 1, 1, 0, 1))
0
-      t1, t2 = Time.local(2000, 1, 1, 1, 0, 0), Time.local(2000, 1, 1, 1, 0, 2)
0
-
0
-      assert t1.past?
0
-      assert t2.future?
0
-      assert t1.today?
0
-      assert t2.today?
0
+  uses_mocha 'Test Time past?, today? and future?' do    
0
+    def test_today_with_time_local
0
+      Date.stubs(:current).returns(Date.new(2000, 1, 1))
0
+      assert_equal false, Time.local(1999,12,31,23,59,59).today?
0
+      assert_equal true,  Time.local(2000,1,1,0).today?
0
+      assert_equal true,  Time.local(2000,1,1,23,59,59).today?
0
+      assert_equal false, Time.local(2000,1,2,0).today?
0
+    end
0
+    
0
+    def test_today_with_time_utc
0
+      Date.stubs(:current).returns(Date.new(2000, 1, 1))
0
+      assert_equal false, Time.utc(1999,12,31,23,59,59).today?
0
+      assert_equal true,  Time.utc(2000,1,1,0).today?
0
+      assert_equal true,  Time.utc(2000,1,1,23,59,59).today?
0
+      assert_equal false, Time.utc(2000,1,2,0).today?
0
+    end
0
+    
0
+    def test_past_with_time_current_as_time_local
0
+      with_env_tz 'US/Eastern' do
0
+        Time.stubs(:current).returns(Time.local(2005,2,10,15,30,45))
0
+        assert_equal true,  Time.local(2005,2,10,15,30,44).past?
0
+        assert_equal false,  Time.local(2005,2,10,15,30,45).past?
0
+        assert_equal false,  Time.local(2005,2,10,15,30,46).past?
0
+        assert_equal true,  Time.utc(2005,2,10,20,30,44).past?
0
+        assert_equal false,  Time.utc(2005,2,10,20,30,45).past?
0
+        assert_equal false,  Time.utc(2005,2,10,20,30,46).past?
0
+      end
0
+    end
0
+    
0
+    def test_past_with_time_current_as_time_with_zone
0
+      with_env_tz 'US/Eastern' do
0
+        twz = Time.utc(2005,2,10,15,30,45).in_time_zone('Central Time (US & Canada)')
0
+        Time.stubs(:current).returns(twz)
0
+        assert_equal true,  Time.local(2005,2,10,10,30,44).past?
0
+        assert_equal false,  Time.local(2005,2,10,10,30,45).past?
0
+        assert_equal false,  Time.local(2005,2,10,10,30,46).past?
0
+        assert_equal true,  Time.utc(2005,2,10,15,30,44).past?
0
+        assert_equal false,  Time.utc(2005,2,10,15,30,45).past?
0
+        assert_equal false,  Time.utc(2005,2,10,15,30,46).past?
0
+      end
0
+    end
0
+    
0
+    def test_future_with_time_current_as_time_local
0
+      with_env_tz 'US/Eastern' do
0
+        Time.stubs(:current).returns(Time.local(2005,2,10,15,30,45))
0
+        assert_equal false,  Time.local(2005,2,10,15,30,44).future?
0
+        assert_equal false,  Time.local(2005,2,10,15,30,45).future?
0
+        assert_equal true,  Time.local(2005,2,10,15,30,46).future?
0
+        assert_equal false,  Time.utc(2005,2,10,20,30,44).future?
0
+        assert_equal false,  Time.utc(2005,2,10,20,30,45).future?
0
+        assert_equal true,  Time.utc(2005,2,10,20,30,46).future?
0
+      end
0
+    end
0
+    
0
+    def test_future_with_time_current_as_time_with_zone
0
+      with_env_tz 'US/Eastern' do
0
+        twz = Time.utc(2005,2,10,15,30,45).in_time_zone('Central Time (US & Canada)')
0
+        Time.stubs(:current).returns(twz)
0
+        assert_equal false,  Time.local(2005,2,10,10,30,44).future?
0
+        assert_equal false,  Time.local(2005,2,10,10,30,45).future?
0
+        assert_equal true,  Time.local(2005,2,10,10,30,46).future?
0
+        assert_equal false,  Time.utc(2005,2,10,15,30,44).future?
0
+        assert_equal false,  Time.utc(2005,2,10,15,30,45).future?
0
+        assert_equal true,  Time.utc(2005,2,10,15,30,46).future?
0
+      end
0
     end
0
   end
0
 

0
@@ -152,16 +152,47 @@ class TimeWithZoneTest < Test::Unit::TestCase
0
     assert_equal false, @twz.between?(Time.utc(2000,1,1,0,0,1), Time.utc(2000,1,1,0,0,2))
0
   end
0
 
0
-  uses_mocha 'past?, today? and future?' do
0
-    def test_past_today_future
0
-      Time.stubs(:current).returns(@twz.utc)
0
-      Date.stubs(:current).returns(@twz.utc.to_date)
0
-      t1, t2 = @twz - 1.second, @twz + 1.second
0
-
0
-      assert t1.past?
0
-      assert t2.future?
0
-      assert !t1.today?
0
-      assert t2.today?
0
+  uses_mocha 'TimeWithZone past?, today? and future?' do    
0
+    def test_today
0
+      Date.stubs(:current).returns(Date.new(2000, 1, 1))
0
+      assert_equal false, ActiveSupport::TimeWithZone.new( nil, @time_zone, Time.utc(1999,12,31,23,59,59) ).today?
0
+      assert_equal true,  ActiveSupport::TimeWithZone.new( nil, @time_zone, Time.utc(2000,1,1,0) ).today?
0
+      assert_equal true,  ActiveSupport::TimeWithZone.new( nil, @time_zone, Time.utc(2000,1,1,23,59,59) ).today?
0
+      assert_equal false, ActiveSupport::TimeWithZone.new( nil, @time_zone, Time.utc(2000,1,2,0) ).today?
0
+    end
0
+    
0
+    def test_past_with_time_current_as_time_local
0
+      with_env_tz 'US/Eastern' do
0
+        Time.stubs(:current).returns(Time.local(2005,2,10,15,30,45))
0
+        assert_equal true,  ActiveSupport::TimeWithZone.new( nil, @time_zone, Time.local(2005,2,10,15,30,44)).past?
0
+        assert_equal false,  ActiveSupport::TimeWithZone.new( nil, @time_zone, Time.local(2005,2,10,15,30,45)).past?
0
+        assert_equal false,  ActiveSupport::TimeWithZone.new( nil, @time_zone, Time.local(2005,2,10,15,30,46)).past?
0
+      end
0
+    end
0
+    
0
+    def test_past_with_time_current_as_time_with_zone
0
+      twz = ActiveSupport::TimeWithZone.new( nil, @time_zone, Time.local(2005,2,10,15,30,45) )
0
+      Time.stubs(:current).returns(twz)
0
+      assert_equal true,  ActiveSupport::TimeWithZone.new( nil, @time_zone, Time.local(2005,2,10,15,30,44)).past?
0
+      assert_equal false,  ActiveSupport::TimeWithZone.new( nil, @time_zone, Time.local(2005,2,10,15,30,45)).past?
0
+      assert_equal false,  ActiveSupport::TimeWithZone.new( nil, @time_zone, Time.local(2005,2,10,15,30,46)).past?
0
+    end
0
+    
0
+    def test_future_with_time_current_as_time_local
0
+      with_env_tz 'US/Eastern' do
0
+        Time.stubs(:current).returns(Time.local(2005,2,10,15,30,45))
0
+        assert_equal false,  ActiveSupport::TimeWithZone.new( nil, @time_zone, Time.local(2005,2,10,15,30,44)).future?
0
+        assert_equal false,  ActiveSupport::TimeWithZone.new( nil, @time_zone, Time.local(2005,2,10,15,30,45)).future?
0
+        assert_equal true,  ActiveSupport::TimeWithZone.new( nil, @time_zone, Time.local(2005,2,10,15,30,46)).future?
0
+      end
0
+    end
0
+    
0
+    def future_with_time_current_as_time_with_zone
0
+      twz = ActiveSupport::TimeWithZone.new( nil, @time_zone, Time.local(2005,2,10,15,30,45) )
0
+      Time.stubs(:current).returns(twz)
0
+      assert_equal false,  ActiveSupport::TimeWithZone.new( nil, @time_zone, Time.local(2005,2,10,15,30,44)).future?
0
+      assert_equal false,  ActiveSupport::TimeWithZone.new( nil, @time_zone, Time.local(2005,2,10,15,30,45)).future?
0
+      assert_equal true,  ActiveSupport::TimeWithZone.new( nil, @time_zone, Time.local(2005,2,10,15,30,46)).future?
0
     end
0
   end
0
 
0
@@ -702,6 +733,14 @@ class TimeWithZoneTest < Test::Unit::TestCase
0
     assert_equal "Sun, 15 Jul 2007 10:30:00 EDT -04:00", twz.years_ago(1).inspect
0
     assert_equal "Sun, 15 Jul 2007 10:30:00 EDT -04:00", (twz - 1.year).inspect
0
   end
0
+  
0
+  protected
0
+    def with_env_tz(new_tz = 'US/Eastern')
0
+      old_tz, ENV['TZ'] = ENV['TZ'], new_tz
0
+      yield
0
+    ensure
0
+      old_tz ? ENV['TZ'] = old_tz : ENV.delete('TZ')
0
+    end
0
 end
0
 
0
 class TimeWithZoneMethodsForTimeAndDateTimeTest < Test::Unit::TestCase