tzinfo 1.0.1 → 1.1.0

data/test/tc_timezone_london.rb

@@ -70,6 +70,18 @@ class TCTimezoneLondon < Test::Unit::TestCase
     assert_equal(0, tz.period_for_local(DateTime.new(2004,10,31,1,59,59), false).utc_total_offset)
     assert_equal(3600, tz.period_for_local(DateTime.new(2004,10,31,1,0,0), true).utc_total_offset)
     assert_equal(0, tz.period_for_local(DateTime.new(2004,10,31,1,0,0), false).utc_total_offset)
+    
+    transitions = tz.transitions_up_to(DateTime.new(2005,1,1,0,0,0), DateTime.new(2004,1,1,0,0,0))
+    assert_equal(2, transitions.length)
+    assert_equal(TimeOrDateTime.new(DateTime.new(2004,3,28,1,0,0)), transitions[0].at)
+    assert_equal(TimezoneOffset.new(0, 0, :GMT), transitions[0].previous_offset)
+    assert_equal(TimezoneOffset.new(0, 3600, :BST), transitions[0].offset)
+    assert_equal(TimeOrDateTime.new(DateTime.new(2004,10,31,1,0,0)), transitions[1].at)
+    assert_equal(TimezoneOffset.new(0, 3600, :BST), transitions[1].previous_offset)
+    assert_equal(TimezoneOffset.new(0, 0, :GMT), transitions[1].offset)
+    
+    offsets = tz.offsets_up_to(DateTime.new(2005,1,1,0,0,0), DateTime.new(2004,1,1,0,0,0))
+    assert_array_same_items([TimezoneOffset.new(0, 0, :GMT), TimezoneOffset.new(0, 3600, :BST)], offsets)
   end 
   
   def test_1961
@@ -122,6 +134,19 @@ class TCTimezoneLondon < Test::Unit::TestCase
       assert_equal(0, tz.period_for_local(DateTime.new(1961,10,29,2,59,59), false).utc_total_offset)
       assert_equal(3600, tz.period_for_local(DateTime.new(1961,10,29,2,0,0), true).utc_total_offset)
       assert_equal(0, tz.period_for_local(DateTime.new(1961,10,29,2,0,0), false).utc_total_offset)
+      
+      
+      transitions = tz.transitions_up_to(DateTime.new(1962,1,1,0,0,0), DateTime.new(1961,1,1,0,0,0))
+      assert_equal(2, transitions.length)
+      assert_equal(TimeOrDateTime.new(DateTime.new(1961,3,26,2,0,0)), transitions[0].at)
+      assert_equal(TimezoneOffset.new(0, 0, :GMT), transitions[0].previous_offset)
+      assert_equal(TimezoneOffset.new(0, 3600, :BST), transitions[0].offset)
+      assert_equal(TimeOrDateTime.new(DateTime.new(1961,10,29,2,0,0)), transitions[1].at)
+      assert_equal(TimezoneOffset.new(0, 3600, :BST), transitions[1].previous_offset)
+      assert_equal(TimezoneOffset.new(0, 0, :GMT), transitions[1].offset)
+      
+      offsets = tz.offsets_up_to(DateTime.new(1962,1,1,0,0,0), DateTime.new(1961,1,1,0,0,0))
+      assert_array_same_items([TimezoneOffset.new(0, 0, :GMT), TimezoneOffset.new(0, 3600, :BST)], offsets)
     end
   end 
   

data/test/tc_timezone_melbourne.rb

@@ -70,6 +70,18 @@ class TCTimezoneMelbourne < Test::Unit::TestCase
     assert_equal(36000, tz.period_for_local(DateTime.new(2004,3,28,2,0,0), false).utc_total_offset)
     assert_equal(36000, tz.period_for_local(DateTime.new(2004,10,31,1,59,59)).utc_total_offset)
     assert_equal(39600, tz.period_for_local(DateTime.new(2004,10,31,3,0,0)).utc_total_offset)
+    
+    transitions = tz.transitions_up_to(DateTime.new(2005,1,1,0,0,0), DateTime.new(2004,1,1,0,0,0))
+    assert_equal(2, transitions.length)
+    assert_equal(TimeOrDateTime.new(DateTime.new(2004,3,27,16,0,0)), transitions[0].at)
+    assert_equal(TimezoneOffset.new(36000, 3600, :EST), transitions[0].previous_offset)
+    assert_equal(TimezoneOffset.new(36000, 0, :EST), transitions[0].offset)
+    assert_equal(TimeOrDateTime.new(DateTime.new(2004,10,30,16,0,0)), transitions[1].at)
+    assert_equal(TimezoneOffset.new(36000, 0, :EST), transitions[1].previous_offset)
+    assert_equal(TimezoneOffset.new(36000, 3600, :EST), transitions[1].offset)
+    
+    offsets = tz.offsets_up_to(DateTime.new(2005,1,1,0,0,0), DateTime.new(2004,1,1,0,0,0))
+    assert_array_same_items([TimezoneOffset.new(36000, 0, :EST), TimezoneOffset.new(36000, 3600, :EST)], offsets)
   end  
 
   def test_1942
@@ -122,6 +134,18 @@ class TCTimezoneMelbourne < Test::Unit::TestCase
       assert_equal(36000, tz.period_for_local(DateTime.new(1942,3,29,1,0,0), false).utc_total_offset)
       assert_equal(36000, tz.period_for_local(DateTime.new(1942,9,27,1,59,59)).utc_total_offset)
       assert_equal(39600, tz.period_for_local(DateTime.new(1942,9,27,3,0,0)).utc_total_offset)
+      
+      transitions = tz.transitions_up_to(DateTime.new(1943,1,1,0,0,0), DateTime.new(1942,1,1,0,0,0))
+      assert_equal(2, transitions.length)
+      assert_equal(TimeOrDateTime.new(DateTime.new(1942,3,28,15,0,0)), transitions[0].at)
+      assert_equal(TimezoneOffset.new(36000, 3600, :EST), transitions[0].previous_offset)
+      assert_equal(TimezoneOffset.new(36000, 0, :EST), transitions[0].offset)
+      assert_equal(TimeOrDateTime.new(DateTime.new(1942,9,26,16,0,0)), transitions[1].at)
+      assert_equal(TimezoneOffset.new(36000, 0, :EST), transitions[1].previous_offset)
+      assert_equal(TimezoneOffset.new(36000, 3600, :EST), transitions[1].offset)
+      
+      offsets = tz.offsets_up_to(DateTime.new(1943,1,1,0,0,0), DateTime.new(1942,1,1,0,0,0))
+      assert_array_same_items([TimezoneOffset.new(36000, 0, :EST), TimezoneOffset.new(36000, 3600, :EST)], offsets)
     end
   end
 

data/test/tc_timezone_new_york.rb

@@ -70,6 +70,18 @@ class TCTimezoneNewYork < Test::Unit::TestCase
     assert_equal(-18000, tz.period_for_local(DateTime.new(2004,10,31,1,59,59), false).utc_total_offset)
     assert_equal(-14400, tz.period_for_local(DateTime.new(2004,10,31,1,0,0), true).utc_total_offset)
     assert_equal(-18000, tz.period_for_local(DateTime.new(2004,10,31,1,0,0), false).utc_total_offset)
+    
+    transitions = tz.transitions_up_to(DateTime.new(2005,1,1,0,0,0), DateTime.new(2004,1,1,0,0,0))
+    assert_equal(2, transitions.length)
+    assert_equal(TimeOrDateTime.new(DateTime.new(2004,4,4,7,0,0)), transitions[0].at)
+    assert_equal(TimezoneOffset.new(-18000, 0, :EST), transitions[0].previous_offset)
+    assert_equal(TimezoneOffset.new(-18000, 3600, :EDT), transitions[0].offset)
+    assert_equal(TimeOrDateTime.new(DateTime.new(2004,10,31,6,0,0)), transitions[1].at)
+    assert_equal(TimezoneOffset.new(-18000, 3600, :EDT), transitions[1].previous_offset)
+    assert_equal(TimezoneOffset.new(-18000, 0, :EST), transitions[1].offset)
+    
+    offsets = tz.offsets_up_to(DateTime.new(2005,1,1,0,0,0), DateTime.new(2004,1,1,0,0,0))
+    assert_array_same_items([TimezoneOffset.new(-18000, 0, :EST), TimezoneOffset.new(-18000, 3600, :EDT)], offsets)
   end     
 
   def test_1957
@@ -122,6 +134,18 @@ class TCTimezoneNewYork < Test::Unit::TestCase
       assert_equal(-18000, tz.period_for_local(DateTime.new(1957,10,27,1,59,59), false).utc_total_offset)
       assert_equal(-14400, tz.period_for_local(DateTime.new(1957,10,27,1,0,0), true).utc_total_offset)
       assert_equal(-18000, tz.period_for_local(DateTime.new(1957,10,27,1,0,0), false).utc_total_offset)
+      
+      transitions = tz.transitions_up_to(DateTime.new(1958,1,1,0,0,0), DateTime.new(1957,1,1,0,0,0))
+      assert_equal(2, transitions.length)
+      assert_equal(TimeOrDateTime.new(DateTime.new(1957,4,28,7,0,0)), transitions[0].at)
+      assert_equal(TimezoneOffset.new(-18000, 0, :EST), transitions[0].previous_offset)
+      assert_equal(TimezoneOffset.new(-18000, 3600, :EDT), transitions[0].offset)
+      assert_equal(TimeOrDateTime.new(DateTime.new(1957,10,27,6,0,0)), transitions[1].at)
+      assert_equal(TimezoneOffset.new(-18000, 3600, :EDT), transitions[1].previous_offset)
+      assert_equal(TimezoneOffset.new(-18000, 0, :EST), transitions[1].offset)
+      
+      offsets = tz.offsets_up_to(DateTime.new(1958,1,1,0,0,0), DateTime.new(1957,1,1,0,0,0))
+      assert_array_same_items([TimezoneOffset.new(-18000, 0, :EST), TimezoneOffset.new(-18000, 3600, :EDT)], offsets)
     end
   end
   

