transproc 0.4.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01eecdd5844cf6c0c3b491536ceb189ad6790517
-  data.tar.gz: c90ca55ae62ce7c30e182827695a299719725205
+  metadata.gz: 5fb2ca80c956f246b5277462bb1dcbf5c3dbd09d
+  data.tar.gz: 7ae7b71a375e026ca281fbb6906850e418ba2b21
 SHA512:
-  metadata.gz: bc6de084dda67ce23903aa7f9fc55c070508828759f4a55b324089738a51e9919d2e69598664ee637185293ce8254a93b593b38b17550b57fe5644f2e3c625cd
-  data.tar.gz: 4acba367f90300be3aee4dedb910db44ac0eed89efa998094e50d4b716f51c584c9e8db8f362670aad752febd70f1d95decefa107fefc2d5c7a9b0b72020d060
+  metadata.gz: d5fcb3e8a8229938d4f2cf16dab007eea0d3b7fbcb09c901c3a7aec87d5ceaa99ebd8e7254400409b4d540fb6426d5ba9d0b6182d36450d27a480430473c68c7
+  data.tar.gz: 708adcb9250af48b08950fdd85e82b6168d468c02b089544b97db283854be4852c37c347c4606779cee336bbf10ed6cc18bc4d595fea44db2fe5be7fd3dbb4b1

data/.travis.yml

@@ -1,19 +1,18 @@
+dist: trusty
 language: ruby
-sudo: false
+sudo: required
 cache: bundler
-env:
-  - CODECLIMATE_REPO_TOKEN=aead71de2239048f830499462c54b57dfc646f1d56ad5dcbbc3469a6ebaf97ca
 bundler_args: --without tools
 script: 'bundle exec rake spec'
+after_success:
+  - '[ "$TRAVIS_RUBY_VERSION" = "2.3.1" ] && [ "$TRAVIS_BRANCH" = "master" ] && bundle exec codeclimate-test-reporter'
 rvm:
   - 2.0
+  - 2.2
   - 2.1
-  - rbx-2
-  - jruby
-  - ruby-head
-matrix:
-  allow_failures:
-    - rvm: ruby-head
+  - 2.3.1
+  - rbx-3
+  - jruby-9.1.5.0
 notifications:
   webhooks:
     urls:

data/CHANGELOG.md

