tzinfo 1.0.1 → 1.1.0

data/test/tc_transition_data_timezone_info.rb

@@ -123,19 +123,19 @@ class TCTransitionDataTimezoneInfo < Test::Unit::TestCase
     dti.transition 2003,  2, :o2, Time.utc(2003, 2,1,1,0,0).to_i
     dti.transition 2003,  3, :o3, Time.utc(2003, 3,1,1,0,0).to_i
     
-    o1 = TimezoneOffsetInfo.new(-17900, 0,    :TESTLMT)
-    o2 = TimezoneOffsetInfo.new(-18000, 3600, :TESTD)
-    o3 = TimezoneOffsetInfo.new(-18000, 0,    :TESTS)
-    o4 = TimezoneOffsetInfo.new(-21600, 3600, :TESTD)
-    
-    t1 = TimezoneTransitionInfo.new(o2, o1, Time.utc(2000, 4,1,1,0,0).to_i)
-    t2 = TimezoneTransitionInfo.new(o3, o2, Time.utc(2000,10,1,1,0,0).to_i)
-    t3 = TimezoneTransitionInfo.new(o2, o3, Time.utc(2001, 3,1,1,0,0).to_i)
-    t4 = TimezoneTransitionInfo.new(o4, o2, Time.utc(2001, 4,1,1,0,0).to_i)
-    t5 = TimezoneTransitionInfo.new(o3, o4, Time.utc(2001,10,1,1,0,0).to_i)
-    t6 = TimezoneTransitionInfo.new(o3, o3, Time.utc(2002,10,1,1,0,0).to_i)
-    t7 = TimezoneTransitionInfo.new(o2, o3, Time.utc(2003, 2,1,1,0,0).to_i)
-    t8 = TimezoneTransitionInfo.new(o3, o2, Time.utc(2003, 3,1,1,0,0).to_i)     
+    o1 = TimezoneOffset.new(-17900, 0,    :TESTLMT)
+    o2 = TimezoneOffset.new(-18000, 3600, :TESTD)
+    o3 = TimezoneOffset.new(-18000, 0,    :TESTS)
+    o4 = TimezoneOffset.new(-21600, 3600, :TESTD)
+    
+    t1 = TimezoneTransitionDefinition.new(o2, o1, Time.utc(2000, 4,1,1,0,0).to_i)
+    t2 = TimezoneTransitionDefinition.new(o3, o2, Time.utc(2000,10,1,1,0,0).to_i)
+    t3 = TimezoneTransitionDefinition.new(o2, o3, Time.utc(2001, 3,1,1,0,0).to_i)
+    t4 = TimezoneTransitionDefinition.new(o4, o2, Time.utc(2001, 4,1,1,0,0).to_i)
+    t5 = TimezoneTransitionDefinition.new(o3, o4, Time.utc(2001,10,1,1,0,0).to_i)
+    t6 = TimezoneTransitionDefinition.new(o3, o3, Time.utc(2002,10,1,1,0,0).to_i)
+    t7 = TimezoneTransitionDefinition.new(o2, o3, Time.utc(2003, 2,1,1,0,0).to_i)
+    t8 = TimezoneTransitionDefinition.new(o3, o2, Time.utc(2003, 3,1,1,0,0).to_i)
     
     assert_equal(TimezonePeriod.new(nil, t1), dti.period_for_utc(DateTime.new(1960, 1,1,1, 0, 0)))
     assert_equal(TimezonePeriod.new(nil, t1), dti.period_for_utc(DateTime.new(1999,12,1,0, 0, 0)))
@@ -165,7 +165,7 @@ class TCTransitionDataTimezoneInfo < Test::Unit::TestCase
     dti.offset :o1, -17900, 0, :TESTLMT
     dti.offset :o2, -18000, 0, :TEST
     
-    o1 = TimezoneOffsetInfo.new(-17900, 0, :TESTLMT)
+    o1 = TimezoneOffset.new(-17900, 0, :TESTLMT)
     
     assert_equal(TimezonePeriod.new(nil, nil, o1), dti.period_for_utc(DateTime.new(2005,1,1,0,0,0)))
     assert_equal(TimezonePeriod.new(nil, nil, o1), dti.period_for_utc(Time.utc(2005,1,1,0,0,0)))
@@ -195,18 +195,18 @@ class TCTransitionDataTimezoneInfo < Test::Unit::TestCase
     dti.transition 2002, 10, :o3, 58861189, 24                   # 2002,10,2,1,0,0
     dti.transition 2003,  2, :o2, Time.utc(2003, 2,2,1,0,0).to_i
     
