tzinfo 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31e0ea9f4896e07430d20f4411903cad49ceb7bbde32bd156e3646376041c0d7
-  data.tar.gz: c91451850421ca0b8cf3b59b5b318a8e8e9b73ff9b87acf546fa28b907665f82
+  metadata.gz: 7546cb5c3ebb595feafce0630fc925d58abba65b66bbd72f2f84e9a67128b7f1
+  data.tar.gz: 11a8bacf90d980fb3e278f95cf6090d9dc54da7dacaaed4e4c59f30bdbcc8b8e
 SHA512:
-  metadata.gz: ed6bd3db29c977cb0d92e01551711e6b1285e3db54d4670893dc7716d54ce869ac5115faca62c7c6497eb656af1eecad71a6eedfcc8900eaf324ce2441ba0d01
-  data.tar.gz: 2675aef510ec569141e29c202d5a353590bd52e9fb9aa41489c467c204a6e203b43274f7035acf18d1bafe37765282dbbd0301f4dbf8e94aef01bcc623cb0fd9
+  metadata.gz: 40bc69496e52eff6e8790e3c03ba3df3c6915daec5ea182d630cfe820bd5e52b83bde35b21240e1482460e8bc3176c75782374376a96ce7e7cd27d4c0aa62c6c
+  data.tar.gz: e3b19c05c5d47e648f6986092e8acca5fe5a3f95420287ab06b5c68dfefa8993b2996767323cf212e705b0cbe20062cfdf98fcfdd9120219075e9a01dab16d60

data/CHANGES.md

@@ -1,5 +1,13 @@
 # Changes
 
+## Version 2.0.4 - 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 2.0.3 - 8-Nov-2020
 
 * Added support for handling "slim" format zoneinfo files that are produced by
@@ -174,6 +182,14 @@
   `TZInfo::Country.get('US').zone_identifiers` should be used instead.
 
 
+## 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
 
 * Added support for handling "slim" format zoneinfo files that are produced by

data/lib/tzinfo/data_sources/zoneinfo_reader.rb

@@ -323,8 +323,11 @@ module TZInfo
           if last_year <= GENERATE_UP_TO
             rules = replace_with_existing_offsets(offsets, rules)
 
-            generated = rules.transitions(last_year).find_all {|t| t.timestamp_value > last_defined.timestamp_value } +
-              (last_year + 1).upto(GENERATE_UP_TO).flat_map {|y| rules.transitions(y) }
+            generated = rules.transitions(last_year).find_all do |t|
+              t.timestamp_value > last_defined.timestamp_value && !offset_matches_rule?(last_defined.offset, t.offset)
+            end
+
+            generated += (last_year + 1).upto(GENERATE_UP_TO).flat_map {|y| rules.transitions(y) }
 
             unless generated.empty?
               transitions[-1] = validate_and_fix_last_defined_transition_offset(file, last_defined, generated[0].previous_offset)

data/lib/tzinfo/version.rb

@@ -3,5 +3,5 @@
 
 module TZInfo
   # The TZInfo version number.
-  VERSION = '2.0.3'
+  VERSION = '2.0.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tzinfo
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 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: concurrent-ruby
@@ -114,9 +114,9 @@ licenses:
 metadata:
   bug_tracker_uri: https://github.com/tzinfo/tzinfo/issues
   changelog_uri: https://github.com/tzinfo/tzinfo/blob/master/CHANGES.md
-  documentation_uri: https://rubydoc.info/gems/tzinfo/2.0.3
+  documentation_uri: https://rubydoc.info/gems/tzinfo/2.0.4
   homepage_uri: https://tzinfo.github.io
-  source_code_uri: https://github.com/tzinfo/tzinfo/tree/v2.0.3
+  source_code_uri: https://github.com/tzinfo/tzinfo/tree/v2.0.4
 post_install_message: 
 rdoc_options:
 - "--title"