tzinfo 1.1.0 → 1.2.0

data/test/tc_timezone_transition.rb

@@ -1,31 +1,9 @@
-#--
-# Copyright (c) 2005-2013 Philip Ross
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#++
-
 require File.join(File.expand_path(File.dirname(__FILE__)), 'test_utils')
 require 'date'
 
 include TZInfo
 
-class TCTimezoneTransition < Test::Unit::TestCase
+class TCTimezoneTransition < Minitest::Test
   
   class TestTimezoneTransition < TimezoneTransition
     def initialize(offset, previous_offset, at)

data/test/tc_timezone_transition_definition.rb

@@ -1,31 +1,9 @@
-#--
-# Copyright (c) 2013 Philip Ross
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#++
-
 require File.join(File.expand_path(File.dirname(__FILE__)), 'test_utils')
 require 'date'
 
 include TZInfo
 
-class TCTimezoneTransitionDefinition < Test::Unit::TestCase
+class TCTimezoneTransitionDefinition < Minitest::Test
   def test_initialize_timestamp_only
     assert_nothing_raised do
       TimezoneTransitionDefinition.new(TimezoneOffset.new(3600, 3600, :TDT),

data/test/tc_timezone_utc.rb

@@ -1,30 +1,8 @@
-#--
-# Copyright (c) 2006-2013 Philip Ross
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#++
-
 require File.join(File.expand_path(File.dirname(__FILE__)), 'test_utils')
 
 include TZInfo
 
-class TCTimezoneUTC < Test::Unit::TestCase
+class TCTimezoneUTC < Minitest::Test
   def test_2004        
     tz = Timezone.get('UTC')
     

data/test/tc_transition_data_timezone_info.rb

@@ -1,30 +1,8 @@
-#--
-# Copyright (c) 2006-2013 Philip Ross
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#++
-
 require File.join(File.expand_path(File.dirname(__FILE__)), 'test_utils')
 
 include TZInfo
 
-class TCTransitionDataTimezoneInfo < Test::Unit::TestCase
+class TCTransitionDataTimezoneInfo < Minitest::Test
   
   def test_identifier
     dti = TransitionDataTimezoneInfo.new('Test/Zone')
@@ -378,10 +356,10 @@ class TCTransitionDataTimezoneInfo < Test::Unit::TestCase
     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,Rational(DATETIME_RESOLUTION,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([t2,t3,t4,t5], dti.transitions_up_to(DateTime.new(2011,10,1,1,0,1), DateTime.new(2010,4,1,1,0,Rational(DATETIME_RESOLUTION,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

data/test/tc_zoneinfo_country_info.rb

@@ -1,30 +1,8 @@
-#--
-# Copyright (c) 2013 Philip Ross
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#++
-
 require File.join(File.expand_path(File.dirname(__FILE__)), 'test_utils')
 
 include TZInfo
 
-class TCZoneinfoCountryInfo < Test::Unit::TestCase
+class TCZoneinfoCountryInfo < Minitest::Test
   
   def test_code
     ci = ZoneinfoCountryInfo.new('ZZ', 'Zzz', []) {|c| }
@@ -44,10 +22,10 @@ class TCZoneinfoCountryInfo < Test::Unit::TestCase
   
   def test_zone_identifiers
     zones = [
-      CountryTimezone.new('ZZ/TimezoneB', 1, 2, 1, 2, 'Timezone B'),
-      CountryTimezone.new('ZZ/TimezoneA', 1, 4, 1, 4, 'Timezone A'),
-      CountryTimezone.new('ZZ/TimezoneC', -10, 3, -20, 7, 'C'),
-      CountryTimezone.new('ZZ/TimezoneD', -10, 3, -20, 7)
+      CountryTimezone.new('ZZ/TimezoneB', Rational(1, 2), Rational(1, 2), 'Timezone B'),
+      CountryTimezone.new('ZZ/TimezoneA', Rational(1, 4), Rational(1, 4), 'Timezone A'),
+      CountryTimezone.new('ZZ/TimezoneC', Rational(-10, 3), Rational(-20, 7), 'C'),
+      CountryTimezone.new('ZZ/TimezoneD', Rational(-10, 3), Rational(-20, 7))
     ]
   
     ci = ZoneinfoCountryInfo.new('ZZ', 'Zzz', zones)
@@ -66,18 +44,18 @@ class TCZoneinfoCountryInfo < Test::Unit::TestCase
   
   def test_zones
     zones = [
-      CountryTimezone.new('ZZ/TimezoneB', 1, 2, 1, 2, 'Timezone B'),
-      CountryTimezone.new('ZZ/TimezoneA', 1, 4, 1, 4, 'Timezone A'),
-      CountryTimezone.new('ZZ/TimezoneC', -10, 3, -20, 7, 'C'),
-      CountryTimezone.new('ZZ/TimezoneD', -10, 3, -20, 7)
+      CountryTimezone.new('ZZ/TimezoneB', Rational(1, 2), Rational(1, 2), 'Timezone B'),
+      CountryTimezone.new('ZZ/TimezoneA', Rational(1, 4), Rational(1, 4), 'Timezone A'),
+      CountryTimezone.new('ZZ/TimezoneC', Rational(-10, 3), Rational(-20, 7), 'C'),
+      CountryTimezone.new('ZZ/TimezoneD', Rational(-10, 3), Rational(-20, 7))
     ]
   
     ci = ZoneinfoCountryInfo.new('ZZ', 'Zzz', zones)
     
-    assert_equal([CountryTimezone.new('ZZ/TimezoneB', 1, 2, 1, 2, 'Timezone B'),
-      CountryTimezone.new('ZZ/TimezoneA', 1, 4, 1, 4, 'Timezone A'),
-      CountryTimezone.new('ZZ/TimezoneC', -10, 3, -20, 7, 'C'),
-      CountryTimezone.new('ZZ/TimezoneD', -10, 3, -20, 7)],
+    assert_equal([CountryTimezone.new('ZZ/TimezoneB', Rational(1, 2), Rational(1, 2), 'Timezone B'),
+      CountryTimezone.new('ZZ/TimezoneA', Rational(1, 4), Rational(1, 4), 'Timezone A'),
+      CountryTimezone.new('ZZ/TimezoneC', Rational(-10, 3), Rational(-20, 7), 'C'),
+      CountryTimezone.new('ZZ/TimezoneD', Rational(-10, 3), Rational(-20, 7))],
       ci.zones)
     assert(ci.zones.frozen?)
     assert(!ci.zones.equal?(zones))

data/test/tc_zoneinfo_data_source.rb

@@ -1,24 +1,4 @@
-#--
-# Copyright (c) 2012-2013 Philip Ross
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#++
+# encoding: UTF-8
 
 require File.join(File.expand_path(File.dirname(__FILE__)), 'test_utils')
 require 'fileutils'
@@ -27,11 +7,12 @@ require 'tmpdir'
 
 include TZInfo
 
-class TCZoneinfoDataSource < Test::Unit::TestCase
+class TCZoneinfoDataSource < Minitest::Test
   ZONEINFO_DIR = File.join(File.expand_path(File.dirname(__FILE__)), 'zoneinfo').untaint
   
   def setup
     @orig_search_path = ZoneinfoDataSource.search_path.clone
+    @orig_alternate_iso3166_tab_search_path = ZoneinfoDataSource.alternate_iso3166_tab_search_path.clone
     @orig_pwd = FileUtils.pwd
     
     # A zoneinfo directory containing files needed by the tests.
@@ -41,6 +22,7 @@ class TCZoneinfoDataSource < Test::Unit::TestCase
   
   def teardown
     ZoneinfoDataSource.search_path = @orig_search_path
+    ZoneinfoDataSource.alternate_iso3166_tab_search_path = @orig_alternate_iso3166_tab_search_path
     FileUtils.chdir(@orig_pwd)
   end
   
@@ -62,7 +44,7 @@ class TCZoneinfoDataSource < Test::Unit::TestCase
     path = ['/tmp/zoneinfo1', '/tmp/zoneinfo2']
     ZoneinfoDataSource.search_path = path
     assert_equal(['/tmp/zoneinfo1', '/tmp/zoneinfo2'], ZoneinfoDataSource.search_path)
-    assert_not_same(path, ZoneinfoDataSource.search_path)
+    refute_same(path, ZoneinfoDataSource.search_path)
   end
   
   def test_set_search_path_array_to_s  
@@ -75,6 +57,37 @@ class TCZoneinfoDataSource < Test::Unit::TestCase
     assert_equal(['/tmp/zoneinfo4', '/tmp/zoneinfo5'], ZoneinfoDataSource.search_path)
   end
   
+  def test_default_alternate_iso3166_tab_search_path
+    assert_equal(['/usr/share/misc/iso3166.tab', '/usr/share/misc/iso3166'], ZoneinfoDataSource.alternate_iso3166_tab_search_path)
+    assert_equal(false, ZoneinfoDataSource.alternate_iso3166_tab_search_path.frozen?)
+  end
+  
+  def test_set_alternate_iso3166_tab_search_path_default
+    ZoneinfoDataSource.alternate_iso3166_tab_search_path = ['/tmp/iso3166.tab', '/tmp/iso3166']
+    assert_equal(['/tmp/iso3166.tab', '/tmp/iso3166'], ZoneinfoDataSource.alternate_iso3166_tab_search_path)
+    
+    ZoneinfoDataSource.alternate_iso3166_tab_search_path = nil
+    assert_equal(['/usr/share/misc/iso3166.tab', '/usr/share/misc/iso3166'], ZoneinfoDataSource.alternate_iso3166_tab_search_path)
+    assert_equal(false, ZoneinfoDataSource.alternate_iso3166_tab_search_path.frozen?)
+  end
+  
+  def test_set_alternate_iso3166_tab_search_path_array
+    path = ['/tmp/iso3166.tab', '/tmp/iso3166']
+    ZoneinfoDataSource.alternate_iso3166_tab_search_path = path
+    assert_equal(['/tmp/iso3166.tab', '/tmp/iso3166'], ZoneinfoDataSource.alternate_iso3166_tab_search_path)
+    refute_same(path, ZoneinfoDataSource.alternate_iso3166_tab_search_path)
+  end
+  
+  def test_set_alternate_iso3166_tab_search_path_array_to_s  
+    ZoneinfoDataSource.alternate_iso3166_tab_search_path = [Pathname.new('/tmp/iso3166.tab')]
+    assert_equal(['/tmp/iso3166.tab'], ZoneinfoDataSource.alternate_iso3166_tab_search_path)
+  end
+  
+  def test_set_alternate_iso3166_tab_search_path_string
+    ZoneinfoDataSource.alternate_iso3166_tab_search_path = ['/tmp/iso3166.tab', '/tmp/iso3166'].join(File::PATH_SEPARATOR)
+    assert_equal(['/tmp/iso3166.tab', '/tmp/iso3166'], ZoneinfoDataSource.alternate_iso3166_tab_search_path)
+  end
+  
   def test_new_search
     Dir.mktmpdir('tzinfo_test_dir1') do |dir1|
       Dir.mktmpdir('tzinfo_test_dir2') do |dir2|
@@ -87,6 +100,7 @@ class TCZoneinfoDataSource < Test::Unit::TestCase
             FileUtils.touch(File.join(dir4, 'iso3166.tab'))
             
             ZoneinfoDataSource.search_path = [file, dir2, dir3, dir4]
+            ZoneinfoDataSource.alternate_iso3166_tab_search_path = []
             
             data_source = ZoneinfoDataSource.new
             assert_equal(dir4, data_source.zoneinfo_dir)
@@ -96,6 +110,46 @@ class TCZoneinfoDataSource < Test::Unit::TestCase
     end
   end
   
+  def test_new_search_solaris_tab_files
+    # Solaris names the tab files 'tab/country.tab' (iso3166.tab) and 
+    # 'tab/zone_sun.tab' (zone.tab).
+    
+    Dir.mktmpdir('tzinfo_test_dir') do |dir|
+      tab = File.join(dir, 'tab')
+      FileUtils.mkdir(tab)
+      FileUtils.touch(File.join(tab, 'country.tab'))
+      FileUtils.touch(File.join(tab, 'zone_sun.tab'))
+      
+      ZoneinfoDataSource.search_path = [dir]
+      ZoneinfoDataSource.alternate_iso3166_tab_search_path = []
+      
+      data_source = ZoneinfoDataSource.new
+      assert_equal(dir, data_source.zoneinfo_dir)
+    end
+  end
+  
+  def test_new_search_alternate_iso3166_path
+    Dir.mktmpdir('tzinfo_test_dir_zoneinfo') do |zoneinfo_dir|
+      Dir.mktmpdir('tzinfo_test_dir_tab') do |tab_dir|
+        FileUtils.touch(File.join(zoneinfo_dir, 'zone.tab'))
+        
+        tab_file = File.join(tab_dir, 'iso3166')
+        
+        ZoneinfoDataSource.search_path = [zoneinfo_dir]
+        ZoneinfoDataSource.alternate_iso3166_tab_search_path = [tab_file]
+        
+        assert_raises(ZoneinfoDirectoryNotFound) do
+          ZoneinfoDataSource.new
+        end
+        
+        FileUtils.touch(tab_file)
+      
+        data_source = ZoneinfoDataSource.new
+        assert_equal(zoneinfo_dir, data_source.zoneinfo_dir)
+      end
+    end
+  end
+  
   def test_new_search_not_found
     Dir.mktmpdir('tzinfo_test_dir1') do |dir1|
       Dir.mktmpdir('tzinfo_test_dir2') do |dir2|
@@ -107,6 +161,7 @@ class TCZoneinfoDataSource < Test::Unit::TestCase
             FileUtils.touch(File.join(dir3, 'iso3166.tab'))
             
             ZoneinfoDataSource.search_path = [file, dir2, dir3, dir4]
+            ZoneinfoDataSource.alternate_iso3166_tab_search_path = []
                       
             assert_raises(ZoneinfoDirectoryNotFound) do
               ZoneinfoDataSource.new
@@ -125,8 +180,9 @@ class TCZoneinfoDataSource < Test::Unit::TestCase
       FileUtils.chdir(dir)
       
       ZoneinfoDataSource.search_path = ['.']
+      ZoneinfoDataSource.alternate_iso3166_tab_search_path = []
       data_source = ZoneinfoDataSource.new
-      assert_equal(Pathname.new(dir).realpath, Pathname.new(dir).realpath)
+      assert_equal(Pathname.new(dir).realpath.to_s, data_source.zoneinfo_dir)
       
       # Change out of the directory to allow it to be deleted on Windows.
       FileUtils.chdir(@orig_pwd)
@@ -143,6 +199,43 @@ class TCZoneinfoDataSource < Test::Unit::TestCase
     end
   end
   
+  def test_new_dir_solaris_tab_files
+    # Solaris names the tab files 'tab/country.tab' (iso3166.tab) and 
+    # 'tab/zone_sun.tab' (zone.tab).
+    
+    Dir.mktmpdir('tzinfo_test') do |dir|
+      tab = File.join(dir, 'tab')
+      FileUtils.mkdir(tab)
+      FileUtils.touch(File.join(tab, 'country.tab'))
+      FileUtils.touch(File.join(tab, 'zone_sun.tab'))
+            
+      data_source = ZoneinfoDataSource.new(dir)
+      assert_equal(dir, data_source.zoneinfo_dir)
+    end
+  end
+  
+  def test_new_dir_alternate_iso3166_path
+    Dir.mktmpdir('tzinfo_test_dir_zoneinfo') do |zoneinfo_dir|
+      Dir.mktmpdir('tzinfo_test_dir_tab') do |tab_dir|
+        FileUtils.touch(File.join(zoneinfo_dir, 'zone.tab'))
+        
+        tab_file = File.join(tab_dir, 'iso3166')
+        FileUtils.touch(tab_file)
+        
+        ZoneinfoDataSource.alternate_iso3166_tab_search_path = [tab_file]
+        
+        assert_raises(InvalidZoneinfoDirectory) do
+          # The alternate_iso3166_tab_search_path should not be used. This should raise 
+          # an exception.
+          ZoneinfoDataSource.new(zoneinfo_dir)
+        end
+        
+        data_source = ZoneinfoDataSource.new(zoneinfo_dir, tab_file)
+        assert_equal(zoneinfo_dir, data_source.zoneinfo_dir)
+      end
+    end
+  end
+  
   def test_new_dir_invalid
     Dir.mktmpdir('tzinfo_test') do |dir|
       assert_raises(InvalidZoneinfoDirectory) do
@@ -151,6 +244,31 @@ class TCZoneinfoDataSource < Test::Unit::TestCase
     end
   end
   
+  def test_new_dir_invalid_alternate_iso3166_path
+    Dir.mktmpdir('tzinfo_test_dir_zoneinfo') do |zoneinfo_dir|
+      Dir.mktmpdir('tzinfo_test_dir_tab') do |tab_dir|
+        FileUtils.touch(File.join(zoneinfo_dir, 'zone.tab'))
+        
+        assert_raises(InvalidZoneinfoDirectory) do
+          ZoneinfoDataSource.new(zoneinfo_dir, File.join(tab_dir, 'iso3166'))
+        end
+      end
+    end
+  end
+  
+  def test_new_dir_invalid_alternate_iso3166_path_overrides_valid
+    Dir.mktmpdir('tzinfo_test_dir_zoneinfo') do |zoneinfo_dir|
+      Dir.mktmpdir('tzinfo_test_dir_tab') do |tab_dir|
+        FileUtils.touch(File.join(zoneinfo_dir, 'iso3166.tab'))
+        FileUtils.touch(File.join(zoneinfo_dir, 'zone.tab'))
+        
+        assert_raises(InvalidZoneinfoDirectory) do
+          ZoneinfoDataSource.new(zoneinfo_dir, File.join(tab_dir, 'iso3166'))
+        end
+      end
+    end
+  end
+  
   def test_new_file
     Dir.mktmpdir('tzinfo_test') do |dir|
       file = File.join(dir, 'file')
@@ -170,7 +288,7 @@ class TCZoneinfoDataSource < Test::Unit::TestCase
       FileUtils.chdir(dir)
       
       data_source = ZoneinfoDataSource.new('.')
-      assert_equal(Pathname.new(dir).realpath, Pathname.new(dir).realpath)
+      assert_equal(Pathname.new(dir).realpath.to_s, data_source.zoneinfo_dir)
       
       # Change out of the directory to allow it to be deleted on Windows.
       FileUtils.chdir(@orig_pwd)
@@ -493,8 +611,6 @@ class TCZoneinfoDataSource < Test::Unit::TestCase
   def get_timezone_filenames(directory)
     entries = Dir.glob(File.join(directory, '**', '*'))
     
-    prefix = File.expand_path(directory) + File::SEPARATOR
-    
     entries = entries.select do |file|
       file.untaint
       File.file?(file)
@@ -563,9 +679,32 @@ class TCZoneinfoDataSource < Test::Unit::TestCase
     end
   end
   
+  def test_timezone_identifiers_ignored_src_directory
+    # Solaris includes a src directory containing the source timezone data files
+    # from the tzdata distribution. These should be ignored.
+    
+    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'))
+      
+      src_dir = File.join(dir, 'src')
+      FileUtils.mkdir(src_dir)
+      
+      File.open(File.join(src_dir, 'europe'), 'w') do |f|
+        f.binmode
+        f.write("Zone\tEurope/London\t0:00\tEU\tGMT/BST\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)
+    assert_equal('Britain (UK)', info.name)
   end
     
   def test_load_country_info_not_exist
@@ -611,12 +750,16 @@ class TCZoneinfoDataSource < Test::Unit::TestCase
   
   def test_load_country_info_check_zones
     Dir.mktmpdir('tzinfo_test') do |dir|
-      File.open(File.join(dir, 'iso3166.tab'), 'w') do |iso3166|
+      RubyCoreSupport.open_file(File.join(dir, 'iso3166.tab'), 'w', :external_encoding => 'UTF-8') do |iso3166|      
+        iso3166.puts('# iso3166.tab')
+        iso3166.puts('')
         iso3166.puts("FC\tFake Country")
         iso3166.puts("OC\tOther Country")
       end
       
-      File.open(File.join(dir, 'zone.tab'), 'w') do |zone|
+      RubyCoreSupport.open_file(File.join(dir, 'zone.tab'), 'w', :external_encoding => 'UTF-8') do |zone|
+        zone.puts('# zone.tab')
+        zone.puts('')
         zone.puts("FC\t+513030-0000731\tFake/One\tDescription of one")
         zone.puts("FC\t+353916+1394441\tFake/Two\tAnother description")
         zone.puts("FC\t-2332-04637\tFake/Three\tThis is Three")
@@ -627,27 +770,185 @@ class TCZoneinfoDataSource < Test::Unit::TestCase
       
       info = data_source.load_country_info('FC')
       assert_equal('FC', info.code)
+      assert_equal('Fake Country', info.name)
       assert_equal(['Fake/One', 'Fake/Two', 'Fake/Three'], info.zone_identifiers)
       assert_equal(true, info.zone_identifiers.frozen?)
       assert_equal([
-        CountryTimezone.new('Fake/One', 6181, 120, -451, 3600, 'Description of one'),
-        CountryTimezone.new('Fake/Two', 32089, 900, 503081, 3600, 'Another description'),
-        CountryTimezone.new('Fake/Three', -353, 15, -2797, 60, 'This is Three')], info.zones)
+        CountryTimezone.new('Fake/One', Rational(6181, 120), Rational(-451, 3600), 'Description of one'),
+        CountryTimezone.new('Fake/Two', Rational(32089, 900), Rational(503081, 3600), 'Another description'),
+        CountryTimezone.new('Fake/Three', Rational(-353, 15), Rational(-2797, 60), 'This is Three')], info.zones)
       assert_equal(true, info.zones.frozen?)
       
       info = data_source.load_country_info('OC')
       assert_equal('OC', info.code)
+      assert_equal('Other Country', info.name)
       assert_equal(['Other/One'], info.zone_identifiers)
       assert_equal(true, info.zone_identifiers.frozen?)
-      assert_equal([CountryTimezone.new('Other/One', 601, 12, 433, 30)], info.zones)
+      assert_equal([CountryTimezone.new('Other/One', Rational(601, 12), Rational(433, 30))], info.zones)
       assert_equal(true, info.zones.frozen?)
     end
   end
   
+  def test_load_country_info_check_zones_solaris_tab_files
+    # Solaris uses 5 columns instead of the usual 4 in zone_sun.tab.
+    # An extra column before the comment gives an optional linked/alternate
+    # timezone identifier (or '-' if not set).
+    #
+    # Additionally, there is a section at the end of the file for timezones
+    # covering regions. These are given lower-case "country" codes. The timezone
+    # identifier column refers to a continent instead of an identifier. These
+    # lines will be ignored by TZInfo.
+    
+    Dir.mktmpdir('tzinfo_test') do |dir|
+      tab_dir = File.join(dir, 'tab')
+      FileUtils.mkdir(tab_dir)
+    
+      RubyCoreSupport.open_file(File.join(tab_dir, 'country.tab'), 'w', :external_encoding => 'UTF-8') do |country|
+        country.puts('# country.tab')
+        country.puts('# Solaris')
+        country.puts("FC\tFake Country")
+        country.puts("OC\tOther Country")
+      end
+      
+      RubyCoreSupport.open_file(File.join(tab_dir, 'zone_sun.tab'), 'w', :external_encoding => 'UTF-8') do |zone_sun|
+        zone_sun.puts('# zone_sun.tab')
+        zone_sun.puts('# Solaris')
+        zone_sun.puts('# Countries')
+        zone_sun.puts("FC\t+513030-0000731\tFake/One\t-\tDescription of one")
+        zone_sun.puts("FC\t+353916+1394441\tFake/Two\tFake/Alias/Two\tAnother description")
+        zone_sun.puts("FC\t-2332-04637\tFake/Three\tFake/Alias/Three\tThis is Three")
+        zone_sun.puts("OC\t+5005+01426\tOther/One\tOther/Linked/One")
+        zone_sun.puts("OC\t+5015+01436\tOther/Two\t-")
+        zone_sun.puts('# Regions')
+        zone_sun.puts("ee\t+0000+00000\tEurope/\tEET")
+        zone_sun.puts("me\t+0000+00000\tEurope/\tMET")
+        zone_sun.puts("we\t+0000+00000\tEurope/\tWET")
+      end
+      
+      data_source = ZoneinfoDataSource.new(dir)
+      
+      info = data_source.load_country_info('FC')
+      assert_equal('FC', info.code)
+      assert_equal('Fake Country', info.name)
+      assert_equal(['Fake/One', 'Fake/Two', 'Fake/Three'], info.zone_identifiers)
+      assert_equal(true, info.zone_identifiers.frozen?)
+      assert_equal([
+        CountryTimezone.new('Fake/One', Rational(6181, 120), Rational(-451, 3600), 'Description of one'),
+        CountryTimezone.new('Fake/Two', Rational(32089, 900), Rational(503081, 3600), 'Another description'),
+        CountryTimezone.new('Fake/Three', Rational(-353, 15), Rational(-2797, 60), 'This is Three')], info.zones)
+      assert_equal(true, info.zones.frozen?)
+      
+      info = data_source.load_country_info('OC')
+      assert_equal('OC', info.code)
+      assert_equal('Other Country', info.name)
+      assert_equal(['Other/One', 'Other/Two'], info.zone_identifiers)
+      assert_equal(true, info.zone_identifiers.frozen?)
+      assert_equal([
+        CountryTimezone.new('Other/One', Rational(601, 12), Rational(433, 30)),
+        CountryTimezone.new('Other/Two', Rational(201, 4), Rational(73, 5))], info.zones)
+      assert_equal(true, info.zones.frozen?)
+    end
+  end
+  
+  def test_load_country_info_check_zones_alternate_iso3166_file
+    Dir.mktmpdir('tzinfo_test') do |dir|
+      zoneinfo_dir = File.join(dir, 'zoneinfo')
+      tab_dir = File.join(dir, 'tab')
+      FileUtils.mkdir(zoneinfo_dir)
+      FileUtils.mkdir(tab_dir)
+      
+      tab_file = File.join(tab_dir, 'iso3166')
+      RubyCoreSupport.open_file(tab_file, 'w', :external_encoding => 'UTF-8') do |iso3166|
+        # Use the BSD 4 column format (alternate iso3166 is used on BSD).
+        iso3166.puts("FC\tFCC\t001\tFake Country")
+        iso3166.puts("OC\tOCC\t002\tOther Country")
+      end
+      
+      RubyCoreSupport.open_file(File.join(zoneinfo_dir, 'zone.tab'), 'w', :external_encoding => 'UTF-8') do |zone|
+        zone.puts("FC\t+513030-0000731\tFake/One\tDescription of one")
+        zone.puts("FC\t+353916+1394441\tFake/Two\tAnother description")
+        zone.puts("FC\t-2332-04637\tFake/Three\tThis is Three")
+        zone.puts("OC\t+5005+01426\tOther/One")
+      end
+      
+      data_source = ZoneinfoDataSource.new(zoneinfo_dir, tab_file)
+      
+      info = data_source.load_country_info('FC')
+      assert_equal('FC', info.code)
+      assert_equal('Fake Country', info.name)
+      assert_equal(['Fake/One', 'Fake/Two', 'Fake/Three'], info.zone_identifiers)
+      assert_equal(true, info.zone_identifiers.frozen?)
+      assert_equal([
+        CountryTimezone.new('Fake/One', Rational(6181, 120), Rational(-451, 3600), 'Description of one'),
+        CountryTimezone.new('Fake/Two', Rational(32089, 900), Rational(503081, 3600), 'Another description'),
+        CountryTimezone.new('Fake/Three', Rational(-353, 15), Rational(-2797, 60), 'This is Three')], info.zones)
+      assert_equal(true, info.zones.frozen?)
+      
+      info = data_source.load_country_info('OC')
+      assert_equal('OC', info.code)
+      assert_equal('Other Country', info.name)
+      assert_equal(['Other/One'], info.zone_identifiers)
+      assert_equal(true, info.zone_identifiers.frozen?)
+      assert_equal([CountryTimezone.new('Other/One', Rational(601, 12), Rational(433, 30))], info.zones)
+      assert_equal(true, info.zones.frozen?)
+    end
+  end
+  
+  def test_load_country_info_four_column_iso31611
+    # OpenBSD and FreeBSD use a 4 column iso3166.tab file that includes
+    # alpha-3 and numeric-3 codes in addition to the alpha-2 and name in the
+    # tz database version.
+    
+    Dir.mktmpdir('tzinfo_test') do |dir|
+      RubyCoreSupport.open_file(File.join(dir, 'iso3166.tab'), 'w', :external_encoding => 'UTF-8') do |iso3166|
+        iso3166.puts("FC\tFCC\t001\tFake Country")
+        iso3166.puts("OC\tOCC\t002\tOther Country")
+      end
+      
+      RubyCoreSupport.open_file(File.join(dir, 'zone.tab'), 'w', :external_encoding => 'UTF-8') do |zone|
+        zone.puts("FC\t+513030-0000731\tFake/One\tDescription of one")
+        zone.puts("OC\t+5005+01426\tOther/One")
+      end
+      
+      data_source = ZoneinfoDataSource.new(dir)
+      
+      info = data_source.load_country_info('FC')
+      assert_equal('FC', info.code)
+      assert_equal('Fake Country', info.name)
+      
+      info = data_source.load_country_info('OC')
+      assert_equal('OC', info.code)
+      assert_equal('Other Country', info.name)
+    end
+  end
+
+  def test_load_country_info_utf8
+    # Files are in ASCII, but may change to UTF-8 (a superset of ASCII) in
+    # the future.
+    
+    Dir.mktmpdir('tzinfo_test') do |dir|
+      RubyCoreSupport.open_file(File.join(dir, 'iso3166.tab'), 'w', :external_encoding => 'UTF-8') do |iso3166|
+        iso3166.puts("UT\tUnicode Test ✓")
+      end
+      
+      RubyCoreSupport.open_file(File.join(dir, 'zone.tab'), 'w', :external_encoding => 'UTF-8') do |zone|
+        zone.puts("UT\t+513030-0000731\tUnicode✓/One\tUnicode Description ✓")
+      end
+      
+      data_source = ZoneinfoDataSource.new(dir)
+      
+      info = data_source.load_country_info('UT')
+      assert_equal('UT', info.code)
+      assert_equal('Unicode Test ✓', info.name)
+      assert_equal(['Unicode✓/One'], info.zone_identifiers)
+      assert_equal([CountryTimezone.new('Unicode✓/One', Rational(6181, 120), Rational(-451, 3600), 'Unicode Description ✓')], info.zones)
+    end
+  end
+  
   def test_country_codes
     file_codes = []
         
-    File.open(File.join(@data_source.zoneinfo_dir, 'iso3166.tab')) do |file|
+    RubyCoreSupport.open_file(File.join(@data_source.zoneinfo_dir, 'iso3166.tab'), 'r', :external_encoding => 'UTF-8', :internal_encoding => 'UTF-8') do |file|
       file.each_line do |line|
         line.chomp!
         file_codes << $1 if line =~ /\A([A-Z]{2})\t/
@@ -658,4 +959,27 @@ class TCZoneinfoDataSource < Test::Unit::TestCase
     assert_array_same_items(file_codes, codes)
     assert_equal(true, codes.frozen?)
   end
+  
+  def test_country_codes_four_column_iso3166
+    # OpenBSD and FreeBSD use a 4 column iso3166.tab file that includes
+    # alpha-3 and numeric-3 codes in addition to the alpha-2 and name in the
+    # tz database version.
+    
+    Dir.mktmpdir('tzinfo_test') do |dir|
+      RubyCoreSupport.open_file(File.join(dir, 'iso3166.tab'), 'w', :external_encoding => 'UTF-8') do |iso3166|
+        iso3166.puts("FC\tFCC\t001\tFake Country")
+        iso3166.puts("OC\tOCC\t002\tOther Country")
+      end
+      
+      RubyCoreSupport.open_file(File.join(dir, 'zone.tab'), 'w', :external_encoding => 'UTF-8') do |zone|
+        zone.puts("FC\t+513030-0000731\tFake/One\tDescription of one")
+        zone.puts("OC\t+5005+01426\tOther/One")
+      end
+      
+      data_source = ZoneinfoDataSource.new(dir)
+      
+      codes = data_source.country_codes
+      assert_array_same_items(%w(FC OC), codes)
+    end
+  end
 end