rekey 1.1.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d0928904addc15f172c1ca0045615ff80deef47
-  data.tar.gz: 25fe2c483347fe26e163b24669e4f6d8e36410ec
+  metadata.gz: 4b2eea49ae061816cbe271e5190dec61dafd1ef1
+  data.tar.gz: 43361ddc40bd86cbace5005ef975af94bfd61b88
 SHA512:
-  metadata.gz: e9460e299ab62557929c865860255e4e0e350297e55b2bf1bf1af90ae0eb3ca6f33c2cc90408590af69a8d86b1ff2e080419382df178d366cccc43435bb15889
-  data.tar.gz: fb96b3a2bbc086c41ebe620a127c6922e09addff5e9c3dc0e081132852d506ec9f0557632c0a6e7d70ac626294bc80e0ee62cb8b81984a35d582e2c7831605e9
+  metadata.gz: 4aca5c1689f96555d7e641c471956c672b33acb20cfcf5c11c6f4b474d70c9b7aeb604b94f7947ad29186f694368a5cfefe416b10852d2baeff1776068147d88
+  data.tar.gz: a18596f0f64718da094d91b81ac06b7e0722cd990e0cafa49b29e4d73d19fd206880d92e9dfc089ffaff1ce6d2057bc225157c4bb139f4a8f7739bce851a6040

data/lib/rekey.rb

@@ -1,4 +1,9 @@
+require 'pluckit'
+
+
 module Rekey
+  VERSION = '2.0.0'
+
   class << self
 
     def rekey(enumerable, key_handle = nil, value_handle = nil, &block)
@@ -34,6 +39,7 @@ module Rekey
             # 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
@@ -43,8 +49,8 @@ module Rekey
             end
           end
         else
-          new_key = pull value, key_handle if key_handle
-          new_value = pull value, value_handle if value_handle
+          new_key = PluckIt.pluck value, key_handle if key_handle
+          new_value = PluckIt.pluck value, value_handle if value_handle
         end
 
         # collect results
@@ -110,27 +116,6 @@ module Rekey
       end
     end
 
-
-    def pull v, handle
-      if ([Symbol, String].include? handle.class) and v.respond_to? handle
-        if v.method(handle).arity <= 0
-          v.send handle
-        else
-          v.send handle, v
-        end
-      elsif v.is_a? Array
-        if handle.is_a? Regexp
-          v.grep handle
-        else
-          v[handle]
-        end
-      elsif v.is_a? Hash
-        v[handle]
-      else
-        raise ArgumentError.new "invalid handle: #{handle}, for value #{v}"
-      end
-    end
-
   end
 end
 

data/test/test_array_handlers.rb

@@ -124,36 +124,6 @@ class RekeyArrayHandlersTest < Minitest::Test
     )
   end
 
-  def test_array_hash
-    data = [
-      { a: 1 },
-      { b: 2 },
-      { c: 3 },
-    ]
-
-    assert_equal(
-      [ [:a], [:b], [:c] ],
-      data.rekey(nil, :keys)
-    )
-
-    assert_equal(
-      [ :a, :b, :c ],
-      data.rekey(nil, :keys).rekey(nil, :first)
-    )
-
-    assert_equal({
-        { a: 1 }.hash => data.first,
-      },
-      data.take(1).rekey(:hash)
-    )
-
-    assert_equal({
-        { a: 1 }.hash => [:a, 1],
-      },
-      data.take(1).rekey(:hash, :first)
-    )
-  end
-
 
   def test_hash_indices
     data = [

metadata

@@ -1,42 +1,64 @@
 --- !ruby/object:Gem::Specification
 name: rekey
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Daniel Pepper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-11 00:00:00.000000000 Z
+date: 2017-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: pluckit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
-description: |2
-      For turning Arrays into Hashes, with keys computed from the Array
-      contents.  Or for rekeying Hashes.
-
-      [ 1, 2, 3 ].rekey {|v| v}
-      => { 1 => 1, 2 => 2, 3 => 3 }
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10'
+description: Reformat Enumerables into Hashes, using derived keys / values
 email: 
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - lib/rekey.rb
-- lib/rekey/version.rb
 - test/test_array_block.rb
 - test/test_array_handlers.rb
 - test/test_empty_input.rb
@@ -45,7 +67,7 @@ files:
 - test/test_invalid_input.rb
 - test/test_range.rb
 - test/test_regexp.rb
-homepage: https://github.com/d1hotpep/rekey
+homepage: https://github.com/dpep/rekey
 licenses:
 - MIT
 metadata: {}
@@ -65,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Rekey

data/lib/rekey/version.rb

@@ -1,3 +0,0 @@
-module Rekey
-  VERSION = '1.1.0'
-end