polyfill 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f89fe1c04a0c5226662965adf194eca6e5efb720
-  data.tar.gz: 714c012252e26b39e93e3967af657a1ba1a6b7f2
+  metadata.gz: ce45400dde62a6c4481017080a3770fe3557619e
+  data.tar.gz: 29d853335b679ed69d51df345786021e8919b121
 SHA512:
-  metadata.gz: 518365852878a1fd4146557895021ecaeff61ae04804e5d386bf43623a8f5114e3cfc7fc8801c978654f83403cff56326fa63e55795cbc3b89fc3d4653a02ddb
-  data.tar.gz: 27082bfce68e460d5dc49697f6020194293631b5b1170653a1edf04bc8145e2d002e3027d110094ee238adf58d76aed0c7b4d29bfe7bc521c12a499453918945
+  metadata.gz: 2f9a80ce2cc37783a1060d403317eb5e142c6c1a97a81057fc4123c9c7d8e7fcf6fcbec1f40d130d43ef8ad737df0db2f55c09b62f2a10de674d815d88b01f2d
+  data.tar.gz: e465ec4b46c0ba099cfd5121402e6366eeca20991f6c00d03656127b0cfb6fe36159f5fd87d955655282e0bc076025d69a1622e10357f81996c7e3bd2ec6525b

data/CHANGELOG.md

@@ -1,3 +1,21 @@
+# [0.8.0][] (2017-04-27)
+
+## Changed
+
+ - `Polyfill()` is no longer used with `include` or `extend`. Instead `Polyfill.get` should
+   be used.
+
+## Added
+
+ - Polyfill.get for getting modules to include or extend
+ - v2.2 Enumerable#slice_when
+
+## Fixed
+
+ - v2.3 Enumerable#chunk_while and v2.2 Enumerable#slice_after should not require `count`
+ - v2.4 Array#sum should not use `each` (the Enumerable version does)
+ - load modules before classes so they don't override the local method
+
 # [0.7.0][] (2017-04-22)
 
 ## Changed
@@ -123,6 +141,7 @@
  - v2.4 String#concat?
  - v2.4 String#prepend?
 
+[0.8.0]: https://github.com/AaronLasseigne/polyfill/compare/v0.7.0...v0.8.0
 [0.7.0]: https://github.com/AaronLasseigne/polyfill/compare/v0.6.0...v0.7.0
 [0.6.0]: https://github.com/AaronLasseigne/polyfill/compare/v0.5.0...v0.6.0
 [0.5.0]: https://github.com/AaronLasseigne/polyfill/compare/v0.4.0...v0.5.0

data/README.md

