rekey 2.0.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04e047b3df727cbbf23aec4f007c37b58dae87b4
-  data.tar.gz: bf1636fc4e51c481a93d146d2710a287e5f41d24
+  metadata.gz: 3ca96460968d77a1bd8dd2c0ae8ccc75d1dd1a70
+  data.tar.gz: 3c66def36a31e036dcd2d655d96f2a0c89ae9cc8
 SHA512:
-  metadata.gz: 89e5039519830eb14570f0446a021b4fb93b29a163263a224f9d2d1d343d07afed4f6a85b22bcbdc92c87a4e0943bc4728ca44ef0fd4feb90475e448226b5cb4
-  data.tar.gz: 27ffe5a8550a6efbcd371e4715987e15af42484b0bef47b23df72f3cc8ff24f8dc8da25ccf887a913336412f566d64e5935831aae1cf6d1bb93fd2ead807ee71
+  metadata.gz: 4a93381b89113f30a4144eeba0e0a94c9127edf053d381a1c15981d24a410013343af7c00637742f32df6d64b3640ccb986f6f22db91b605785cee73a196055f
+  data.tar.gz: d88d014185adfc737ff1b3c9b66873d8c108a575e1fb1824007c0846c771600efb958ac5930279da4c19aabb47a7ff413913fe37d698d060c560dbfd9b4817ec

data/lib/rekey.rb

@@ -1,122 +1,8 @@
-require 'pluckit'
+require_relative 'rekey/rekey'
 
 
 module Rekey
-  VERSION = '2.0.1'
-
-  class << self
-
-    def rekey(enumerable, key_handle = nil, value_handle = nil, &block)
-      # validate input
-      validate_input key_handle, value_handle, &block
-
-      key_fn = if enumerable.respond_to?(:keys)
-        proc {|k, v| k}
-      else
-        proc {|v| nil}
-      end
-
-      value_fn = if enumerable.respond_to?(:values)
-        proc {|k, v| v}
-      else
-        proc {|v| v}
-      end
-
-      res = get_return_type enumerable, key_handle, value_handle, &block
-
-      # rekey input
-      enumerable.each do |*args|
-        key = key_fn.call *args
-        value = value_fn.call *args
-        new_key = key
-        new_value = value
-
-        if block
-          if block.arity <= 0
-            # function pointer, eg. &:to_i
-            new_key = block.call value
-          elsif block.arity == 1
-            # standard block
-            new_key = block.call value
-          else
-            # block that wants both key and value
-            data = block.call key, value
-            if data.is_a? Array
-              new_key, new_value = data
-            else
-              # only returned a new key value
-              new_key = data
-            end
-          end
-        else
-          new_key = PluckIt.pluck value, key_handle if key_handle
-          new_value = PluckIt.pluck value, value_handle if value_handle
-        end
-
-        # collect results
-
-        unless res
-          # determine return type based on the first
-          # computed key value
-          res = new_key ? {} : []
-        end
-
-        if res.is_a? Array
-          unless new_key.nil?
-            # safeguard against stupidity
-            raise ArgumentError.new(
-              "not expecting a key value, got: #{new_key}"
-            )
-          end
-
-          res.push new_value
-        else
-          res[new_key] = new_value
-        end
-      end
-
-      res
-    end
-
-
-    private
-
-    def validate_input key_handle, value_handle, &block
-      if block
-        if (key_handle or value_handle)
-          raise ArgumentError.new 'expected key / value handles, *or* block'
-        end
-      else
-        unless key_handle or value_handle
-          raise ArgumentError.new 'expected 1 or 2 args, got 0'
-        end
-      end
-    end
-
-
-    def get_return_type enumerable, key_handle, value_handle, &block
-      # determine return type
-      res = if block
-        # no way to determine type...do it dynamically,
-        # based on block return type
-
-        if enumerable.empty?
-          raise TypeError.new(
-            'unable to determine return type for empty input'
-          )
-        end
-
-        nil
-      else
-        if key_handle or enumerable.respond_to?(:keys)
-          {}
-        else
-          []
-        end
-      end
-    end
-
-  end
+  VERSION = '3.0.0'
 end
 
 

data/lib/rekey/rekey.rb

@@ -0,0 +1,78 @@
+require 'pluckit/pluck'
+
+
+module Rekey
+  class << self
+
+    def rekey(enumerable, key_handle = nil, value_handle = nil, &block)
+      validate_input key_handle, value_handle, &block
+
+      key_value_fn = if enumerable.respond_to?(:keys)
+        proc {|k, v| [k, v]}
+      else
+        proc {|v| [nil, v]}
+      end
+
+      # determine return type
+      res = if key_handle or block or enumerable.respond_to?(:keys)
+        {}
+      else
+        []
+      end
+
+      # rekey input
+      enumerable.each_with_object(res) do |*args, res|
+        key, value = key_value_fn.call *args
+        new_key = key
+        new_value = value
+
+        if block
+          if block.arity <= 0
+            # function pointer, eg. &:to_i
+            new_key = block.call value
+          elsif block.arity == 1
+            # standard block
+            new_key = block.call value
+          else
+            # block that wants both key and value
+            new_key = block.call key, value
+          end
+        else
+          new_key = PluckIt.pluck value, key_handle if key_handle
+          new_value = PluckIt.pluck value, value_handle if value_handle
+        end
+
+        # collect results
+        if res.is_a? Array
+          unless new_key.nil?
+            # safeguard against stupidity
+            raise ArgumentError.new(
+              "not expecting a key value, got: #{new_key}"
+            )
+          end
+
+          res.push new_value
+        else
+          res[new_key] = new_value
+        end
+      end
+    end
+
+
+    private
+
+    def validate_input key_handle, value_handle, &block
+      if block
+        if (key_handle or value_handle)
+          raise ArgumentError.new 'expected key / value handles, *or* block'
+        end
+      else
+        unless key_handle or value_handle
+          raise ArgumentError.new 'key_handle and/or value_handle are required'
+        end
+      end
+    end
+
+
+  end
+end