-    o1 = TimezoneOffsetInfo.new(-17900,    0, :TESTLMT)
-    o2 = TimezoneOffsetInfo.new(-18000, 3600, :TESTD)
-    o3 = TimezoneOffsetInfo.new(-18000,    0, :TESTS)
-    o4 = TimezoneOffsetInfo.new(-21600, 3600, :TESTD)
+    o1 = TimezoneOffset.new(-17900,    0, :TESTLMT)
+    o2 = TimezoneOffset.new(-18000, 3600, :TESTD)
+    o3 = TimezoneOffset.new(-18000,    0, :TESTS)
+    o4 = TimezoneOffset.new(-21600, 3600, :TESTD)
     
-    t1 = TimezoneTransitionInfo.new(o2, o1, Time.utc(2000, 4,2,1,0,0).to_i)
-    t2 = TimezoneTransitionInfo.new(o3, o2, Time.utc(2000,10,2,1,0,0).to_i)
-    t3 = TimezoneTransitionInfo.new(o2, o3, Time.utc(2001, 3,2,1,0,0).to_i)
-    t4 = TimezoneTransitionInfo.new(o4, o2, Time.utc(2001, 4,2,1,0,0).to_i)
-    t5 = TimezoneTransitionInfo.new(o3, o4, Time.utc(2001,10,2,1,0,0).to_i)
-    t6 = TimezoneTransitionInfo.new(o3, o3, Time.utc(2002,10,2,1,0,0).to_i)
-    t7 = TimezoneTransitionInfo.new(o2, o3, Time.utc(2003, 2,2,1,0,0).to_i)
+    t1 = TimezoneTransitionDefinition.new(o2, o1, Time.utc(2000, 4,2,1,0,0).to_i)
+    t2 = TimezoneTransitionDefinition.new(o3, o2, Time.utc(2000,10,2,1,0,0).to_i)
+    t3 = TimezoneTransitionDefinition.new(o2, o3, Time.utc(2001, 3,2,1,0,0).to_i)
+    t4 = TimezoneTransitionDefinition.new(o4, o2, Time.utc(2001, 4,2,1,0,0).to_i)
+    t5 = TimezoneTransitionDefinition.new(o3, o4, Time.utc(2001,10,2,1,0,0).to_i)
+    t6 = TimezoneTransitionDefinition.new(o3, o3, Time.utc(2002,10,2,1,0,0).to_i)
+    t7 = TimezoneTransitionDefinition.new(o2, o3, Time.utc(2003, 2,2,1,0,0).to_i)
     
     
     assert_equal([TimezonePeriod.new(nil, t1)], dti.periods_for_local(DateTime.new(1960, 1, 1, 1, 0, 0)))
@@ -257,14 +257,14 @@ class TCTransitionDataTimezoneInfo < Test::Unit::TestCase
     dti.transition 1915,  8, :o3, 290485733, 120  # 1915, 8, 4,22,36,0
     dti.transition 1916,  4, :o4,  29051813,  12  # 1916, 4,30,22, 0,0
     
-    o1 = TimezoneOffsetInfo.new(5040,    0, :LMT)
-    o2 = TimezoneOffsetInfo.new(5040,    0, :WMT)
-    o3 = TimezoneOffsetInfo.new(3600,    0, :CET)
-    o4 = TimezoneOffsetInfo.new(3600, 3600, :CEST)
+    o1 = TimezoneOffset.new(5040,    0, :LMT)
+    o2 = TimezoneOffset.new(5040,    0, :WMT)
+    o3 = TimezoneOffset.new(3600,    0, :CET)
+    o4 = TimezoneOffset.new(3600, 3600, :CEST)
     
-    t1 = TimezoneTransitionInfo.new(o2, o1, 288925853, 120)
-    t2 = TimezoneTransitionInfo.new(o3, o2, 290485733, 120)
-    t3 = TimezoneTransitionInfo.new(o4, o3,  29051813,  12)
+    t1 = TimezoneTransitionDefinition.new(o2, o1, 288925853, 120)
+    t2 = TimezoneTransitionDefinition.new(o3, o2, 290485733, 120)
+    t3 = TimezoneTransitionDefinition.new(o4, o3,  29051813,  12)
     
     assert_equal([TimezonePeriod.new(t1, t2),
                   TimezonePeriod.new(t2, t3)], dti.periods_for_local(DateTime.new(1915,8,4,23,40,0)))      
