tzinfo 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7f0a351bb373ff9068cb63ac357116b714aba6ee3a80c937bab19598f1cb524
-  data.tar.gz: 73fe312723a4ffdeb9ca5340156ef3708795d8485dfd4739aaef5d7c79773937
+  metadata.gz: ec86298303c2574741a727440578c6e0b7f89be23f2c6d6e3ee01fccfeb1206e
+  data.tar.gz: c0fddb69282a1d64a69c5c73419ec5971a0baf7cc0d6af904879e39393953aa0
 SHA512:
-  metadata.gz: 5ac0373dd3c0355db72d99d0cb59fb5adb34cd26bc084bdf3beaa06e35e195e23fbeb444b6d125d956157ab66705fe044c0b12111db634873d90ecccddc59aca
-  data.tar.gz: 04cddba2b691dc949cd61d9a2f5dd58a77a9bd4d0c5042fa02d43359432edeba36e336db7bf1fa0dc0289eaa17c2f6fb08631af7211ed21f07ebb51a22461471
+  metadata.gz: 24abd1a7d10d00dacf003d6d80211fa2f6bd46f90bf1068ed473d74a4cab3f2a44a46c3224a942f41850cbdaf303bbf59e02dba37b5bf0af600d60435f5d5242
+  data.tar.gz: a4665320a7cf87ac113e50e6af2f93f5d4df9c6f40af1b3d35bbf8a2ee88aeb95fb98d7e04b6cb3c2fedc1e0bb94c13d185fd712cd2105ae527129ae2abbecac

data.tar.gz.sig

@@ -1,2 +1 @@
-^u�_o,e�IM���N!�m:2��	ir@-DR����((���6��@�燫z7���[zb�yHߢ���BX9�qENi��l�U7
-��β�A�8iKCJ��=ܧ��f��7�w;]x4�
+<�U��#񑐋�p�D��P�����Kf�����_0e|��)��E��H�C�p`t�XR��d���R�[x�����-�,5�h۫��U�{u��wu�
��b���! d�`jX5?��>���T��)a��2���_���.d~�^��/�t'z%��?�'�eh�~�T{B�RĐY�'_$�0~����8'�����O6ŏ( yp�	������S`d{r���1�B���b�u�n��[�������$o��8��jt�#E

data/CHANGES.md

@@ -1,5 +1,16 @@
 # Changes
 
+## Version 2.0.1 - 24-Dec-2019
+
+* Fixed "SecurityError: Insecure operation - require" exceptions when loading
+  data with recent Ruby releases in safe mode. #100.
+* Fixed warnings when running on Ruby 2.7. #109.
+* Add a `TZInfo::Timezone#=~` method that performs a regex match on the time
+  zone identifier. #99.
+* Add a `TZInfo::Country#=~` method that performs a regex match on the country
+  code.
+
+
 ## Version 2.0.0 - 26-Dec-2018
 
 ### Added
@@ -145,6 +156,16 @@
   `TZInfo::Country.get('US').zone_identifiers` should be used instead.
 
 
+## Version 1.2.6 - 24-Dec-2019
+
+* `Timezone#strftime('%s', time)` will now return the correct number of seconds
+  since the epoch. #91.
+* Removed the unused `TZInfo::RubyDataSource::REQUIRE_PATH` constant.
+* Fixed "SecurityError: Insecure operation - require" exceptions when loading
+  data with recent Ruby releases in safe mode.
+* Fixed warnings when running on Ruby 2.7. #106 and #111.
+
+
 ## Version 1.2.5 - 4-Feb-2018
 
 * Support recursively (deep) freezing `Country` and `Timezone` instances. #80.

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2005-2018 Philip Ross
+Copyright (c) 2005-2019 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

data/lib/tzinfo.rb

@@ -5,6 +5,18 @@
 module TZInfo
 end
 
+# Object#untaint is a deprecated no-op in Ruby >= 2.7 and will be removed in
+# 3.0. Add a refinement to either silence the warning, or supply the method if
+# needed.
+old_verbose = $VERBOSE
+$VERBOSE = false
+begin
+  o = Object.new
+  require_relative 'tzinfo/untaint_ext' if [:taint, :untaint, :tainted?].none? {|m| o.respond_to?(m) } || !o.taint.tainted?
+ensure
+  $VERBOSE = old_verbose
+end
+
 require_relative 'tzinfo/version'
 
 require_relative 'tzinfo/string_deduper'

data/lib/tzinfo/country.rb

@@ -176,6 +176,16 @@ module TZInfo
       code.hash
     end
 
+    # Matches `regexp` against the {code} of this {Country}.
+    #
+    # @param regexp [Regexp] a `Regexp` to match against the {code} of
+    #   this {Country}.
+    # @return [Integer] the position the match starts, or `nil` if there is no
+    #   match.
+    def =~(regexp)
+      regexp =~ code
+    end
+
     # Returns a serialized representation of this {Country}. This method is
     # called when using `Marshal.dump` with an instance of {Country}.
     #

data/lib/tzinfo/data_sources/ruby_data_source.rb

@@ -2,6 +2,8 @@
 # frozen_string_literal: true
 
 module TZInfo
+  using UntaintExt if TZInfo.const_defined?(:UntaintExt)
+
   module DataSources
     # A {TZInfoDataNotFound} exception is raised if the tzinfo-data gem could
     # not be found (i.e. `require 'tzinfo/data'` failed) when selecting the Ruby
@@ -48,7 +50,7 @@ module TZInfo
           data_file = File.join('', 'tzinfo', 'data.rb')
           path = $".reverse_each.detect {|p| p.end_with?(data_file) }
           if path
-            @base_path = File.join(File.dirname(path), 'data')
+            @base_path = File.join(File.dirname(path), 'data').untaint
           else
             @base_path = 'tzinfo/data'
           end

data/lib/tzinfo/data_sources/zoneinfo_data_source.rb

@@ -2,6 +2,8 @@
 # frozen_string_literal: true
 
 module TZInfo
+  using UntaintExt if TZInfo.const_defined?(:UntaintExt)
+
   module DataSources
     # An {InvalidZoneinfoDirectory} exception is raised if {ZoneinfoDataSource}
     # is initialized with a specific zoneinfo path that is not a valid zoneinfo

data/lib/tzinfo/data_sources/zoneinfo_reader.rb

@@ -2,6 +2,8 @@
 # frozen_string_literal: true
 
 module TZInfo
+  using UntaintExt if TZInfo.const_defined?(:UntaintExt)
+
   module DataSources
     # An {InvalidZoneinfoFile} exception is raised if an attempt is made to load
     # an invalid zoneinfo file.

data/lib/tzinfo/timezone.rb

@@ -1119,6 +1119,16 @@ module TZInfo
       identifier.hash
     end
 
+    # Matches `regexp` against the {identifier} of this {Timezone}.
+    #
+    # @param regexp [Regexp] a `Regexp` to match against the {identifier} of
+    #   this {Timezone}.
+    # @return [Integer] the position the match starts, or `nil` if there is no
+    #   match.
+    def =~(regexp)
+      regexp =~ identifier
+    end
+
     # Returns a serialized representation of this {Timezone}. This method is
     # called when using `Marshal.dump` with an instance of {Timezone}.
     #

data/lib/tzinfo/untaint_ext.rb

@@ -0,0 +1,18 @@
+# encoding: UTF-8
+# frozen_string_literal: true
+
+module TZInfo
+  # Object#untaint is deprecated in Ruby >= 2.7 and will be removed in 3.0.
+  # UntaintExt adds a refinement to make Object#untaint a no-op and avoid the
+  # warning.
+  #
+  # @private
+  module UntaintExt # :nodoc:
+    refine Object do
+      def untaint
+        self
+      end
+    end
+  end
+  private_constant :UntaintExt
+end

data/lib/tzinfo/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tzinfo
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Philip Ross
@@ -11,8 +11,8 @@ cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   MIIDPDCCAiSgAwIBAgIBATANBgkqhkiG9w0BAQsFADAkMSIwIAYDVQQDDBlwaGls
-  LnJvc3MvREM9Z21haWwvREM9Y29tMB4XDTE4MTAyNzE3NTQyNVoXDTE5MTAyNzE3
-  NTQyNVowJDEiMCAGA1UEAwwZcGhpbC5yb3NzL0RDPWdtYWlsL0RDPWNvbTCCASIw
+  LnJvc3MvREM9Z21haWwvREM9Y29tMB4XDTE5MTIyNDE0NTU0N1oXDTM5MTIyNDE0
+  NTU0N1owJDEiMCAGA1UEAwwZcGhpbC5yb3NzL0RDPWdtYWlsL0RDPWNvbTCCASIw
   DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJGcwfqn4ZsmPl0b1Lt9dCzExrE5
   EeP/CRQjBdGHkF+mSpi69XysxdwLdfg5SPr9LfxthUug4nNFd5fDCiXM8hYe9jQD
   TmkIQKNBh4fFpGngn9gyy+SumCXi6b5L6d/aMc59NAOM6LJ88TOdH1648dh5rq3C
@@ -22,14 +22,14 @@ cert_chain:
   AaN5MHcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFA+Z8zvfzBuA
   esoHIfz7+jxfUOcfMB4GA1UdEQQXMBWBE3BoaWwucm9zc0BnbWFpbC5jb20wHgYD
   VR0SBBcwFYETcGhpbC5yb3NzQGdtYWlsLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEA
-  G7spOhX+wjEVvsn5KAqbeDXcRhnuAzz/DbAq8xkG84etG4HNNdGxe8z7DY0YuqQQ
-  uau4AXpjQwtXRp6wYrzLjpn6Gsj0NGcv9TOcxHPPpr/cZnFuLdN5Sk7Q1sK8OuJ1
-  7JSj/nRsuNVgoo5dSAghVbCUNd2Ch31oDGPQFzedmKo09mNTd72CfcjzrjXaHDIB
-  ObXSs1zIhlYXDJGC5Dpr1/fG2W7bd8xt4UwQBH8u53KKYbHjHcbF+9x3O9TDweZq
-  lDDjxNrOZq4IuD3jrJI+T95Lo5RSCenQmPnJIGtfaoN+omC2q0HMFNx31TcWCcC8
-  Y2Wt5gQskVrMQo+j0zgJcw==
+  J80xgZ3gGdQVA8N+8NJANU5HLuZIU9jOaAlziU9ImoTgPiOHKGZC4as1TwT4kBt1
+  Qcnu7YSANYRrxP5tpOHsWPF/MQYgerAFCZS5+PzOTudwZ+7OsMW4/EMHy6aCVHEd
+  c7HzQRC4mSrDRpWxzyBnZ5nX5OAmIkKA8NgeKybT/4Ku6iFPPUQwlyxQaO+Wlxdo
+  FqHwpjRyoiVSpe4RUTNK3d3qesWPYi7Lxn6k6ZZeEdvG6ya33AXktE3jmmF+jPR1
+  J3Zn/kSTjTekiaspyGbczC3PUaeJNxr+yCvR4sk71Xmk/GaKKGOHedJ1uj/LAXrA
+  MR0mpl7b8zCg0PFC1J73uw==
   -----END CERTIFICATE-----
-date: 2018-12-26 00:00:00.000000000 Z
+date: 2019-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -102,6 +102,7 @@ files:
 - lib/tzinfo/timezone_proxy.rb
 - lib/tzinfo/timezone_transition.rb
 - lib/tzinfo/transitions_timezone_period.rb
+- lib/tzinfo/untaint_ext.rb
 - lib/tzinfo/version.rb
 - lib/tzinfo/with_offset.rb
 homepage: https://tzinfo.github.io
@@ -127,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Time Zone Library