data/test/test_array_block.rb

@@ -8,24 +8,6 @@ class RekeyArrayBlockTest < Minitest::Test
     @input = [*1..3]
   end
 
-  def test_both
-    assert_equal({
-        1 => 1,
-        2 => 2,
-        3 => 3,
-      },
-      @input.rekey {|k, v| [v, v] }
-    )
-
-    assert_equal({
-        '1' => 1.0,
-        '2' => 2.0,
-        '3' => 3.0,
-      },
-      @input.rekey {|k, v| [v.to_s, v.to_f] }
-    )
-  end
-
   def test_keys
     assert_equal({
         1 => 1,
@@ -54,22 +36,8 @@ class RekeyArrayBlockTest < Minitest::Test
 
   def test_nil_key
     assert_equal(
-      @input,
-      @input.rekey {|k, v| [nil, v.to_i] }
-    )
-
-    assert_equal(
-      @input,
-      # k is nil because input is array
-      @input.rekey {|k, v| [k, v.to_i] }
-    )
-
-    assert_equal([
-        '1',
-        '2',
-        '3',
-      ],
-      @input.rekey {|k, v| [nil, v.to_s] }
+      { nil => 3 },
+      @input.rekey {|k, v| nil }
     )
   end
 

data/test/test_empty_input.rb

@@ -24,10 +24,6 @@ class RekeyEmptyInputTest < Minitest::Test
       [],
       Set.new.rekey(nil, :k)
     )
-
-    assert_raises TypeError do
-      {}.rekey do |k| 1 end
-    end
   end
 
 end

data/test/test_hash_block.rb

@@ -11,29 +11,6 @@ class RekeyHashBlockTest < Minitest::Test
     }
   end
 
-  def test_both
-    assert_equal(
-      @input,
-      @input.rekey {|k, v| [k, v] }
-    )
-
-    assert_equal({
-        1 => 1,
-        2 => 2,
-        3 => 3,
-      },
-      @input.rekey {|k, v| [v, v] }
-    )
-
-    assert_equal({
-        '1' => 1.0,
-        '2' => 2.0,
-        '3' => 3.0,
-      },
-      @input.rekey {|k, v| [v.to_s, v.to_f] }
-    )
-  end
-
   def test_arity1_keys
     assert_equal({
         1 => 1,
@@ -88,12 +65,9 @@ class RekeyHashBlockTest < Minitest::Test
   end
 
   def test_nil_key
-    assert_equal([
-        1,
-        2,
-        3,
-      ],
-      @input.rekey {|k, v| [nil, v] }
+    assert_equal(
+      { nil => 3 },
+      @input.rekey {|k, v| nil }
     )
   end
 

data/test/test_monkey_patching.rb

@@ -0,0 +1,34 @@
+require 'minitest/autorun'
+require 'set'
+
+$LOAD_PATH.unshift 'lib'
+require 'rekey/rekey'
+
+
+class MonkeyPatchingTest < Minitest::Test
+  def test_not_installed
+    if defined? Rekey::VERSION
+      # entire library was loaded, so these tests are invalid.
+      # this happens when run through `rake`
+      skip
+    end
+
+    # `require 'pluckit/pluck'` should load PluckIt
+    # but not monkey patch
+    assert_raises NoMethodError do
+      [ 1, 2, 3 ].rekey 0
+    end
+
+    assert_raises NoMethodError do
+      { a: 1 }.rekey 0
+    end
+
+    assert_raises NoMethodError do
+      Set.new([ 1, 2, 3 ]).rekey 0
+    end
+
+    puts 'no monkey patching'
+  end
+
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rekey
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 3.0.0
 platform: ruby
 authors:
 - Daniel Pepper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-08 00:00:00.000000000 Z
+date: 2018-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pluckit
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -59,15 +59,17 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/rekey.rb
+- lib/rekey/rekey.rb
 - test/test_array_block.rb
 - test/test_array_handlers.rb
 - test/test_empty_input.rb
 - test/test_hash_block.rb
 - test/test_hash_handlers.rb
 - test/test_invalid_input.rb
+- test/test_monkey_patching.rb
 - test/test_range.rb
 - test/test_regexp.rb
-homepage: https://github.com/dpep/rekey
+homepage: https://github.com/dpep/rb_rekey
 licenses:
 - MIT
 metadata: {}
@@ -87,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Rekey
@@ -98,5 +100,6 @@ test_files:
 - test/test_hash_block.rb
 - test/test_hash_handlers.rb
 - test/test_invalid_input.rb
+- test/test_monkey_patching.rb
 - test/test_range.rb
 - test/test_regexp.rb