tzinfo 1.2.4 → 1.2.6

data/test/tc_ruby_data_source.rb

@@ -2,11 +2,29 @@ require File.join(File.expand_path(File.dirname(__FILE__)), 'test_utils')
 
 include TZInfo
 
+using TaintExt if Module.const_defined?(:TaintExt)
+
 class TCRubyDataSource < Minitest::Test
   def setup
     @data_source = RubyDataSource.new
   end
   
+  def test_initialize_not_found
+    # A failure to load tzinfo/data in initialize will not cause an exception.
+    # Attempts to load data files will subsequently fail.
+    code = <<-EOF
+      begin
+        ds = TZInfo::RubyDataSource.new
+        puts 'Initialized'
+        ds.load_timezone_info('Europe/London')
+      rescue Exception => e
+        puts e.class
+      end
+    EOF
+
+    assert_sub_process_returns(['Initialized', 'TZInfo::InvalidTimezoneIdentifier'], code)
+  end
+
   def test_load_timezone_info_data
     info = @data_source.load_timezone_info('Europe/London')
     assert_kind_of(DataTimezoneInfo, info)
@@ -55,7 +73,9 @@ class TCRubyDataSource < Minitest::Test
   end
 
   def test_load_timezone_info_tainted
-    safe_test do
+    skip_if_has_bug_14060
+
+    safe_test(:unavailable => :skip) do
       identifier = 'Europe/Amsterdam'.dup.taint
       assert(identifier.tainted?)
       info = @data_source.load_timezone_info(identifier)
@@ -65,6 +85,8 @@ class TCRubyDataSource < Minitest::Test
   end
   
   def test_load_timezone_info_tainted_and_frozen
+    skip_if_has_bug_14060
+
     safe_test do
       info = @data_source.load_timezone_info('Europe/Amsterdam'.dup.taint.freeze)
       assert_equal('Europe/Amsterdam', info.identifier)
@@ -119,7 +141,7 @@ class TCRubyDataSource < Minitest::Test
   end
   
   def test_load_country_info_tainted
-    safe_test do
+    safe_test(:unavailable => :skip) do
       code = 'NL'.dup.taint
       assert(code.tainted?)
       info = @data_source.load_country_info(code)

data/test/tc_time_or_datetime.rb

@@ -4,6 +4,12 @@ require 'rational' unless defined?(Rational)
 include TZInfo
 
 class TCTimeOrDateTime < Minitest::Test
+  # Ruby 1.8.7 (built with GCC 8.3.0 on Ubuntu 19.04) fails to perform DateTime
+  # arithmetic operations correctly when sub-seconds are used. Detect this and
+  # disable the affected tests.
+  DATETIME_SUBSECOND_ARITHMETIC_IS_BROKEN = (DateTime.new(2019, 12, 22, 15, 0, Rational(1, 1000)) + Rational(1, 86400)).strftime('%Q') != '1577026801001'
+  puts "DateTime sub-second arithmetic is broken on this platform" if DATETIME_SUBSECOND_ARITHMETIC_IS_BROKEN
+
   def test_initialize_time
     assert_nothing_raised do
       TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3, 721000))
@@ -128,6 +134,11 @@ class TCTimeOrDateTime < Minitest::Test
     assert_equal(Time.utc(2006, 3, 24, 15, 32, 3, 721123),
       TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3 + Rational(7211239, 10000000))).to_time)
   end
+
+  def test_to_time_after_freeze
+    assert_equal(Time.utc(2006, 3, 24, 15, 32, 3), TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)).freeze.to_time)
+    assert_equal(Time.utc(2006, 3, 24, 15, 32, 3), TimeOrDateTime.new(1143214323).freeze.to_time)
+  end
   
   def test_to_datetime
     assert_equal(DateTime.new(2006, 3, 24, 15, 32, 3),
@@ -157,6 +168,11 @@ class TCTimeOrDateTime < Minitest::Test
     assert_equal(DateTime.new(2006, 3, 24, 15, 32, 3 + Rational(721123, 1000000)),
       TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3, 721123 + Rational(9, 10))).to_datetime)
   end
+
+  def test_to_datetime_after_freeze
+    assert_equal(DateTime.new(2006, 3, 24, 15, 32, 3), TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)).freeze.to_datetime)
+    assert_equal(DateTime.new(2006, 3, 24, 15, 32, 3), TimeOrDateTime.new(1143214323).freeze.to_datetime)
+  end
   
   def test_to_i
     assert_equal(1143214323,
@@ -172,6 +188,11 @@ class TCTimeOrDateTime < Minitest::Test
     assert_equal(1143214323,
       TimeOrDateTime.new('1143214323').to_i)
   end
+
+  def test_to_i_after_freeze
+    assert_equal(1143214323, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)).freeze.to_i)
+    assert_equal(1143214323, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)).freeze.to_i)
+  end
   
   def test_to_orig
     assert_equal(Time.utc(2006, 3, 24, 15, 32, 3),
@@ -485,12 +506,12 @@ class TCTimeOrDateTime < Minitest::Test
     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(Time.utc(2006, 3, 24, 15, 32, 4, 721000), (TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3, 721000)) + 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(DateTime.new(2006, 3, 24, 15, 32, 4 + Rational(721, 1000)), (TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3 + Rational(721, 1000))) + 1).to_orig)
+    assert_equal(DateTime.new(2006, 3, 24, 15, 32, 4 + Rational(721, 1000)), (TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3 + Rational(721, 1000))) + 1).to_orig) unless DATETIME_SUBSECOND_ARITHMETIC_IS_BROKEN
     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(Time.utc(2006, 3, 24, 15, 32, 2, 721000), (TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3, 721000)) + (-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(DateTime.new(2006, 3, 24, 15, 32, 2 + Rational(721, 1000)), (TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3 + Rational(721, 1000))) + (-1)).to_orig)
+    assert_equal(DateTime.new(2006, 3, 24, 15, 32, 2 + Rational(721, 1000)), (TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3 + Rational(721, 1000))) + (-1)).to_orig) unless DATETIME_SUBSECOND_ARITHMETIC_IS_BROKEN
     assert_equal(1143214322, (TimeOrDateTime.new(1143214323) + (-1)).to_orig)
   end
   
@@ -503,12 +524,12 @@ class TCTimeOrDateTime < Minitest::Test
     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(Time.utc(2006, 3, 24, 15, 32, 2, 721000), (TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3, 721000)) - 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(DateTime.new(2006, 3, 24, 15, 32, 2 + Rational(721, 1000)), (TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3 + Rational(721, 1000))) - 1).to_orig)
+    assert_equal(DateTime.new(2006, 3, 24, 15, 32, 2 + Rational(721, 1000)), (TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3 + Rational(721, 1000))) - 1).to_orig) unless DATETIME_SUBSECOND_ARITHMETIC_IS_BROKEN
     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(Time.utc(2006, 3, 24, 15, 32, 4, 721000), (TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3, 721000)) - (-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(DateTime.new(2006, 3, 24, 15, 32, 4 + Rational(721, 1000)), (TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3 + Rational(721, 1000))) - (-1)).to_orig)
+    assert_equal(DateTime.new(2006, 3, 24, 15, 32, 4 + Rational(721, 1000)), (TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3 + Rational(721, 1000))) - (-1)).to_orig) unless DATETIME_SUBSECOND_ARITHMETIC_IS_BROKEN
     assert_equal(1143214324, (TimeOrDateTime.new(1143214323) - (-1)).to_orig)
   end
   
@@ -521,12 +542,12 @@ class TCTimeOrDateTime < Minitest::Test
     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(Time.utc(2006, 3, 24, 15, 32, 4, 721000), TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3, 721000)).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(DateTime.new(2006, 3, 24, 15, 32, 4 + Rational(721, 1000)), TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3 + Rational(721, 1000))).add_with_convert(1).to_orig)
