RubyGems - tzinfo - Versions diffs - 2.0.5 → 2.0.6 - Mend

tzinfo 2.0.5 → 2.0.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (15) hide show

checksums.yaml +4 -4
checksums.yaml.gz.sig +0 -0
data/CHANGES.md +10 -0
data/LICENSE +1 -1
data/lib/tzinfo/data_sources/posix_time_zone_parser.rb +2 -6
data/lib/tzinfo/data_sources/ruby_data_source.rb +1 -5
data/lib/tzinfo/data_sources/zoneinfo_data_source.rb +1 -5
data/lib/tzinfo/data_sources/zoneinfo_reader.rb +1 -5
data/lib/tzinfo/ruby_core_support.rb +38 -0
data/lib/tzinfo/version.rb +1 -1
data/lib/tzinfo.rb +2 -6
data.tar.gz.sig +0 -0
metadata +6 -6
metadata.gz.sig +0 -0
data/lib/tzinfo/untaint_ext.rb +0 -18

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f5b3120678f9251533f0c044814f666142eb5538412c92c06aa66719251f474
-  data.tar.gz: a837074505ff48d553506e1eeb4eac8e3148cc6aa48e996e552d4d9bde1ef614
+  metadata.gz: 15d9fc81161265595f6a97ed55898742c0b8f912052bffe58aca4528c08855c8
+  data.tar.gz: adf8f44066cfd018a145416f53b510615d8143bad62a3105dcabfb37c900a2e8
 SHA512:
-  metadata.gz: f9f43bcf636bc1c3311cc3d417a951dfeb7cc697ad37add1b6b4bbbb0caa0a7226da508ca5c5521d1cf122254ded7ecd4b1da7f6240121dc311b1706c15119d1
-  data.tar.gz: 48314ac805148665c326cc450e2dc96582bb26a2ecc58d97234252c866a162f4f60d2495b6ddaaf3f7b3bd27190d9db452159d58ae57505463a836ce097b5acc
+  metadata.gz: d5a124cea3cb29e8e6227bc72527da598d4047801a32998a3cb427d3dae4bfdc241e070f95c0db556db504f773f470a3855b2e4579bded1b5e00e68c33f2733b
+  data.tar.gz: 6f00d941afda6034a23a125ec06a175c60c0c50e0c7cf9b8b1f2a7adad82b9bd768d2c46b3d44bf1b2f0dc8b690ccf410d979a9821d3959e370b2c93e41163b8

checksums.yaml.gz.sig CHANGED Viewed

Binary file

data/CHANGES.md CHANGED Viewed

@@ -1,5 +1,10 @@
 # Changes
+## Version 2.0.6 - 28-Jan-2023
+* Eliminate `Object#untaint` deprecation warnings on JRuby 9.4.0.0. #145.
 ## Version 2.0.5 - 19-Jul-2022
 * Changed `DateTime` results to always use the proleptic Gregorian calendar.
@@ -194,6 +199,11 @@
   `TZInfo::Country.get('US').zone_identifiers` should be used instead.
+## Version 1.2.11 - 28-Jan-2023
+* Eliminate `Object#untaint` deprecation warnings on JRuby 9.4.0.0. #145.
 ## Version 1.2.10 - 19-Jul-2022
 * Fixed a relative path traversal bug that could cause arbitrary files to be

data/LICENSE CHANGED Viewed

@@ -1,4 +1,4 @@
-Copyright (c) 2005-2022 Philip Ross
+Copyright (c) 2005-2023 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/data_sources/posix_time_zone_parser.rb CHANGED Viewed

@@ -4,10 +4,6 @@
 require 'strscan'
 module TZInfo
-  # Use send as a workaround for erroneous 'wrong number of arguments' errors
-  # with JRuby 9.0.5.0 when calling methods with Java implementations. See #114.
-  send(:using, UntaintExt) if TZInfo.const_defined?(:UntaintExt)
   module DataSources
     # An {InvalidPosixTimeZone} exception is raised if an invalid POSIX-style
     # time zone string is encountered.
@@ -43,12 +39,12 @@ module TZInfo
         s = StringScanner.new(tz_string)
         check_scan(s, /([^-+,\d<][^-+,\d]*) | <([^>]+)>/x)
-        std_abbrev = @string_deduper.dedupe((s[1] || s[2]).untaint)
+        std_abbrev = @string_deduper.dedupe(RubyCoreSupport.untaint(s[1] || s[2]))
         check_scan(s, /([-+]?\d+)(?::(\d+)(?::(\d+))?)?/)
         std_offset = get_offset_from_hms(s[1], s[2], s[3])
         if s.scan(/([^-+,\d<][^-+,\d]*) | <([^>]+)>/x)
-          dst_abbrev = @string_deduper.dedupe((s[1] || s[2]).untaint)
+          dst_abbrev = @string_deduper.dedupe(RubyCoreSupport.untaint(s[1] || s[2]))
           if s.scan(/([-+]?\d+)(?::(\d+)(?::(\d+))?)?/)
             dst_offset = get_offset_from_hms(s[1], s[2], s[3])

data/lib/tzinfo/data_sources/ruby_data_source.rb CHANGED Viewed

@@ -2,10 +2,6 @@
 # frozen_string_literal: true
 module TZInfo
