tzinfo 0.1.2 → 0.2.0

data/test/tc_offset_rationals.rb

@@ -0,0 +1,25 @@
+$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
+require 'test/unit'
+require 'tzinfo/offset_rationals'
+
+include TZInfo
+
+class TCOffsetRationals < Test::Unit::TestCase
+  def test_rational_for_offset
+    [0,1,2,3,4,-1,-2,-3,-4,30*60,-30*60,61*60,-61*60,14*60*60,-14*60*60,20*60*60,-20*60*60].each {|seconds|
+      assert_equal(Rational(seconds, 86400), OffsetRationals.rational_for_offset(seconds))      
+    }
+  end
+  
+  def test_rational_for_offset_constant
+    -28.upto(28) {|i|
+      seconds = i * 30 * 60
+      
+      r1 = OffsetRationals.rational_for_offset(seconds)
+      r2 = OffsetRationals.rational_for_offset(seconds)
+      
+      assert_equal(Rational(seconds, 86400), r1)
+      assert_same(r1, r2)
+    }
+  end
+end

data/test/tc_time_or_datetime.rb

@@ -0,0 +1,386 @@
+$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
+require 'test/unit'
+require 'tzinfo/time_or_datetime'
+
+include TZInfo
+
+class TCTimeOrDateTime < Test::Unit::TestCase
+  def test_initialize_time
+    TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3))    
+  end
+  
+  def test_initialize_time_local    
+    tdt = TimeOrDateTime.new(Time.local(2006, 3, 24, 15, 32, 3))
+    assert_equal(Time.utc(2006, 3, 24, 15, 32, 3), tdt.to_time)    
+    assert_equal('UTC', tdt.to_time.zone)
+  end
+  
+  def test_initialize_datetime
+    TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3))
+  end
+  
+  def test_initialize_int
+    TimeOrDateTime.new(1143214323)
+  end
+  
+  def test_initialize_string
+    TimeOrDateTime.new('1143214323')
+  end
+  
+  def test_to_time
+    assert_equal(Time.utc(2006, 3, 24, 15, 32, 3),
+      TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)).to_time)
+    assert_equal(Time.utc(2006, 3, 24, 15, 32, 3),
+      TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)).to_time)
+    assert_equal(Time.utc(2006, 3, 24, 15, 32, 3),
+      TimeOrDateTime.new(1143214323).to_time)
+    assert_equal(Time.utc(2006, 3, 24, 15, 32, 3),
+      TimeOrDateTime.new('1143214323').to_time)
+  end
+  
+  def test_to_datetime
+    assert_equal(DateTime.new(2006, 3, 24, 15, 32, 3),
+      TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)).to_datetime)
+    assert_equal(DateTime.new(2006, 3, 24, 15, 32, 3),
+      TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)).to_datetime)
+    assert_equal(DateTime.new(2006, 3, 24, 15, 32, 3),
+      TimeOrDateTime.new(1143214323).to_datetime)
+    assert_equal(DateTime.new(2006, 3, 24, 15, 32, 3),
+      TimeOrDateTime.new('1143214323').to_datetime)
+  end
+  
+  def test_to_i
+    assert_equal(1143214323,
+      TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)).to_i)
+    assert_equal(1143214323,
+      TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)).to_i)
+    assert_equal(1143214323,
+      TimeOrDateTime.new(1143214323).to_i)
+    assert_equal(1143214323,
+      TimeOrDateTime.new('1143214323').to_i)
+  end
+  
+  def test_to_orig
+    assert_equal(Time.utc(2006, 3, 24, 15, 32, 3),
+      TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)).to_orig)
+    assert_equal(DateTime.new(2006, 3, 24, 15, 32, 3),
+      TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)).to_orig)
+    assert_equal(1143214323,
+      TimeOrDateTime.new(1143214323).to_orig)
+    assert_equal(1143214323,
+      TimeOrDateTime.new('1143214323').to_orig) 
+  end
+  
+  def test_to_s
+    assert_equal("Time: #{Time.utc(2006, 3, 24, 15, 32, 3).to_s}",
+      TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)).to_s)
+    assert_equal("DateTime: #{DateTime.new(2006, 3, 24, 15, 32, 3)}",
+      TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)).to_s)
+    assert_equal('Timestamp: 1143214323',
+      TimeOrDateTime.new(1143214323).to_s)
+    assert_equal('Timestamp: 1143214323',
+      TimeOrDateTime.new('1143214323').to_s) 
+  end
+  
+  def test_year
+    assert_equal(2006, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)).year)
+    assert_equal(2006, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)).year)
+    assert_equal(2006, TimeOrDateTime.new(1143214323).year)
+  end
+  
+  def test_mon
+    assert_equal(3, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)).mon)
+    assert_equal(3, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)).mon)
+    assert_equal(3, TimeOrDateTime.new(1143214323).mon)    
+  end
+  
+  def test_month
+    assert_equal(3, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)).month)
+    assert_equal(3, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)).month)
+    assert_equal(3, TimeOrDateTime.new(1143214323).month)
+  end
+  
+  def test_mday
+    assert_equal(24, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)).mday)
+    assert_equal(24, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)).mday)
+    assert_equal(24, TimeOrDateTime.new(1143214323).mday)
+  end
+  
+  def test_day
+    assert_equal(24, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)).day)
+    assert_equal(24, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)).day)
+    assert_equal(24, TimeOrDateTime.new(1143214323).day)
+  end
+  
+  def test_hour
+    assert_equal(15, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)).hour)
+    assert_equal(15, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)).hour)
+    assert_equal(15, TimeOrDateTime.new(1143214323).hour)
+  end
+  
+  def test_min
+    assert_equal(32, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)).min)
+    assert_equal(32, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)).min)
+    assert_equal(32, TimeOrDateTime.new(1143214323).min)
+  end
+  
+  def test_sec
+    assert_equal(3, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)).sec)
+    assert_equal(3, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)).sec)
+    assert_equal(3, TimeOrDateTime.new(1143214323).sec)
+  end
+  
+  def test_compare_timeordatetime_time
+    assert_equal(-1, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) <=> TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 4)))
+    assert_equal(-1, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) <=> TimeOrDateTime.new(Time.utc(2007, 3, 24, 15, 32, 3)))
+    assert_equal(0, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) <=> TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)))
+    assert_equal(1, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) <=> TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 2)))
+    assert_equal(1, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) <=> TimeOrDateTime.new(Time.utc(2005, 3, 24, 15, 32, 3)))
+    assert_equal(-1, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) <=> TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 4)))
+    assert_equal(-1, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) <=> TimeOrDateTime.new(Time.utc(2007, 3, 24, 15, 32, 3)))
+    assert_equal(0, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) <=> TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)))
+    assert_equal(1, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) <=> TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 2)))
+    assert_equal(1, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) <=> TimeOrDateTime.new(Time.utc(2005, 3, 24, 15, 32, 3)))
+    assert_equal(-1, TimeOrDateTime.new(DateTime.new(1960, 3, 24, 15, 32, 3)) <=> TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)))
+    assert_equal(1, TimeOrDateTime.new(DateTime.new(2040, 3, 24, 15, 32, 3)) <=> TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)))
+    assert_equal(-1, TimeOrDateTime.new(1143214323) <=> TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 4)))
+    assert_equal(-1, TimeOrDateTime.new(1143214323) <=> TimeOrDateTime.new(Time.utc(2007, 3, 24, 15, 32, 3)))
+    assert_equal(0, TimeOrDateTime.new(1143214323) <=> TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)))
+    assert_equal(1, TimeOrDateTime.new(1143214323) <=> TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 2)))
+    assert_equal(1, TimeOrDateTime.new(1143214323) <=> TimeOrDateTime.new(Time.utc(2005, 3, 24, 15, 32, 3)))
+  end
+  
+  def test_compare_timeordatetime_datetime
+    assert_equal(-1, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) <=> TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 4)))
+    assert_equal(-1, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) <=> TimeOrDateTime.new(DateTime.new(2040, 3, 24, 15, 32, 3)))
+    assert_equal(0, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) <=> TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)))
+    assert_equal(1, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) <=> TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 2)))
+    assert_equal(1, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) <=> TimeOrDateTime.new(DateTime.new(1960, 3, 24, 15, 32, 3)))
+    assert_equal(-1, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) <=> TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 4)))
+    assert_equal(-1, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) <=> TimeOrDateTime.new(DateTime.new(2040, 3, 24, 15, 32, 3)))
+    assert_equal(0, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) <=> TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)))
+    assert_equal(1, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) <=> TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 2)))
+    assert_equal(1, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) <=> TimeOrDateTime.new(DateTime.new(1960, 3, 24, 15, 32, 3)))
+    assert_equal(-1, TimeOrDateTime.new(DateTime.new(1960, 3, 24, 15, 32, 3)) <=> TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)))
+    assert_equal(1, TimeOrDateTime.new(DateTime.new(2040, 3, 24, 15, 32, 3)) <=> TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)))
+    assert_equal(-1, TimeOrDateTime.new(1143214323) <=> TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 4)))
+    assert_equal(-1, TimeOrDateTime.new(1143214323) <=> TimeOrDateTime.new(DateTime.new(2040, 3, 24, 15, 32, 3)))
+    assert_equal(0, TimeOrDateTime.new(1143214323) <=> TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)))
+    assert_equal(1, TimeOrDateTime.new(1143214323) <=> TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 2)))
+    assert_equal(1, TimeOrDateTime.new(1143214323) <=> TimeOrDateTime.new(DateTime.new(1960, 3, 24, 15, 32, 3)))
+  end
+  
+  def test_compare_timeordatetime_timestamp
+    assert_equal(-1, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) <=> TimeOrDateTime.new(1143214324))
+    assert_equal(-1, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) <=> TimeOrDateTime.new(1174750323))
+    assert_equal(0, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) <=> TimeOrDateTime.new(1143214323))
+    assert_equal(1, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) <=> TimeOrDateTime.new(1143214322))
+    assert_equal(1, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) <=> TimeOrDateTime.new(1111678323))
+    assert_equal(-1, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) <=> TimeOrDateTime.new(1143214324))
+    assert_equal(-1, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) <=> TimeOrDateTime.new(1174750323))
+    assert_equal(0, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) <=> TimeOrDateTime.new(1143214323))
+    assert_equal(1, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) <=> TimeOrDateTime.new(1143214322))
+    assert_equal(1, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) <=> TimeOrDateTime.new(1111678323))
+    assert_equal(-1, TimeOrDateTime.new(DateTime.new(1960, 3, 24, 15, 32, 3)) <=> TimeOrDateTime.new(1143214323))
+    assert_equal(1, TimeOrDateTime.new(DateTime.new(2040, 3, 24, 15, 32, 3)) <=> TimeOrDateTime.new(1143214323))
+    assert_equal(-1, TimeOrDateTime.new(1143214323) <=> TimeOrDateTime.new(1143214324))
+    assert_equal(-1, TimeOrDateTime.new(1143214323) <=> TimeOrDateTime.new(1174750323))
+    assert_equal(0, TimeOrDateTime.new(1143214323) <=> TimeOrDateTime.new(1143214323))
+    assert_equal(1, TimeOrDateTime.new(1143214323) <=> TimeOrDateTime.new(1143214322))
+    assert_equal(1, TimeOrDateTime.new(1143214323) <=> TimeOrDateTime.new(1111678323))
+  end
+  
+  def test_compare_time
+    assert_equal(-1, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) <=> Time.utc(2006, 3, 24, 15, 32, 4))
+    assert_equal(-1, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) <=> Time.utc(2007, 3, 24, 15, 32, 3))
+    assert_equal(0, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) <=> Time.utc(2006, 3, 24, 15, 32, 3))
+    assert_equal(1, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) <=> Time.utc(2006, 3, 24, 15, 32, 2))
+    assert_equal(1, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) <=> Time.utc(2005, 3, 24, 15, 32, 3))
+    assert_equal(-1, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) <=> Time.utc(2006, 3, 24, 15, 32, 4))
+    assert_equal(-1, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) <=> Time.utc(2007, 3, 24, 15, 32, 3))
+    assert_equal(0, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) <=> Time.utc(2006, 3, 24, 15, 32, 3))
+    assert_equal(1, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) <=> Time.utc(2006, 3, 24, 15, 32, 2))
+    assert_equal(1, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) <=> Time.utc(2005, 3, 24, 15, 32, 3))
+    assert_equal(-1, TimeOrDateTime.new(DateTime.new(1960, 3, 24, 15, 32, 3)) <=> Time.utc(2006, 3, 24, 15, 32, 3))
+    assert_equal(1, TimeOrDateTime.new(DateTime.new(2040, 3, 24, 15, 32, 3)) <=> Time.utc(2006, 3, 24, 15, 32, 3))
+    assert_equal(-1, TimeOrDateTime.new(1143214323) <=> Time.utc(2006, 3, 24, 15, 32, 4))
+    assert_equal(-1, TimeOrDateTime.new(1143214323) <=> Time.utc(2007, 3, 24, 15, 32, 3))
+    assert_equal(0, TimeOrDateTime.new(1143214323) <=> Time.utc(2006, 3, 24, 15, 32, 3))
+    assert_equal(1, TimeOrDateTime.new(1143214323) <=> Time.utc(2006, 3, 24, 15, 32, 2))
+    assert_equal(1, TimeOrDateTime.new(1143214323) <=> Time.utc(2005, 3, 24, 15, 32, 3))
+  end
+  
+  def test_compare_datetime
+    assert_equal(-1, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) <=> DateTime.new(2006, 3, 24, 15, 32, 4))
+    assert_equal(-1, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) <=> DateTime.new(2040, 3, 24, 15, 32, 3))
+    assert_equal(0, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) <=> DateTime.new(2006, 3, 24, 15, 32, 3))
+    assert_equal(1, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) <=> DateTime.new(2006, 3, 24, 15, 32, 2))
+    assert_equal(1, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) <=> DateTime.new(1960, 3, 24, 15, 32, 3))
+    assert_equal(-1, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) <=> DateTime.new(2006, 3, 24, 15, 32, 4))
+    assert_equal(-1, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) <=> DateTime.new(2040, 3, 24, 15, 32, 3))
+    assert_equal(0, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) <=> DateTime.new(2006, 3, 24, 15, 32, 3))
+    assert_equal(1, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) <=> DateTime.new(2006, 3, 24, 15, 32, 2))
+    assert_equal(1, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) <=> DateTime.new(1960, 3, 24, 15, 32, 3))
+    assert_equal(-1, TimeOrDateTime.new(DateTime.new(1960, 3, 24, 15, 32, 3)) <=> DateTime.new(2006, 3, 24, 15, 32, 3))
+    assert_equal(1, TimeOrDateTime.new(DateTime.new(2040, 3, 24, 15, 32, 3)) <=> DateTime.new(2006, 3, 24, 15, 32, 3))
+    assert_equal(-1, TimeOrDateTime.new(1143214323) <=> DateTime.new(2006, 3, 24, 15, 32, 4))
+    assert_equal(-1, TimeOrDateTime.new(1143214323) <=> DateTime.new(2040, 3, 24, 15, 32, 3))
+    assert_equal(0, TimeOrDateTime.new(1143214323) <=> DateTime.new(2006, 3, 24, 15, 32, 3))
+    assert_equal(1, TimeOrDateTime.new(1143214323) <=> DateTime.new(2006, 3, 24, 15, 32, 2))
+    assert_equal(1, TimeOrDateTime.new(1143214323) <=> DateTime.new(1960, 3, 24, 15, 32, 3))
+  end
+  
+  def test_compare_timestamp
+    assert_equal(-1, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) <=> 1143214324)
+    assert_equal(-1, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) <=> 1174750323)
+    assert_equal(0, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) <=> 1143214323)
+    assert_equal(1, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) <=> 1143214322)
+    assert_equal(1, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) <=> 1111678323)
+    assert_equal(-1, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) <=> 1143214324)
+    assert_equal(-1, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) <=> 1174750323)
+    assert_equal(0, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) <=> 1143214323)
+    assert_equal(1, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) <=> 1143214322)
+    assert_equal(1, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) <=> 1111678323)
+    assert_equal(-1, TimeOrDateTime.new(DateTime.new(1960, 3, 24, 15, 32, 3)) <=> 1143214323)
+    assert_equal(1, TimeOrDateTime.new(DateTime.new(2040, 3, 24, 15, 32, 3)) <=> 1143214323)
+    assert_equal(-1, TimeOrDateTime.new(1143214323) <=> 1143214324)
+    assert_equal(-1, TimeOrDateTime.new(1143214323) <=> 1174750323)
+    assert_equal(0, TimeOrDateTime.new(1143214323) <=> 1143214323)
+    assert_equal(1, TimeOrDateTime.new(1143214323) <=> 1143214322)
+    assert_equal(1, TimeOrDateTime.new(1143214323) <=> 1111678323)
+  end
+  
+  def test_compare_timestamp_str
+    assert_equal(-1, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) <=> '1143214324')
+    assert_equal(-1, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) <=> '1174750323')
+    assert_equal(0, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) <=> '1143214323')
+    assert_equal(1, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) <=> '1143214322')
+    assert_equal(1, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) <=> '1111678323')
+    assert_equal(-1, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) <=> '1143214324')
+    assert_equal(-1, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) <=> '1174750323')
+    assert_equal(0, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) <=> '1143214323')
+    assert_equal(1, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) <=> '1143214322')
+    assert_equal(1, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) <=> '1111678323')
+    assert_equal(-1, TimeOrDateTime.new(DateTime.new(1960, 3, 24, 15, 32, 3)) <=> '1143214323')
+    assert_equal(1, TimeOrDateTime.new(DateTime.new(2040, 3, 24, 15, 32, 3)) <=> '1143214323')
+    assert_equal(-1, TimeOrDateTime.new(1143214323) <=> '1143214324')
+    assert_equal(-1, TimeOrDateTime.new(1143214323) <=> '1174750323')
+    assert_equal(0, TimeOrDateTime.new(1143214323) <=> '1143214323')
+    assert_equal(1, TimeOrDateTime.new(1143214323) <=> '1143214322')
+    assert_equal(1, TimeOrDateTime.new(1143214323) <=> '1111678323')
+  end
+  
+  def test_add
+    assert_equal(Time.utc(2006, 3, 24, 15, 32, 3), (TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) + 0).to_orig)
+    assert_equal(DateTime.new(2006, 3, 24, 15, 32, 3), (TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) + 0).to_orig)
+    assert_equal(1143214323, (TimeOrDateTime.new(1143214323) + 0).to_orig)
+    assert_equal(Time.utc(2006, 3, 24, 15, 32, 4), (TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) + 1).to_orig)
+    assert_equal(DateTime.new(2006, 3, 24, 15, 32, 4), (TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) + 1).to_orig)
+    assert_equal(1143214324, (TimeOrDateTime.new(1143214323) + 1).to_orig)
+    assert_equal(Time.utc(2006, 3, 24, 15, 32, 2), (TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) + (-1)).to_orig)
+    assert_equal(DateTime.new(2006, 3, 24, 15, 32, 2), (TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) + (-1)).to_orig)
+    assert_equal(1143214322, (TimeOrDateTime.new(1143214323) + (-1)).to_orig)
+  end
+  
+  def test_subtract     
+    assert_equal(Time.utc(2006, 3, 24, 15, 32, 3), (TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) - 0).to_orig)
+    assert_equal(DateTime.new(2006, 3, 24, 15, 32, 3), (TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) - 0).to_orig)   
+    assert_equal(1143214323, (TimeOrDateTime.new(1143214323) - 0).to_orig)
+    assert_equal(Time.utc(2006, 3, 24, 15, 32, 2), (TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) - 1).to_orig)
+    assert_equal(DateTime.new(2006, 3, 24, 15, 32, 2), (TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) - 1).to_orig)
+    assert_equal(1143214322, (TimeOrDateTime.new(1143214323) - 1).to_orig)
+    assert_equal(Time.utc(2006, 3, 24, 15, 32, 4), (TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) - (-1)).to_orig)
+    assert_equal(DateTime.new(2006, 3, 24, 15, 32, 4), (TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) - (-1)).to_orig)
+    assert_equal(1143214324, (TimeOrDateTime.new(1143214323) - (-1)).to_orig)
+  end
+  
+  def test_add_with_convert
+    assert_equal(Time.utc(2006, 3, 24, 15, 32, 3), TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)).add_with_convert(0).to_orig)
+    assert_equal(DateTime.new(2006, 3, 24, 15, 32, 3), TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)).add_with_convert(0).to_orig)
+    assert_equal(1143214323, TimeOrDateTime.new(1143214323).add_with_convert(0).to_orig)
+    assert_equal(Time.utc(2006, 3, 24, 15, 32, 4), TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)).add_with_convert(1).to_orig)
+    assert_equal(DateTime.new(2006, 3, 24, 15, 32, 4), TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)).add_with_convert(1).to_orig)
+    assert_equal(1143214324, TimeOrDateTime.new(1143214323).add_with_convert(1).to_orig)
+    assert_equal(Time.utc(2006, 3, 24, 15, 32, 2), TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)).add_with_convert(-1).to_orig)
+    assert_equal(DateTime.new(2006, 3, 24, 15, 32, 2), TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)).add_with_convert(-1).to_orig)
+    assert_equal(1143214322, TimeOrDateTime.new(1143214323).add_with_convert(-1).to_orig)
+    
+    assert_equal(DateTime.new(1969, 12, 31, 23, 59, 59), TimeOrDateTime.new(Time.utc(1970, 1, 1, 0, 0, 0)).add_with_convert(-1).to_orig)
+    assert_equal(DateTime.new(2038, 1, 19, 3, 14, 8), TimeOrDateTime.new(Time.utc(2038, 1, 19, 3, 14, 7)).add_with_convert(1).to_orig)
+  end
+  
+  def test_wrap_time
+    t = TimeOrDateTime.wrap(Time.utc(2006, 3, 24, 15, 32, 3))
+    assert_instance_of(TimeOrDateTime, t)
+    assert_equal(Time.utc(2006, 3, 24, 15, 32, 3), t.to_orig)
+  end
+  
+  def test_wrap_datetime
+    t = TimeOrDateTime.wrap(DateTime.new(2006, 3, 24, 15, 32, 3))
+    assert_instance_of(TimeOrDateTime, t)
+    assert_equal(DateTime.new(2006, 3, 24, 15, 32, 3), t.to_orig)
+  end
+  
+  def test_wrap_timestamp
+    t = TimeOrDateTime.wrap(1143214323)
+    assert_instance_of(TimeOrDateTime, t)
+    assert_equal(1143214323, t.to_orig)
+  end 
+  
+  def test_wrap_timestamp_str
+    t = TimeOrDateTime.wrap('1143214323')
+    assert_instance_of(TimeOrDateTime, t)
+    assert_equal(1143214323, t.to_orig)
+  end
+
+  def test_wrap_timeordatetime
+    t = TimeOrDateTime.new(1143214323)
+    t2 = TimeOrDateTime.wrap(t)
+    assert_same(t, t2)    
+  end
+  
+  def test_wrap_block_time
+    assert_equal(Time.utc(2006, 3, 24, 15, 32, 4), TimeOrDateTime.wrap(Time.utc(2006, 3, 24, 15, 32, 3)) {|t|
+      assert_instance_of(TimeOrDateTime, t)
+      assert_equal(Time.utc(2006, 3, 24, 15, 32, 3), t.to_orig)
+      t + 1
+    })
+  end
+  
+  def test_wrap_block_datetime
+    assert_equal(DateTime.new(2006, 3, 24, 15, 32, 4), TimeOrDateTime.wrap(DateTime.new(2006, 3, 24, 15, 32, 3)) {|t|
+      assert_instance_of(TimeOrDateTime, t)
+      assert_equal(DateTime.new(2006, 3, 24, 15, 32, 3), t.to_orig)
+      t + 1
+    })
+  end
+  
+  def test_wrap_block_timestamp
+    assert_equal(1143214324, TimeOrDateTime.wrap(1143214323) {|t|
+      assert_instance_of(TimeOrDateTime, t)
+      assert_equal(1143214323, t.to_orig)
+      t + 1
+    })
+  end
+  
+  def test_wrap_block_timestamp_str
+    assert_equal(1143214324, TimeOrDateTime.wrap('1143214323') {|t|
+      assert_instance_of(TimeOrDateTime, t)
+      assert_equal(1143214323, t.to_orig)
+      t + 1
+    })
+  end
+  
+  def test_wrap_block_timeordatetime
+    t1 = TimeOrDateTime.new(1143214323)
+        
+    t2 = TimeOrDateTime.wrap(t1) {|t|
+      assert_same(t1, t)
+      t + 1           
+    }
+      
+    assert_not_nil(t2)
+    assert_instance_of(TimeOrDateTime, t2)
+    assert_equal(1143214324, t2.to_orig)
+  end
+end

data/test/tc_timezone.rb

@@ -216,29 +216,49 @@ class TCTimezone < Test::Unit::TestCase
   def test_period_for_utc
     dt = DateTime.new(2005,2,18,16,24,23)
     t = Time.utc(2005,2,18,16,24,23)
+    t2 = Time.local(2005,2,18,16,24,23)
+    ts = t.to_i
         
     dt_period = Timezone.get('Europe/London').period_for_utc(dt)
     t_period = Timezone.get('Europe/London').period_for_utc(t)
+    t2_period = Timezone.get('Europe/London').period_for_utc(t2)
+    ts_period = Timezone.get('Europe/London').period_for_utc(ts)
     
     assert_equal(DateTime.new(2004,10,31,1,0,0), dt_period.utc_start)
-    assert_equal(DateTime.new(2005,3,27,1,0,0), dt_period.utc_end)
+    assert_equal(DateTime.new(2005,3,27,1,0,0), dt_period.utc_end)   
     
     assert_equal(DateTime.new(2004,10,31,1,0,0), t_period.utc_start)
     assert_equal(DateTime.new(2005,3,27,1,0,0), t_period.utc_end)
+    
+    assert_equal(DateTime.new(2004,10,31,1,0,0), t2_period.utc_start)
+    assert_equal(DateTime.new(2005,3,27,1,0,0), t2_period.utc_end)
+    
+    assert_equal(DateTime.new(2004,10,31,1,0,0), ts_period.utc_start)
+    assert_equal(DateTime.new(2005,3,27,1,0,0), ts_period.utc_end)
   end
   
   def test_period_for_local
     dt = DateTime.new(2005,2,18,16,24,23)
     t = Time.utc(2005,2,18,16,24,23)
+    t2 = Time.local(2005,2,18,16,24,23)
+    ts = t.to_i
     
     dt_period = Timezone.get('Europe/London').period_for_local(dt)
     t_period = Timezone.get('Europe/London').period_for_local(t)
+    t2_period = Timezone.get('Europe/London').period_for_local(t2)
+    ts_period = Timezone.get('Europe/London').period_for_local(ts)        
     
     assert_equal(DateTime.new(2004,10,31,1,0,0), dt_period.utc_start)
     assert_equal(DateTime.new(2005,3,27,1,0,0), dt_period.utc_end)
     
     assert_equal(DateTime.new(2004,10,31,1,0,0), t_period.utc_start)
     assert_equal(DateTime.new(2005,3,27,1,0,0), t_period.utc_end)
+    
+    assert_equal(DateTime.new(2004,10,31,1,0,0), t2_period.utc_start)
+    assert_equal(DateTime.new(2005,3,27,1,0,0), t2_period.utc_end)
+    
+    assert_equal(DateTime.new(2004,10,31,1,0,0), ts_period.utc_start)
+    assert_equal(DateTime.new(2005,3,27,1,0,0), ts_period.utc_end)
   end
   
   def test_period_for_local_invalid
@@ -339,33 +359,49 @@ class TCTimezone < Test::Unit::TestCase
   def test_utc_to_local
     dt = DateTime.new(2005,2,18,16,24,23)
     t = Time.utc(2005,2,18,16,24,23)
+    t2 = Time.local(2005,2,18,16,24,23)
+    ts = t.to_i
         
-    assert_equal(dt, Timezone.get('Europe/London').utc_to_local(dt))
-    assert_not_equal(t, Timezone.get('Europe/London').utc_to_local(dt))
+    assert_equal(dt, Timezone.get('Europe/London').utc_to_local(dt))    
     assert_equal(t, Timezone.get('Europe/London').utc_to_local(t))
-    assert_not_equal(dt, Timezone.get('Europe/London').utc_to_local(t))
+    assert_equal(t, Timezone.get('Europe/London').utc_to_local(t2))
+    assert_equal(ts, Timezone.get('Europe/London').utc_to_local(ts))
   end    
   
   def test_local_to_utc
     dt = DateTime.new(2005,2,18,16,24,23)
     t = Time.utc(2005,2,18,16,24,23)
+    t2 = Time.local(2005,2,18,16,24,23)
+    ts = t.to_i
         
-    assert_equal(dt, Timezone.get('Europe/London').local_to_utc(dt))
-    assert_not_equal(t, Timezone.get('Europe/London').local_to_utc(dt))
+    assert_equal(dt, Timezone.get('Europe/London').local_to_utc(dt))    
     assert_equal(t, Timezone.get('Europe/London').local_to_utc(t))
-    assert_not_equal(dt, Timezone.get('Europe/London').local_to_utc(t))
+    assert_equal(t, Timezone.get('Europe/London').local_to_utc(t2))
+    assert_equal(ts, Timezone.get('Europe/London').local_to_utc(ts))
   end
   
   def test_local_to_utc_invalid
     assert_raise(PeriodNotFound) {
       Timezone.get('America/New_York').local_to_utc(DateTime.new(2004,4,4,2,30,0))
     }
+    assert_raise(PeriodNotFound) {
+      Timezone.get('America/New_York').local_to_utc(Time.utc(2004,4,4,2,30,0))
+    }
+    assert_raise(PeriodNotFound) {
+      Timezone.get('America/New_York').local_to_utc(Time.utc(2004,4,4,2,30,0).to_i)
+    }
   end
   
   def test_local_to_utc_ambiguous
     assert_raise(AmbiguousTime) {
       Timezone.get('America/New_York').local_to_utc(DateTime.new(2004,10,31,1,30,0))
     }
+    assert_raise(AmbiguousTime) {
+      Timezone.get('America/New_York').local_to_utc(Time.utc(2004,10,31,1,30,0))
+    }
+    assert_raise(AmbiguousTime) {
+      Timezone.get('America/New_York').local_to_utc(Time.utc(2004,10,31,1,30,0).to_i)
+    }
   end
   
   def test_local_to_utc_dst_flag_resolved