backports 3.16.1 → 3.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2118947fbadf4aa13865b5ceec7be5ed416ab4ada72647c076bcc277c034abfc
-  data.tar.gz: c6237a756a22de924ef77c9b0027a55d55a9c2386286ef2ba86c8967b75cb2e3
+  metadata.gz: a3d24b48165778d61941516a41ffd588433f8481e2271c203faf13b00633f625
+  data.tar.gz: 9ea6f26974c57c1ee4656cf3067d4ae274b66d939327125f729dce56523e1e94
 SHA512:
-  metadata.gz: 324ce7e19fabc56f101dcf2b567f1b3e2b75b7d165351a6b8526df050d8646a13a3645b5aa747e51ded19f9e486adea6b9612f31798a5660135ededc837f2888
-  data.tar.gz: 6455e9141e9a2fb66a68be72184caedc36529027459590d35be9ebc462967424ed6cb736b2fd836b2f998e616985e473c895d27f56fafd55c4ee13f838e761ec
+  metadata.gz: b9ad712f51352110a758778522f443f24a668434ddbf78f7b8c0580935bb7ccd7465663ce27b6656cf0e785347f960a46b384daed7eb05329afa049a3ec8f228
+  data.tar.gz: 557038055c3775404fb13c546c4ea0caaa8ddcd1a631c2a232f044345dbce5ae38dbe183de86c288b0b39e8d961201d5512923f6d596f03b9afa662b0b64c39b

data/CHANGELOG.md

@@ -8,11 +8,26 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 Note: [Next major version (X-mas 2020)](https://github.com/marcandre/backports/issues/139) will drop support for Ruby < 2.2.
 
+## [3.17.0](https://github.com/marcandre/backports/compare/v3.16.1...v3.16.2) - 2020-03-06
+
+### Added
+
+* Ruby 2.6 backports
+
+  * Range
+    * `cover?` (with `Range` argument)
+
+### Changed
+
+Requiring features for a particular version of Ruby or `latest` is un-deprecated but
+instead simply warned in verbose mode.
+
 ## [3.16.1](https://github.com/marcandre/backports/compare/v3.16.0...v3.16.1) - 2020-02-16
 
 ### Deprecated
 
-Officially deprecate requiring features for a particular version of Ruby, `latest`, `std_lib` or `rails` backports
+Officially deprecate requiring features for a particular version of Ruby, `latest`, `std_lib` or `rails` backports.
+Partly un-deprecated in 3.17.0!
 
 ### Fixed
 

data/Gemfile

@@ -14,6 +14,12 @@ group :test do
   gem 'test-unit', '~>2.1.1.0'
 end
 
+if RUBY_VERSION >= '2.3.0'
+  group :development do
+    gem 'rubocop', '~> 0.80.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

data/README.md

@@ -1,4 +1,4 @@
-# Backports Library [<img src="https://travis-ci.org/marcandre/backports.svg?branch=master">](https://travis-ci.org/marcandre/backports) [<img src="https://badge.fury.io/rb/backports.svg" alt="Gem Version" />](http://badge.fury.io/rb/backports)
+# Backports Library [<img src="https://travis-ci.org/marcandre/backports.svg?branch=master">](https://travis-ci.org/marcandre/backports) [<img src="https://badge.fury.io/rb/backports.svg" alt="Gem Version" />](http://badge.fury.io/rb/backports) [![Tidelift](https://tidelift.com/badges/package/rubygems/backports)](https://tidelift.com/subscription/pkg/rubygems-backports?utm_source=rubygems-backports&utm_medium=referral&utm_campaign=readme)
 
 Yearning to use some of the new cool features in Ruby 2.7 while using 2.3.x?
 Have some legacy code in Ruby 1.8 but can't live without `flat_map`?
@@ -35,20 +35,22 @@ Class:
 This will make sure that Hash responds to dig, fetch_values, <, <=, >, >= and
 to_proc
 
-### Up to a specific Ruby version (deprecated)
+### Up to a specific Ruby version (for quick coding)
 
-Although this is deprecated, you can load all backports up to a specific version.
+You can load all backports up to a specific version.
 For example, to bring any
-version of Ruby mostly up to Ruby 2.4.0's standards:
+version of Ruby mostly up to Ruby 2.7.0's standards:
 
-    require 'backports/2.4.0'
+    require 'backports/2.7.0'
 
 This will bring in all the features of 1.8.7 and many features of Ruby 1.9.x
-all the way up to Ruby 2.4.0 (for all versions of Ruby)!
+all the way up to Ruby 2.7.0 (for all versions of Ruby)!
 
-While it is not recommended, you may `require 'backports/latest'` as a
-shortcut to the latest Ruby version supported. This is equivalent to the
-deprecated `require 'backports'`.
+You may `require 'backports/latest'` as a
+shortcut to the latest Ruby version supported.
+
+*Note*: For production / public gems, it is highly recommended you only require
+the backports you need explicitly.
 
 *Note*: Although I am a Ruby committer, this gem is a personal project and is
 not endorsed by ruby-core.
@@ -153,6 +155,9 @@ itself, JRuby and Rubinius.
 *  Proc
   * +<<+, +>>+
 
+*  Range
+  * `cover?` (with `Range` argument)
+
 ## Ruby 2.5 backports
 
 *  Array

data/SECURITY.md

@@ -0,0 +1,5 @@
+## Security contact information
+
+To report a security vulnerability, please use the
+[Tidelift security contact](https://tidelift.com/security).
+Tidelift will coordinate the fix and disclosure.

data/lib/backports.rb

@@ -1,3 +1,9 @@
 require "backports/version"
+
+require "backports/tools/deprecation"
+Backports.deprecate :require_version,
+                    "Doing `require 'backports'` is deprecated and will not load any backport in the next major release.\n" \
+                    "Require just the needed backports instead, or 'backports/latest'."
 require "backports/2.4"
+Backports.warned[:rails] = true
 require "backports/rails"

data/lib/backports/1.8.7.rb

@@ -2,10 +2,10 @@
 require "backports/tools/require_relative_dir"
 require "backports/tools/deprecation"
 
-Backports.deprecate :require_version,
-  'Requiring backports/<ruby version> is deprecated. Require just the needed backports instead'
+Backports.frown_upon :require_version,
+  'Requiring backports/<ruby version> is not recommended in production. Require just the needed backports instead.'
 
-Backports.deprecation_warned[:require_std_lib] = true
+Backports.warned[:require_std_lib] = true
 require "backports/std_lib"
 
 Backports.require_relative_dir

data/lib/backports/2.2.0/enumerable/slice_after.rb

@@ -7,7 +7,7 @@ unless Enumerable.method_defined? :slice_after
       raise ArgumentError, 'both pattern and block are given' if pattern != Backports::Undefined && block
       raise ArgumentError, 'wrong number of arguments (given 0, expected 1)' if pattern == Backports::Undefined && !block
       enum = self
-      block ||= Proc.new{|elem| pattern === elem}
+      block ||= proc {|elem| pattern === elem}
       Enumerator.new do |y|
         acc = []
         enum.each do |*elem|

data/lib/backports/2.2.0/float/next_float.rb

@@ -4,7 +4,7 @@ unless Float.method_defined? :next_float
   class Float
     def next_float
       return Float::INFINITY if self == Float::INFINITY
-      r = Backports.integer_to_float(Backports.float_to_integer(self)+1)
+      r = Backports.integer_to_float(Backports.float_to_integer(self) + 1)
       r == 0 ? -0.0 : r # Map +0.0 to -0.0
     end
   end

data/lib/backports/2.2.0/float/prev_float.rb

@@ -5,7 +5,7 @@ unless Float.method_defined? :prev_float
   class Float
     def prev_float
       return -Float::INFINITY if self == -Float::INFINITY
-      Backports.integer_to_float(Backports.float_to_integer(self)-1)
+      Backports.integer_to_float(Backports.float_to_integer(self) - 1)
     end
   end
 end

data/lib/backports/2.2.0/method/super_method.rb

@@ -6,10 +6,10 @@ unless Method.method_defined? :super_method
       singleton_klass = class << receiver; self; end
       call_chain = singleton_klass.ancestors
       # find current position in call chain:
-      skip = call_chain.find_index{|c| c == owner} or return
+      skip = call_chain.find_index {|c| c == owner} or return
       call_chain = call_chain.drop(skip + 1)
       # find next in chain with a definition:
-      next_index = call_chain.find_index{|c| c.method_defined? name}
+      next_index = call_chain.find_index {|c| c.method_defined? name}
       next_index && call_chain[next_index].instance_method(name).bind(receiver)
     end
   end

data/lib/backports/2.3.0/array/bsearch_index.rb

@@ -5,7 +5,7 @@ unless Array.method_defined? :bsearch_index
       from = 0
       to   = size - 1
       satisfied = nil
-      while from <= to do
+      while from <= to
         midpoint = (from + to).div(2)
         result = yield(self[midpoint])
         case result

data/lib/backports/2.3.0/hash/lt.rb

@@ -5,7 +5,7 @@ unless Hash.method_defined? :<
       hash = Backports.coerce_to_hash(hash)
       return false unless size < hash.size
       each do |k, v|
-        v2 = hash.fetch(k){ return false }
+        v2 = hash.fetch(k) { return false }
         return false unless v2 == v
       end
       true

data/lib/backports/2.3.0/hash/lte.rb

@@ -5,7 +5,7 @@ unless Hash.method_defined? :<=
       hash = Backports.coerce_to_hash(hash)
       return false unless size <= hash.size
       each do |k, v|
-        v2 = hash.fetch(k){ return false }
+        v2 = hash.fetch(k) { return false }
         return false unless v2 == v
       end
       true

data/lib/backports/2.3.0/hash/to_proc.rb

@@ -2,7 +2,7 @@ unless Hash.method_defined? :to_proc
   class Hash
     def to_proc
       h = self
-      Proc.new{|*args| h[*args]}
+      proc {|*args| h[*args]}
     end
   end
 end

data/lib/backports/2.3.0/struct/dig.rb

@@ -2,11 +2,10 @@ unless Struct.method_defined? :dig
   class Struct
     def dig(key, *rest)
       return nil unless respond_to?(key)
-      val = self.public_send(key)
+      val = public_send(key)
       return val if rest.empty? || val == nil
       raise TypeError, "#{val.class} does not have #dig method" unless val.respond_to? :dig
       val.dig(*rest)
     end
   end
 end
-

data/lib/backports/2.4.0/hash/transform_values.rb

@@ -1,6 +1,6 @@
 class Hash
   def transform_values
-    return to_enum(:transform_values){ size } unless block_given?
+    return to_enum(:transform_values) { size } unless block_given?
     h = {}
     each do |key, value|
       h[key] = yield value
@@ -9,7 +9,7 @@ class Hash
   end unless method_defined? :transform_values
 
   def transform_values!
-    return to_enum(:transform_values!){ size } unless block_given?
+    return to_enum(:transform_values!) { size } unless block_given?
     reject!{} if frozen? # Force error triggerring if frozen, in case of empty array
     each do |key, value|
       self[key] = yield value

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

@@ -3,4 +3,3 @@ class TrueClass
     self
   end
 end unless (true.dup rescue false)
-

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

@@ -1,6 +1,6 @@
 class Hash
   def transform_keys
-    return to_enum(:transform_keys){ size } unless block_given?
+    return to_enum(:transform_keys) { size } unless block_given?
     h = {}
     each do |key, value|
       h[yield key] = value

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

@@ -6,9 +6,9 @@ class Integer
   def self.sqrt(n)
     n = Backports.coerce_to_int(n)
     return Math.sqrt(n).to_i if n <= 9_999_899_999_899_999_322_536_673_279
-    bits_shift = n.bit_length/2 + 1
+    bits_shift = n.bit_length / 2 + 1
     bitn_mask = root = 1 << bits_shift
-    while true
+    loop do
       root ^= bitn_mask if (root * root) > n
       bitn_mask >>= 1
       return root if bitn_mask == 0

data/lib/backports/2.5.0/module/alias_method.rb

@@ -1,4 +1,3 @@
 class Module
   public :alias_method
 end
-

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

@@ -6,14 +6,10 @@ unless String.method_defined? :undump
       raise 'string contains null byte' if string["\0"]
       raise 'non-ASCII character detected' unless string.ascii_only?
 
-      #raise '.force_encoding("...") format is not supported by backports' if string.match(/\A".*"\.force_encoding\("[^"]*"\)\z/)
-      match = string.match(/\A(".*?"?)(?:\.force_encoding\("([^"]*)"\))?\z/)
-      if match
-        string = match[1]
-        encoding = match[2]
-      else
+      match = string.match(/\A(".*?"?)(?:\.force_encoding\("([^"]*)"\))?\z/) or
         raise %(invalid dumped string; not wrapped with '"' nor '"...".force_encoding("...")' form)
-      end
+      string = match[1]
+      encoding = match[2]
 
       # Ruby 1.9.3 does weird things to encoding during gsub
       encoding ||= string.encoding.to_s

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__
 end

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

@@ -11,7 +11,10 @@ unless Enumerable.method_defined? :chain
     def initialize(*enums)
       @enums = enums
       @rewindable = -1
-      self
+      # This self is necessary to pass RubySpec,
+      # See rubyspec/core/enumerator/chain/initialize_spec.rb
+      # ...it checks what call of #initialize on non-initalized object returns
+      self # rubocop:disable Lint/Void
     end
 
     def each(*args, &block)

data/lib/backports/2.6.0/hash/to_h.rb

@@ -1,6 +1,6 @@
 require 'backports/2.0.0/hash/to_h' unless Hash.method_defined? :to_h
 
-if {:n => true}.to_h{[:ok, true]}[:n]
+if {:n => true}.to_h {[:ok, true]}[:n]
   require 'backports/tools/alias_method_chain'
   require 'backports/2.1.0/array/to_h'
 

data/lib/backports/2.6.0/range.rb

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

data/lib/backports/2.6.0/range/cover.rb

@@ -0,0 +1,22 @@
+unless (1..4).cover?(2..3)
+  require 'backports/tools/alias_method_chain'
+
+  class Range
+    def cover_with_range_compatibility?(what)
+      return cover_without_range_compatibility?(what) unless what.is_a?(Range)
+
+      left = self.begin <=> what.begin
+      right = self.end <=> what.end
+      return false unless left && right
+
+      left <= 0 && (
+        right >= 1 ||
+        right == 0 && (!exclude_end? || what.exclude_end?) ||
+        what.exclude_end? && what.begin.is_a?(Integer) &&
+          what.end.is_a?(Integer) && cover_without_range_compatibility?(what.end - 1)
+      )
+    end
+    Backports.alias_method_chain self, :cover?, :range_compatibility
+  end
+
+end

data/lib/backports/2.7.0/enumerable/filter_map.rb

@@ -5,10 +5,10 @@ unless Enumerable.method_defined? :filter_map
     def filter_map
       return to_enum(:filter_map) unless block_given?
 
-      each_with_object([]) { |item, res|
+      each_with_object([]) do |item, res|
         processed = yield(item)
         res << processed if processed
-      }
+      end
     end
   end
 end

data/lib/backports/tools/deprecation.rb

@@ -1,12 +1,19 @@
 module Backports
   class << self
-    attr_accessor :deprecation_warned
-    Backports.deprecation_warned = {}
+    attr_accessor :warned # private
+    Backports.warned = {}
 
-    def deprecate kind, msg
-      return if deprecation_warned[kind]
-      warn msg
-      deprecation_warned[kind] = msg
+    def frown_upon kind, msg
+      warn kind, msg if $VERBOSE
     end
+
+    def warn kind, msg
+      return if warned[kind]
+      super msg
+      warned[kind] = msg
+    end
+
+    alias_method :deprecate, :warn
+
   end
 end

data/lib/backports/version.rb

@@ -1,3 +1,3 @@
 module Backports
-  VERSION = "3.16.1" unless Backports.constants.include? :VERSION # the guard is against a redefinition warning that happens on Travis
+  VERSION = "3.17.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.16.1
+  version: 3.17.0
 platform: ruby
 authors:
 - Marc-André Lafortune
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-16 00:00:00.000000000 Z
+date: 2020-03-06 00:00:00.000000000 Z
 dependencies: []
 description: Essential backports that enable many of the nice features of Ruby for
   earlier versions.
@@ -22,6 +22,7 @@ files:
 - Gemfile
 - LICENSE.txt
 - README.md
+- SECURITY.md
 - backports.gemspec
 - lib/backports.rb
 - lib/backports/1.8.7.rb
@@ -509,6 +510,8 @@ files:
 - lib/backports/2.6.0/method/compose.rb
 - lib/backports/2.6.0/proc.rb
 - lib/backports/2.6.0/proc/compose.rb
+- lib/backports/2.6.0/range.rb
+- lib/backports/2.6.0/range/cover.rb
 - lib/backports/2.6.rb
 - lib/backports/2.7.0.rb
 - lib/backports/2.7.0/array.rb