transproc 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd81b477e8c02b0e1644d7dd91c0dd798a09d24f
-  data.tar.gz: 6dde0346785ecc1de03f0beb9458cee9c427b5e1
+  metadata.gz: 64dbe08d203b9ac87e38de4e8f46dde2899d5cfc
+  data.tar.gz: 6c4e2cd21783a8fea8e3f4ebfe05656ca8e1cd73
 SHA512:
-  metadata.gz: da55a09ce5a269141913ef066754d2e49a6e0cd45debdac119df3aff3788d0a287e654b43590c9c73223fd2b8ccfed48e4a6c850889259747414517c4eef21ad
-  data.tar.gz: 37c85578845d113c1f792cc02d83c9b697c585c8426fe8f76dc3b913a7ff307b97bc226cf039a95f40a1861d091e9a339b13016f71a512a7557e0a2428592a11
+  metadata.gz: e46205bc38e87eb30fa40d1466bfb0f1cff727a945d985f22bb17ae9ac2c3be4910363403c08f2092514f15c2de6d06b8d5863ec9db530fa600465ea9782c601
+  data.tar.gz: 964e3d01aa66e74542a79ea9844977c299cab95984959d066336b3203b67364e4728938e5412a9cde5acbc7661d5f5d744e3d42d17dc89574856f4d56e8d1aff

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# v1.0.2 2017-02-25
+
+## Fixed
+
+* `combine` works fine when there are missing nodes for deeply nested arrays (Kukunin)
+
+[Compare v1.0.1...v1.0.2](https://github.com/solnic/transproc/compare/v1.0.1...v1.0.2)
+
 # v1.0.1 2017-02-25
 
 * `combine` is now multiple times faster, depending on the level of nesting (Kukunin + splattael) 

data/lib/transproc/array/combine.rb

@@ -1,9 +1,12 @@
 module Transproc
   module ArrayTransformations
     class Combine
+      EMPTY_ARRAY = [].freeze
+
       class << self
         def combine(array, mappings)
           root, nodes = array
+          return EMPTY_ARRAY if root.nil?
           return root if nodes.nil?
           groups = group_nodes(nodes, mappings)
 
@@ -23,7 +26,7 @@ module Transproc
         end
 
         def element_candidates(element, candidates, keys)
-          candidates[element_candidates_key(element, keys)] || []
+          candidates[element_candidates_key(element, keys)] || EMPTY_ARRAY
         end
 
         def group_nodes(nodes, mappings)

data/lib/transproc/version.rb

@@ -1,3 +1,3 @@
 module Transproc
-  VERSION = '1.0.1'.freeze
+  VERSION = '1.0.2'.freeze
 end

data/spec/unit/array/combine_spec.rb

@@ -24,21 +24,6 @@ describe Transproc::ArrayTransformations do
       it { is_expected.to eq input.first }
     end
 
-    it 'does not modify its input' do
-      input = [
-        [{ name: 'Jane' }],
-        [[{ user: 'Jane', title: 'One' }]]
-      ]
-
-      output = [
-        { name: 'Jane', tasks: [{ user: 'Jane', title: 'One' }] }
-      ]
-
-      combined = described_class.combine(input, [[:tasks, name: :user]])
-
-      expect(combined).to eql(output)
-    end
-
     context 'with one group' do
       let(:input) do
         [
@@ -113,6 +98,78 @@ describe Transproc::ArrayTransformations do
       end
     end
 
+    context 'with non-array argument' do
+      let(:input) do
+        123
+      end
+
+      let(:mappings) { [[:page, {page_id: :id}]] }
+
+      it { is_expected.to eq(123) }
+    end
+
+    context 'with empty nested array' do
+      let(:input) do
+        [
+          [],
+          [
+            []
+          ]
+        ]
+      end
+
+      let(:mappings) { [[:menu_items, {id: :menu_id}, [[:page, {page_id: :id}]]]] }
+
+      it 'does not crash' do
+        expect { result }.not_to raise_error
+      end
+    end
+
+    context 'with enumerable input' do
+      let(:my_enumerator) do
+        Class.new do
+          include Enumerable
+          extend Forwardable
+
+          def_delegator :@array, :each
+
+          def initialize(array)
+            @array = array
+          end
+        end
+      end
+
+      let(:input) do
+        [
+          my_enumerator.new([
+            {name: 'Jane', email: 'jane@doe.org'}.freeze,
+            {name: 'Joe', email: 'joe@doe.org'}.freeze
+          ].freeze),
+          my_enumerator.new([
+            my_enumerator.new([
+              {user: 'Jane', title: 'One'}.freeze,
+              {user: 'Jane', title: 'Two'}.freeze,
+              {user: 'Joe', title: 'Three'}.freeze
+            ].freeze)
+          ].freeze)
+        ].freeze
+      end
+      let(:mappings) { [[:tasks, {name: :user}]] }
+
+      it 'supports enumerables as well' do
+        output = [
+          {name: 'Jane', email: 'jane@doe.org', tasks: [
+            {user: 'Jane', title: 'One'},
+            {user: 'Jane', title: 'Two'}
+          ]},
+          {name: 'Joe', email: 'joe@doe.org', tasks: [
+            {user: 'Joe', title: 'Three'}
+          ]}
+        ]
+        is_expected.to eql(output)
+      end
+    end
+
     describe 'integration test' do
       let(:input) do
         [
@@ -161,54 +218,5 @@ describe Transproc::ArrayTransformations do
         is_expected.to eql(output)
       end
     end
-
-    it 'merges hashes from arrays using provided join keys' do
-      input = [
-        # parent users
-        [
-          { name: 'Jane', email: 'jane@doe.org' }.freeze,
-          { name: 'Joe', email: 'joe@doe.org' }.freeze
-        ].freeze,
-        [
-          [
-            # user tasks
-            [
-              { user: 'Jane', title: 'One' }.freeze,
-              { user: 'Jane', title: 'Two' }.freeze,
-              { user: 'Joe', title: 'Three' }.freeze
-            ].freeze,
-            [
-              # task tags
-              [
-                { task: 'One', tag: 'red' }.freeze,
-                { task: 'Three', tag: 'blue' }.freeze
-              ].freeze
-            ].freeze
-          ].freeze
-        ].freeze
-      ].freeze
-
-      output = [
-        { name: 'Jane', email: 'jane@doe.org', tasks: [
-          { user: 'Jane', title: 'One', tags: [{ task: 'One', tag: 'red' }] },
-          { user: 'Jane', title: 'Two', tags: [] }]
-        },
-        {
-          name: 'Joe', email: 'joe@doe.org', tasks: [
-            {
-              user: 'Joe', title: 'Three', tags: [
-                { task: 'Three', tag: 'blue' }
-              ]
-            }
-          ]
-        }
-      ]
-
-      combine = described_class.t(:combine, [
-        [:tasks, { name: :user }, [[:tags, title: :task]]]
-      ])
-
-      expect(combine[input]).to eql(output)
-    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: transproc
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Piotr Solnica