abstractivator 0.0.21 → 0.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 225d5358712a6832210c7f813bc04131d388f7c4
-  data.tar.gz: d04cf93b9969771af87f578a3fee1eaa3053ac0b
+  metadata.gz: ed70b3e745e17ec7a24ef81a0f8734a88408f6ee
+  data.tar.gz: 7f463093462a219c2f055da69e14f867ad45d5cd
 SHA512:
-  metadata.gz: 9715f8fd66114314cb1eed58c43bed53e60c12e28d814c4c7414686d15d79b21cd078d234ce49d63ea7e7811a5f5f4ed97a5872512549969ee1b673d7e12d00a
-  data.tar.gz: d00027043d191a6eae479d5a57971f6fbd6dba1d1858b7f83edf9ae791e2a97194b03179d34ea6a30e5688c4f8bbf50c44443127566c84f5e0904f0148303ca0
+  metadata.gz: 36cc3d351e63c62cb1a84cd073747a734a145b1712111fad30431df3f82c59b5eb7cf4eca6c096d8eb824131c2b953a28eedcf0b83cc8ba1bc327ff8260aa1f2
+  data.tar.gz: aabc33b65cd3f7133f78828e2f14e379c360f64accbccd2df9d6f399594d88730b8ccfd1d29904ec763f83a12f212435fd74d5873889e56606088174dccc8e9d

data/lib/abstractivator/enumerable_ext.rb

@@ -1,4 +1,5 @@
 require 'set'
+require 'abstractivator/proc_ext'
 
 module Enumerable
 
@@ -48,7 +49,7 @@ module Enumerable
   end
 
   def hash_map(get_key=->x{x}, &get_value)
-    Hash[self.map{|x| [get_key.(x), get_value ? get_value.(x) : x]}]
+    Hash[self.map{|x| [Proc.loose_call(get_key, [x]), get_value ? get_value.call(x) : x]}]
   end
 
   def outer_join(right, get_left_key, get_right_key, default_value)

data/lib/abstractivator/proc_ext.rb

@@ -30,7 +30,10 @@ class Proc
   end
 
   def self.loose_call(x, args, &block)
-    x.respond_to?(:call) ? x.call(*args.take(x.arity).pad_right(x.arity), &block) : x
+    x = x.to_proc if x.respond_to?(:to_proc)
+    x.respond_to?(:call) or return x
+    args = args.take(x.arity).pad_right(x.arity) if x.arity >= 0
+    x.call(*args, &block)
   end
 end
 

data/lib/abstractivator/version.rb

@@ -1,3 +1,3 @@
 module Abstractivator
-  VERSION = '0.0.21'
+  VERSION = '0.0.22'
 end

data/spec/lib/abstractivator/enumerable_ext_spec.rb

@@ -141,4 +141,24 @@ describe Enumerable do
       expect(result).to eql [:x, 1, 2, 3]
     end
   end
+
+  describe '#hash_map' do
+    let!(:xs) { [Object, Hash, Array] }
+    it 'turns an array into a map' do
+      result = xs.hash_map(proc{|x| x.to_s[0]}) {|x| x.to_s }
+      expect(result).to eql({ 'O' => 'Object', 'H' => 'Hash', 'A' => 'Array' })
+    end
+    it 'the value transformer can be omitted' do
+      result = xs.hash_map(proc{|x| x.to_s[0]})
+      expect(result).to eql({ 'O' => Object, 'H' => Hash, 'A' => Array })
+    end
+    it 'the key transformer can be omitted' do
+      result = xs.hash_map(&:to_s)
+      expect(result).to eql({ Object => 'Object', Hash => 'Hash', Array => 'Array' })
+    end
+    it 'the key transformer is called loosely' do
+      result = xs.hash_map(:to_s)
+      expect(result).to eql({ 'Object' => Object, 'Hash' => Hash, 'Array' => Array })
+    end
+  end
 end

data/spec/lib/abstractivator/proc_ext_spec.rb

@@ -34,7 +34,10 @@ context 'in the world of functional programming' do
 
   describe 'Proc::loose_call' do
     it 'returns the first argument if it is not a proc' do
-      expect(Proc.loose_call(:a, [:b, :c])).to eql :a
+      expect(Proc.loose_call('a', ['b', 'c'])).to eql 'a'
+    end
+    it 'attempts to convert the first argument to proc' do
+      expect(Proc.loose_call(:to_s, ['5'])).to eql '5'
     end
     it 'calls the proc with an appropriate number of arguments' do
       events = []
@@ -48,6 +51,9 @@ context 'in the world of functional programming' do
     it 'pads with nils' do
       expect(Proc.loose_call(->(a, b) {[a, b]}, [1])).to eql [1, nil]
     end
+    it 'works with variable-arity procs' do
+      expect(Proc.loose_call(->(*args) {args}, [1, 2])).to eql [1, 2]
+    end
   end
 
   describe 'Proc#loosen_args' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: abstractivator
 version: !ruby/object:Gem::Version
-  version: 0.0.21
+  version: 0.0.22
 platform: ruby
 authors:
 - Peter Winton