+    assert_equal(DateTime.new(2006, 3, 24, 15, 32, 4 + Rational(721, 1000)), TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3 + Rational(721, 1000))).add_with_convert(1).to_orig) unless DATETIME_SUBSECOND_ARITHMETIC_IS_BROKEN
     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(Time.utc(2006, 3, 24, 15, 32, 2, 721000), TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3, 721000)).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(DateTime.new(2006, 3, 24, 15, 32, 2 + Rational(721, 1000)), TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3 + Rational(721, 1000))).add_with_convert(-1).to_orig)
+    assert_equal(DateTime.new(2006, 3, 24, 15, 32, 2 + Rational(721, 1000)), TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3 + Rational(721, 1000))).add_with_convert(-1).to_orig) unless DATETIME_SUBSECOND_ARITHMETIC_IS_BROKEN
     assert_equal(1143214322, TimeOrDateTime.new(1143214323).add_with_convert(-1).to_orig)
     
     if RubyCoreSupport.time_supports_negative

data/test/tc_timezone.rb

@@ -2,6 +2,8 @@ require File.join(File.expand_path(File.dirname(__FILE__)), 'test_utils')
 
 include TZInfo
 
+using TaintExt if Module.const_defined?(:TaintExt)
+
 class TCTimezone < Minitest::Test
 
   class BlockCalled < StandardError
@@ -242,7 +244,7 @@ class TCTimezone < Minitest::Test
   def test_get_tainted_loaded
     Timezone.get('Europe/Andorra')
   
-    safe_test do
+    safe_test(:unavailable => :skip) do
       identifier = 'Europe/Andorra'.dup.taint
       assert(identifier.tainted?)
       tz = Timezone.get(identifier)
@@ -261,7 +263,9 @@ class TCTimezone < Minitest::Test
   end
   
   def test_get_tainted_not_previously_loaded
-    safe_test do
+    skip_if_has_bug_14060
+
+    safe_test(:unavailable => :skip) do
       identifier = 'Europe/Andorra'.dup.taint
       assert(identifier.tainted?)
       tz = Timezone.get(identifier)
@@ -271,6 +275,8 @@ class TCTimezone < Minitest::Test
   end
   
   def test_get_tainted_and_frozen_not_previously_loaded
+    skip_if_has_bug_14060
+
     safe_test do
       tz = Timezone.get('Europe/Amsterdam'.dup.taint.freeze)
       assert_equal('Europe/Amsterdam', tz.identifier)
@@ -1260,6 +1266,7 @@ class TCTimezone < Minitest::Test
     assert_equal('BST BST', tz.strftime('%Z %Z', dt))
     assert_equal('BST %Z %BST %%Z %%BST', tz.strftime('%Z %%Z %%%Z %%%%Z %%%%%Z', dt))
     assert_equal('+0100 +01:00 +01:00:00 +01 %::::z', tz.strftime('%z %:z %::z %:::z %::::z', dt))
+    assert_equal('1153001522 %s %1153001522', tz.strftime('%s %%s %%%s', dt))
   end
   
   def test_strftime_time
@@ -1271,6 +1278,7 @@ class TCTimezone < Minitest::Test
     assert_equal('BST BST', tz.strftime('%Z %Z', t))
     assert_equal('BST %Z %BST %%Z %%BST', tz.strftime('%Z %%Z %%%Z %%%%Z %%%%%Z', t))
     assert_equal('+0100 +01:00 +01:00:00 +01 %::::z', tz.strftime('%z %:z %::z %:::z %::::z', t))
+    assert_equal('1153001522 %s %1153001522', tz.strftime('%s %%s %%%s', t))
   end
   
   def test_strftime_int
@@ -1282,6 +1290,7 @@ class TCTimezone < Minitest::Test
     assert_equal('BST BST', tz.strftime('%Z %Z', i))
     assert_equal('BST %Z %BST %%Z %%BST', tz.strftime('%Z %%Z %%%Z %%%%Z %%%%%Z', i))
     assert_equal('+0100 +01:00 +01:00:00 +01 %::::z', tz.strftime('%z %:z %::z %:::z %::::z', i))