data/test/{tc_timezone_offset_info.rb → tc_timezone_offset.rb}

@@ -24,51 +24,51 @@ require File.join(File.expand_path(File.dirname(__FILE__)), 'test_utils')
 
 include TZInfo
 
-class TCTimezoneOffsetInfo < Test::Unit::TestCase
+class TCTimezoneOffset < Test::Unit::TestCase
   
   def test_utc_offset
-    o1 = TimezoneOffsetInfo.new(18000, 0, :TEST)
-    o2 = TimezoneOffsetInfo.new(-3600, 3600, :TEST2)
+    o1 = TimezoneOffset.new(18000, 0, :TEST)
+    o2 = TimezoneOffset.new(-3600, 3600, :TEST2)
     
     assert_equal(18000, o1.utc_offset)
     assert_equal(-3600, o2.utc_offset)
   end
   
   def test_std_offset
-    o1 = TimezoneOffsetInfo.new(18000, 0, :TEST)
-    o2 = TimezoneOffsetInfo.new(-3600, 3600, :TEST2)
+    o1 = TimezoneOffset.new(18000, 0, :TEST)
+    o2 = TimezoneOffset.new(-3600, 3600, :TEST2)
     
     assert_equal(0, o1.std_offset)
     assert_equal(3600, o2.std_offset)
   end
   
   def test_utc_total_offset
-    o1 = TimezoneOffsetInfo.new(18000, 0, :TEST)
-    o2 = TimezoneOffsetInfo.new(-3600, 3600, :TEST2)
+    o1 = TimezoneOffset.new(18000, 0, :TEST)
+    o2 = TimezoneOffset.new(-3600, 3600, :TEST2)
     
     assert_equal(18000, o1.utc_total_offset)
     assert_equal(0, o2.utc_total_offset)
   end
   
   def test_abbreviation
-    o1 = TimezoneOffsetInfo.new(18000, 0, :TEST)
-    o2 = TimezoneOffsetInfo.new(-3600, 3600, :TEST2)
+    o1 = TimezoneOffset.new(18000, 0, :TEST)
+    o2 = TimezoneOffset.new(-3600, 3600, :TEST2)
     
     assert_equal(:TEST, o1.abbreviation)
     assert_equal(:TEST2, o2.abbreviation)
   end
   
   def test_dst
-    o1 = TimezoneOffsetInfo.new(18000, 0, :TEST)
-    o2 = TimezoneOffsetInfo.new(-3600, 3600, :TEST2)
+    o1 = TimezoneOffset.new(18000, 0, :TEST)
+    o2 = TimezoneOffset.new(-3600, 3600, :TEST2)
     
     assert_equal(false, o1.dst?)
     assert_equal(true, o2.dst?)
   end
   
   def test_to_local
-    o1 = TimezoneOffsetInfo.new(18000, 0, :TEST)
-    o2 = TimezoneOffsetInfo.new(-3600, 3600, :TEST2)
+    o1 = TimezoneOffset.new(18000, 0, :TEST)
+    o2 = TimezoneOffset.new(-3600, 3600, :TEST2)
     
     assert_equal(1148949080, o1.to_local(1148931080))
     assert_equal(Time.utc(2006, 5, 30, 0, 31, 20), o1.to_local(Time.utc(2006, 5, 29, 19, 31, 20)))
@@ -88,8 +88,8 @@ class TCTimezoneOffsetInfo < Test::Unit::TestCase
   end
   
   def test_to_utc
-    o1 = TimezoneOffsetInfo.new(18000, 0, :TEST)
-    o2 = TimezoneOffsetInfo.new(-3600, 3600, :TEST2)
+    o1 = TimezoneOffset.new(18000, 0, :TEST)
+    o2 = TimezoneOffset.new(-3600, 3600, :TEST2)
     
     assert_equal(1148913080, o1.to_utc(1148931080))
     assert_equal(Time.utc(2006, 5, 29, 14, 31, 20), o1.to_utc(Time.utc(2006, 5, 29, 19, 31, 20)))
@@ -109,11 +109,11 @@ class TCTimezoneOffsetInfo < Test::Unit::TestCase
   end
   
   def test_equality
-    o1 = TimezoneOffsetInfo.new(18000, 0, :TEST)
-    o2 = TimezoneOffsetInfo.new(18000, 0, :TEST)
-    o3 = TimezoneOffsetInfo.new(18001, 0, :TEST)
-    o4 = TimezoneOffsetInfo.new(18000, 1, :TEST)
-    o5 = TimezoneOffsetInfo.new(18000, 0, :TEST2)
+    o1 = TimezoneOffset.new(18000, 0, :TEST)
+    o2 = TimezoneOffset.new(18000, 0, :TEST)
+    o3 = TimezoneOffset.new(18001, 0, :TEST)
+    o4 = TimezoneOffset.new(18000, 1, :TEST)
+    o5 = TimezoneOffset.new(18000, 0, :TEST2)
     
     assert_equal(true, o1 == o1)
     assert_equal(true, o1 == o2)
@@ -124,11 +124,11 @@ class TCTimezoneOffsetInfo < Test::Unit::TestCase
   end
   
   def test_eql
-    o1 = TimezoneOffsetInfo.new(18000, 0, :TEST)
-    o2 = TimezoneOffsetInfo.new(18000, 0, :TEST)
-    o3 = TimezoneOffsetInfo.new(18001, 0, :TEST)
-    o4 = TimezoneOffsetInfo.new(18000, 1, :TEST)
-    o5 = TimezoneOffsetInfo.new(18000, 0, :TEST2)
+    o1 = TimezoneOffset.new(18000, 0, :TEST)
+    o2 = TimezoneOffset.new(18000, 0, :TEST)
+    o3 = TimezoneOffset.new(18001, 0, :TEST)
+    o4 = TimezoneOffset.new(18000, 1, :TEST)
+    o5 = TimezoneOffset.new(18000, 0, :TEST2)
     
     assert_equal(true, o1.eql?(o1))
     assert_equal(true, o1.eql?(o2))
@@ -139,8 +139,8 @@ class TCTimezoneOffsetInfo < Test::Unit::TestCase
   end
   
   def test_hash
-    o1 = TimezoneOffsetInfo.new(18000, 0, :TEST)
-    o2 = TimezoneOffsetInfo.new(-3600, 3600, :TEST2)
+    o1 = TimezoneOffset.new(18000, 0, :TEST)
+    o2 = TimezoneOffset.new(-3600, 3600, :TEST2)
     
     assert_equal(18000.hash ^ 0.hash ^ :TEST.hash, o1.hash)
     assert_equal(-3600.hash ^ 3600.hash ^ :TEST2.hash, o2.hash)

data/test/tc_timezone_period.rb

@@ -26,14 +26,28 @@ include TZInfo
 
 class TCTimezonePeriod < Test::Unit::TestCase
   
+  class TestTimezoneTransition < TimezoneTransition
+    def initialize(offset, previous_offset, at)
+      super(offset, previous_offset)
+      @at = TimeOrDateTime.wrap(at)
+    end
+    
+    def at
+      @at
+    end
+  end
+  
   def test_initialize_start_end
-    std = TimezoneOffsetInfo.new(-7200, 0, :TEST)
-    dst = TimezoneOffsetInfo.new(-7200, 3600, :TEST)
-    start_t = TimezoneTransitionInfo.new(dst, std, 1136073600)
-    end_t = TimezoneTransitionInfo.new(std, dst, 1136160000)
+    std = TimezoneOffset.new(-7200, 0, :TEST)
+    dst = TimezoneOffset.new(-7200, 3600, :TEST)
+    start_t = TestTimezoneTransition.new(dst, std, 1136073600)
+    end_t = TestTimezoneTransition.new(std, dst, 1136160000)
       
     p = TimezonePeriod.new(start_t, end_t)
     
+    assert_same(start_t, p.start_transition)
+    assert_same(end_t, p.end_transition)
+    assert_same(dst, p.offset)
     assert_equal(DateTime.new(2006,1,1,0,0,0), p.utc_start)
     assert_equal(Time.utc(2006,1,1,0,0,0), p.utc_start_time)
     assert_equal(DateTime.new(2006,1,2,0,0,0), p.utc_end)
@@ -51,22 +65,25 @@ class TCTimezonePeriod < Test::Unit::TestCase
   end
   
   def test_initialize_start_end_offset
-    std = TimezoneOffsetInfo.new(-7200, 0, :TEST)
-    dst = TimezoneOffsetInfo.new(-7200, 3600, :TEST)
-    special = TimezoneOffsetInfo.new(0, 0, :SPECIAL)
-    start_t = TimezoneTransitionInfo.new(dst, std, 1136073600)
-    end_t = TimezoneTransitionInfo.new(std, dst, 1136160000)
+    std = TimezoneOffset.new(-7200, 0, :TEST)
+    dst = TimezoneOffset.new(-7200, 3600, :TEST)
+    special = TimezoneOffset.new(0, 0, :SPECIAL)
+    start_t = TestTimezoneTransition.new(dst, std, 1136073600)
+    end_t = TestTimezoneTransition.new(std, dst, 1136160000)
       
     assert_raises(ArgumentError) { TimezonePeriod.new(start_t, end_t, special) }
   end
   
   def test_initialize_start
-    std = TimezoneOffsetInfo.new(-7200, 0, :TEST)
-    dst = TimezoneOffsetInfo.new(-7200, 3600, :TEST)
-    start_t = TimezoneTransitionInfo.new(dst, std, 1136073600)   
+    std = TimezoneOffset.new(-7200, 0, :TEST)
+    dst = TimezoneOffset.new(-7200, 3600, :TEST)
+    start_t = TestTimezoneTransition.new(dst, std, 1136073600)
       
     p = TimezonePeriod.new(start_t, nil)
     
+    assert_same(start_t, p.start_transition)
+    assert_nil(p.end_transition)
+    assert_same(dst, p.offset)
     assert_equal(DateTime.new(2006,1,1,0,0,0), p.utc_start)
     assert_equal(Time.utc(2006,1,1,0,0,0), p.utc_start_time)
     assert_nil(p.utc_end)
@@ -84,21 +101,24 @@ class TCTimezonePeriod < Test::Unit::TestCase
   end
   
   def test_initialize_start_offset
-    std = TimezoneOffsetInfo.new(-7200, 0, :TEST)
-    dst = TimezoneOffsetInfo.new(-7200, 3600, :TEST)
-    special = TimezoneOffsetInfo.new(0, 0, :SPECIAL)
-    start_t = TimezoneTransitionInfo.new(dst, std, 1136073600)   
+    std = TimezoneOffset.new(-7200, 0, :TEST)
+    dst = TimezoneOffset.new(-7200, 3600, :TEST)
+    special = TimezoneOffset.new(0, 0, :SPECIAL)
+    start_t = TestTimezoneTransition.new(dst, std, 1136073600)
       
     assert_raises(ArgumentError) { TimezonePeriod.new(start_t, nil, special) }
   end
   
   def test_initialize_end
-    std = TimezoneOffsetInfo.new(-7200, 0, :TEST)
-    dst = TimezoneOffsetInfo.new(-7200, 3600, :TEST)    
-    end_t = TimezoneTransitionInfo.new(std, dst, 1136160000)
+    std = TimezoneOffset.new(-7200, 0, :TEST)
+    dst = TimezoneOffset.new(-7200, 3600, :TEST)    
+    end_t = TestTimezoneTransition.new(std, dst, 1136160000)
       
     p = TimezonePeriod.new(nil, end_t)
     
+    assert_nil(p.start_transition)
+    assert_same(end_t, p.end_transition)
+    assert_same(dst, p.offset)
     assert_nil(p.utc_start)
     assert_nil(p.utc_start_time)
     assert_equal(DateTime.new(2006,1,2,0,0,0), p.utc_end)
@@ -116,10 +136,10 @@ class TCTimezonePeriod < Test::Unit::TestCase
   end
   
   def test_initialize_end_offset
-    std = TimezoneOffsetInfo.new(-7200, 0, :TEST)
-    dst = TimezoneOffsetInfo.new(-7200, 3600, :TEST)    
-    special = TimezoneOffsetInfo.new(0, 0, :SPECIAL)
-    end_t = TimezoneTransitionInfo.new(std, dst, 1136160000)
+    std = TimezoneOffset.new(-7200, 0, :TEST)
+    dst = TimezoneOffset.new(-7200, 3600, :TEST)    
+    special = TimezoneOffset.new(0, 0, :SPECIAL)
+    end_t = TestTimezoneTransition.new(std, dst, 1136160000)
       
     assert_raises(ArgumentError) { TimezonePeriod.new(nil, end_t, special) }    
   end
@@ -129,10 +149,13 @@ class TCTimezonePeriod < Test::Unit::TestCase
   end
   
   def test_initialize_offset
-    special = TimezoneOffsetInfo.new(0, 0, :SPECIAL)
+    special = TimezoneOffset.new(0, 0, :SPECIAL)
       
     p = TimezonePeriod.new(nil, nil, special)
     
+    assert_nil(p.start_transition)
+    assert_nil(p.end_transition)
+    assert_same(special, p.offset)
     assert_nil(p.utc_start)
     assert_nil(p.utc_start_time)
     assert_nil(p.utc_end)
@@ -150,11 +173,11 @@ class TCTimezonePeriod < Test::Unit::TestCase
   end
   
   def test_dst    
-    p1 = TimezonePeriod.new(nil, nil, TimezoneOffsetInfo.new(-14400, 3600, :TEST))
-    p2 = TimezonePeriod.new(nil, nil, TimezoneOffsetInfo.new(-14400, 0, :TEST))
-    p3 = TimezonePeriod.new(nil, nil, TimezoneOffsetInfo.new(-14400, -3600, :TEST))
-    p4 = TimezonePeriod.new(nil, nil, TimezoneOffsetInfo.new(-14400, 7200, :TEST))
-    p5 = TimezonePeriod.new(nil, nil, TimezoneOffsetInfo.new(-14400, -7200, :TEST))
+    p1 = TimezonePeriod.new(nil, nil, TimezoneOffset.new(-14400, 3600, :TEST))
+    p2 = TimezonePeriod.new(nil, nil, TimezoneOffset.new(-14400, 0, :TEST))
+    p3 = TimezonePeriod.new(nil, nil, TimezoneOffset.new(-14400, -3600, :TEST))
+    p4 = TimezonePeriod.new(nil, nil, TimezoneOffset.new(-14400, 7200, :TEST))
+    p5 = TimezonePeriod.new(nil, nil, TimezoneOffset.new(-14400, -7200, :TEST))
     
     assert_equal(true, p1.dst?)
     assert_equal(false, p2.dst?)
@@ -164,11 +187,11 @@ class TCTimezonePeriod < Test::Unit::TestCase
   end
   
   def test_valid_for_utc
-    offset = TimezoneOffsetInfo.new(-7200, 3600, :TEST)
-    t1 = TimezoneTransitionInfo.new(offset, offset, 1104541261)
-    t2 = TimezoneTransitionInfo.new(offset, offset, 1107309722)
-    t3 = TimezoneTransitionInfo.new(offset, offset, 210551144461, 86400)
-    t4 = TimezoneTransitionInfo.new(offset, offset, 105276956461, 43200)
+    offset = TimezoneOffset.new(-7200, 3600, :TEST)
+    t1 = TestTimezoneTransition.new(offset, offset, 1104541261)
+    t2 = TestTimezoneTransition.new(offset, offset, 1107309722)
+    t3 = TestTimezoneTransition.new(offset, offset, DateTime.new(1960, 1, 1, 1, 1, 1))
+    t4 = TestTimezoneTransition.new(offset, offset, DateTime.new(1960, 2, 2, 2, 2, 2))
     
     p1 = TimezonePeriod.new(t1, t2)
     p2 = TimezonePeriod.new(nil, t2)
@@ -217,11 +240,11 @@ class TCTimezonePeriod < Test::Unit::TestCase
   end
   
   def test_utc_after_start
-    offset = TimezoneOffsetInfo.new(-7200, 3600, :TEST)
-    t1 = TimezoneTransitionInfo.new(offset, offset, 1104541261)
-    t2 = TimezoneTransitionInfo.new(offset, offset, 1107309722)
-    t3 = TimezoneTransitionInfo.new(offset, offset, 210077845261, 86400)
-    t4 = TimezoneTransitionInfo.new(offset, offset, 105040306861, 43200)
+    offset = TimezoneOffset.new(-7200, 3600, :TEST)
+    t1 = TestTimezoneTransition.new(offset, offset, 1104541261)
+    t2 = TestTimezoneTransition.new(offset, offset, 1107309722)
+    t3 = TestTimezoneTransition.new(offset, offset, DateTime.new(1945, 1, 1, 1, 1, 1))
+    t4 = TestTimezoneTransition.new(offset, offset, DateTime.new(1945, 2, 2, 2, 2, 2))
     
     p1 = TimezonePeriod.new(t1, t2)
     p2 = TimezonePeriod.new(nil, t2)
@@ -242,11 +265,11 @@ class TCTimezonePeriod < Test::Unit::TestCase
   end
   
   def test_utc_before_end
-    offset = TimezoneOffsetInfo.new(-7200, 3600, :TEST)
-    t1 = TimezoneTransitionInfo.new(offset, offset, 1104541261)
-    t2 = TimezoneTransitionInfo.new(offset, offset, 1107309722)
-    t3 = TimezoneTransitionInfo.new(offset, offset, 210077845261, 86400)
-    t4 = TimezoneTransitionInfo.new(offset, offset, 105040306861, 43200)
+    offset = TimezoneOffset.new(-7200, 3600, :TEST)
+    t1 = TestTimezoneTransition.new(offset, offset, 1104541261)
+    t2 = TestTimezoneTransition.new(offset, offset, 1107309722)
+    t3 = TestTimezoneTransition.new(offset, offset, DateTime.new(1945, 1, 1, 1, 1, 1))
+    t4 = TestTimezoneTransition.new(offset, offset, DateTime.new(1945, 2, 2, 2, 2, 2))
     
     p1 = TimezonePeriod.new(t1, t2)
     p2 = TimezonePeriod.new(t1, nil)
@@ -267,12 +290,12 @@ class TCTimezonePeriod < Test::Unit::TestCase
   end
   
   def test_valid_for_local
-    offset = TimezoneOffsetInfo.new(-7200, 3600, :TEST)
-    t1 = TimezoneTransitionInfo.new(offset, offset, 1104544861)
-    t2 = TimezoneTransitionInfo.new(offset, offset, 1107313322)
-    t3 = TimezoneTransitionInfo.new(offset, offset, 1104544861)
-    t4 = TimezoneTransitionInfo.new(offset, offset, 210551144461, 86400)
-    t5 = TimezoneTransitionInfo.new(offset, offset, 105276956461, 43200)
+    offset = TimezoneOffset.new(-7200, 3600, :TEST)
+    t1 = TestTimezoneTransition.new(offset, offset, 1104544861)
+    t2 = TestTimezoneTransition.new(offset, offset, 1107313322)
+    t3 = TestTimezoneTransition.new(offset, offset, 1104544861)
+    t4 = TestTimezoneTransition.new(offset, offset, DateTime.new(1960, 1, 1, 1, 1, 1))
+    t5 = TestTimezoneTransition.new(offset, offset, DateTime.new(1960, 2, 2, 2, 2, 2))
     
     p1 = TimezonePeriod.new(t1, t2)
     p2 = TimezonePeriod.new(nil, t2)
@@ -321,11 +344,11 @@ class TCTimezonePeriod < Test::Unit::TestCase
   end
   
   def test_local_after_start
-    offset = TimezoneOffsetInfo.new(-7200, 3600, :TEST)
-    t1 = TimezoneTransitionInfo.new(offset, offset, 1104544861)
-    t2 = TimezoneTransitionInfo.new(offset, offset, 1107313322)
-    t3 = TimezoneTransitionInfo.new(offset, offset, 210077845261, 86400)
-    t4 = TimezoneTransitionInfo.new(offset, offset, 105040306861, 43200)
+    offset = TimezoneOffset.new(-7200, 3600, :TEST)
+    t1 = TestTimezoneTransition.new(offset, offset, 1104544861)
+    t2 = TestTimezoneTransition.new(offset, offset, 1107313322)
+    t3 = TestTimezoneTransition.new(offset, offset, DateTime.new(1945, 1, 1, 1, 1, 1))
+    t4 = TestTimezoneTransition.new(offset, offset, DateTime.new(1945, 2, 2, 2, 2, 2))
     
     p1 = TimezonePeriod.new(t1, t2)
     p2 = TimezonePeriod.new(nil, t2)
@@ -346,11 +369,11 @@ class TCTimezonePeriod < Test::Unit::TestCase
   end
   
   def test_local_before_end
-    offset = TimezoneOffsetInfo.new(-7200, 3600, :TEST)
-    t1 = TimezoneTransitionInfo.new(offset, offset, 1104544861)
-    t2 = TimezoneTransitionInfo.new(offset, offset, 1107313322)
-    t3 = TimezoneTransitionInfo.new(offset, offset, 210077845261, 86400)
-    t4 = TimezoneTransitionInfo.new(offset, offset, 105040306861, 43200)
+    offset = TimezoneOffset.new(-7200, 3600, :TEST)
+    t1 = TestTimezoneTransition.new(offset, offset, 1104544861)
+    t2 = TestTimezoneTransition.new(offset, offset, 1107313322)
+    t3 = TestTimezoneTransition.new(offset, offset, DateTime.new(1945, 1, 1, 1, 1, 1))
+    t4 = TestTimezoneTransition.new(offset, offset, DateTime.new(1945, 2, 2, 2, 2, 2))
     
     p1 = TimezonePeriod.new(t1, t2)    
     p2 = TimezonePeriod.new(t1, nil)
@@ -371,9 +394,9 @@ class TCTimezonePeriod < Test::Unit::TestCase
   end
   
   def test_to_local
-    p1 = TimezonePeriod.new(nil, nil, TimezoneOffsetInfo.new(-14400, 3600, :TEST))
-    p2 = TimezonePeriod.new(nil, nil, TimezoneOffsetInfo.new(-14400, 0, :TEST))
-    p3 = TimezonePeriod.new(nil, nil, TimezoneOffsetInfo.new(7200, 3600, :TEST))
+    p1 = TimezonePeriod.new(nil, nil, TimezoneOffset.new(-14400, 3600, :TEST))
+    p2 = TimezonePeriod.new(nil, nil, TimezoneOffset.new(-14400, 0, :TEST))
+    p3 = TimezonePeriod.new(nil, nil, TimezoneOffset.new(7200, 3600, :TEST))
         
     assert_equal(DateTime.new(2005,1,19,22,0,0), p1.to_local(DateTime.new(2005,1,20,1,0,0)))
     assert_equal(DateTime.new(2005,1,19,22,0,0 + Rational(512,1000)), p1.to_local(DateTime.new(2005,1,20,1,0,0 + Rational(512,1000))))
@@ -383,9 +406,9 @@ class TCTimezonePeriod < Test::Unit::TestCase
   end
   
   def test_to_utc
-    p1 = TimezonePeriod.new(nil, nil, TimezoneOffsetInfo.new(-14400, 3600, :TEST))
-    p2 = TimezonePeriod.new(nil, nil, TimezoneOffsetInfo.new(-14400, 0, :TEST))
-    p3 = TimezonePeriod.new(nil, nil, TimezoneOffsetInfo.new(7200, 3600, :TEST))
+    p1 = TimezonePeriod.new(nil, nil, TimezoneOffset.new(-14400, 3600, :TEST))
+    p2 = TimezonePeriod.new(nil, nil, TimezoneOffset.new(-14400, 0, :TEST))
+    p3 = TimezonePeriod.new(nil, nil, TimezoneOffset.new(7200, 3600, :TEST))
         
     assert_equal(DateTime.new(2005,1,20,4,0,0), p1.to_utc(DateTime.new(2005,1,20,1,0,0)))
     assert_equal(DateTime.new(2005,1,20,4,0,0 + Rational(571,1000)), p1.to_utc(DateTime.new(2005,1,20,1,0,0 + Rational(571,1000))))
@@ -395,9 +418,9 @@ class TCTimezonePeriod < Test::Unit::TestCase
   end
   
   def test_time_boundary_start
-    o1 = TimezoneOffsetInfo.new(-3600, 0, :TEST)
-    o2 = TimezoneOffsetInfo.new(-3600, 3600, :TEST)
-    t1 = TimezoneTransitionInfo.new(o1, o2, 0)
+    o1 = TimezoneOffset.new(-3600, 0, :TEST)
+    o2 = TimezoneOffset.new(-3600, 3600, :TEST)
+    t1 = TestTimezoneTransition.new(o1, o2, 0)
     
     p1 = TimezonePeriod.new(t1, nil)
     
@@ -410,9 +433,9 @@ class TCTimezonePeriod < Test::Unit::TestCase
   end
   
   def test_time_boundary_end
-    o1 = TimezoneOffsetInfo.new(0, 3600, :TEST)
-    o2 = TimezoneOffsetInfo.new(0, 0, :TEST)
-    t1 = TimezoneTransitionInfo.new(o2, o1, 2147482800)
+    o1 = TimezoneOffset.new(0, 3600, :TEST)
+    o2 = TimezoneOffset.new(0, 0, :TEST)
+    t1 = TestTimezoneTransition.new(o2, o1, 2147482800)
     
     p1 = TimezonePeriod.new(nil, t1)
     
@@ -425,12 +448,12 @@ class TCTimezonePeriod < Test::Unit::TestCase
   end
   
   def test_equality
-    o1 = TimezoneOffsetInfo.new(0, 3600, :TEST)
-    o2 = TimezoneOffsetInfo.new(0, 0, :TEST)
-    t1 = TimezoneTransitionInfo.new(o1, o2, 1149368400)    
-    t2 = TimezoneTransitionInfo.new(o1, o2, 19631123, 8)
-    t3 = TimezoneTransitionInfo.new(o1, o2, 1149454800)
-    t4 = TimezoneTransitionInfo.new(o1, o2, 1149541200)
+    o1 = TimezoneOffset.new(0, 3600, :TEST)
+    o2 = TimezoneOffset.new(0, 0, :TEST)
+    t1 = TestTimezoneTransition.new(o1, o2, 1149368400)
+    t2 = TestTimezoneTransition.new(o1, o2, DateTime.new(2006, 6, 3, 21, 0, 0))
+    t3 = TestTimezoneTransition.new(o1, o2, 1149454800)
+    t4 = TestTimezoneTransition.new(o1, o2, 1149541200)
     
     p1 = TimezonePeriod.new(t1, t3)
     p2 = TimezonePeriod.new(t1, t3)
@@ -476,12 +499,12 @@ class TCTimezonePeriod < Test::Unit::TestCase
   end
   
   def test_eql
-    o1 = TimezoneOffsetInfo.new(0, 3600, :TEST)
-    o2 = TimezoneOffsetInfo.new(0, 0, :TEST)
-    t1 = TimezoneTransitionInfo.new(o1, o2, 1149368400)    
-    t2 = TimezoneTransitionInfo.new(o1, o2, 19631123, 8)
-    t3 = TimezoneTransitionInfo.new(o1, o2, 1149454800)
-    t4 = TimezoneTransitionInfo.new(o1, o2, 1149541200)
+    o1 = TimezoneOffset.new(0, 3600, :TEST)
+    o2 = TimezoneOffset.new(0, 0, :TEST)
+    t1 = TestTimezoneTransition.new(o1, o2, 1149368400)
+    t2 = TestTimezoneTransition.new(o1, o2, DateTime.new(2006, 6, 3, 21, 0, 0))
+    t3 = TestTimezoneTransition.new(o1, o2, 1149454800)
+    t4 = TestTimezoneTransition.new(o1, o2, 1149541200)
     
     p1 = TimezonePeriod.new(t1, t3)
     p2 = TimezonePeriod.new(t1, t3)
@@ -527,12 +550,12 @@ class TCTimezonePeriod < Test::Unit::TestCase
   end
   
   def test_hash
-    o1 = TimezoneOffsetInfo.new(0, 3600, :TEST)
-    o2 = TimezoneOffsetInfo.new(0, 0, :TEST)
-    t1 = TimezoneTransitionInfo.new(o1, o2, 1149368400)    
-    t2 = TimezoneTransitionInfo.new(o1, o2, 19631123, 8)
-    t3 = TimezoneTransitionInfo.new(o1, o2, 1149454800)
-    t4 = TimezoneTransitionInfo.new(o1, o2, 1149541200)
+    o1 = TimezoneOffset.new(0, 3600, :TEST)
+    o2 = TimezoneOffset.new(0, 0, :TEST)
+    t1 = TestTimezoneTransition.new(o1, o2, 1149368400)
+    t2 = TestTimezoneTransition.new(o1, o2, DateTime.new(2006, 6, 3, 21, 0, 0))
+    t3 = TestTimezoneTransition.new(o1, o2, 1149454800)
+    t4 = TestTimezoneTransition.new(o1, o2, 1149541200)
     
     p1 = TimezonePeriod.new(t1, t3)    
     p2 = TimezonePeriod.new(t3, nil)