tzinfo 1.2.8 → 1.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9569ae7387d4f2847ba35f6a1268fbbc9019f9bbef1cc72e70569757320db079
-  data.tar.gz: bb66169c01610b980c35be5c7102d780d07167b785acd6ea5887b89d15eb107d
+  metadata.gz: ddfbcb761e22870203af94d9cd3d47254ce0487d49ab51d804190d7d1961c125
+  data.tar.gz: f1e1f7eb70f406974d3fdbcda4cb78a6e2fa0842c0a6ec912fe80986a59e57fa
 SHA512:
-  metadata.gz: d9847f779c051d96c2457d364b18bdc9bc74e9b17ffd8e84106ce9c6562b2634e60f08b81af9fff6ba7c0af3b898ba4483fe8e9fa31b3e004251b203c1bee933
-  data.tar.gz: 8737907d69e81c06650a1f01b1ba45afc83f38a66b44fca093431cfea65208a92f56ada755e9f87724a6b866ecbfed11d1ef09552bbf983ce47c15c90269a322
+  metadata.gz: 5fe024d4d8c134dc324dedab7e6bca66293cf52e80ca16a3d32222e961dd5b563eead2bd110a72a212e7cde0e8ad0c87bc075ce19ad06e3d46ee0b3c3fb45c0a
+  data.tar.gz: 2c9c48dd44315d61129850ee160932f64afb1e90d8ca82dcd9388b2a79699c3b140340c9541ef822ba02d0791bc4df7c1c7e5a15c9d5840d37f177c1e5942242

data/CHANGES.md

@@ -1,3 +1,12 @@
+Version 1.2.9 - 16-Dec-2020
+---------------------------
+
+* Fixed an incorrect InvalidTimezoneIdentifier exception raised when loading a
+  zoneinfo file that includes rules specifying an additional transition to the
+  final defined offset (for example, Africa/Casablanca in version 2018e of the
+  Time Zone Database). #123.
+
+
 Version 1.2.8 - 8-Nov-2020
 --------------------------
 
@@ -5,7 +14,7 @@ Version 1.2.8 - 8-Nov-2020
   default by zic version 2020b and later. The POSIX-style TZ string is now used
   calculate DST transition times after the final defined transition in the file.
   The 64-bit section is now always used regardless of whether Time has support
-  for 64-bit times.
+  for 64-bit times. #120.
 * Rubinius is no longer supported.
 
 

data/lib/tzinfo/zoneinfo_timezone_info.rb

@@ -313,8 +313,13 @@ module TZInfo
           last_year = (Time.at(last_defined[:at]).utc + previous_offset[:utc_total_offset]).year
 
           if last_year <= GENERATE_UP_TO
-            generated = rules.transitions(last_year).find_all {|t| t.at > last_defined[:at] } +
-              (last_year + 1).upto(GENERATE_UP_TO).map {|y| rules.transitions(y) }.flatten
+            last_defined_offset = offsets[last_defined[:offset]]
+
+            generated = rules.transitions(last_year).find_all do |t|
+              t.at > last_defined[:at] && !offset_matches_rule?(last_defined_offset, t.offset)
+            end
+
+            generated += (last_year + 1).upto(GENERATE_UP_TO).map {|y| rules.transitions(y) }.flatten
 
             unless generated.empty?
               transitions[-1] = validate_and_fix_last_defined_transition_offset(file, offsets, last_defined, generated[0].previous_offset)

data/test/tc_zoneinfo_timezone_info.rb

@@ -1895,7 +1895,18 @@ class TCZoneinfoTimezoneInfo < Minitest::Test
     end
   end
 
-  def test_load_tz_string_specifies_transition_to_offset_of_final_transition_same_year
+  def test_load_tz_string_specifies_transition_to_offset_of_final_transition_same_year_skip_dst_start
+    # TZInfo v1.2.8 considered this to be an error. However, this is a valid
+    # situation with Africa/Casablanca in 2018e.
+    #
+    # The last defined transitions are:
+    #   At 2037-03-29 02:00Z change to WEST UTC+1
+    #   At 2037-10-04 02:00Z change to WET  UTC+0
+    #
+    # The rules define the end of DST to be at 03:00 local time on the last
+    # Sunday of October (2037-10-31). This later transition needs to be
+    # ignored.
+
     offsets = [
       {:gmtoff =>  7142, :isdst => false, :abbrev => 'LMT'},
       {:gmtoff =>  7200, :isdst => false, :abbrev => 'XST'},
@@ -1916,9 +1927,76 @@ class TCZoneinfoTimezoneInfo < Minitest::Test
       JulianDayOfYearTransitionRule.new(300, 7200)
     )
 
+    generate_up_to = ZoneinfoTimezoneInfo::GENERATE_UP_TO
+
     tzif_test(offsets, transitions, :rules => rules) do |path, format|
