rekey 3.0.1 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a5afeefc751d6d94e863fbc3a0728323f9c8379
-  data.tar.gz: c79b4c27daf11a1905fe2e5d09d0b07be8cc5f5f
+  metadata.gz: 9fd354b9d3c1d9586254cada81be1e6bb9727a4a
+  data.tar.gz: 35a6a2235d235543d2ce42cd483f98ba8ea3da38
 SHA512:
-  metadata.gz: 98b0ac1857651dd1d2f561cf10fbb466ab3bedd10c1068702454c0aaa4750c1f5edea75c7096d164a5316e335f0e7805aa2fa145c7ce63cdb48d8bcde0f71624
-  data.tar.gz: 76a0051babba822500df84772fec87e7686fa29349d14e98239162f81e34202ce774b3a45cf07cffa92206d5c8f6747aa46a56781d8b5582ad0dc83e20605517
+  metadata.gz: f3dba9ce015ac3bd8cb5c6b0e9c1f887c2127453649e2d0357e52d710ddc67970a8ae2747d3b1686198ed29533b66c3445df3ef227d69b39c6666c075b51301c
+  data.tar.gz: b9b139e019b4587f06dd0c1a1fed7e7fb9e7bd78c72af91cdb2202a8015612c1f268e10b121cfcb23e12ac8160e2b10f83368b55cf6d6e400cb8048bbc81e62e

data/lib/rekey.rb

@@ -2,7 +2,7 @@ require_relative 'rekey/rekey'
 
 
 module Rekey
-  VERSION = '3.0.1'
+  VERSION = '4.0.0'
 end
 
 

data/lib/rekey/rekey.rb

@@ -2,77 +2,61 @@ require 'pluckit/pluck'
 
 
 module Rekey
-  class << self
+  extend self
 
-    def rekey(enumerable, key_handle = nil, value_handle = nil, &block)
-      validate_input key_handle, value_handle, &block
+  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
+    key_value_fn = if enumerable.respond_to?(:keys)
+      proc {|k, v| [k, v]}
+    else
+      proc {|v| [nil, v]}
+    end
 
-      # rekey input
-      enumerable.each_with_object(res) do |*args, res|
-        key, value = key_value_fn.call *args
-        new_key = key
-        new_value = value
+    # rekey input
+    enumerable.each_with_object({}) 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
+      if block
+        if block.arity < 2
+          # block only wants value
+          # arity -1 is a function pointer, eg. &:to_i
+          new_key = block.call value
         else
-          new_key = PluckIt.pluckit value, key_handle if key_handle
-          new_value = PluckIt.pluckit value, value_handle if value_handle
-        end
+          # block wants both key and value
 
-        # collect results
-        if res.is_a? Array
-          unless new_key.nil?
-            # safeguard against stupidity
+          if key_value_fn.arity != 2
             raise ArgumentError.new(
-              "not expecting a key value, got: #{new_key}"
+              'rekey block requests key/value pair but only value available'
             )
           end
 
-          res.push new_value
-        else
-          res[new_key] = new_value
+          new_key = block.call key, value
         end
+      else
+        new_key = PluckIt.pluckit value, key_handle
+        new_value = PluckIt.pluckit value, value_handle if value_handle
       end
+
+      # collect results
+      res[new_key] = new_value
     end
+  end
 
 
-    private
+  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
+  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
+    elsif key_handle.nil?
+      raise ArgumentError.new 'key handle or block required'
     end
+  end
 
 
-  end
 end

data/test/test_array_block.rb

@@ -1,5 +1,5 @@
 require 'minitest/autorun'
-require 'rekey'
+require_relative '../lib/rekey'
 
 
 class RekeyArrayBlockTest < Minitest::Test
@@ -8,7 +8,7 @@ class RekeyArrayBlockTest < Minitest::Test
     @input = [*1..3]
   end
 