@@ -277,10 +277,10 @@ class TCTransitionDataTimezoneInfo < Test::Unit::TestCase
     
     dti.transition 2000, 7, :o2, Time.utc(2000,7,1,0,0,0).to_i
     
-    o1 = TimezoneOffsetInfo.new(-3600, 0, :TESTD)
-    o2 = TimezoneOffsetInfo.new(-3600, 0, :TESTS)
+    o1 = TimezoneOffset.new(-3600, 0, :TESTD)
+    o2 = TimezoneOffset.new(-3600, 0, :TESTS)
     
-    t1 = TimezoneTransitionInfo.new(o2, o1, Time.utc(2000,7,1,0,0,0).to_i)
+    t1 = TimezoneTransitionDefinition.new(o2, o1, Time.utc(2000,7,1,0,0,0).to_i)
                 
     # 2000-07-01 00:00:00 UTC is 2000-06-30 23:00:00 UTC-1
     # hence to find periods for local times between 2000-06-30 23:00:00
@@ -297,7 +297,7 @@ class TCTransitionDataTimezoneInfo < Test::Unit::TestCase
     dti.offset :o1, -17900, 0, :TESTLMT
     dti.offset :o2, -18000, 0, :TEST
     
-    o1 = TimezoneOffsetInfo.new(-17900, 0, :TESTLMT)
+    o1 = TimezoneOffset.new(-17900, 0, :TESTLMT)
     
     assert_equal([TimezonePeriod.new(nil, nil, o1)], dti.periods_for_local(DateTime.new(2005,1,1,0,0,0)))
     assert_equal([TimezonePeriod.new(nil, nil, o1)], dti.periods_for_local(Time.utc(2005,1,1,0,0,0)))
@@ -312,6 +312,106 @@ class TCTransitionDataTimezoneInfo < Test::Unit::TestCase
     assert_raises(NoOffsetsDefined) { dti.periods_for_local(Time.utc(2005,1,1,0,0,0).to_i) }
   end
   
+  def test_transitions_up_to
+    dti = TransitionDataTimezoneInfo.new('Test/Zone')
+    dti.offset :o1, -17900,    0, :TESTLMT
+    dti.offset :o2, -18000, 3600, :TESTD
+    dti.offset :o3, -18000,    0, :TESTS
+    dti.offset :o4, -21600, 3600, :TESTD
+    
+    dti.transition 2010,  4, :o2, Time.utc(2010, 4,1,1,0,0).to_i
+    dti.transition 2010, 10, :o3, Time.utc(2010,10,1,1,0,0).to_i
+    dti.transition 2011,  3, :o2, 58934917, 24                    # (2011, 3,1,1,0,0)
+    dti.transition 2011,  4, :o4, Time.utc(2011, 4,1,1,0,0).to_i, 58935661, 24
+    dti.transition 2011, 10, :o3, Time.utc(2011,10,1,1,0,0).to_i
+    
+    o1 = TimezoneOffset.new(-17900, 0,    :TESTLMT)
+    o2 = TimezoneOffset.new(-18000, 3600, :TESTD)
+    o3 = TimezoneOffset.new(-18000, 0,    :TESTS)
+    o4 = TimezoneOffset.new(-21600, 3600, :TESTD)
+    
+    t1 = TimezoneTransitionDefinition.new(o2, o1, Time.utc(2010, 4,1,1,0,0).to_i)
+    t2 = TimezoneTransitionDefinition.new(o3, o2, Time.utc(2010,10,1,1,0,0).to_i)
+    t3 = TimezoneTransitionDefinition.new(o2, o3, Time.utc(2011, 3,1,1,0,0).to_i)
+    t4 = TimezoneTransitionDefinition.new(o4, o2, Time.utc(2011, 4,1,1,0,0).to_i)
+    t5 = TimezoneTransitionDefinition.new(o3, o4, Time.utc(2011,10,1,1,0,0).to_i)
+    
+    assert_equal([], dti.transitions_up_to(Time.utc(2010,4,1,1,0,0)))
+    assert_equal([], dti.transitions_up_to(Time.utc(2010,4,1,1,0,0), Time.utc(2000,1,1,0,0,0)))
+    assert_equal([t1], dti.transitions_up_to(Time.utc(2010,4,1,1,0,1)))
+    assert_equal([t1], dti.transitions_up_to(Time.utc(2010,4,1,1,0,1), Time.utc(2000,1,1,0,0,0)))
+    assert_equal([t2,t3,t4], dti.transitions_up_to(Time.utc(2011,4,1,1,0,1), Time.utc(2010,10,1,1,0,0)))
+    assert_equal([t2,t3,t4], dti.transitions_up_to(Time.utc(2011,10,1,1,0,0), Time.utc(2010,4,1,1,0,1)))
+    assert_equal([t3], dti.transitions_up_to(Time.utc(2011,4,1,1,0,0), Time.utc(2010,10,1,1,0,1)))
+    assert_equal([], dti.transitions_up_to(Time.utc(2011,3,1,1,0,0), Time.utc(2010,10,1,1,0,1)))
+    assert_equal([t1,t2,t3,t4], dti.transitions_up_to(Time.utc(2011,10,1,1,0,0)))
+    assert_equal([t1,t2,t3,t4,t5], dti.transitions_up_to(Time.utc(2011,10,1,1,0,1)))
+    assert_equal([t1,t2,t3,t4,t5], dti.transitions_up_to(Time.utc(2011,10,1,1,0,0,1)))
+    assert_equal([t1,t2,t3,t4,t5], dti.transitions_up_to(Time.utc(2011,10,1,1,0,1), Time.utc(2010,4,1,1,0,0)))
+    assert_equal([t2,t3,t4,t5], dti.transitions_up_to(Time.utc(2011,10,1,1,0,1), Time.utc(2010,4,1,1,0,1)))
+    assert_equal([t2,t3,t4,t5], dti.transitions_up_to(Time.utc(2011,10,1,1,0,1), Time.utc(2010,4,1,1,0,0,1)))
+    assert_equal([t5], dti.transitions_up_to(Time.utc(2015,1,1,0,0,0), Time.utc(2011,10,1,1,0,0)))
+    assert_equal([], dti.transitions_up_to(Time.utc(2015,1,1,0,0,0), Time.utc(2011,10,1,1,0,1)))
+
+    assert_equal([], dti.transitions_up_to(Time.utc(2010,4,1,1,0,0).to_i))
+    assert_equal([], dti.transitions_up_to(Time.utc(2010,4,1,1,0,0).to_i, Time.utc(2000,1,1,0,0,0).to_i))
+    assert_equal([t1], dti.transitions_up_to(Time.utc(2010,4,1,1,0,1).to_i))
+    assert_equal([t1], dti.transitions_up_to(Time.utc(2010,4,1,1,0,1).to_i, Time.utc(2000,1,1,0,0,0).to_i))
+    assert_equal([t2,t3,t4], dti.transitions_up_to(Time.utc(2011,4,1,1,0,1).to_i, Time.utc(2010,10,1,1,0,0).to_i))
+    assert_equal([t2,t3,t4], dti.transitions_up_to(Time.utc(2011,10,1,1,0,0).to_i, Time.utc(2010,4,1,1,0,1).to_i))
+    assert_equal([t3], dti.transitions_up_to(Time.utc(2011,4,1,1,0,0).to_i, Time.utc(2010,10,1,1,0,1).to_i))
+    assert_equal([], dti.transitions_up_to(Time.utc(2011,3,1,1,0,0).to_i, Time.utc(2010,10,1,1,0,1).to_i))
+    assert_equal([t1,t2,t3,t4], dti.transitions_up_to(Time.utc(2011,10,1,1,0,0).to_i))
+    assert_equal([t1,t2,t3,t4,t5], dti.transitions_up_to(Time.utc(2011,10,1,1,0,1).to_i))
+    assert_equal([t1,t2,t3,t4,t5], dti.transitions_up_to(Time.utc(2011,10,1,1,0,1).to_i, Time.utc(2010,4,1,1,0,0).to_i))
+    assert_equal([t2,t3,t4,t5], dti.transitions_up_to(Time.utc(2011,10,1,1,0,1).to_i, Time.utc(2010,4,1,1,0,1).to_i))
+    assert_equal([t5], dti.transitions_up_to(Time.utc(2015,1,1,0,0,0).to_i, Time.utc(2011,10,1,1,0,0).to_i))
+    assert_equal([], dti.transitions_up_to(Time.utc(2015,1,1,0,0,0).to_i, Time.utc(2011,10,1,1,0,1).to_i))
+    
+    assert_equal([], dti.transitions_up_to(DateTime.new(2010,4,1,1,0,0)))
+    assert_equal([], dti.transitions_up_to(DateTime.new(2010,4,1,1,0,0), DateTime.new(2000,1,1,0,0,0)))
+    assert_equal([t1], dti.transitions_up_to(DateTime.new(2010,4,1,1,0,1)))
+    assert_equal([t1], dti.transitions_up_to(DateTime.new(2010,4,1,1,0,1), DateTime.new(2000,1,1,0,0,0)))
+    assert_equal([t2,t3,t4], dti.transitions_up_to(DateTime.new(2011,4,1,1,0,1), DateTime.new(2010,10,1,1,0,0)))
+    assert_equal([t2,t3,t4], dti.transitions_up_to(DateTime.new(2011,10,1,1,0,0), DateTime.new(2010,4,1,1,0,1)))
+    assert_equal([t3], dti.transitions_up_to(DateTime.new(2011,4,1,1,0,0), DateTime.new(2010,10,1,1,0,1)))
+    assert_equal([], dti.transitions_up_to(DateTime.new(2011,3,1,1,0,0), DateTime.new(2010,10,1,1,0,1)))
+    assert_equal([t1,t2,t3,t4], dti.transitions_up_to(DateTime.new(2011,10,1,1,0,0)))
+    assert_equal([t1,t2,t3,t4,t5], dti.transitions_up_to(DateTime.new(2011,10,1,1,0,1)))
+    assert_equal([t1,t2,t3,t4,t5], dti.transitions_up_to(DateTime.new(2011,10,1,1,0,Rational(1,1000000))))
+    assert_equal([t1,t2,t3,t4,t5], dti.transitions_up_to(DateTime.new(2011,10,1,1,0,1), DateTime.new(2010,4,1,1,0,0)))
+    assert_equal([t2,t3,t4,t5], dti.transitions_up_to(DateTime.new(2011,10,1,1,0,1), DateTime.new(2010,4,1,1,0,1)))
+    assert_equal([t2,t3,t4,t5], dti.transitions_up_to(DateTime.new(2011,10,1,1,0,1), DateTime.new(2010,4,1,1,0,Rational(1,1000000))))
+    assert_equal([t5], dti.transitions_up_to(DateTime.new(2015,1,1,0,0,0), DateTime.new(2011,10,1,1,0,0)))
+    assert_equal([], dti.transitions_up_to(DateTime.new(2015,1,1,0,0,0), DateTime.new(2011,10,1,1,0,1)))
+  end
+  
+  def test_transitions_up_to_no_transitions
+    dti = TransitionDataTimezoneInfo.new('Test/Zone')
+    dti.offset :o1, -17900, 0, :TESTLMT
+        
+    assert_equal([], dti.transitions_up_to(Time.utc(2015,1,1,0,0,0)))
+    assert_equal([], dti.transitions_up_to(Time.utc(2015,1,1,0,0,0).to_i))
+    assert_equal([], dti.transitions_up_to(DateTime.new(2015,1,1,0,0,0)))
+  end
+  
+  def test_transitions_up_to_utc_to_not_greater_than_utc_from
+    dti = TransitionDataTimezoneInfo.new('Test/Zone')
+    dti.offset :o1, -17900, 0, :TESTLMT
+    
+    assert_raises(ArgumentError) do
+      dti.transitions_up_to(Time.utc(2012,8,1,0,0,0), Time.utc(2013,8,1,0,0,0))
+    end
+    
+    assert_raises(ArgumentError) do
+      dti.transitions_up_to(Time.utc(2012,8,1,0,0,0).to_i, Time.utc(2012,8,1,0,0,0).to_i)
+    end
+    
+    assert_raises(ArgumentError) do
+      dti.transitions_up_to(DateTime.new(2012,8,1,0,0,0), DateTime.new(2012,8,1,0,0,0))
+    end
+  end
+  
   def test_datetime_and_timestamp_use
     dti = TransitionDataTimezoneInfo.new('Test/Zone')
     dti.offset :o1, 0,    0, :TESTS
@@ -323,23 +423,23 @@ class TCTransitionDataTimezoneInfo < Test::Unit::TestCase
     dti.transition 2038,  1, :o1, 2147483648, 3328347557, 1350
     
     if RubyCoreSupport.time_supports_negative && RubyCoreSupport.time_supports_64bit
-      assert(dti.period_for_utc(DateTime.new(1901,12,13,20,45,51)).send(:start_transition).at.eql?(TimeOrDateTime.new(-2147483649)))
+      assert(dti.period_for_utc(DateTime.new(1901,12,13,20,45,51)).start_transition.at.eql?(TimeOrDateTime.new(-2147483649)))
     else
-      assert(dti.period_for_utc(DateTime.new(1901,12,13,20,45,51)).send(:start_transition).at.eql?(TimeOrDateTime.new(DateTime.new(1901,12,13,20,45,51))))
+      assert(dti.period_for_utc(DateTime.new(1901,12,13,20,45,51)).start_transition.at.eql?(TimeOrDateTime.new(DateTime.new(1901,12,13,20,45,51))))
     end
     
     if RubyCoreSupport.time_supports_negative          
-      assert(dti.period_for_utc(DateTime.new(1969,12,31,23,59,59)).send(:start_transition).at.eql?(TimeOrDateTime.new(-1)))
+      assert(dti.period_for_utc(DateTime.new(1969,12,31,23,59,59)).start_transition.at.eql?(TimeOrDateTime.new(-1)))
     else