@@ -1,4 +1,28 @@
-## v0.3.3 to-be-released
+## 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
+
+* Class level transproc DSL (AMHOL)
+
+## Fixed
+
+* Works on latest rubinius again (katafrakt)
+
+[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
 
 ## Fixed
 
@@ -8,7 +32,7 @@
 
 * `MalformedInputError` exception. Transproc doesn't catch and re-raise exceptions any longer (nepalez)
 
-[Compare v0.3.2...HEAD](https://github.com/solnic/transproc/compare/v0.3.2...HEAD)
+[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
 

data/Gemfile

@@ -4,13 +4,15 @@ gemspec
 
 group :test do
   gem 'equalizer'
-  gem 'codeclimate-test-reporter', require: nil
 
   if RUBY_VERSION >= '2.1'
     gem 'anima'
     platform :mri do
       gem 'mutant', github: 'mbj/mutant', branch: 'master'
       gem 'mutant-rspec'
+
+      gem 'codeclimate-test-reporter', require: false
+      gem 'simplecov', require: false
     end
   else
     gem 'anima', '~> 0.2.0'

data/README.md

@@ -5,7 +5,7 @@
 [coveralls]: https://coveralls.io/r/solnic/transproc
 [inchpages]: http://inch-ci.org/github/solnic/transproc
 
-# Transproc [![Join the chat at https://gitter.im/solnic/transproc](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/solnic/transproc)
+# Transproc
 
 [![Gem Version](https://badge.fury.io/rb/transproc.svg)][gem]
 [![Build Status](https://travis-ci.org/solnic/transproc.svg?branch=master)][travis]

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/class_interface.rb

@@ -0,0 +1,102 @@
+module Transproc
+  class Transformer
+    # @api private
+    module ClassInterface
+      # Return a base Transproc::Transformer class with the
+      # container configured to the passed argument.
+      #
+      # @example
+      #
+      #   class MyTransformer < Transproc::Transformer[Transproc]
+      #   end
+      #
+      # @param [Transproc::Registry] container
+      #   The container to resolve transprocs from
+      #
+      # @return [subclass of Transproc::Transformer]
+      #
+      # @api public
+      def [](container)
+        klass = Class.new(Transformer)
+        klass.container(container)
+        klass
+      end
+
+      # @api private
+      def inherited(subclass)
+        subclass.container(container)
+      end
+
+      # Get or set the container to resolve transprocs from.
+      #
+      # @example
+      #
+      #   # Setter
+      #   Transproc::Transformer.container(Transproc)
+      #   # => Transproc
+      #
+      #   # Getter
+      #   Transproc::Transformer.container
+      #   # => Transproc
+      #
+      # @param [Transproc::Registry] container
+      #   The container to resolve transprocs from
+      #
+      # @return [Transproc::Registry]
+      #
+      # @api private
+      def container(container = ::Transproc::Undefined)
+        if container == ::Transproc::Undefined
+          @container
+        else
+          @container = container
+        end
+      end
+
+      # @api private
+      def method_missing(method, *args, &block)
+        if container.functions.has_key?(method)
+          if block_given?
+            transformations << container[
+              method,
+              *args,
+              create(container, &block).transproc
+            ]
+          else
+            transformations << container[method, *args]
+          end
+        else
+          super
+        end
+      end
+
+      # @api private
+      def respond_to_missing?(method, _include_private = false)
+        container.functions.has_key?(method) || super
+      end
+
+      # @api private
+      def transproc
+        transformations.reduce(:>>)
+      end
+
+      private
+      # An array containing the transformation pipeline
+      #
+      # @api private
+      def transformations
+        @transformations ||= []
+      end
+
+      # Create and return a new instance of Transproc::Transformer
+      # evaluating the block argument as the class body
+      #
+      # @api private
+      def create(container, &block)
+        klass = self[container]
+        klass.instance_eval(&block)
+        klass
+      end
+    end
+  end
+end

data/lib/transproc/transformer.rb

@@ -0,0 +1,69 @@
+require 'transproc/transformer/class_interface'
+
+module Transproc
+  # Transfomer class for defining transprocs with a class DSL.
+  #
+  # @example
+  #   require 'anima'
+  #   require 'transproc/all'
+  #
+  #   class User
+  #     include Anima.new(:name, :address)
+  #   end
+  #
+  #   class Address
+  #     include Anima.new(:city, :street, :zipcode)
+  #   end
+  #
+  #   class UsersMapper < Transproc::Transformer
+  #     map_array do
+  #       symbolize_keys
+  #       rename_keys user_name: :name
+  #       nest :address, %i(city street zipcode)
+  #       map_value :address do
+  #         constructor_inject Address
+  #       end
+  #       constructor_inject User
+  #     end
+  #   end
+  #
+  #   UsersMapper.new.call(
+  #     [
+  #       { 'user_name' => 'Jane',
+  #         'city' => 'NYC',
+  #         'street' => 'Street 1',
+  #         'zipcode' => '123'
+  #       }
+  #     ]
+  #   )
+  #   # => [
+  #     #<User
+  #       name="Jane"
+  #       address=#<Address city="NYC" street="Street 1" zipcode="123">>
+  #   ]
+  #
+  # @api public
+  class Transformer
+    extend ClassInterface
+
+    # Execute the transformation pipeline with the given input.
+    #
+    # @example
+    #
+    #   class SymbolizeKeys < Transproc::Transformer
+    #     symbolize_keys
+    #   end
+    #
+    #   SymbolizeKeys.new.call('name' => 'Jane')
+    #   # => {:name=>"Jane"}
+    #
+    # @param [mixed] input The input to pass to the pipeline
+    #
+    # @return [mixed] output The output returned from the pipeline
+    #
+    # @api public
+    def call(input)
+      self.class.transproc.call(input)
+    end
+  end
+end

data/lib/transproc/version.rb

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

data/lib/transproc.rb

@@ -5,9 +5,12 @@ require 'transproc/composer'
 require 'transproc/error'
 require 'transproc/store'
 require 'transproc/registry'
+require 'transproc/transformer'
 require 'transproc/support/deprecations'
 
 module Transproc
+  Undefined = Object.new.freeze
+  Transformer.container(self)
   # Function registry
   #
   # @api private
@@ -75,10 +78,10 @@ def Transproc(fn, *args)
   case fn
   when Proc then Transproc::Function.new(fn, args: args)
   when Symbol
-    fun = Transproc[fn, *args]
-    case fun
-    when Transproc::Function, Transproc::Composite then fun
-    else Transproc::Function.new(fun, args: args)
+    func = Transproc[fn, *args]
+    case func
+    when Transproc::Function, Transproc::Composite then func
+    else Transproc::Function.new(func, args: args)
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,6 +1,8 @@
-if RUBY_ENGINE == 'rbx'
-  require 'codeclimate-test-reporter'
-  CodeClimate::TestReporter.start
+if RUBY_ENGINE == 'ruby' && RUBY_VERSION == '2.3.1'
+  require 'simplecov'
+  SimpleCov.start do
+    add_filter '/spec/'
+  end
 end
 
 require 'equalizer'

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

data/spec/unit/transformer_spec.rb

@@ -0,0 +1,86 @@
+require 'spec_helper'
+
+describe Transproc::Transformer do
+  let(:klass) { Class.new(Transproc::Transformer) }
+  let(:transformer) { klass.new }
+
+  describe '.container' do
+    context 'without setter argument' do
+      subject! { klass.container }
+
+      it 'defaults to Transproc' do
+        is_expected.to eq(Transproc)
+      end
+    end
+
+    context 'with setter argument' do
+      subject! { klass.container({}) }
+
+      it 'sets and returns the container' do
+        expect(klass.container).to eq({})
+      end
+    end
+  end
+
+  describe '.[]' do
+    let(:container) { double('Transproc') }
+
+    subject!(:klass) { Transproc::Transformer[container] }
+
+    it { expect(klass.container).to eq(container) }
+    it { is_expected.to be_a(::Class) }
+  end
+
+  describe '#call' do
+    let(:klass) do
+      Class.new(Transproc::Transformer) do
+        map_array do
+          symbolize_keys
+          rename_keys user_name: :name
+          nest :address, [:city, :street, :zipcode]
+          map_value :address do
+            constructor_inject Test::Address
+          end
+          constructor_inject Test::User
+        end
+      end
+    end
+    let(:input) do
+      [
+        { 'user_name' => 'Jane',
+          'city' => 'NYC',
+          'street' => 'Street 1',
+          'zipcode' => '123'
+        }
+      ]
+    end
+    let(:output) do
+      [
+        Test::User.new(
+          name: 'Jane',
+          address: Test::Address.new(
+            city: 'NYC',
+            street: 'Street 1',
+            zipcode: '123'
+          )
+        )
+      ]
+    end
+
+    before do
+      module Test
+        class User
+          include Anima.new(:name, :address)
+        end
+
+        class Address
+          include Anima.new(:city, :street, :zipcode)
+        end
+      end
+    end
+
+    subject! { transformer.call(input) }
+
+    it { is_expected.to eq(output) }
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: transproc
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.2
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-23 00:00:00.000000000 Z
+date: 2017-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -88,6 +88,8 @@ files:
 - lib/transproc/rspec.rb
 - lib/transproc/store.rb
 - lib/transproc/support/deprecations.rb
+- lib/transproc/transformer.rb
+- lib/transproc/transformer/class_interface.rb
 - lib/transproc/version.rb
 - rakelib/mutant.rake
 - rakelib/rubocop.rake
@@ -105,6 +107,7 @@ files:
 - spec/unit/recursion_spec.rb
 - spec/unit/registry_spec.rb
 - spec/unit/store_spec.rb
+- spec/unit/transformer_spec.rb
 - spec/unit/transproc_spec.rb
 - transproc.gemspec
 homepage: http://solnic.github.io/transproc/
@@ -127,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Transform Ruby objects in functional style
@@ -146,5 +149,5 @@ test_files:
 - spec/unit/recursion_spec.rb
 - spec/unit/registry_spec.rb
 - spec/unit/store_spec.rb
+- spec/unit/transformer_spec.rb
 - spec/unit/transproc_spec.rb
-has_rdoc: