transproc 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76ec2952fb54e5e56fe3b9026a5a25526555f7dc
-  data.tar.gz: e6c3346aa655eb3efeb2544e34540d835cf3a5fe
+  metadata.gz: 5fb2ca80c956f246b5277462bb1dcbf5c3dbd09d
+  data.tar.gz: 7ae7b71a375e026ca281fbb6906850e418ba2b21
 SHA512:
-  metadata.gz: 664e5c3008cd510d42708d08514e3482b5fa018c9cb5dfb9ad9f310aba1b251380147f03cba0ceab2f3f6b5b5ea42bab4c69324d758ec1298060c0c2131bd641
-  data.tar.gz: ef2d05a99e725737443d18292a31cd9081eab26f0c95a90b257b223059b26f906f7ac577fd6a318540d08a4fa1afabe83bdc9618443872e38f02606fc86f7008
+  metadata.gz: d5fcb3e8a8229938d4f2cf16dab007eea0d3b7fbcb09c901c3a7aec87d5ceaa99ebd8e7254400409b4d540fb6426d5ba9d0b6182d36450d27a480430473c68c7
+  data.tar.gz: 708adcb9250af48b08950fdd85e82b6168d468c02b089544b97db283854be4852c37c347c4606779cee336bbf10ed6cc18bc4d595fea44db2fe5be7fd3dbb4b1

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## v0.4.2 2017-01-12
+
+## Added
+
+* prefix option to HashTransformations#unwrap and HashTransformations#unwrap! (AMHOL)
+
+## Fixed
+
+* `map_array` won't cause a SystemStackError in case of gigantic arrays (solnic)
+
+[Compare v0.4.1...v0.4.2](https://github.com/solnic/transproc/compare/v0.4.1...v0.4.2)
+
 ## v0.4.1 2016-11-08
 
 ## Added

data/lib/transproc/array.rb

@@ -38,7 +38,7 @@ module Transproc
     #
     # @api public
     def self.map_array(array, fn)
-      map_array!(Array[*array], fn)
+      map_array!(array.dup, fn)
     end
 
     # Same as `map_array` but mutates the array

data/lib/transproc/hash.rb

@@ -318,14 +318,19 @@ module Transproc
     #   Transproc(:unwrap, :address, [:street, :zipcode])[address: { street: 'Street', zipcode: '123' }]
     #   # => {street: "Street", zipcode: "123"}
     #
-    # @param [Hash]
+    # @param [Hash] hash
+    # @param [Mixed] root The root key to unwrap values from
+    # @param [Array] keys The keys that should be unwrapped (optional)
+    # @param [Hash] options hash of options (optional)
+    # @option options [Boolean] :prefix if true, unwrapped keys will be prefixed
+    #                           with the root key followed by an underscore (_)
     #
     # @return [Hash]
     #
     # @api public
-    def self.unwrap(hash, root, keys = nil)
+    def self.unwrap(hash, root, keys = nil, prefix: false)
       copy = Hash[hash].merge(root => Hash[hash[root]])
-      unwrap!(copy, root, keys)
+      unwrap!(copy, root, keys, prefix: prefix)
     end
 
     # Same as `:unwrap` but mutates the hash
@@ -333,11 +338,23 @@ module Transproc
     # @see HashTransformations.unwrap
     #
     # @api public
-    def self.unwrap!(hash, root, selected = nil)
+    def self.unwrap!(hash, root, selected = nil, prefix: false)
       if nested_hash = hash[root]
         keys = nested_hash.keys
         keys &= selected if selected
-        hash.update(Hash[keys.zip(keys.map { |key| nested_hash.delete(key) })])
+        new_keys = if prefix
+          keys.map do |key|
+            if root.is_a?(::Symbol)
+              [root, key].join('_').to_sym
+            else
+              [root, key].join('_')
+            end
+          end
+        else
+          keys
+        end
+
+        hash.update(Hash[new_keys.zip(keys.map { |key| nested_hash.delete(key) })])
         hash.delete(root) if nested_hash.empty?
       end
 

data/lib/transproc/transformer.rb

@@ -15,7 +15,7 @@ module Transproc
   #     include Anima.new(:city, :street, :zipcode)
   #   end
   #
-  #   class UsersMapper
+  #   class UsersMapper < Transproc::Transformer
   #     map_array do
   #       symbolize_keys
   #       rename_keys user_name: :name

data/lib/transproc/version.rb

@@ -1,3 +1,3 @@
 module Transproc
-  VERSION = '0.4.1'.freeze
+  VERSION = '0.4.2'.freeze
 end

data/spec/unit/array_transformations_spec.rb

@@ -132,6 +132,14 @@ describe Transproc::ArrayTransformations do
       expect(map[input]).to eql(output)
       expect(input).to eql(original)
     end
+
+    it 'handles huge arrays' do
+      map = described_class.t(:map_array, hashes[:symbolize_keys])
+
+      input = 138706.times.map { |i| { 'key' => i } }
+
+      expect { map[input] }.to_not raise_error(SystemStackError, /stack level too deep/)
+    end
   end
 
   describe '.map_array!' do

data/spec/unit/hash_transformations_spec.rb

@@ -318,6 +318,28 @@ describe Transproc::HashTransformations do
 
       expect(input).to eql(output)
     end
+
+    it 'prefixes unwrapped keys and retains root string type if prefix option is truthy' do
+      unwrap = described_class.t(:unwrap!, 'wrapped', prefix: true)
+
+      input = { 'wrapped' => { one: nil, two: false } }
+      output = { 'wrapped_one' => nil, 'wrapped_two' => false }
+
+      unwrap[input]
+
+      expect(input).to eql(output)
+    end
+
+    it 'prefixes unwrapped keys and retains root type if prefix option is truthy' do
+      unwrap = described_class.t(:unwrap!, :wrapped, prefix: true)
+
+      input = { wrapped: { 'one' => nil, 'two' => false } }
+      output = { wrapped_one: nil, wrapped_two: false }
+
+      unwrap[input]
+
+      expect(input).to eql(output)
+    end
   end
 
   describe '.unwrap' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: transproc
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-08 00:00:00.000000000 Z
+date: 2017-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler