backports 3.17.1 → 3.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96610f4ef4df388ed73a054e17beb5e0b18303f27a0ca81dc8f7b25bf2cbe5e2
-  data.tar.gz: bc295cdd8cea47ab32ade680a343989f47c6970d869d37d49ff99457378d7e58
+  metadata.gz: 7545e11eda01d2ea412b51973b69d70ede1544ad14d11511085f80d51f1e9924
+  data.tar.gz: 9cfd27da7f62e6606b73afa3770e25eb7fd90d254eb95c242fe375e38a10f078
 SHA512:
-  metadata.gz: 5d0c16a92ba629fb6db4894605fd73c78386f639ce7b2bb4ca09d9b2581313662df0633c69a8cd9a7faab9972eb7e6bd7dbc38946f96aa5a4d4b41570f75cd54
-  data.tar.gz: 5497f4f75e11ef12cf1880ccdd18c37e5d81ebee5ad437edd28b2b27b1c4860d670473662842f7a76caaa32bf43a241e0532c724ce96797f90f0bb1e01447187
+  metadata.gz: 64f2afe9cf49d42da0122399c765cf8e9eda203145957fa3a296f169ac36c1f471cd08d3384d397b987c9cf368947e4f5db6fe0ba460d0fbad014ff0a40e35e8
+  data.tar.gz: 0d52dd7e5b79dd2dd225ddff67a34bdd329141e4c0ce924369271ce9e4fde48e2462452940e18110d64b6d9c10f3fd8c4cd5d57a8944317a8124c0b37f22887a

data/CHANGELOG.md

@@ -6,7 +6,52 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 ## [Unreleased]
 
-Note: [Next major version (X-mas 2020)](https://github.com/marcandre/backports/issues/139) will drop support for Ruby < 2.2.
+Note: [Next major version (X-mas 2021?)](https://github.com/marcandre/backports/issues/139) may drop support for Ruby < 2.2, please comment.
+
+## [3.19.0](https://github.com/marcandre/backports/compare/v3.19.0...v3.18.2) - 2020-12-28
+
+### Added
+
+* Ruby 3.0 backports
+
+  * Env
+    * `except`
+
+  * Hash
+    * `except`
+    * `transform_keys`, `transform_keys!` (with hash argument)
+
+  * Symbol
+    * `name`
+
+* Ruby 2.3 backports
+
+  * Queue
+    * `close`, `closed?` (affects `push`, `pop` and aliases)
+
+## [3.18.2](https://github.com/marcandre/backports/compare/v3.18.0...v3.18.2) - 2020-08-26
+
+### Fixed
+
+Require per ruby version now properly requiring 2.3.0 backports for `String` [#152]
+
+## [3.18.1](https://github.com/marcandre/backports/compare/v3.18.1...v3.18.2) - 2020-66-22
+
+### Fixed
+
+Fixed Changelog URI in gem manifest
+
+## [3.18.0](https://github.com/marcandre/backports/compare/v3.17.2...v3.18.0) - 2020-06-22
+
+### Changed
+
+Require per ruby version / all requires now check `RUBY_VERSION` to be more efficient [#149]
+
+## [3.17.2](https://github.com/marcandre/backports/compare/v3.17.1...v3.17.2) - 2020-04-09
+
+### Fixed
+
+Fix Range#cover (Ruby 2.6.0) [#148]
 
 ## [3.17.1](https://github.com/marcandre/backports/compare/v3.17.0...v3.17.1) - 2020-04-09
 

data/Gemfile

@@ -1,29 +1,16 @@
 source "http://rubygems.org"
 
-# Declare your gem's dependencies in backports.gemspec.
-# Bundler will treat runtime dependencies like base dependencies, and
-# development dependencies will be added by default to the :development group.
 gemspec
 
-# jquery-rails is used by the dummy application
 group :test do
   gem "rake"
   gem 'mspec'
   gem 'activesupport', '~>3.2.0'
-  gem 'minitest', '< 5.0.0', :require => false
-  gem 'test-unit', '~>2.1.1.0'
+  gem 'test-unit'
 end
 
-if RUBY_VERSION >= '2.3.0'
+if RUBY_VERSION >= '2.4.0'
   group :development do
-    gem 'rubocop', '~> 0.80.0'
+    gem 'rubocop', '~> 1.1.0'
   end
 end
-
-# Declare any dependencies that are still in development here instead of in
-# your gemspec. These might include edge Rails or gems from your path or
-# Git. Remember to move these dependencies to your gemspec before releasing
-# your gem to rubygems.org.
-
-# To use debugger
-# gem 'ruby-debug19', :require => 'ruby-debug'

data/README.md

@@ -9,7 +9,7 @@ The goal of 'backports' is to make it easier to write ruby code that runs
 across different versions of Ruby.
 
 Note: [Next major version (X-mas
-2020)](https://github.com/marcandre/backports/issues/139) will drop support
+2021?)](https://github.com/marcandre/backports/issues/139) may drop support
 for Ruby < 2.2.
 
 ## Loading backports
@@ -109,6 +109,18 @@ itself, JRuby and Rubinius.
 
 # Complete List of backports
 
+## Ruby 3.0 backports
+
+#### Env
+  - `except`
+
+#### Hash
+  - `except`
+  - `transform_keys`, `transform_keys!` (with hash argument)
+
+#### Symbol
+  - `name`
+
 ## Ruby 2.7 backports
 
 #### Array
@@ -206,13 +218,16 @@ itself, JRuby and Rubinius.
   - `compact`, `compact!`
   - `transform_values`, `transform_values!`
 
+#### Queue
+  - `close`, `closed?`
+
 #### Regexp
   - `match?`
 
 #### String
   - `match?`
 
-#### FalseClass, Fixnum, Float, NilClass, TrueClass
+#### FalseClass, Fixnum, Bignum, Float, NilClass, TrueClass
   - `dup`
 
 ## Ruby 2.3 backports

data/backports.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   if gem.respond_to?(:metadata)
-    gem.metadata['changelog_uri'] = 'https://github.com/marcandre/backports/blob/master/CHANGELOG.rdoc'
+    gem.metadata['changelog_uri'] = 'https://github.com/marcandre/backports/blob/master/CHANGELOG.md'
     gem.metadata['source_code_uri'] = 'https://github.com/marcandre/backports'
     gem.metadata['bug_tracker_uri'] = 'https://github.com/marcandre/backports/issues'
   end

data/lib/backports/1.8.7.rb

@@ -5,7 +5,8 @@ require "backports/tools/deprecation"
 Backports.frown_upon :require_version,
   'Requiring backports/<ruby version> is not recommended in production. Require just the needed backports instead.'
 
-Backports.warned[:require_std_lib] = true
-require "backports/std_lib"
-
-Backports.require_relative_dir
+if RUBY_VERSION < '1.8.7'
+  Backports.warned[:require_std_lib] = true
+  require "backports/std_lib"
+  Backports.require_relative_dir
+end

data/lib/backports/1.9.1.rb

@@ -1,3 +1,8 @@
 # require this file to load all the backports up to Ruby 1.9.1 (including all of 1.8.8 and below)
 require 'backports/1.8'
-Backports.require_relative_dir
+
+if RUBY_VERSION < '1.9.1'
+  Backports.warned[:require_std_lib] = true
+  require "backports/std_lib"
+  Backports.require_relative_dir
+end

data/lib/backports/1.9.2.rb

@@ -1,3 +1,8 @@
 # require this file to load all the backports up to Ruby 1.9.2
 require 'backports/1.9.1'
-Backports.require_relative_dir
+
+if RUBY_VERSION < '1.9.2'
+  Backports.warned[:require_std_lib] = true
+  require "backports/std_lib"
+  Backports.require_relative_dir
+end

data/lib/backports/1.9.3.rb

@@ -1,3 +1,8 @@
 # require this file to load all the backports up to Ruby 1.9.3
 require 'backports/1.9.2'
-Backports.require_relative_dir
+
+if RUBY_VERSION < '1.9.3'
+  Backports.warned[:require_std_lib] = true
+  require "backports/std_lib"
+  Backports.require_relative_dir
+end

data/lib/backports/2.0.0.rb

@@ -1,3 +1,8 @@
 # require this file to load all the backports up to Ruby 2.0.0
-require 'backports/1.9'
-Backports.require_relative_dir
+require 'backports/1.9.3'
+
+if RUBY_VERSION < '2.0'
+  Backports.warned[:require_std_lib] = true
+  require "backports/std_lib"
+  Backports.require_relative_dir
+end

data/lib/backports/2.1.0.rb

@@ -1,3 +1,3 @@
 # require this file to load all the backports up to Ruby 2.1.0
-require 'backports/2.0'
-Backports.require_relative_dir
+require 'backports/2.0.0'
+Backports.require_relative_dir if RUBY_VERSION < '2.1'

data/lib/backports/2.2.0.rb

@@ -1,3 +1,3 @@
 # require this file to load all the backports up to Ruby 2.2
-require 'backports/2.1'
-Backports.require_relative_dir
+require 'backports/2.1.0'
+Backports.require_relative_dir if RUBY_VERSION < '2.2'

data/lib/backports/2.2.0/string/unicode_normalize.rb

@@ -4,7 +4,7 @@ unless String.method_defined? :unicode_normalize
   if (Regexp.compile("[\u{11100}-\u{11102}]") rescue false)
     class String
       def unicode_normalize(form = :nfc)
-        require 'backports/tools/normalize.rb' unless defined? UnicodeNormalize
+        require 'backports/tools/normalize' unless defined? UnicodeNormalize
         ## The following line can be uncommented to avoid repeated checking for
         ## UnicodeNormalize. However, tests didn't show any noticeable speedup
         ## when doing this. This comment also applies to the commented out lines
@@ -14,13 +14,13 @@ unless String.method_defined? :unicode_normalize
       end
 
       def unicode_normalize!(form = :nfc)
-        require 'backports/tools/normalize.rb' unless defined? UnicodeNormalize
+        require 'backports/tools/normalize' unless defined? UnicodeNormalize
         # String.send(:define_method, :unicode_normalize!, ->(form = :nfc) { replace(unicode_normalize(form)) } )
         replace(unicode_normalize(form))
       end
 
       def unicode_normalized?(form = :nfc)
-        require 'backports/tools/normalize.rb' unless defined? UnicodeNormalize
+        require 'backports/tools/normalize' unless defined? UnicodeNormalize
         # String.send(:define_method, :unicode_normalized?, ->(form = :nfc) { UnicodeNormalize.normalized?(self, form) } )
         UnicodeNormalize.normalized?(self, form)
       end

data/lib/backports/2.3.0.rb

@@ -1,3 +1,3 @@
 # require this file to load all the backports up to Ruby 2.3
-require 'backports/2.2'
-Backports.require_relative_dir
+require 'backports/2.2.0'
+Backports.require_relative_dir if RUBY_VERSION < '2.3'

data/lib/backports/2.3.0/queue/close.rb

@@ -0,0 +1,48 @@
+unless Queue.method_defined? :close
+  require 'backports/tools/alias_method_chain'
+
+  class ClosedQueueError < StopIteration
+  end
+
+  class Queue
+    CLOSE_MESSAGE = Object.new
+
+    def push_with_close(arg)
+      raise ClosedQueueError, 'queue closed' if closed?
+
+      push_without_close(arg)
+    end
+    Backports.alias_method_chain self, :push, :close
+    alias_method :<<, :push
+    alias_method :enq, :push
+
+    def pop_with_close(non_block = false)
+      begin
+        r = pop_without_close(non_block || closed?)
+
+        r unless CLOSE_MESSAGE == r
+      rescue ThreadError
+        raise if non_block || !closed?
+      end
+    end
+    Backports.alias_method_chain self, :pop, :close
+
+    alias_method :shift, :pop
+    alias_method :deq, :pop
+
+    def close
+      @closed = true
+      2.times do
+        Thread.pass
+        num_waiting.times do
+          push_without_close CLOSE_MESSAGE
+        end
+      end
+      self
+    end
+
+    def closed?
+      !!defined?(@closed)
+    end
+  end
+end

data/lib/backports/2.3.0/string.rb

@@ -0,0 +1,3 @@
+require 'backports/tools/require_relative_dir'
+
+Backports.require_relative_dir

data/lib/backports/2.4.0.rb

@@ -1,3 +1,3 @@
 # require this file to load all the backports up to Ruby 2.4
-require 'backports/2.3'
-Backports.require_relative_dir
+require 'backports/2.3.0'
+Backports.require_relative_dir if RUBY_VERSION < '2.4'

data/lib/backports/2.4.0/bignum.rb

@@ -0,0 +1,3 @@
+require 'backports/tools/require_relative_dir'
+
+Backports.require_relative_dir

data/lib/backports/2.4.0/bignum/dup.rb

@@ -0,0 +1,5 @@
+class Bignum
+  def dup
+    self
+  end
+end unless ((1 << 64).dup rescue false)

data/lib/backports/2.5.0.rb

@@ -1,3 +1,3 @@
 # require this file to load all the backports up to Ruby 2.5
-require 'backports/2.4'
-Backports.require_relative_dir
+require 'backports/2.4.0'
+Backports.require_relative_dir if RUBY_VERSION < '2.5'

data/lib/backports/2.5.0/hash/transform_keys.rb

@@ -10,9 +10,16 @@ class Hash
 
   def transform_keys!
     return enum_for(:transform_keys!) { size } unless block_given?
-    merge!({}) if frozen?
-    keys.each do |key|
-      self[yield(key)] = delete(key)
+
+    self[:trigger_error] = :immediately if frozen?
+
+    h = {}
+    begin
+      each do |key, value|
+        h[yield key] = value
+      end
+    ensure
+      replace(h)
     end
     self
   end unless method_defined? :transform_keys!

data/lib/backports/2.5.0/integer/sqrt.rb

@@ -9,7 +9,7 @@ class Integer
     bits_shift = n.bit_length / 2 + 1
     bitn_mask = root = 1 << bits_shift
     loop do
-      root ^= bitn_mask if (root * root) > n
+      root ^= bitn_mask if (root * root) > n # rubocop:disable Lint/BinaryOperatorWithIdenticalOperands
       bitn_mask >>= 1
       return root if bitn_mask == 0
       root |= bitn_mask

data/lib/backports/2.5.0/string/undump.rb

@@ -39,9 +39,9 @@ unless String.method_defined? :undump
       #   * only allowing the first character after the \\ to not be alpha/num/space, so \\\\#@inst_var_access is ignored
       # To reduce the number of calls to eval a little, we wrap everything in a (...)+ so that consecutive escapes are
       # handled at the same time.
-      result = string.gsub(/(\\+(u\{[\w ]+\}|[^cCM][\w]*))+/) do |s|
+      result = string.gsub(/(\\+(u\{[\w ]+\}|[^cCM]\w*))+/) do |s|
         begin
-          eval("\"#{s}\"")
+          eval("\"#{s}\"")  # "body"
         rescue SyntaxError => e
           raise RuntimeError, e.message, e.backtrace
         end

data/lib/backports/2.5.0/struct/new.rb

@@ -19,5 +19,5 @@ if RUBY_VERSION >= '2.0.0' && (Struct.new(:a, :keyword_init => true) && false re
     end
     Backports.alias_method_chain(self, :new, :keyword_init)
   end
-  ], __FILE__, __LINE__
+  ], nil, __FILE__, __LINE__ - 19
 end

data/lib/backports/2.5.rb

@@ -1,2 +1,2 @@
-# require this file to load all the backports of Ruby 2.4 and below
+# require this file to load all the backports of Ruby 2.5 and below
 require 'backports/2.5.0'

data/lib/backports/2.6.0.rb

@@ -1,3 +1,3 @@
-# require this file to load all the backports up to Ruby 2.5
-require 'backports/2.5'
-Backports.require_relative_dir
+# require this file to load all the backports up to Ruby 2.6
+require 'backports/2.5.0'
+Backports.require_relative_dir if RUBY_VERSION < '2.6'

data/lib/backports/2.6.0/enumerable/chain.rb

@@ -8,6 +8,7 @@ unless Enumerable.method_defined? :chain
   Enumerator = Enumerable::Enumerator unless Object.const_defined? :Enumerator # For 1.8.x
 
   class Enumerator::Chain < Enumerator
+    # rubocop:disable Lint/MissingSuper
     def initialize(*enums)
       @enums = enums
       @rewindable = -1
@@ -16,6 +17,7 @@ unless Enumerable.method_defined? :chain
       # ...it checks what call of #initialize on non-initalized object returns
       self # rubocop:disable Lint/Void
     end
+    # rubocop:enable Lint/MissingSuper
 
     def each(*args, &block)
       @enums.each_with_index do |enum, i|

data/lib/backports/2.6.rb

@@ -1,2 +1,2 @@
-# require this file to load all the backports of Ruby 2.4 and below
+# require this file to load all the backports of Ruby 2.6 and below
 require 'backports/2.6.0'

data/lib/backports/2.7.0.rb

@@ -1,3 +1,3 @@
-# require this file to load all the backports up to Ruby 2.5
-require 'backports/2.6'
-Backports.require_relative_dir
+# require this file to load all the backports up to Ruby 2.7
+require 'backports/2.6.0'
+Backports.require_relative_dir if RUBY_VERSION < '2.7'

data/lib/backports/3.0.0.rb

@@ -0,0 +1,3 @@
+# require this file to load all the backports up to Ruby 3.0
+require 'backports/2.7.0'
+Backports.require_relative_dir if RUBY_VERSION < '3.0'

data/lib/backports/3.0.0/env.rb

@@ -0,0 +1,3 @@
+require 'backports/tools/require_relative_dir'
+
+Backports.require_relative_dir

data/lib/backports/3.0.0/env/except.rb

@@ -0,0 +1,10 @@
+class << ENV
+  def except(*keys)
+    if keys.size > 4 && size > 4 # index if O(m*n) is big
+      h = {}
+      keys.each { |key| h[key] = true }
+      keys = h
+    end
+    reject { |key, _value| keys.include? key}
+  end
+end unless ENV.respond_to? :except

data/lib/backports/3.0.0/hash.rb

@@ -0,0 +1,3 @@
+require 'backports/tools/require_relative_dir'
+
+Backports.require_relative_dir

data/lib/backports/3.0.0/hash/except.rb

@@ -0,0 +1,10 @@
+class Hash
+  def except(*keys)
+    if keys.size > 4 && size > 4 # index if O(m*n) is big
+      h = {}
+      keys.each { |key| h[key] = true }
+      keys = h
+    end
+    reject { |key, _value| keys.include? key}
+  end
+end unless Hash.method_defined? :except

data/lib/backports/3.0.0/hash/transform_keys.rb

@@ -0,0 +1,48 @@
+class Hash
+  unless ({}.transform_keys(:x => 1) rescue false)
+    require 'backports/2.5.0/hash/transform_keys'
+    require 'backports/tools/alias_method_chain'
+
+    def transform_keys_with_hash_arg(hash = not_given = true, &block)
+      return to_enum(:transform_keys) { size } if not_given && !block
+
+      return transform_keys_without_hash_arg(&block) if not_given
+
+      h = {}
+      if block_given?
+        each do |key, value|
+          h[hash.fetch(key) { yield key }] = value
+        end
+      else
+        each do |key, value|
+          h[hash.fetch(key, key)] = value
+        end
+      end
+      h
+    end
+    Backports.alias_method_chain self, :transform_keys, :hash_arg
+
+    def transform_keys_with_hash_arg!(hash = not_given = true, &block)
+      return enum_for(:transform_keys!) { size } if not_given && !block
+
+      return transform_keys_without_hash_arg!(&block) if not_given
+
+      h = {}
+      begin
+        if block_given?
+          each do |key, value|
+            h[hash.fetch(key) { yield key }] = value
+          end
+        else
+          each do |key, value|
+            h[hash.fetch(key, key)] = value
+          end
+        end
+      ensure
+        replace(h)
+      end
+      self
+    end
+    Backports.alias_method_chain self, :transform_keys!, :hash_arg
+  end
+end

data/lib/backports/3.0.0/symbol.rb

@@ -0,0 +1,3 @@
+require 'backports/tools/require_relative_dir'
+
+Backports.require_relative_dir

data/lib/backports/3.0.0/symbol/name.rb

@@ -0,0 +1,11 @@
+unless Symbol.method_defined? :name
+  def Backports.symbol_names
+    @symbol_names ||= ObjectSpace::WeakMap.new
+  end
+
+  class Symbol
+    def name
+      Backports.symbol_names[self] ||= to_s.freeze
+    end
+  end
+end

data/lib/backports/3.0.rb

@@ -0,0 +1 @@
+require 'backports/3.0.0'

data/lib/backports/tools/require_relative_dir.rb

@@ -7,7 +7,12 @@ module Backports
         compact.
         sort.
         each do |f|
-          require short_path + f
+          path = '../../' + short_path + f
+          if Kernel.private_method_defined?(:require_relative)
+            require_relative path
+          else
+            require File.expand_path(path)
+          end
         end
   end
 end

data/lib/backports/version.rb

@@ -1,3 +1,3 @@
 module Backports
-  VERSION = "3.17.1" unless Backports.constants.include? :VERSION # the guard is against a redefinition warning that happens on Travis
+  VERSION = "3.19.0" unless Backports.constants.include? :VERSION # the guard is against a redefinition warning that happens on Travis
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: backports
 version: !ruby/object:Gem::Version
-  version: 3.17.1
+  version: 3.19.0
 platform: ruby
 authors:
 - Marc-André Lafortune
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-09 00:00:00.000000000 Z
+date: 2020-12-28 00:00:00.000000000 Z
 dependencies: []
 description: Essential backports that enable many of the nice features of Ruby for
   earlier versions.
@@ -425,12 +425,16 @@ files:
 - lib/backports/2.3.0/numeric.rb
 - lib/backports/2.3.0/numeric/negative.rb
 - lib/backports/2.3.0/numeric/positive.rb
+- lib/backports/2.3.0/queue/close.rb
+- lib/backports/2.3.0/string.rb
 - lib/backports/2.3.0/string/uminus.rb
 - lib/backports/2.3.0/string/uplus.rb
 - lib/backports/2.3.0/struct.rb
 - lib/backports/2.3.0/struct/dig.rb
 - lib/backports/2.3.rb
 - lib/backports/2.4.0.rb
+- lib/backports/2.4.0/bignum.rb
+- lib/backports/2.4.0/bignum/dup.rb
 - lib/backports/2.4.0/comparable.rb
 - lib/backports/2.4.0/comparable/clamp.rb
 - lib/backports/2.4.0/enumerable.rb
@@ -528,6 +532,15 @@ files:
 - lib/backports/2.7.0/time/ceil.rb
 - lib/backports/2.7.0/time/floor.rb
 - lib/backports/2.7.rb
+- lib/backports/3.0.0.rb
+- lib/backports/3.0.0/env.rb
+- lib/backports/3.0.0/env/except.rb
+- lib/backports/3.0.0/hash.rb
+- lib/backports/3.0.0/hash/except.rb
+- lib/backports/3.0.0/hash/transform_keys.rb
+- lib/backports/3.0.0/symbol.rb
+- lib/backports/3.0.0/symbol/name.rb
+- lib/backports/3.0.rb
 - lib/backports/basic_object.rb
 - lib/backports/force/array_map.rb
 - lib/backports/force/enumerable_map.rb
@@ -566,10 +579,10 @@ homepage: http://github.com/marcandre/backports
 licenses:
 - MIT
 metadata:
-  changelog_uri: https://github.com/marcandre/backports/blob/master/CHANGELOG.rdoc
+  changelog_uri: https://github.com/marcandre/backports/blob/master/CHANGELOG.md
   source_code_uri: https://github.com/marcandre/backports
   bug_tracker_uri: https://github.com/marcandre/backports/issues
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -584,8 +597,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Backports of Ruby features for older Ruby.
 test_files: []