+    assert_equal('1153001522 %s %1153001522', tz.strftime('%s %%s %%%s', i))
   end
   
   def test_get_missing_data_source

data/test/tc_timezone_period.rb

@@ -149,6 +149,13 @@ class TCTimezonePeriod < Minitest::Test
     assert_nil(p.local_end)
     assert_nil(p.local_end_time)
   end
+
+  def test_utc_total_offset_rational_after_freeze
+    o = TimezoneOffset.new(3600, 0, :TEST)
+    p = TimezonePeriod.new(nil, nil, o)
+    p.freeze
+    assert_equal(Rational(1, 24), p.utc_total_offset_rational)
+  end
   
   def test_dst    
     p1 = TimezonePeriod.new(nil, nil, TimezoneOffset.new(-14400, 3600, :TEST))

data/test/tc_timezone_proxy.rb

@@ -88,6 +88,15 @@ class TCTimezoneProxy < Minitest::Test
       assert_same(Timezone.get('UTC'), proxy.canonical_zone)
     end
   end
+
+  def test_after_freeze
+    proxy = TimezoneProxy.new('Europe/London')
+    real = Timezone.get('Europe/London')
+    t = Time.utc(2017, 6, 1)
+    proxy.freeze
+    assert_equal('Europe/London', proxy.identifier)
+    assert_equal(real.utc_to_local(t), proxy.utc_to_local(t))
+  end
   
   def test_equals
     assert_equal(true, TimezoneProxy.new('Europe/London') == TimezoneProxy.new('Europe/London'))

data/test/tc_timezone_transition.rb

@@ -68,6 +68,13 @@ class TCTimezoneTransition < Minitest::Test
     assert(TimeOrDateTime.new(DateTime.new(2006, 5, 30, 1, 31, 20)).eql?(t2.local_end_at))
     assert(TimeOrDateTime.new(Time.utc(2006, 5, 30, 1, 31, 20)).eql?(t3.local_end_at))
   end
+
+  def test_local_end_at_after_freeze
+    t = TestTimezoneTransition.new(TimezoneOffset.new(3600, 3600, :TDT),
+      TimezoneOffset.new(3600, 0, :TST), 1148949080)
+    t.freeze
+    assert(TimeOrDateTime.new(1148952680).eql?(t.local_end_at))
+  end
   
   def test_local_end
     t1 = TestTimezoneTransition.new(TimezoneOffset.new(3600, 3600, :TDT),
@@ -107,6 +114,13 @@ class TCTimezoneTransition < Minitest::Test
     assert(TimeOrDateTime.new(DateTime.new(2006, 5, 30, 2, 31, 20)).eql?(t2.local_start_at))
     assert(TimeOrDateTime.new(Time.utc(2006, 5, 30, 2, 31, 20)).eql?(t3.local_start_at))
   end
+
+  def test_local_start_at_after_freeze
+    t = TestTimezoneTransition.new(TimezoneOffset.new(3600, 3600, :TDT),
+      TimezoneOffset.new(3600, 0, :TST), 1148949080)
+    t.freeze
+    assert(TimeOrDateTime.new(1148956280).eql?(t.local_start_at))
+  end
   
   def test_local_start
     t1 = TestTimezoneTransition.new(TimezoneOffset.new(3600, 3600, :TDT),

data/test/tc_timezone_transition_definition.rb

@@ -70,6 +70,17 @@ class TCTimezoneTransitionDefinition < Minitest::Test
       assert(TimeOrDateTime.new(DateTime.new(2038, 1, 19, 3, 14, 8)).eql?(t.at))
     end
   end
+
+  def test_at_after_freeze
+    t1 = TimezoneTransitionDefinition.new(TimezoneOffset.new(3600, 3600, :TDT),
+      TimezoneOffset.new(3600, 0, :TST), 1148949080)
+    t2 = TimezoneTransitionDefinition.new(TimezoneOffset.new(3600, 3600, :TDT),
+      TimezoneOffset.new(3600, 0, :TST), 5300392727, 2160)
+    t1.freeze
+    t2.freeze
+    assert(TimeOrDateTime.new(1148949080).eql?(t1.at))
+    assert(TimeOrDateTime.new(DateTime.new(2006, 5, 30, 0, 31, 20)).eql?(t2.at))
+  end
   
   def test_eql_timestamp
     t1 = TimezoneTransitionDefinition.new(TimezoneOffset.new(3600, 3600, :TDT),

data/test/tc_transition_data_timezone_info.rb

@@ -359,7 +359,17 @@ class TCTransitionDataTimezoneInfo < Minitest::Test
     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(DATETIME_RESOLUTION,1000000))))
+
+    # Ruby 1.8.7 (built with GCC 8.3.0 on Ubuntu 19.04) fails to perform
+    # DateTime comparisons correctly when sub-seconds are used.
+    to = DateTime.new(2011,10,1,1,0,1)
+    from = DateTime.new(2010,4,1,1,0,Rational(DATETIME_RESOLUTION,1000000))
+    if to > from
+      assert_equal([t2,t3,t4,t5], dti.transitions_up_to(to, from))
+    else
+      puts "This platform does not consider the DateTime #{to.strftime('%Y-%m-%d %H:%m:%S.%N')} to be later than the DateTime #{from.strftime('%Y-%m-%d %H:%m:%S.%N')}"
+    end
+
     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

@@ -35,6 +35,20 @@ class TCZoneinfoCountryInfo < Minitest::Test
     assert(!ci.zones.equal?(zones))
     assert(!zones.frozen?)
   end
+
+  def test_zone_identifiers_after_freeze
+    zones = [
+      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)
+    ci.freeze
+
+    assert_equal(['ZZ/TimezoneB', 'ZZ/TimezoneA', 'ZZ/TimezoneC', 'ZZ/TimezoneD'], ci.zone_identifiers)
+  end
   
   def test_zones_empty
     ci = ZoneinfoCountryInfo.new('ZZ', 'Zzz', [])

data/test/tc_zoneinfo_data_source.rb

@@ -7,6 +7,15 @@ require 'tmpdir'
 
 include TZInfo
 
+# Use send as a workaround for an issue on JRuby 9.2.9.0 where using the
+# refinement causes calls to RubyCoreSupport.file_open to fail to pass the block
+# parameter.
+#
+# https://travis-ci.org/tzinfo/tzinfo/jobs/628812051#L1931
+# https://github.com/jruby/jruby/issues/6009
+send(:using, TZInfo::RubyCoreSupport::UntaintExt) if TZInfo::RubyCoreSupport.const_defined?(:UntaintExt)
+send(:using, TaintExt) if Module.const_defined?(:TaintExt)
+
 class TCZoneinfoDataSource < Minitest::Test
   ZONEINFO_DIR = File.join(File.expand_path(File.dirname(__FILE__)), 'zoneinfo').untaint
   
@@ -653,7 +662,7 @@ class TCZoneinfoDataSource < Minitest::Test
   end
 
   def test_load_timezone_info_tainted
-    safe_test do
+    safe_test(:unavailable => :skip) do
       identifier = 'Europe/Amsterdam'.dup.taint
       assert(identifier.tainted?)
       info = @data_source.load_timezone_info(identifier)
@@ -840,7 +849,7 @@ class TCZoneinfoDataSource < Minitest::Test
   end
   
   def test_load_country_info_tainted
-    safe_test do
+    safe_test(:unavailable => :skip) do
       code = 'NL'.dup.taint
       assert(code.tainted?)
       info = @data_source.load_country_info(code)

data/test/tc_zoneinfo_timezone_info.rb

@@ -5,6 +5,8 @@ require 'tempfile'
 
 include TZInfo
 
+using RubyCoreSupport::UntaintExt if RubyCoreSupport.const_defined?(:UntaintExt)
+
 class TCZoneinfoTimezoneInfo < Minitest::Test
 
   begin
