rekey 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6c9d60055fe41b5eb0256261b47ddb024c9f59a
-  data.tar.gz: aa50ed7dae9056378b866e0087c47f05924864f0
+  metadata.gz: 4d0928904addc15f172c1ca0045615ff80deef47
+  data.tar.gz: 25fe2c483347fe26e163b24669e4f6d8e36410ec
 SHA512:
-  metadata.gz: e4d5f92fec88e352f45cb44a964e18ba305b2ebb2cc7e345e66e712382413791d30d5331499c6bbad6034260de97891b7973a550390d59593a363b3aaea077c9
-  data.tar.gz: 62e709ab09d097bff692620e27ba1f8f32aeb062d517b3c05f19a424d545b4cde05c4bbe33010a2aa911a25af38d1545d5b8ceb4e6fc37bf13a2a87f9e90e79e
+  metadata.gz: e9460e299ab62557929c865860255e4e0e350297e55b2bf1bf1af90ae0eb3ca6f33c2cc90408590af69a8d86b1ff2e080419382df178d366cccc43435bb15889
+  data.tar.gz: fb96b3a2bbc086c41ebe620a127c6922e09addff5e9c3dc0e081132852d506ec9f0557632c0a6e7d70ac626294bc80e0ee62cb8b81984a35d582e2c7831605e9

data/lib/rekey.rb

@@ -3,15 +3,7 @@ module Rekey
 
     def rekey(enumerable, key_handle = nil, value_handle = nil, &block)
       # validate input
-      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
+      validate_input key_handle, value_handle, &block
 
       key_fn = if enumerable.respond_to?(:keys)
         proc {|k, v| k}
@@ -25,9 +17,9 @@ module Rekey
         proc {|v| v}
       end
 
-      # return type will be determined later
-      res = nil
+      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
@@ -83,6 +75,42 @@ module Rekey
 
     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
+
+
     def pull v, handle
       if ([Symbol, String].include? handle.class) and v.respond_to? handle
         if v.method(handle).arity <= 0

data/lib/rekey/version.rb

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

data/test/test_empty_input.rb

@@ -0,0 +1,33 @@
+require 'minitest/autorun'
+require 'rekey'
+
+
+class RekeyEmptyInputTest < Minitest::Test
+
+  def test_all
+    assert_equal(
+      {},
+      [].rekey(:k, :v)
+    )
+
+    assert_equal(
+      {},
+      {}.rekey(:k, :v)
+    )
+
+    assert_equal(
+      {},
+      Set.new.rekey(:k, :v)
+    )
+
+    assert_equal(
+      [],
+      Set.new.rekey(nil, :k)
+    )
+
+    assert_raises TypeError do
+      {}.rekey do |k| 1 end
+    end
+  end
+
+end

data/test/test_invalid_input.rb

@@ -0,0 +1,25 @@
+require 'minitest/autorun'
+require 'rekey'
+
+
+class RekeyInvalidInputTest < Minitest::Test
+  def setup
+    @input = [*1..3]
+  end
+
+
+  def test_all
+    assert_raises ArgumentError do
+      @input.rekey
+    end
+
+    assert_raises ArgumentError do
+      @input.rekey(:k) do |k| 1 end
+    end
+
+    assert_raises ArgumentError do
+      @input.rekey(:k, :v) do |k| 1 end
+    end
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rekey
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Daniel Pepper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-29 00:00:00.000000000 Z
+date: 2017-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -39,8 +39,10 @@ files:
 - lib/rekey/version.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_range.rb
 - test/test_regexp.rb
 homepage: https://github.com/d1hotpep/rekey
@@ -70,7 +72,9 @@ summary: Rekey
 test_files:
 - 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_range.rb
 - test/test_regexp.rb