-  # Use send as a workaround for erroneous 'wrong number of arguments' errors
-  # with JRuby 9.0.5.0 when calling methods with Java implementations. See #114.
-  send(: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
@@ -52,7 +48,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').untaint
+            @base_path = RubyCoreSupport.untaint(File.join(File.dirname(path), 'data'))
           else
             @base_path = 'tzinfo/data'
           end

data/lib/tzinfo/data_sources/zoneinfo_data_source.rb CHANGED Viewed

@@ -2,10 +2,6 @@
 # frozen_string_literal: true
 module TZInfo
-  # Use send as a workaround for erroneous 'wrong number of arguments' errors
-  # with JRuby 9.0.5.0 when calling methods with Java implementations. See #114.
-  send(: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
@@ -444,7 +440,7 @@ module TZInfo
           end
           unless entry =~ /\./ || exclude.include?(entry)
-            entry.untaint
+            RubyCoreSupport.untaint(entry)
             path = dir + [entry]
             full_path = File.join(@zoneinfo_dir, *path)

data/lib/tzinfo/data_sources/zoneinfo_reader.rb CHANGED Viewed

@@ -2,10 +2,6 @@
 # frozen_string_literal: true
 module TZInfo
-  # Use send as a workaround for erroneous 'wrong number of arguments' errors
-  # with JRuby 9.0.5.0 when calling methods with Java implementations. See #114.
-  send(: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.
@@ -448,7 +444,7 @@ module TZInfo
           abbrev_end = abbrev.index("\0", abbrev_start)
           raise InvalidZoneinfoFile, "Missing abbreviation null terminator in file '#{file.path}'." unless abbrev_end
-          abbr = @string_deduper.dedupe(abbrev[abbrev_start...abbrev_end].force_encoding(Encoding::UTF_8).untaint)
+          abbr = @string_deduper.dedupe(RubyCoreSupport.untaint(abbrev[abbrev_start...abbrev_end].force_encoding(Encoding::UTF_8)))
           TimezoneOffset.new(base_utc_offset, std_offset, abbr)
         end

data/lib/tzinfo/ruby_core_support.rb ADDED Viewed

@@ -0,0 +1,38 @@
+module TZInfo
+  # Methods to support different versions of Ruby.
+  #
+  # @private
+  module RubyCoreSupport #:nodoc:
+    class << self
+      # Object#untaint is deprecated and becomes a no-op in Ruby >= 2.7. It has
+      # been removed from Ruby 3.2.
+      if !Object.new.respond_to?(:untaint) || RUBY_VERSION =~ /\A(\d+)\.(\d+)(?:\.|\z)/ && ($1 == '2' && $2.to_i >= 7 || $1.to_i >= 3)
+        # :nocov_functional_untaint:
+        # Returns the supplied `Object`
+        #
+        # @param o [Object] the `Object` to untaint.
+        # @return [Object] `o`.
+        def untaint(o)
+          o
+        end
+        # :nocov_functional_untaint:
+      else
+        # :nocov_no_functional_untaint:
+        # Untaints and returns the supplied `Object`.
+        #
+        # @param o [Object] the `Object` to untaint.
+        # @return [Object] `o`.
+        def untaint(o)
+          o.untaint
+        end
+        # :nocov_no_functional_untaint:
+      end
+    end
+  end
+  private_constant :RubyCoreSupport
+end

data/lib/tzinfo/version.rb CHANGED Viewed

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

data/lib/tzinfo.rb CHANGED Viewed

@@ -17,12 +17,8 @@ module TZInfo
   end
 end
-# Object#untaint is a deprecated no-op in Ruby >= 2.7 and will be removed in
-# 3.2. Add a refinement to either silence the warning, or supply the method if
-# needed.
-if !Object.new.respond_to?(:untaint) || RUBY_VERSION =~ /\A(\d+)\.(\d+)(?:\.|\z)/ && ($1 == '2' && $2.to_i >= 7 || $1.to_i >= 3)
-  require_relative 'tzinfo/untaint_ext'
-end
+require_relative 'tzinfo/ruby_core_support'
 require_relative 'tzinfo/version'

data.tar.gz.sig CHANGED Viewed

Binary file

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tzinfo
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.6
 platform: ruby
 authors:
 - Philip Ross
@@ -29,7 +29,7 @@ cert_chain:
   J3Zn/kSTjTekiaspyGbczC3PUaeJNxr+yCvR4sk71Xmk/GaKKGOHedJ1uj/LAXrA
   MR0mpl7b8zCg0PFC1J73uw==
   -----END CERTIFICATE-----
-date: 2022-07-19 00:00:00.000000000 Z
+date: 2023-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -94,6 +94,7 @@ files:
 - lib/tzinfo/info_timezone.rb
 - lib/tzinfo/linked_timezone.rb
 - lib/tzinfo/offset_timezone_period.rb
+- lib/tzinfo/ruby_core_support.rb
 - lib/tzinfo/string_deduper.rb
 - lib/tzinfo/time_with_offset.rb
 - lib/tzinfo/timestamp.rb
@@ -105,7 +106,6 @@ files:
 - lib/tzinfo/timezone_transition.rb
 - lib/tzinfo/transition_rule.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
@@ -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.5
+  documentation_uri: https://rubydoc.info/gems/tzinfo/2.0.6
   homepage_uri: https://tzinfo.github.io
-  source_code_uri: https://github.com/tzinfo/tzinfo/tree/v2.0.5
+  source_code_uri: https://github.com/tzinfo/tzinfo/tree/v2.0.6
 post_install_message:
 rdoc_options:
 - "--title"
@@ -136,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.5
 signing_key:
 specification_version: 4
 summary: Time Zone Library

metadata.gz.sig CHANGED Viewed

Binary file

data/lib/tzinfo/untaint_ext.rb DELETED Viewed

@@ -1,18 +0,0 @@
-# encoding: UTF-8
-# frozen_string_literal: true
-module TZInfo
-  # Object#untaint is deprecated in Ruby >= 2.7 and will be removed in 3.2.
-  # 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