@@ -1070,6 +1072,110 @@ class TCZoneinfoTimezoneInfo < Minitest::Test
       assert_period(:XST1, 3600,    0, false, Time.utc(2000,  4, 1),                   nil, info)
     end
   end
+
+  def test_read_offset_negative_std_offset_dst
+    # The zoneinfo files don't include the offset from standard time, so this
+    # has to be derived by looking at changes in the total UTC offset.
+
+    offsets = [
+      {:gmtoff => -100, :isdst => false, :abbrev => 'LMT'},
+      {:gmtoff => 3600, :isdst => false, :abbrev => 'XST'},
+      {:gmtoff =>    0, :isdst => true,  :abbrev => 'XWT'}]
+
+    transitions = [
+      {:at => Time.utc(2000,  1, 1), :offset_index => 1},
+      {:at => Time.utc(2000,  2, 1), :offset_index => 2},
+      {:at => Time.utc(2000,  3, 1), :offset_index => 1},
+      {:at => Time.utc(2000,  4, 1), :offset_index => 2},
+      {:at => Time.utc(2000,  5, 1), :offset_index => 1}]
+
+    tzif_test(offsets, transitions) do |path, format|
+      info = ZoneinfoTimezoneInfo.new('Zone/NegativeStdOffsetDst', path)
+      assert_equal('Zone/NegativeStdOffsetDst', info.identifier)
+
+      assert_period(:LMT, -100,     0, false,                  nil, Time.utc(2000, 1, 1), info)
+      assert_period(:XST, 3600,     0, false, Time.utc(2000, 1, 1), Time.utc(2000, 2, 1), info)
+      assert_period(:XWT, 3600, -3600,  true, Time.utc(2000, 2, 1), Time.utc(2000, 3, 1), info)
+      assert_period(:XST, 3600,     0, false, Time.utc(2000, 3, 1), Time.utc(2000, 4, 1), info)
+      assert_period(:XWT, 3600, -3600,  true, Time.utc(2000, 4, 1), Time.utc(2000, 5, 1), info)
+      assert_period(:XST, 3600,     0, false, Time.utc(2000, 5, 1),                  nil, info)
+    end
+  end
+
+  def test_read_offset_negative_std_offset_dst_initial_dst
+    # The zoneinfo files don't include the offset from standard time, so this
+    # has to be derived by looking at changes in the total UTC offset.
+
+    offsets = [
+      {:gmtoff => -100, :isdst => false, :abbrev => 'LMT'},
+      {:gmtoff =>    0, :isdst => true,  :abbrev => 'XWT'},
+      {:gmtoff => 3600, :isdst => false, :abbrev => 'XST'}]
+
+    transitions = [
+      {:at => Time.utc(2000,  1, 1), :offset_index => 1},
+      {:at => Time.utc(2000,  2, 1), :offset_index => 2},
+      {:at => Time.utc(2000,  3, 1), :offset_index => 1},
+      {:at => Time.utc(2000,  4, 1), :offset_index => 2},
+      {:at => Time.utc(2000,  5, 1), :offset_index => 1}]
+
+    tzif_test(offsets, transitions) do |path, format|
+      info = ZoneinfoTimezoneInfo.new('Zone/NegativeStdOffsetDstInitialDst', path)
+      assert_equal('Zone/NegativeStdOffsetDstInitialDst', info.identifier)
+
+      assert_period(:LMT, -100,     0, false,                  nil, Time.utc(2000, 1, 1), info)
+      assert_period(:XWT, 3600, -3600,  true, Time.utc(2000, 1, 1), Time.utc(2000, 2, 1), info)
+      assert_period(:XST, 3600,     0, false, Time.utc(2000, 2, 1), Time.utc(2000, 3, 1), info)
+      assert_period(:XWT, 3600, -3600,  true, Time.utc(2000, 3, 1), Time.utc(2000, 4, 1), info)
+      assert_period(:XST, 3600,     0, false, Time.utc(2000, 4, 1), Time.utc(2000, 5, 1), info)
+      assert_period(:XWT, 3600, -3600,  true, Time.utc(2000, 5, 1),                  nil, info)
+    end
+  end
+
+  def test_read_offset_prefer_base_offset_moves_to_dst_not_hour
+    offsets = [
+      {:gmtoff => -100, :isdst => false, :abbrev => 'LMT'},
+      {:gmtoff =>    0, :isdst => false, :abbrev => 'XST'},
+      {:gmtoff => 1800, :isdst => true,  :abbrev => 'XDT'},
+      {:gmtoff => 1800, :isdst => false, :abbrev => 'XST'}]
+
+    transitions = [
+      {:at => Time.utc(2000,  1, 1), :offset_index => 1},
+      {:at => Time.utc(2000,  2, 1), :offset_index => 2},
+      {:at => Time.utc(2000,  3, 1), :offset_index => 3}]
+
+    tzif_test(offsets, transitions) do |path, format|
+      info = ZoneinfoTimezoneInfo.new('Zone/BaseOffsetMovesToDstNotHour', path)
+      assert_equal('Zone/BaseOffsetMovesToDstNotHour', info.identifier)
+
+      assert_period(:LMT, -100,     0, false,                  nil, Time.utc(2000, 1, 1), info)
+      assert_period(:XST,    0,     0, false, Time.utc(2000, 1, 1), Time.utc(2000, 2, 1), info)
+      assert_period(:XDT,    0,  1800,  true, Time.utc(2000, 2, 1), Time.utc(2000, 3, 1), info)
+      assert_period(:XST, 1800,     0, false, Time.utc(2000, 3, 1),                  nil, info)
+    end
+  end
+
+  def test_read_offset_prefer_base_offset_moves_from_dst_not_hour
+    offsets = [
+      {:gmtoff => -100, :isdst => false, :abbrev => 'LMT'},
+      {:gmtoff => 1800, :isdst => false, :abbrev => 'XST'},
+      {:gmtoff => 1800, :isdst => true,  :abbrev => 'XDT'},
+      {:gmtoff =>    0, :isdst => false, :abbrev => 'XST'}]
+
+    transitions = [
+      {:at => Time.utc(2000,  1, 1), :offset_index => 1},
+      {:at => Time.utc(2000,  2, 1), :offset_index => 2},
+      {:at => Time.utc(2000,  3, 1), :offset_index => 3}]
+
+    tzif_test(offsets, transitions) do |path, format|
+      info = ZoneinfoTimezoneInfo.new('Zone/BaseOffsetMovesFromDstNotHour', path)
+      assert_equal('Zone/BaseOffsetMovesFromDstNotHour', info.identifier)
+
+      assert_period(:LMT, -100,     0, false,                  nil, Time.utc(2000, 1, 1), info)
+      assert_period(:XST, 1800,     0, false, Time.utc(2000, 1, 1), Time.utc(2000, 2, 1), info)
+      assert_period(:XDT,    0,  1800,  true, Time.utc(2000, 2, 1), Time.utc(2000, 3, 1), info)
+      assert_period(:XST,    0,     0, false, Time.utc(2000, 3, 1),                  nil, info)
+    end
+  end
   
   def test_load_in_safe_mode
     offsets = [{:gmtoff => -12094, :isdst => false, :abbrev => 'LT'}]

data/test/test_utils.rb

@@ -1,4 +1,6 @@
-TESTS_DIR = File.expand_path(File.dirname(__FILE__)).untaint
+tests_dir = File.expand_path(File.dirname(__FILE__))
+tests_dir.untaint if RUBY_VERSION < '2.7'
+TESTS_DIR = tests_dir
 TZINFO_LIB_DIR = File.expand_path(File.join(TESTS_DIR, '..', 'lib'))
 TZINFO_TEST_DATA_DIR = File.join(TESTS_DIR, 'tzinfo-data')
 TZINFO_TEST_ZONEINFO_DIR = File.join(TESTS_DIR, 'zoneinfo')
@@ -55,18 +57,57 @@ module Kernel
   end
   
   def safe_test(options = {})
-    # JRuby and Rubinus don't support SAFE levels.
-    available = !(defined?(RUBY_ENGINE) && %w(jruby rbx).include?(RUBY_ENGINE))
+    # Ruby >= 2.7, JRuby and Rubinus don't support SAFE levels.
+    available = RUBY_VERSION < '2.7' && !(defined?(RUBY_ENGINE) && %w(jruby rbx).include?(RUBY_ENGINE))
    
     if available || options[:unavailable] != :skip
       thread = Thread.new do
-        $SAFE = options[:level] || 1 if available
-        yield
+        orig_diff = Minitest::Assertions.diff
+
+        if available
+          orig_safe = $SAFE
+          $SAFE = options[:level] || 1
+        end
+        begin
+          # Disable the use of external diff tools during safe mode tests (since
+          # safe mode will prevent their use). The initial value is retrieved
+          # before activating safe mode because the first time
+          # Minitest::Assertions.diff is called, it will attempt to find a diff
+          # tool. Finding the diff tool will also fail in safe mode.
+          Minitest::Assertions.diff = nil
+          begin
+            yield
+          ensure
+            Minitest::Assertions.diff = orig_diff
+          end
+        ensure
+          if available
+            # On Ruby < 2.6, setting $SAFE affects only the current thread
+            # and the $SAFE level cannot be downgraded. Catch and ignore the
+            # SecurityError.
+            # On Ruby >= 2.6, setting $SAFE is global, and the $SAFE level
+            # can be downgraded. Restore $SAFE back to the original level.
+            begin
+              $SAFE = orig_safe
+            rescue SecurityError
+            end
+          end
+        end
       end
       
       thread.join
     end
   end
+
+  def skip_if_has_bug_14060
+    # On Ruby 2.4.4 in safe mode, require will fail with a SecurityError for
+    # any file that has not previously been loaded, regardless of whether the
+    # file name is tainted.
+    # See https://bugs.ruby-lang.org/issues/14060#note-5.
+    if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'ruby' && RUBY_VERSION == '2.4.4'
+      skip('Skipping test due to Ruby 2.4.4 being affected by Bug 14060 (see https://bugs.ruby-lang.org/issues/14060#note-5)')
+    end
+  end
   
   def assert_array_same_items(expected, actual, msg = nil)
     full_message = message(msg, '') { diff(expected, actual) }
@@ -123,6 +164,19 @@ module Kernel
 end
 
 
+# Object#taint is a deprecated no-op in Ruby 2.7 and outputs a warning. It will
+# be removed in 3.0. Silence the warning or supply a replacement.
+if TZInfo::RubyCoreSupport.const_defined?(:UntaintExt)
+  module TaintExt
+    refine Object do
+      def taint
+        self
+      end
+    end
+  end
+end
+
+
 # JRuby 1.7.5 to 1.7.9 consider DateTime instances that differ by less than 
 # 1 millisecond to be equivalent (https://github.com/jruby/jruby/issues/1311).
 #

data/test/ts_all_zoneinfo.rb

@@ -2,6 +2,8 @@ require File.join(File.expand_path(File.dirname(__FILE__)), 'test_utils.rb')
 
 # Use a zoneinfo directory containing files needed by the tests.
 # The symlinks in this directory are set up in test_utils.rb.
-TZInfo::DataSource.set(:zoneinfo, File.join(File.expand_path(File.dirname(__FILE__)), 'zoneinfo').untaint)
+zoneinfo_path = File.join(File.expand_path(File.dirname(__FILE__)), 'zoneinfo')
+zoneinfo_path.untaint if RUBY_VERSION < '2.7'
+TZInfo::DataSource.set(:zoneinfo, zoneinfo_path)
 
 require File.join(File.expand_path(File.dirname(__FILE__)), 'ts_all.rb')

data/tzinfo.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'tzinfo'
-  s.version = '1.2.4'
+  s.version = '1.2.6'
   s.summary = 'Daylight savings aware timezone library'
   s.description = 'TZInfo provides daylight savings aware transformations between times in different time zones.'
   s.author = 'Philip Ross'