-      assert(dti.period_for_utc(DateTime.new(1969,12,31,23,59,59)).send(:start_transition).at.eql?(TimeOrDateTime.new(DateTime.new(1969,12,31,23,59,59))))
+      assert(dti.period_for_utc(DateTime.new(1969,12,31,23,59,59)).start_transition.at.eql?(TimeOrDateTime.new(DateTime.new(1969,12,31,23,59,59))))
     end
     
-    assert(dti.period_for_utc(DateTime.new(2001,9,9,2,46,40)).send(:start_transition).at.eql?(TimeOrDateTime.new(1000000000)))
+    assert(dti.period_for_utc(DateTime.new(2001,9,9,2,46,40)).start_transition.at.eql?(TimeOrDateTime.new(1000000000)))
         
     if RubyCoreSupport.time_supports_64bit
-      assert(dti.period_for_utc(DateTime.new(2038,1,19,3,14,8)).send(:start_transition).at.eql?(TimeOrDateTime.new(2147483648)))
+      assert(dti.period_for_utc(DateTime.new(2038,1,19,3,14,8)).start_transition.at.eql?(TimeOrDateTime.new(2147483648)))
     else
-      assert(dti.period_for_utc(DateTime.new(2038,1,19,3,14,8)).send(:start_transition).at.eql?(TimeOrDateTime.new(DateTime.new(2038,1,19,3,14,8))))
+      assert(dti.period_for_utc(DateTime.new(2038,1,19,3,14,8)).start_transition.at.eql?(TimeOrDateTime.new(DateTime.new(2038,1,19,3,14,8))))
     end
   end
 end

data/test/tc_zoneinfo_data_source.rb

@@ -216,6 +216,32 @@ class TCZoneinfoDataSource < Test::Unit::TestCase
     end
   end
   
+  def test_load_timezone_info_ignored_file
+    assert_raises(InvalidTimezoneIdentifier) do
+      @data_source.load_timezone_info('localtime')
+    end
+  end
+  
+  def test_load_timezone_info_ignored_plus_version_file
+    # Mac OS X includes a file named +VERSION containing the tzdata version.
+    
+    Dir.mktmpdir('tzinfo_test') do |dir|
+      FileUtils.touch(File.join(dir, 'zone.tab'))
+      FileUtils.touch(File.join(dir, 'iso3166.tab'))
+      
+      File.open(File.join(dir, '+VERSION'), 'w') do |f|
+        f.binmode
+        f.write("2013a\n")
+      end
+      
+      data_source = ZoneinfoDataSource.new(dir)
+      
+      assert_raises(InvalidTimezoneIdentifier) do
+        data_source.load_timezone_info('+VERSION')
+      end
+    end
+  end
+  
   def test_load_timezone_info_nil
     assert_raises(InvalidTimezoneIdentifier) do
       @data_source.load_timezone_info(nil)
@@ -416,9 +442,9 @@ class TCZoneinfoDataSource < Test::Unit::TestCase
       zone = File.join(dir, 'Zone')      
       
       File.open(File.join(@data_source.zoneinfo_dir, 'EST')) do |src|
-        # Change format to 3 (which is not a valid format).
+        # Change header to TZif1 (which is not a valid header).
         File.open(zone, 'wb') do |dest|
-          dest.write('TZif3')
+          dest.write('TZif1')
           src.pos = 5
           FileUtils.copy_stream(src, dest)
         end
@@ -434,13 +460,23 @@ class TCZoneinfoDataSource < Test::Unit::TestCase
 
   def test_load_timezone_info_tainted
     safe_test do
-      info = @data_source.load_timezone_info('Europe/Amsterdam'.taint)
+      identifier = 'Europe/Amsterdam'.taint
+      assert(identifier.tainted?)
+      info = @data_source.load_timezone_info(identifier)
       assert_equal('Europe/Amsterdam', info.identifier)
+      assert(identifier.tainted?)
     end
   end
   
-  def test_load_timezone_info_tainted_zoneinfo_dir_safe_mode
+  def test_load_timezone_info_tainted_and_frozen
     safe_test do
+      info = @data_source.load_timezone_info('Europe/Amsterdam'.taint.freeze)
+      assert_equal('Europe/Amsterdam', info.identifier)
+    end
+  end
+  
+  def test_load_timezone_info_tainted_zoneinfo_dir_safe_mode
+    safe_test(:unavailable => :skip) do
       assert_raises(SecurityError) do
         ZoneinfoDataSource.new(@data_source.zoneinfo_dir.dup.taint)
       end
@@ -509,6 +545,24 @@ class TCZoneinfoDataSource < Test::Unit::TestCase
     end
   end
   
+  def test_timezone_identifiers_ignored_plus_version_file
+    # Mac OS X includes a file named +VERSION containing the tzdata version.
+    
+    Dir.mktmpdir('tzinfo_test') do |dir|
+      FileUtils.touch(File.join(dir, 'zone.tab'))
+      FileUtils.touch(File.join(dir, 'iso3166.tab'))
+      FileUtils.cp(File.join(@data_source.zoneinfo_dir, 'EST'), File.join(dir, 'EST'))
+      
+      File.open(File.join(dir, '+VERSION'), 'w') do |f|
+        f.binmode
+        f.write("2013a\n")
+      end
+      
+      data_source = ZoneinfoDataSource.new(dir)
+      assert_array_same_items(['EST'], data_source.timezone_identifiers)
+    end
+  end
+  
   def test_load_country_info
     info = @data_source.load_country_info('GB')
     assert_equal('GB', info.code)
@@ -540,7 +594,17 @@ class TCZoneinfoDataSource < Test::Unit::TestCase
   
   def test_load_country_info_tainted
     safe_test do
-      info = @data_source.load_country_info('NL'.taint)
+      code = 'NL'.taint
+      assert(code.tainted?)
+      info = @data_source.load_country_info(code)
+      assert_equal('NL', info.code)
+      assert(code.tainted?)
+    end
+  end
+  
+  def test_load_country_info_tainted_and_frozen
+    safe_test do
+      info = @data_source.load_country_info('NL'.taint.freeze)
       assert_equal('NL', info.code)
     end
   end

data/test/tc_zoneinfo_timezone_info.rb

@@ -31,6 +31,14 @@ include TZInfo
 
 class TCZoneinfoTimezoneInfo < Test::Unit::TestCase
 
+  begin
+    Time.at(-2147483649)
+    Time.at(2147483648)
+    SUPPORTS_64BIT = true
+  rescue RangeError
+    SUPPORTS_64BIT = false
+  end
+
   def assert_period(abbreviation, utc_offset, std_offset, dst, start_at, end_at, info)    
     if start_at
       period = info.period_for_utc(start_at)
@@ -89,19 +97,26 @@ class TCZoneinfoTimezoneInfo < Test::Unit::TestCase
     
     # Options for testing malformed zoneinfo files.
     magic = options[:magic]
+    section2_magic = options[:section2_magic]
     abbrev_separator = options[:abbrev_separator] || "\0"
     abbrev_offset_base = options[:abbrev_offset_base] || 0
       
     unless magic
       if format == 1
         magic = "TZif\0"
-      elsif format == 2
-        magic = 'TZif2'
+      elsif format >= 2
+        magic = "TZif#{format}"
       else
         raise ArgumentError, 'Invalid format specified'
       end
     end
     
+    if section2_magic.kind_of?(Proc)
+      section2_magic = section2_magic.call(format)
+    else
+      section2_magic = magic unless section2_magic
+    end
+    
     convert_times_to_i(transitions)
     convert_times_to_i(leaps)    
     
@@ -155,9 +170,9 @@ class TCZoneinfoTimezoneInfo < Test::Unit::TestCase
         file.write("\0" * offsets.length * 2)
       end
       
-      if format == 2
+      if format >= 2
         file.write(
-          [magic, offsets.length, offsets.length, leaps.length, 
+          [section2_magic, offsets.length, offsets.length, leaps.length, 
            transitions.length, offsets.length, abbrevs_length].pack('a5 x15 NNNNNN'))
     
         unless transitions.empty?
@@ -198,8 +213,11 @@ class TCZoneinfoTimezoneInfo < Test::Unit::TestCase
   end
   
   def tzif_test(offsets, transitions, leaps = [], options = {}, &block)
-    write_tzif(1, offsets, transitions, leaps, options, &block)
-    write_tzif(2, offsets, transitions, leaps, options, &block)
+    min_format = options[:min_format] || 1
+    
+    min_format.upto(3) do |format|
+      write_tzif(format, offsets, transitions, leaps, options, &block)
+    end
   end
   
   def test_load
@@ -307,7 +325,7 @@ class TCZoneinfoTimezoneInfo < Test::Unit::TestCase
   end
   
   def test_load_invalid_magic
-    ['TZif3', 'tzif2', '12345'].each do |magic|    
+    ['TZif4', 'tzif2', '12345'].each do |magic|    
       offsets = [{:gmtoff => -12094, :isdst => false, :abbrev => 'LT'}]
           
       tzif_test(offsets, [], [], :magic => magic) do |path, format|        
@@ -318,6 +336,38 @@ class TCZoneinfoTimezoneInfo < Test::Unit::TestCase
     end
   end
   
+  # These tests can only be run if the platform supports 64-bit Times. When
+  # 64-bit support is unavailable, the second section will not be read, so no 
+  # error will be raised.
+  if SUPPORTS_64BIT
+    def test_load_invalid_section2_magic
+      ['TZif4', 'tzif2', '12345'].each do |section2_magic|    
+        offsets = [{:gmtoff => -12094, :isdst => false, :abbrev => 'LT'}]
+            
+        tzif_test(offsets, [], [], :min_format => 2, :section2_magic => section2_magic) do |path, format|        
+          assert_raises(InvalidZoneinfoFile) do
+            ZoneinfoTimezoneInfo.new('Zone4', path)
+          end
+        end
+      end
+    end
+    
+    def test_load_mismatched_section2_magic
+      minus_one = Proc.new {|f| f == 2 ? "TZif\0" : "TZif#{f - 1}" }
+      plus_one = Proc.new {|f| "TZif#{f + 1}" }
+      
+      [minus_one, plus_one].each do |section2_magic|    
+        offsets = [{:gmtoff => -12094, :isdst => false, :abbrev => 'LT'}]
+            
+        tzif_test(offsets, [], [], :min_format => 2, :section2_magic => section2_magic) do |path, format|        
+          assert_raises(InvalidZoneinfoFile) do
+            ZoneinfoTimezoneInfo.new('Zone5', path)
+          end
+        end
+      end
+    end
+  end
+  
   def test_load_invalid_format
     Tempfile.open('tzinfo-test-zone') do |file|
       file.write('Invalid')
@@ -399,21 +449,14 @@ class TCZoneinfoTimezoneInfo < Test::Unit::TestCase
       assert_period(:XNST,    0,    0, false, Time.utc(2000, 12, 31),                    nil, info)
     end
   end
-  
+
   def test_load_64bit
     # Some platforms support 64-bit Times, others only 32-bit. The TZif version
-    # 2 format contains both 32-bit and 64-bit times. 
+    # 2 and later format contains both 32-bit and 64-bit times. 
     
-    # Where 64-bit is supported and a TZif 2 file is provided, the 64-bit times
-    # should be used, otherwise the 32-bit information should be used.
-      
-    begin
-      Time.at(-2147483649)
-      Time.at(2147483648)
-      supports_64bit = true
-    rescue RangeError
-      supports_64bit = false
-    end
+    # Where 64-bit is supported and a TZif 2 or later file is provided, the 
+    # 64-bit times should be used, otherwise the 32-bit information should be 
+    # used.
   
     offsets = [
       {:gmtoff => 3542, :isdst => false, :abbrev => 'LMT'},
@@ -431,7 +474,7 @@ class TCZoneinfoTimezoneInfo < Test::Unit::TestCase
       info = ZoneinfoTimezoneInfo.new('Zone/SixtyFour', path)
       assert_equal('Zone/SixtyFour', info.identifier)
   
-      if supports_64bit && format == 2
+      if SUPPORTS_64BIT && format >= 2
         assert_period(:LMT,  3542,    0, false,                    nil, Time.utc(1850,  1,  2), info)
         assert_period(:XST,  3600,    0, false, Time.utc(1850,  1,  2), Time.utc(2003,  4, 22), info)
         assert_period(:XDT,  3600, 3600,  true, Time.utc(2003,  4, 22), Time.utc(2003, 10, 21), info)