-  def test_keys
+  def test_all
     assert_equal({
         1 => 1,
         2 => 2,
@@ -17,6 +17,14 @@ class RekeyArrayBlockTest < Minitest::Test
       @input.rekey {|v| v }
     )
 
+    assert_equal({
+        1 => 1,
+        2 => 2,
+        3 => 3,
+      },
+      @input.rekey(&:itself)
+    )
+
     assert_equal({
         2 => 1,
         4 => 2,
@@ -32,12 +40,15 @@ class RekeyArrayBlockTest < Minitest::Test
       },
       @input.rekey {|v| v.to_s }
     )
-  end
 
-  def test_nil_key
     assert_equal(
       { nil => 3 },
-      @input.rekey {|k, v| nil }
+      @input.rekey {|v| nil }
+    )
+
+    assert_equal(
+      { 123 => 3 },
+      @input.rekey { 123 }
     )
   end
 

data/test/test_array_handlers.rb

@@ -1,5 +1,5 @@
 require 'minitest/autorun'
-require 'rekey'
+require_relative '../lib/rekey'
 
 
 class RekeyArrayHandlersTest < Minitest::Test
@@ -8,31 +8,6 @@ class RekeyArrayHandlersTest < Minitest::Test
     @input = [*1..3]
   end
 
-  def test_both
-    assert_equal({
-        1 => 1,
-        2 => 2,
-        3 => 3,
-      },
-      @input.rekey(:to_i, :to_i)
-    )
-
-    assert_equal({
-        '1' => 1.0,
-        '2' => 2.0,
-        '3' => 3.0,
-      },
-      @input.rekey(:to_s, :to_f)
-    )
-
-    assert_equal({
-        '1' => 1.0,
-        '2' => 2.0,
-        '3' => 3.0,
-      },
-      @input.rekey('to_s', 'to_f')
-    )
-  end
 
   def test_keys
     assert_equal({
@@ -68,23 +43,34 @@ class RekeyArrayHandlersTest < Minitest::Test
     )
   end
 
-  def test_values
-    assert_equal(
-      @input,
-      @input.rekey(nil, :to_i)
+
+  def test_both
+    assert_equal({
+        1 => 1,
+        2 => 2,
+        3 => 3,
+      },
+      @input.rekey(:to_i, :to_i)
     )
 
-    assert_equal(
-      @input.map(&:to_f),
-      @input.rekey(nil, :to_f)
+    assert_equal({
+        '1' => 1.0,
+        '2' => 2.0,
+        '3' => 3.0,
+      },
+      @input.rekey(:to_s, :to_f)
     )
 
-    assert_equal(
-      @input.map(&:to_s),
-      @input.rekey(nil, 'to_s')
+    assert_equal({
+        '1' => 1.0,
+        '2' => 2.0,
+        '3' => 3.0,
+      },
+      @input.rekey('to_s', 'to_f')
     )
   end
 
+
   def test_array_indices
     array_data = [
       [ 1, 2, 3 ],
@@ -92,16 +78,6 @@ class RekeyArrayHandlersTest < Minitest::Test
       [ 7, 8, 9 ],
     ]
 
-    assert_equal(
-      array_data,
-      array_data.rekey(nil, :to_a)
-    )
-
-    assert_equal(
-      [ 1, 4, 7 ],
-      array_data.rekey(nil, 0)
-    )
-
     assert_equal({
         1 => 3,
         4 => 6,

data/test/test_empty_input.rb

@@ -1,5 +1,6 @@
 require 'minitest/autorun'
-require 'rekey'
+require 'set'
+require_relative '../lib/rekey'
 
 
 class RekeyEmptyInputTest < Minitest::Test
@@ -19,11 +20,6 @@ class RekeyEmptyInputTest < Minitest::Test
       {},
       Set.new.rekey(:k, :v)
     )
-
-    assert_equal(
-      [],
-      Set.new.rekey(nil, :k)
-    )
   end
 
 end

data/test/test_hash_block.rb

@@ -1,5 +1,5 @@
 require 'minitest/autorun'
-require 'rekey'
+require_relative '../lib/rekey'
 
 
 class RekeyHashBlockTest < Minitest::Test

data/test/test_hash_handlers.rb

@@ -1,8 +1,9 @@
 require 'minitest/autorun'
-require 'rekey'
+require_relative '../lib/rekey'
 
 
 class RekeyHashHandlersTest < Minitest::Test
+
   def setup
     @input = {
       a: 1,
@@ -11,32 +12,6 @@ class RekeyHashHandlersTest < Minitest::Test
     }
   end
 
-  def test_both
-    assert_equal({
-        1 => 1,
-        2 => 2,
-        3 => 3,
-      },
-      @input.rekey(:to_i, :to_i)
-    )
-
-    assert_equal({
-        '1' => 1.0,
-        '2' => 2.0,
-        '3' => 3.0,
-      },
-      @input.rekey(:to_s, :to_i)
-    )
-
-    assert_equal({
-        '1' => 1.0,
-        '2' => 2.0,
-        '3' => 3.0,
-      },
-      @input.rekey('to_s', 'to_i')
-    )
-
-  end
 
   def test_keys
     assert_equal({
@@ -56,29 +31,34 @@ class RekeyHashHandlersTest < Minitest::Test
     )
   end
 
-  def test_values
-    assert_equal(
-      @input,
-      @input.rekey(nil, :to_i)
+
+  def test_both
+    assert_equal({
+        1 => 1,
+        2 => 2,
+        3 => 3,
+      },
+      @input.rekey(:to_i, :to_i)
     )
 
     assert_equal({
-        a: '1',
-        b: '2',
-        c: '3',
+        '1' => 1.0,
+        '2' => 2.0,
+        '3' => 3.0,
       },
-      @input.rekey(nil, :to_s)
+      @input.rekey(:to_s, :to_i)
     )
 
     assert_equal({
-        a: '1',
-        b: '2',
-        c: '3',
+        '1' => 1.0,
+        '2' => 2.0,
+        '3' => 3.0,
       },
-      @input.rekey(nil, 'to_s')
+      @input.rekey('to_s', 'to_i')
     )
   end
 
+
   def test_hash_array
     data = {
       a: [ 1, 2, 3 ],
@@ -86,14 +66,6 @@ class RekeyHashHandlersTest < Minitest::Test
       c: [ 7, 8, 9 ],
     }
 
-    assert_equal({
-        a: 1,
-        b: 4,
-        c: 7,
-      },
-      data.rekey(nil, 0)
-    )
-
     assert_equal({
         1 => 2,
         4 => 5,
@@ -101,8 +73,17 @@ class RekeyHashHandlersTest < Minitest::Test
       },
       data.rekey(0, 1)
     )
+
+    assert_equal({
+        1 => 3,
+        4 => 6,
+        7 => 9,
+      },
+      data.rekey(:min, :max)
+    )
   end
 
+
   def test_hash_hash
     data = {
       a: { i: 1, v: 2 },
@@ -111,11 +92,11 @@ class RekeyHashHandlersTest < Minitest::Test
     }
 
     assert_equal({
-        a: 1,
-        b: 2,
-        c: 3,
+        1 => { i: 1, v: 2 },
+        2 => { i: 2, v: 4 },
+        3 => { i: 3, v: 6 },
       },
-      data.rekey(nil, :i)
+      data.rekey(:i)
     )
 
     assert_equal({

data/test/test_invalid_input.rb

@@ -1,5 +1,5 @@
 require 'minitest/autorun'
-require 'rekey'
+require_relative '../lib/rekey'
 
 
 class RekeyInvalidInputTest < Minitest::Test
@@ -8,18 +8,43 @@ class RekeyInvalidInputTest < Minitest::Test
   end
 
 
-  def test_all
+  def test_nil
     assert_raises ArgumentError do
       @input.rekey
     end
 
     assert_raises ArgumentError do
-      @input.rekey(:k) do |k| 1 end
+      @input.rekey nil
     end
 
     assert_raises ArgumentError do
-      @input.rekey(:k, :v) do |k| 1 end
+      @input.rekey nil, :v
     end
+
+    # unfortunately, these still pass
+    @input.rekey(nil) {|v| v}
+    @input.rekey(nil, nil) {|v| v}
   end
 
+
+  def test_handles_and_block
+    assert_raises ArgumentError do
+      @input.rekey(:k) {|k| 1}
+    end
+
+    assert_raises ArgumentError do
+      @input.rekey(:k, :v) {|k| 1}
+    end
+  end
+
+
+  def test_block_underflow
+    # block requesting key and value, but @input
+    # doesn't have keys
+    assert_raises ArgumentError do
+      @input.rekey {|k, v| 1}
+    end
+  end
+
+
 end

data/test/test_monkey_patching.rb

@@ -1,11 +1,10 @@
 require 'minitest/autorun'
 require 'set'
-
-$LOAD_PATH.unshift 'lib'
-require 'rekey/rekey'
+require_relative '../lib/rekey/rekey'
 
 
 class MonkeyPatchingTest < Minitest::Test
+
   def test_not_installed
     if defined? Rekey::VERSION
       # entire library was loaded, so these tests are invalid.
@@ -33,4 +32,13 @@ class MonkeyPatchingTest < Minitest::Test
   end
 
 
+  def test_pluckit
+    assert PluckIt
+
+    assert_raises NoMethodError do
+      [ 1, 2, 3 ].pluck 0
+    end
+  end
+
+
 end

data/test/test_range.rb

@@ -1,5 +1,5 @@
 require 'minitest/autorun'
-require 'rekey'
+require_relative '../lib/rekey'
 
 
 class RekeyRangeTest < Minitest::Test
@@ -12,25 +12,11 @@ class RekeyRangeTest < Minitest::Test
   end
 
   def test_stuff
-    assert_equal([
-        [ 1, 2 ],
-        [ 4, 5 ],
-      ],
-      @input.rekey(nil, 0..1)
-    )
-
-    assert_equal([
-        [ 2 ],
-        [ 5 ],
-      ],
-      @input.rekey(nil, 1...2)
-    )
-
     assert_equal({
-        [ 2 ] => @input[0],
-        [ 5 ] => @input[1],
+        [ 1, 2 ] => [ 1, 2, 3 ],
+        [ 4, 5 ] => [ 4, 5, 6 ],
       },
-      @input.rekey(1...2)
+      @input.rekey(0..1)
     )
 
     assert_equal({

data/test/test_regexp.rb

@@ -1,29 +1,29 @@
 require 'minitest/autorun'
-require 'rekey'
+require_relative '../lib/rekey'
 
 
 class RekeyRegexpTest < Minitest::Test
 
   def setup
     @input = [
-      [ 'a', 'aa', 'b', 'ba' ],
-      [ 'b', 'c', 'bc' ],
+      [ 'a', 'aa', 'b', 'ba', 'dd' ],
+      [ 'b', 'c', 'bc', 'de' ],
     ]
   end
 
   def test_stuff
-    assert_equal([
-        ['a', 'aa', 'ba'],
-        [],
-      ],
-      @input.rekey(nil, /a/)
+    assert_equal({
+        'a' => ['a', 'aa', 'ba'],
+        'b' => [],
+      },
+      @input.rekey(0, /a/)
     )
 
-    assert_equal([
-        ['b', 'ba'],
-        ['b', 'bc'],
-      ],
-      @input.rekey(nil, /b/)
+    assert_equal({
+        ['dd'] => ['b', 'ba'],
+        ['de'] => ['b', 'bc'],
+      },
+      @input.rekey(/d/, /b/)
     )
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rekey
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 4.0.0
 platform: ruby
 authors:
 - Daniel Pepper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-26 00:00:00.000000000 Z
+date: 2018-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pluckit