-      error = assert_raises(InvalidZoneinfoFile) { ZoneinfoTimezoneInfo.new('Invalid/Offset', path, @posix_tz_parser) }
-      assert_equal("The first offset indicated by the POSIX-style TZ string did not match the final defined offset in file '#{path}'.", error.message)
+      info = ZoneinfoTimezoneInfo.new('Ignore/Std', path, @posix_tz_parser)
+      assert_equal('Ignore/Std', info.identifier)
+
+      assert_period(:LMT, 7142,    0, false, nil,                                     Time.utc(1971,  1,  2, 2, 0, 0) -  7142, info)
+      assert_period(:XST, 7200,    0, false, Time.utc(1971,  1,  2, 2, 0, 0) -  7142, Time.utc(1981,  4, 10, 1, 0, 0) -  7200, info)
+      assert_period(:XDT, 7200, 3600, true,  Time.utc(1981,  4, 10, 1, 0, 0) -  7200, Time.utc(1981, 10, 27, 2, 0, 0) - 10800, info)
+      assert_period(:XST, 7200,    0, false, Time.utc(1981, 10, 27, 2, 0, 0) - 10800, Time.utc(1982,  4, 10, 1, 0, 0) -  7200, info)
+      assert_period(:XDT, 7200, 3600, true,  Time.utc(1982,  4, 10, 1, 0, 0) -  7200, Time.utc(1982, 10, 27, 2, 0, 0) - 10800, info)
+
+      1983.upto(generate_up_to).each do |year|
+        assert_period(:XST, 7200,    0, false, Time.utc(year - 1, 10, 27, 2, 0, 0) - 10800, Time.utc(year,  4, 11, 1, 0, 0) -  7200, info)
+        assert_period(:XDT, 7200, 3600, true,  Time.utc(year,      4, 11, 1, 0, 0) -  7200, Time.utc(year, 10, 27, 2, 0, 0) - 10800, info)
+      end
+
+      assert_period(:XST, 7200,    0, false, Time.utc(generate_up_to, 10, 27, 2, 0, 0) - 10800, nil, info)
+    end
+  end
+
+  def test_load_tz_string_specifies_transition_to_offset_of_final_transition_same_year_skip_dst_end
+    # TZInfo v1.2.8 considered this to be an error. However, this is a valid
+    # situation with Africa/Casablanca in 2018e.
+    #
+    # The last defined transitions are:
+    #   At 2037-03-29 02:00Z change to WEST UTC+1
+    #   At 2037-10-04 02:00Z change to WET  UTC+0
+    #
+    # The rules define the end of DST to be at 03:00 local time on the last
+    # Sunday of October (2037-10-31). This later transition needs to be
+    # ignored.
+
+    offsets = [
+      {:gmtoff =>  7142, :isdst => false, :abbrev => 'LMT'},
+      {:gmtoff =>  7200, :isdst => false, :abbrev => 'XST'},
+      {:gmtoff => 10800, :isdst => true,  :abbrev => 'XDT'}
+    ]
+
+    transitions = [
+      {:at => Time.utc(1971,  1,  2, 2, 0, 0) -  7142, :offset_index => 1},
+      {:at => Time.utc(1981,  4, 10, 1, 0, 0) -  7200, :offset_index => 2},
+      {:at => Time.utc(1981, 10, 27, 2, 0, 0) - 10800, :offset_index => 1}
+    ]
+
+    rules = AnnualRules.new(
+      TimezoneOffset.new(7200, 0, 'XST'),
+      TimezoneOffset.new(7200, 3600, 'XDT'),
+      JulianDayOfYearTransitionRule.new(100, 3600),
+      JulianDayOfYearTransitionRule.new(301, 7200)
+    )
+
+    generate_up_to = ZoneinfoTimezoneInfo::GENERATE_UP_TO
+
+    tzif_test(offsets, transitions, :rules => rules) do |path, format|
+      info = ZoneinfoTimezoneInfo.new('Ignore/Std', path, @posix_tz_parser)
+      assert_equal('Ignore/Std', info.identifier)
+
+      assert_period(:LMT, 7142,    0, false, nil,                                     Time.utc(1971,  1,  2, 2, 0, 0) -  7142, info)
+      assert_period(:XST, 7200,    0, false, Time.utc(1971,  1,  2, 2, 0, 0) -  7142, Time.utc(1981,  4, 10, 1, 0, 0) -  7200, info)
+      assert_period(:XDT, 7200, 3600, true,  Time.utc(1981,  4, 10, 1, 0, 0) -  7200, Time.utc(1981, 10, 27, 2, 0, 0) - 10800, info)
+      assert_period(:XST, 7200,    0, false, Time.utc(1981, 10, 27, 2, 0, 0) - 10800, Time.utc(1982,  4, 10, 1, 0, 0) -  7200, info)
+
+      1982.upto(generate_up_to - 1).each do |year|
+        assert_period(:XDT, 7200, 3600, true,  Time.utc(year,  4, 10, 1, 0, 0) -  7200, Time.utc(year,     10, 28, 2, 0, 0) - 10800, info)
+        assert_period(:XST, 7200,    0, false, Time.utc(year, 10, 28, 2, 0, 0) - 10800, Time.utc(year + 1,  4, 10, 1, 0, 0) -  7200, info)
+      end
+
+      assert_period(:XDT, 7200, 3600, true,  Time.utc(generate_up_to,  4, 10, 1, 0, 0) -  7200, Time.utc(generate_up_to, 10, 28, 2, 0, 0) - 10800, info)
+      assert_period(:XST, 7200,    0, false, Time.utc(generate_up_to, 10, 28, 2, 0, 0) - 10800, nil,                                               info)
     end
   end
 

data/tzinfo.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'tzinfo'
-  s.version = '1.2.8'
+  s.version = '1.2.9'
   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'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tzinfo
 version: !ruby/object:Gem::Version
-  version: 1.2.8
+  version: 1.2.9
 platform: ruby
 authors:
 - Philip Ross
@@ -29,7 +29,7 @@ cert_chain:
   J3Zn/kSTjTekiaspyGbczC3PUaeJNxr+yCvR4sk71Xmk/GaKKGOHedJ1uj/LAXrA
   MR0mpl7b8zCg0PFC1J73uw==
   -----END CERTIFICATE-----
-date: 2020-11-08 00:00:00.000000000 Z
+date: 2020-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thread_safe