@@ -33,7 +33,7 @@ See the [implementation table](#implementation-table) for specifics about what h
 Add it to your Gemfile:
 
 ```ruby
-gem 'polyfill', '0.7.0'
+gem 'polyfill', '0.8.0'
 ```
 
 Or install it manually:
@@ -52,6 +52,8 @@ This project uses [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## Usage
 
+### Polyfill
+
 With the `Polyfill` method, you can polyfill methods for one or more Ruby
 objects. Each object is passed as a key. The value is an array of strings
 containing the methods you would like to polyfill. Instance methods need to
@@ -88,15 +90,37 @@ This currently adds support for `respond_to?`, `__send__`, and `send`.
 using Polyfill(native: true, Numeric: :all)
 ```
 
+### Polyfill.get
+
 Prior to Ruby 2.4, refinements do not work on Modules. When using a polyfill
 on a module it will instead refine the core classes that use the module. If
 you're building your own class, it will not receive the polyfill. Instead,
-you can add the polyfill by using `include`.
+you can `include` (or `extend`) in a polyfill with `Polyfill.get`.
+
+```ruby
+class Foo
+  include Comparable
+  include Polyfill.get(:Comparable, :all)
+end
+```
+
+To use specific methods you can pass an array of symbols in place of `:all`.
 
 ```ruby
 class Foo
   include Comparable
-  include Polyfill(Comparable: :all)
+  include Polyfill.get(:Comparable, %i[clamp])
+end
+```
+
+Like before, the polyfills can be halted at a maximum version with the
+`:version` option. The version must be a string with the major and minor
+version only.
+
+```ruby
+class Foo
+  include Comparable
+  include Polyfill.get(:Comparable, :all, version: '2.3')
 end
 ```
 
@@ -111,7 +135,7 @@ end
 |                  | #min                     | No          | This method already existed but was inherited from `Enumerable`. It was optimized on `Array` so redefining `Enumerable#min` no longer affects this.
 |                  | #pack                    | No          |
 |                  | #sum                     | Yes         |
-| BasicObject      | #__send__                | No          |
+| BasicObject      | #\_\_send\_\_            | No          |
 | Binding          | #irb                     | No          |
 | Comparable       | #clamp                   | Yes         |
 | CSV              | #new                     | No          |
@@ -297,7 +321,7 @@ end
 |             | #min                                    | No          |
 |             | #min_by                                 | No          |
 |             | #slice_after                            | Yes         |
-|             | #slice_when                             | No          |
+|             | #slice_when                             | Yes         |
 | Etc         | .confstr                                | No          |
 |             | .sysconf                                | No          |
 |             | .nprocessors                            | No          |
@@ -306,9 +330,8 @@ end
 |             | #prev_float                             | No          |
 | File        | .birthtime                              | No          |
 |             | #birthtime                              | No          |
-|             | .find                                   | No          |
-|             | #find                                   | No          |
 | File::Stat  | #birthtime                              | No          |
+| Find        | .find                                   | No          |
 | GC          | .latest_gc_info                         | No          |
 |             | .stat                                   | No          |
 | IO          | #each_codepoint                         | No          |

data/Rakefile

@@ -3,6 +3,8 @@ require 'rspec/core/rake_task'
 require 'rubocop/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
-RuboCop::RakeTask.new
+RuboCop::RakeTask.new(:rubocop) do |task|
+  task.options = ['--display-cop-names']
+end
 
 task default: %i[spec rubocop]

data/lib/polyfill.rb

@@ -5,6 +5,99 @@ require 'polyfill/utils'
 
 module Polyfill
   module Parcel; end
+
+  def get(module_name, methods, options = {})
+    if Object.const_get(module_name.to_s).is_a?(Class)
+      raise ArgumentError, "#{module_name} is a class not a module"
+    end
+
+    #
+    # parse options
+    #
+    versions = {
+      '2.2' => Polyfill::V2_2,
+      '2.3' => Polyfill::V2_3,
+      '2.4' => Polyfill::V2_4
+    }
+    desired_version = options.delete(:version) || versions.keys.max
+    unless versions.keys.include?(desired_version)
+      raise ArgumentError, "invalid value for keyword version: #{desired_version}"
+    end
+    versions.reject! do |version_number, _|
+      version_number > desired_version
+    end
+
+    unless options.empty?
+      raise ArgumentError, "unknown keyword: #{options.first[0]}"
+    end
+
+    #
+    # find all polyfills for the module across all versions
+    #
+    module_names = module_name.to_s.split('::')
+    current_ruby_version = RUBY_VERSION[/\A(\d+\.\d+)/, 1]
+
+    modules_with_updates = []
+    modules = []
+    versions.each do |version_number, version_module|
+      begin
+        final_module = module_names
+          .reduce(version_module) do |current_mod, name|
+          current_mod.const_get(name, false)
+        end
+
+        modules_with_updates << final_module
+
+        next if version_number <= current_ruby_version
+
+        modules << final_module.clone
+      rescue NameError
+        nil
+      end
+    end
+
+    if modules_with_updates.empty?
+      raise ArgumentError, %Q("#{module_name}" has no updates)
+    end
+
+    #
+    # remove methods that were not requested
+    #
+    methods_with_updates = modules_with_updates.flat_map(&:instance_methods).uniq
+    requested_methods = methods == :all ? methods_with_updates : methods
+
+    unless (leftovers = (requested_methods - methods_with_updates)).empty?
+      raise ArgumentError, %Q("##{leftovers.first}" is not a valid method on #{module_name} or has no updates)
+    end
+
+    modules.each do |instance_module|
+      instance_module.instance_methods.each do |name|
+        instance_module.send(:remove_method, name) unless requested_methods.include?(name)
+      end
+    end
+
+    #
+    # build the module to return
+    #
+    mod = Module.new
+
+    # make sure the methods get added if this module is included
+    mod.singleton_class.send(:define_method, :included) do |base|
+      modules.each do |module_to_add|
+        base.include module_to_add unless module_to_add.instance_methods.empty?
+      end
+    end
+
+    # make sure the methods get added if this module is extended
+    mod.singleton_class.send(:define_method, :extended) do |base|
+      modules.each do |module_to_add|
+        base.extend module_to_add unless module_to_add.instance_methods.empty?
+      end
+    end
+
+    Polyfill::Parcel.const_set("O#{mod.object_id}", mod)
+  end
+  module_function :get
 end
 
 def Polyfill(options = {}) # rubocop:disable Style/MethodName
@@ -14,6 +107,15 @@ def Polyfill(options = {}) # rubocop:disable Style/MethodName
   # parse options
   #
   objects, others = options.partition { |key,| key[/\A[A-Z]/] }
+  objects.sort! do |a, b|
+    if !a.is_a?(Class) && b.is_a?(Class)
+      -1
+    elsif a.is_a?(Class) && !b.is_a?(Class)
+      1
+    else
+      0
+    end
+  end
   others = others.to_h
 
   versions = {
@@ -36,10 +138,9 @@ def Polyfill(options = {}) # rubocop:disable Style/MethodName
   end
 
   #
-  # useful vars
+  # useful var
   #
   current_ruby_version = RUBY_VERSION[/\A(\d+\.\d+)/, 1]
-  all_instance_modules = []
 
   objects.each do |full_name, methods|
     #
@@ -63,7 +164,7 @@ def Polyfill(options = {}) # rubocop:disable Style/MethodName
       .compact
 
     if object_modules.empty?
-      raise ArgumentError, %Q("#{full_name}" is not a valid class or has no updates)
+      raise ArgumentError, %Q("#{full_name}" is not a valid object or has no updates)
     end
 
     #
@@ -172,8 +273,6 @@ def Polyfill(options = {}) # rubocop:disable Style/MethodName
 
       next if instance_module.instance_methods.empty?
 
-      all_instance_modules << instance_module
-
       mod.module_exec(requested_instance_methods) do |methods_added|
         base_classes.each do |klass|
           refine Object.const_get(klass) do
@@ -201,15 +300,6 @@ def Polyfill(options = {}) # rubocop:disable Style/MethodName
     end
   end
 
-  #
-  # make sure the includes get added if this module is included
-  #
-  mod.singleton_class.send(:define_method, :included) do |base|
-    all_instance_modules.each do |instance_module|
-      base.include instance_module
-    end
-  end
-
   Polyfill::Parcel.const_set("O#{mod.object_id}", mod)
 end
 

data/lib/polyfill/v2_2/enumerable.rb

@@ -6,27 +6,38 @@ module Polyfill
         raise ArgumentError, 'wrong number of arguments (given 0, expected 1)' if !pattern && !block_given?
 
         matcher = pattern || ::Proc.new
-        enum_count =
-          begin
-            size
-          rescue NameError
-            count
-          end
 
         ::Enumerator.new do |yielder|
           output = []
-          run = 1
           each do |element, *rest|
             elements = rest.any? ? [element, *rest] : element
 
             output.push(elements)
-            if matcher === elements || run == enum_count # rubocop:disable Style/CaseEquality
+            if matcher === output.last # rubocop:disable Style/CaseEquality
               yielder << output
               output = []
             end
+          end
+          yielder << output unless output.empty?
+        end
+      end
+
+      def slice_when
+        block = ::Proc.new
+
+        ::Enumerator.new do |yielder|
+          output = []
+          each do |element, *rest|
+            elements = rest.any? ? [element, *rest] : element
 
-            run += 1
+            if output.empty? || !block.call(output.last, elements)
+              output.push(elements)
+            else
+              yielder << output
+              output = [elements]
+            end
           end
+          yielder << output unless output.empty?
         end
       end
     end

data/lib/polyfill/v2_3/enumerable.rb

@@ -4,35 +4,19 @@ module Polyfill
       def chunk_while
         block = ::Proc.new
 
-        enum_count =
-          begin
-            size
-          rescue NameError
-            count
-          end
-
-        return [self] if enum_count == 1
-
         ::Enumerator.new do |yielder|
           output = []
-          each_cons(2).with_index(1) do |(a, b), run|
-            if run == enum_count - 1
-              if block.call(a, b)
-                output.push(a, b)
-                yielder << output
-              else
-                output.push(a)
-                yielder << output
-                yielder << [b]
-              end
+          each do |element, *rest|
+            elements = rest.any? ? [element, *rest] : element
+
+            if output.empty? || block.call(output.last, elements)
+              output.push(elements)
             else
-              output.push(a)
-              unless block.call(a, b)
-                yielder << output
-                output = []
-              end
+              yielder << output
+              output = [elements]
             end
           end
+          yielder << output unless output.empty?
         end
       end
 

data/lib/polyfill/v2_4/array.rb

@@ -1,6 +1,10 @@
+require_relative 'numeric'
+
 module Polyfill
   module V2_4
     module Array
+      using Polyfill(Numeric: %w[#dup])
+
       def concat(*others)
         return super if others.length == 1
 
@@ -13,14 +17,10 @@ module Polyfill
       end
 
       def sum(init = 0)
-        acc =
-          begin
-            init.dup
-          rescue TypeError
-            init
-          end
+        acc = init.dup
 
-        each do |elem|
+        for i in 0..(size - 1) # rubocop:disable Style/For
+          elem = self[i]
           acc += block_given? ? yield(elem) : elem
         end
 

data/lib/polyfill/v2_4/enumerable.rb

@@ -1,6 +1,10 @@
+require_relative 'numeric'
+
 module Polyfill
   module V2_4
     module Enumerable
+      using Polyfill(Numeric: %w[#dup])
+
       def chunk(*)
         return enum_for(:chunk) unless block_given?
 
@@ -8,12 +12,7 @@ module Polyfill
       end
 
       def sum(init = 0)
-        acc =
-          begin
-            init.dup
-          rescue TypeError
-            init
-          end
+        acc = init.dup
 
         each do |elem|
           acc += block_given? ? yield(elem) : elem

data/lib/polyfill/version.rb

@@ -1,3 +1,3 @@
 module Polyfill
-  VERSION = '0.7.0'.freeze
+  VERSION = '0.8.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polyfill
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Aaron Lasseigne
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-22 00:00:00.000000000 Z
+date: 2017-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler