transproc 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca6a7b97e58a3d28f1c9ebeb9303a52926c94d39
-  data.tar.gz: f1255fcec0934e3f096a6b47252d1ab6937df70e
+  metadata.gz: cd81b477e8c02b0e1644d7dd91c0dd798a09d24f
+  data.tar.gz: 6dde0346785ecc1de03f0beb9458cee9c427b5e1
 SHA512:
-  metadata.gz: f9a87bded9276d2be3f4847bd59528a29e26c54333518ead773f304b8c342a9dc63b8f18bc681483e10cd70c7717194cbc56d74b921d7228fd28b991339ec949
-  data.tar.gz: 6ef8c827fd903e226c3c1660091aac9fa231108ab7b7cecda5c438d142b633b81428000fa43802b51258d4033d774ac4f5ba90e0c97dbf77bbe42d66b30955da
+  metadata.gz: da55a09ce5a269141913ef066754d2e49a6e0cd45debdac119df3aff3788d0a287e654b43590c9c73223fd2b8ccfed48e4a6c850889259747414517c4eef21ad
+  data.tar.gz: 37c85578845d113c1f792cc02d83c9b697c585c8426fe8f76dc3b913a7ff307b97bc226cf039a95f40a1861d091e9a339b13016f71a512a7557e0a2428592a11

data/CHANGELOG.md

@@ -1,4 +1,11 @@
-## v1.0.0 2017-01-29
+# v1.0.1 2017-02-25
+
+* `combine` is now multiple times faster, depending on the level of nesting (Kukunin + splattael) 
+* `nest` (thus `wrap` too) is ~2x faster now (solnic)
+
+[Compare v1.0.0...v1.0.1](https://github.com/solnic/transproc/compare/v1.0.0...v1.0.1)
+
+# v1.0.0 2017-01-29
 
 ## Added
 
@@ -14,7 +21,7 @@
 
 [Compare v0.4.2...v1.0.0](https://github.com/solnic/transproc/compare/v0.4.2...v1.0.0)
 
-## v0.4.2 2017-01-12
+# v0.4.2 2017-01-12
 
 ## Added
 
@@ -26,7 +33,7 @@
 
 [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
+# v0.4.1 2016-11-08
 
 ## Added
 
@@ -38,7 +45,7 @@
 
 [Compare v0.4.0...v0.4.1](https://github.com/solnic/transproc/compare/v0.4.0...v0.4.1)
 
-## v0.4.0 2015-11-23
+# v0.4.0 2015-11-23
 
 ## Fixed
 
@@ -50,7 +57,7 @@
 
 [Compare v0.3.2...v0.4.0](https://github.com/solnic/transproc/compare/v0.3.2...v0.4.0)
 
-## v0.3.2 2015-08-17
+# v0.3.2 2015-08-17
 
 ## Changed
 
@@ -62,7 +69,7 @@
 
 [Compare v0.3.1...v0.3.2](https://github.com/solnic/transproc/compare/v0.3.1...v0.3.2)
 
-## v0.3.1 2015-08-06
+# v0.3.1 2015-08-06
 
 ### Added
 
@@ -74,7 +81,7 @@
 
 [Compare v0.3.0...v0.3.1](https://github.com/solnic/transproc/compare/v0.3.0...v0.3.1)
 
-## v0.3.0 2015-07-12
+# v0.3.0 2015-07-12
 
 This release deprecates a couple of APIs and changes the way functions can be
 accessed. The global `Transproc()` function registry is now deprecated and you
@@ -104,7 +111,7 @@ in 1.0.0.
 
 [Compare v0.2.4...v0.3.0](https://github.com/solnic/transproc/compare/v0.2.4...v0.3.0)
 
-## v0.2.4 2015-06-20
+# v0.2.4 2015-06-20
 
 ### Added
 
@@ -118,7 +125,7 @@ in 1.0.0.
 
 [Compare v0.2.3...v0.2.4](https://github.com/solnic/transproc/compare/v0.2.3...v0.2.4)
 
-## v0.2.3 2015-06-02
+# v0.2.3 2015-06-02
 
 ### Added
 
@@ -134,7 +141,7 @@ in 1.0.0.
 
 [Compare v0.2.2...v0.2.3](https://github.com/solnic/transproc/compare/v0.2.2...v0.2.3)
 
-## v0.2.2 2015-05-22
+# v0.2.2 2015-05-22
 
 ### Added
 
@@ -148,7 +155,7 @@ in 1.0.0.
 
 [Compare v0.2.1...v0.2.2](https://github.com/solnic/transproc/compare/v0.2.1...v0.2.2)
 
-## v0.2.1 2015-05-17
+# v0.2.1 2015-05-17
 
 ### Added
 
@@ -177,7 +184,7 @@ in 1.0.0.
 
 [Compare v0.2.0...v0.2.1](https://github.com/solnic/transproc/compare/v0.2.0...v0.2.1)
 
-## v0.2.0 2015-04-14
+# v0.2.0 2015-04-14
 
 ### Added
 
@@ -199,7 +206,7 @@ in 1.0.0.
 
 [Compare v0.1.3...v0.2.0](https://github.com/solnic/transproc/compare/v0.1.3...v0.2.0)
 
-## v0.1.3 2015-04-07
+# v0.1.3 2015-04-07
 
 ### Added
 
@@ -212,7 +219,7 @@ in 1.0.0.
 
 [Compare v0.1.2...v0.1.3](https://github.com/solnic/transproc/compare/v0.1.2...v0.1.3)
 
-## v0.1.2 2015-03-14
+# v0.1.2 2015-03-14
 
 ### Changed
 
@@ -220,7 +227,7 @@ in 1.0.0.
 
 [Compare v0.1.1...v0.1.2](https://github.com/solnic/transproc/compare/v0.1.1...v0.1.2)
 
-## v0.1.1 2015-03-13
+# v0.1.1 2015-03-13
 
 ### Changed
 
@@ -234,7 +241,7 @@ in 1.0.0.
 
 [Compare v0.1.0...v0.1.1](https://github.com/solnic/transproc/compare/v0.1.0...v0.1.1)
 
-## v0.1.0 2014-12-28
+# v0.1.0 2014-12-28
 
 ### Added
 
@@ -247,6 +254,6 @@ in 1.0.0.
 
 [Compare v0.0.1...v0.1.0](https://github.com/solnic/transproc/compare/v0.0.1...v0.1.0)
 
-## v0.0.1 2014-12-24
+# v0.0.1 2014-12-24
 
 First public release \o/

data/README.md

@@ -45,15 +45,15 @@ Or install it yourself as:
 Simple transformations are defined as easy as:
 
 ```ruby
-increament = Transproc::Function.new(-> (data) { data + 1 })
-increament[1] # => 2
+increment = Transproc::Function.new(-> (data) { data + 1 })
+increment[1] # => 2
 ```
 
 It's easy to compose transformations:
 
 ```ruby
 to_string = Transproc::Function.new(:to_s.to_proc)
-(increament >> to_string)[1] => '2'
+(increment >> to_string)[1] => '2'
 ```
 
 It's easy to pass additional arguments to transformations:

data/lib/transproc/array.rb

@@ -1,5 +1,6 @@
 require 'transproc/coercions'
 require 'transproc/hash'
+require 'transproc/array/combine'
 
 module Transproc
   # Transformation functions for Array objects
@@ -58,7 +59,7 @@ module Transproc
     # @api public
     def self.wrap(array, key, keys)
       nest = HashTransformations[:nest, key, keys]
-      map_array(array, nest)
+      array.map { |element| nest.call(element) }
     end
 
     # Group array values using provided root key and value keys
@@ -118,53 +119,8 @@ module Transproc
       array.flat_map { |item| HashTransformations.split(item, key, keys) }
     end
 
-    CACHE = Hash.new { |h, k| h[k] = {} }
-
-    def self.combine(array, mappings, cache = CACHE.dup)
-      root, groups = array
-
-      root.map do |parent|
-        child_hash = {}
-
-        for candidates in groups
-          index = groups.index(candidates)
-          data = mappings[index]
-
-          key = data[0]
-          keys = data[1]
-
-          children =
-            if data.size == 2
-              candidates
-            else
-              combine(candidates, data[2])
-            end
-
-          child_keys = keys.size > 1 ? keys.values : keys.values[0]
-          pk_names = keys.size > 1 ? keys.keys : keys.keys[0]
-
-          pkey_value =
-            if pk_names.is_a?(Array)
-              parent.values_at(*pk_names)
-            else
-              parent[pk_names]
-            end
-
-          cache[key][child_keys] ||= children.group_by do |child|
-            if child_keys.is_a?(Array)
-              child.values_at(*child_keys)
-            else
-              child[child_keys]
-            end
-          end
-
-          child_arr = cache[key][child_keys][pkey_value] || []
-
-          child_hash[key] = child_arr
-        end
-
-        parent.merge(child_hash)
-      end
+    def self.combine(array, mappings)
+      Combine.combine(array, mappings)
     end
 
     # Converts the array of hashes to array of values, extracted by given key

data/lib/transproc/array/combine.rb

@@ -0,0 +1,56 @@
+module Transproc
+  module ArrayTransformations
+    class Combine
+      class << self
+        def combine(array, mappings)
+          root, nodes = array
+          return root if nodes.nil?
+          groups = group_nodes(nodes, mappings)
+
+          root.map do |element|
+            element.dup.tap { |copy| add_groups_to_element(copy, groups, mappings) }
+          end
+        end
+
+        private
+
+        def add_groups_to_element(element, groups, mappings)
+          groups.each_with_index do |candidates, index|
+            mapping = mappings[index]
+            resource_key = mapping[0]
+            element[resource_key] = element_candidates(element, candidates, mapping[1].keys)
+          end
+        end
+
+        def element_candidates(element, candidates, keys)
+          candidates[element_candidates_key(element, keys)] || []
+        end
+
+        def group_nodes(nodes, mappings)
+          nodes.each_with_index.map do |candidates, index|
+            mapping = mappings[index]
+            group_candidates(candidates, mapping)
+          end
+        end
+
+        def group_candidates(candidates, mapping)
+          nested_mapping = mapping[2]
+          candidates = combine(candidates, nested_mapping) unless nested_mapping.nil?
+          group_candidates_by_keys(candidates, mapping[1].values)
+        end
+
+        def group_candidates_by_keys(candidates, keys)
+          return candidates.group_by { |a| a.values_at(*keys) } if keys.size > 1
+
+          key = keys.first
+          candidates.group_by { |a| a[key] }
+        end
+
+        def element_candidates_key(element, keys)
+          return element.values_at(*keys) if keys.size > 1
+          element[keys.first]
+        end
+      end
+    end
+  end
+end

data/lib/transproc/function.rb

@@ -85,7 +85,8 @@ module Transproc
     #
     # @api public
     def to_ast
-      [name, args]
+      args_ast = args.map { |arg| arg.respond_to?(:to_ast) ? arg.to_ast : arg }
+      [name, args_ast]
     end
 
     # Converts a transproc to a simple proc

data/lib/transproc/hash.rb

@@ -209,18 +209,26 @@ module Transproc
     # @return [Hash]
     #
     # @api public
-    def self.nest(source_hash, root, keys)
-      nest_keys = source_hash.keys & keys
+    def self.nest(hash, root, keys)
+      child = {}
 
-      if !nest_keys.empty?
-        hash = Hash[source_hash]
-        child = Hash[nest_keys.zip(nest_keys.map { |key| hash.delete(key) })]
-        old_nest = hash[root]
-        new_nest = old_nest.is_a?(Hash) ? old_nest.merge(child) : child
-        hash.merge(root => new_nest)
+      keys.each do |key|
+        child[key] = hash[key] if hash.key?(key)
+      end
+
+      output = Hash[hash]
+
+      child.each_key { |key| output.delete(key) }
+
+      old_root = hash[root]
+
+      if old_root.is_a?(Hash)
+        output[root] = old_root.merge(child)
       else
-        source_hash.merge(root => {})
+        output[root] = child
       end
+
+      output
     end
 
     # Collapse a nested hash from a specified key

data/lib/transproc/registry.rb

@@ -46,8 +46,9 @@ module Transproc
     #
     def [](fn, *args)
       fetched = fetch(fn)
-      return fetched if already_wrapped?(fetched)
-      Function.new(fetched, args: args, name: fn)
+
+      return Function.new(fetched, args: args, name: fn) unless already_wrapped?(fetched)
+      args.empty? ? fetched : fetched.with(*args)
     end
     alias_method :t, :[]
 

data/lib/transproc/version.rb

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

data/spec/unit/array/combine_spec.rb

@@ -0,0 +1,214 @@
+require 'spec_helper'
+
+describe Transproc::ArrayTransformations do
+  describe '.combine' do
+    subject(:result) { described_class.t(:combine, mappings)[input] }
+
+    let(:input) { [[]] }
+    let(:mappings) { [] }
+
+    it { is_expected.to be_a(Array) }
+
+    it { is_expected.to eq([]) }
+
+    context 'without groups' do
+      let(:input) do
+        [
+          [
+            {name: 'Jane', email: 'jane@doe.org'}.freeze,
+            {name: 'Joe', email: 'joe@doe.org'}.freeze
+          ].freeze
+        ].freeze
+      end
+
+      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
+        [
+          [
+            {name: 'Jane', email: 'jane@doe.org'}.freeze,
+            {name: 'Joe', email: 'joe@doe.org'}.freeze
+          ].freeze,
+          [
+            [
+              {user: 'Jane', title: 'One'}.freeze,
+              {user: 'Jane', title: 'Two'}.freeze,
+              {user: 'Joe', title: 'Three'}.freeze
+            ]
+          ]
+        ].freeze
+      end
+      let(:mappings) { [[:tasks, {name: :user}]] }
+
+      it 'merges hashes from arrays using provided join keys' 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
+
+    context 'with empty nodes' do
+      let(:input) do
+        [
+          [{name: 'Jane', email: 'jane@doe.org'}.freeze].freeze,
+          [
+            []
+          ]
+        ].freeze
+      end
+
+      let(:mappings) { [[:tasks, {name: :user}]] }
+
+      it { is_expected.to eq([{name: 'Jane', email: 'jane@doe.org', tasks: []}]) }
+    end
+
+    context 'with double mapping' do
+      let(:input) do
+        [
+          [
+            {name: 'Jane', email: 'jane@doe.org'}.freeze
+          ].freeze,
+          [
+            [
+              {user: 'Jane', user_email: 'jane@doe.org', title: 'One'}.freeze,
+              {user: 'Jane', user_email: '', title: 'Two'}.freeze
+            ].freeze
+          ].freeze
+        ].freeze
+      end
+
+      let(:mappings) { [[:tasks, {name: :user, email: :user_email}]] }
+
+      it 'searches by two keys simultaneously' do
+        output = [
+          {name: 'Jane', email: 'jane@doe.org', tasks: [
+            {user: 'Jane', user_email: 'jane@doe.org', title: 'One'}
+          ]}
+        ]
+        is_expected.to eql(output)
+      end
+    end
+
+    describe 'integration test' do
+      let(:input) do
+        [
+          [
+            {name: 'Jane', email: 'jane@doe.org'},
+            {name: 'Joe', email: 'joe@doe.org'}
+          ],
+          [
+            [
+              # user tasks
+              [
+                {user: 'Jane', title: 'One'},
+                {user: 'Jane', title: 'Two'},
+                {user: 'Joe', title: 'Three'}
+              ],
+              [
+                # task tags
+                [
+                  {task: 'One', tag: 'red'},
+                  {task: 'Three', tag: 'blue'}
+                ]
+              ]
+            ]
+          ]
+        ]
+      end
+
+      let(:mappings) { [[:tasks, {name: :user}, [[:tags, title: :task]]]] }
+
+      it 'merges hashes from arrays using provided join keys' do
+        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'}
+                ]
+              }
+            ]
+          }
+        ]
+        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

data/spec/unit/array_transformations_spec.rb

@@ -230,55 +230,4 @@ describe Transproc::ArrayTransformations do
       expect(ungroup[input]).to eql(output)
     end
   end
-
-  describe '.combine' do
-    it 'merges hashes from arrays using provided join keys' do
-      input = [
-        # parent users
-        [
-          { name: 'Jane', email: 'jane@doe.org' },
-          { name: 'Joe', email: 'joe@doe.org' }
-        ],
-        [
-          [
-            # user tasks
-            [
-              { user: 'Jane', title: 'One' },
-              { user: 'Jane', title: 'Two' },
-              { user: 'Joe', title: 'Three' }
-            ],
-            [
-              # task tags
-              [
-                { task: 'One', tag: 'red' },
-                { task: 'Three', tag: 'blue' }
-              ]
-            ]
-          ]
-        ]
-      ]
-
-      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

data/spec/unit/function_spec.rb

@@ -98,6 +98,21 @@ describe Transproc::Function do
       expect(fn[:ok]).to eql('ok')
       expect(fn.to_ast).to eql([:to_string, []])
     end
+
+    it 'plays well with functions as arguments' do
+      container.register(:map_array, Transproc::ArrayTransformations.t(:map_array))
+      container.register(:to_symbol, Transproc::Coercions.t(:to_symbol))
+      fn = container.t(:map_array, container.t(:to_symbol))
+
+      expect(fn.call(%w(a b c))).to eql([:a, :b, :c])
+      expect(fn.to_ast).to eql(
+        [
+          :map_array, [
+            [:to_symbol, []]
+          ]
+        ]
+      )
+    end
   end
 
   describe '#==' do

data/spec/unit/registry_spec.rb

@@ -100,6 +100,14 @@ describe Transproc::Registry do
       expect(foo[:prefix_one]).to eq function
     end
 
+    it 'allows to overwrite function arguments' do
+      foo.register(:map_array, Transproc::ArrayTransformations.t(:map_array))
+
+      fn = foo[:map_array, ->(value) { value.to_sym }]
+
+      expect(fn.call(%w(a b c))).to eq([:a, :b, :c])
+    end
+
     it 'registers and fetches composite' do
       composite = foo[:prefix, '1'] + foo[:prefix, '2']
       foo.register(:double_prefix, composite)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: transproc
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-29 00:00:00.000000000 Z
+date: 2017-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -73,6 +73,7 @@ files:
 - lib/transproc.rb
 - lib/transproc/all.rb
 - lib/transproc/array.rb
+- lib/transproc/array/combine.rb
 - lib/transproc/class.rb
 - lib/transproc/coercions.rb
 - lib/transproc/composer.rb
@@ -94,6 +95,7 @@ files:
 - rakelib/rubocop.rake
 - spec/spec_helper.rb
 - spec/support/mutant.rb
+- spec/unit/array/combine_spec.rb
 - spec/unit/array_transformations_spec.rb
 - spec/unit/class_transformations_spec.rb
 - spec/unit/coercions_spec.rb
@@ -129,13 +131,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.9
 signing_key: 
 specification_version: 4
 summary: Transform Ruby objects in functional style
 test_files:
 - spec/spec_helper.rb
 - spec/support/mutant.rb
+- spec/unit/array/combine_spec.rb
 - spec/unit/array_transformations_spec.rb
 - spec/unit/class_transformations_spec.rb
 - spec/unit/coercions_spec.rb