transproc 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b2b9e293f1bc88414fb4b5f49380dfc59eb72e9
-  data.tar.gz: 551725a59dac3558f757aa2c3094fa6085999408
+  metadata.gz: 01eecdd5844cf6c0c3b491536ceb189ad6790517
+  data.tar.gz: c90ca55ae62ce7c30e182827695a299719725205
 SHA512:
-  metadata.gz: 3626b0f8b8198a308bfd19595a9246babe7778d94ccfe75c41ce23bfe595f5ebadbd9c0d0d186c81064b5b0e1137b83d60b28765a091ea29c9ecc69fefd10d09
-  data.tar.gz: 615eb4a86e3216cc450d5270447998fd80764d1668dc69ba70cb0d95ed364d3775b82a5f37701c36de093947fafd7734a91c40633f45c8ebc5e6f066e4245202
+  metadata.gz: bc6de084dda67ce23903aa7f9fc55c070508828759f4a55b324089738a51e9919d2e69598664ee637185293ce8254a93b593b38b17550b57fe5644f2e3c625cd
+  data.tar.gz: 4acba367f90300be3aee4dedb910db44ac0eed89efa998094e50d4b716f51c584c9e8db8f362670aad752febd70f1d95decefa107fefc2d5c7a9b0b72020d060

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## v0.3.3 to-be-released
+
+## Fixed
+
+* `rename_keys` no longer creates new keys (robmiller)
+
+## Deleted
+
+* `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)
+
 ## v0.3.2 2015-08-17
 
 ## Changed

data/Gemfile

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

data/README.md

@@ -39,20 +39,24 @@ Or install it yourself as:
 ``` ruby
 require 'json'
 require 'transproc/all'
-require 'inflecto'
 
 # create your own local registry for transformation functions
 module Functions
   extend Transproc::Registry
 end
 
-# import necessary functions from external modules
+# import necessary functions from other transprocs...
 module Functions
-  # all transformations available in the imported module
+  # import all singleton methods from a module/class
   import Transproc::HashTransformations
   import Transproc::ArrayTransformations
+end
 
-  # only specific transformation (renamed into the desired local name)
+# ...or from any external library
+require 'inflecto'
+module Functions
+  # import only necessary singleton methods from a module/class
+  # and rename them locally
   import :camelize, from: Inflecto, as: :camel_case
 end
 

data/lib/transproc.rb

@@ -40,7 +40,7 @@ module Transproc
   #
   # @api private
   def self.[](name, *args)
-    fn = functions.fetch(name) { raise FunctionNotFoundError.new(name) }
+    fn = functions.fetch(name) { raise(FunctionNotFoundError, name) }
 
     if args.any?
       fn.with(*args)

data/lib/transproc/all.rb

@@ -5,4 +5,5 @@ require 'transproc/coercions'
 require 'transproc/conditional'
 require 'transproc/array'
 require 'transproc/hash'
+require 'transproc/proc'
 require 'transproc/recursion'

data/lib/transproc/composite.rb

@@ -27,7 +27,7 @@ module Transproc
     #
     # @api public
     def call(value)
-      right.(left.(value))
+      right.call(left.call(value))
     end
     alias_method :[], :call
 

data/lib/transproc/error.rb

@@ -8,16 +8,4 @@ module Transproc
       super "No globally registered function for #{function}"
     end
   end
-
-  class MalformedInputError < Error
-    attr_reader :function, :value, :original_error
-
-    def initialize(function, value, error)
-      @function = function
-      @value = value
-      @original_error = error
-      super "Failed to call_function #{function} with #{value.inspect} - #{error}"
-      set_backtrace(error.backtrace)
-    end
-  end
 end

data/lib/transproc/function.rb

@@ -44,9 +44,7 @@ module Transproc
     #
     # @api public
     def call(*value)
-      fn.(*value, *args)
-    rescue => e
-      raise MalformedInputError.new(@name, value, e)
+      fn.call(*value, *args)
     end
     alias_method :[], :call
 

data/lib/transproc/hash.rb

@@ -171,7 +171,37 @@ module Transproc
     #
     # @api public
     def self.rename_keys!(hash, mapping)
-      mapping.each { |k, v| hash[v] = hash.delete(k) }
+      mapping.each { |k, v| hash[v] = hash.delete(k) if hash.has_key?(k) }
+      hash
+    end
+
+    # Copy all keys in a hash using provided mapping hash
+    #
+    # @example
+    #   Transproc(:copy_keys, user_name: :name)[user_name: 'Jane']
+    #   # => {:user_name => "Jane", :name => "Jane"}
+    #
+    # @param [Hash] hash The input hash
+    # @param [Hash] mapping The key-copy mapping
+    #
+    # @return [Hash]
+    #
+    # @api public
+    def self.copy_keys(hash, mapping)
+      copy_keys!(Hash[hash], mapping)
+    end
+
+    # Same as `:copy_keys` but mutates the hash
+    #
+    # @see HashTransformations.copy_keys
+    #
+    # @api public
+    def self.copy_keys!(hash, mapping)
+      mapping.each do |original_key, new_keys|
+        [*new_keys].each do |new_key|
+          hash[new_key] = hash[original_key]
+        end
+      end
       hash
     end
 
@@ -446,8 +476,9 @@ module Transproc
     #
     # @api public
     def self.deep_merge(hash, other)
-      Hash[hash].merge(other) do |key, original_value, new_value|
-        if original_value.respond_to?(:to_hash) && new_value.respond_to?(:to_hash)
+      Hash[hash].merge(other) do |_, original_value, new_value|
+        if original_value.respond_to?(:to_hash) &&
+           new_value.respond_to?(:to_hash)
           deep_merge(Hash[original_value], Hash[new_value])
         else
           new_value

data/lib/transproc/proc.rb

@@ -0,0 +1,46 @@
+module Transproc
+  # Transformation functions for Procs
+  #
+  # @example
+  #   require 'ostruct'
+  #   require 'transproc/proc'
+  #
+  #   include Transproc::Helper
+  #
+  #   fn = t(
+  #     :map_value,
+  #     'foo_bar',
+  #     t(:bind, OpenStruct.new(prefix: 'foo'), -> s { [prefix, s].join('_') })
+  #   )
+  #
+  #   fn["foo_bar" => "bar"]
+  #   # => {"foo_bar" => "foo_bar"}
+  #
+  # @api public
+  module ProcTransformations
+    extend Registry
+
+    # Change the binding for the given function
+    #
+    # @example
+    #   Transproc(
+    #     :bind,
+    #     OpenStruct.new(prefix: 'foo'),
+    #     -> s { [prefix, s].join('_') }
+    #   )['bar']
+    #   # => "foo_bar"
+    #
+    # @param [Proc]
+    #
+    # @return [Proc]
+    #
+    # @api public
+    def self.bind(value, binding, fn)
+      binding.instance_exec(value, &fn)
+    end
+
+    # @deprecated Register methods globally
+    (methods - Registry.instance_methods - Registry.methods)
+      .each { |name| Transproc.register name, t(name) }
+  end
+end

data/lib/transproc/recursion.rb

@@ -10,8 +10,8 @@ module Transproc
   #
   #   fn = t(:hash_recursion, t(:symbolize_keys))
   #
-  #   fn["name" => "Jane", "address" => { "street" => "Street 1", "zipcode" => "123" }]
-  #   # => {:name=>"Jane", :address=>{:street=>"Street 1", :zipcode=>"123"}}
+  #   fn["name" => "Jane", "address" => { "street" => "Street 1" }]
+  #   # => {:name=>"Jane", :address=>{:street=>"Street 1"}}
   #
   # @api public
   module Recursion
@@ -36,7 +36,14 @@ module Transproc
     #       ]
     #     }
     #   ]
-    #   => {:id=>1, :name=>"Jane", :tasks=>[{:id=>1, :description=>"Write some code"}, {:id=>2, :description=>"Write some more code"}]}
+    #   => {
+    #        :id=>1,
+    #        :name=>"Jane",
+    #        :tasks=>[
+    #          {:id=>1, :description=>"Write some code"},
+    #          {:id=>2, :description=>"Write some more code"}
+    #        ]
+    #      }
     #
     # @param [Enumerable]
     #

data/lib/transproc/rspec.rb

@@ -5,8 +5,15 @@
 # ==============================================================================
 
 shared_context :call_transproc do
-  let!(:__initial__) { input.dup rescue input      }
-  let!(:__fn__)      { described_class[*arguments] }
+  let!(:__fn__) { described_class[*arguments] }
+  let!(:__initial__) do
+    begin
+      input.dup
+    rescue
+      input
+    end
+  end
+
   subject { __fn__[input] }
 end
 
@@ -14,7 +21,7 @@ shared_examples :transforming_data do
   include_context :call_transproc
 
   it '[returns the expected output]' do
-    expect(subject).to eql(output), <<-REPORT.gsub(/.+\|/, "")
+    expect(subject).to eql(output), <<-REPORT.gsub(%r{.+\|}, '')
       |
       |fn = #{described_class}#{Array[*arguments]}
       |
@@ -33,7 +40,7 @@ shared_examples :transforming_immutable_data do
 
   it '[keeps input unchanged]' do
     expect { subject }
-      .not_to change { input }, <<-REPORT.gsub(/.+\|/, "")
+      .not_to change { input }, <<-REPORT.gsub(%r{.+\|}, '')
         |
         |fn = #{described_class}#{Array[*arguments]}
         |
@@ -51,7 +58,7 @@ shared_examples :mutating_input_data do
   it '[changes input]' do
     expect { subject }
       .to change { input }
-      .to(output), <<-REPORT.gsub(/.+\|/, "")
+      .to(output), <<-REPORT.gsub(%r{.+\|}, '')
         |
         |fn = #{described_class}#{Array[*arguments]}
         |

data/lib/transproc/support/deprecations.rb

@@ -1,10 +1,10 @@
 module Transproc
   module Deprecations
     def self.announce(name, msg)
-      warn <<-MSG.gsub(/^\s+/, '')
+      warn <<-MSG.gsub(%r{^\s+}, '')
         #{name} is deprecated and will be removed in 1.0.0.
         #{msg}
-        #{caller.detect { |l| !l.include?('lib/transproc')}}
+        #{caller.detect { |l| !l.include?('lib/transproc') } }
       MSG
     end
   end

data/lib/transproc/version.rb

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

data/spec/spec_helper.rb

@@ -5,6 +5,7 @@ end
 
 require 'equalizer'
 require 'anima'
+require 'ostruct'
 require 'transproc/all'
 
 begin

data/spec/unit/function_not_found_error_spec.rb

@@ -4,8 +4,8 @@ describe Transproc::FunctionNotFoundError do
   it 'complains that the function not registered globally' do
     expect { Transproc(:foo) }.to raise_error do |error|
       expect(error).to be_kind_of described_class
-      expect(error.message["foo"]).not_to be_nil
-      expect(error.message["global"]).not_to be_nil
+      expect(error.message['foo']).not_to be_nil
+      expect(error.message['global']).not_to be_nil
     end
   end
 
@@ -14,7 +14,7 @@ describe Transproc::FunctionNotFoundError do
 
     expect { Foo[:foo] }.to raise_error do |error|
       expect(error).to be_kind_of described_class
-      expect(error.message["function Foo[:foo]"]).not_to be_nil
+      expect(error.message['function Foo[:foo]']).not_to be_nil
     end
   end
 end

data/spec/unit/hash_transformations_spec.rb

@@ -31,7 +31,7 @@ describe Transproc::HashTransformations do
       symbolize_keys = described_class.t(:symbolize_keys)
 
       input = { 1 => 'bar' }
-      output = { :'1' => 'bar' }
+      output = { '1'.to_sym => 'bar' }
 
       expect(symbolize_keys[input]).to eql(output)
       expect { symbolize_keys[input] }.not_to change { input }
@@ -46,7 +46,7 @@ describe Transproc::HashTransformations do
       output = { foo: 'bar', baz: [{ one: 1 }, 'two'] }
 
       expect(symbolize_keys[input]).to eql(output)
-      expect(input).to eql({ 'foo' => 'bar', 'baz' => [{ 'one' => 1 }, 'two'] })
+      expect(input).to eql('foo' => 'bar', 'baz' => [{ 'one' => 1 }, 'two'])
     end
   end
 
@@ -121,6 +121,16 @@ describe Transproc::HashTransformations do
       expect(map[input]).to eql(output)
       expect(input).to eql('foo' => 'bar', :bar => 'baz')
     end
+
+    it "only renames keys and never creates new ones" do
+      map = described_class.t(:rename_keys, 'foo' => :foo, 'bar' => :bar)
+
+      input = { 'bar' => 'baz' }
+      output = { bar: 'baz' }
+
+      expect(map[input]).to eql(output)
+      expect(input).to eql('bar' => 'baz')
+    end
   end
 
   describe '.rename_keys!' do
@@ -135,6 +145,59 @@ describe Transproc::HashTransformations do
       expect(input).to eql(output)
     end
   end
+  describe '.copy_keys' do
+    context 'with single destination key' do
+      it 'returns a new hash with applied functions' do
+        map = described_class.t(:copy_keys, 'foo' => :foo)
+
+        input = { 'foo' => 'bar', :bar => 'baz' }
+        output = { 'foo' => 'bar', foo: 'bar', bar: 'baz' }
+
+        expect(map[input]).to eql(output)
+        expect(input).to eql('foo' => 'bar', :bar => 'baz')
+      end
+    end
+
+    context 'with multiple destination keys' do
+      it 'returns a new hash with applied functions' do
+        map = described_class.t(:copy_keys, 'foo' => [:foo, :baz])
+
+        input = { 'foo' => 'bar', :bar => 'baz' }
+        output = { 'foo' => 'bar', foo: 'bar', baz: 'bar', bar: 'baz' }
+
+        expect(map[input]).to eql(output)
+        expect(input).to eql('foo' => 'bar', :bar => 'baz')
+      end
+    end
+  end
+
+  describe '.copy_keys!' do
+    context 'with single destination key' do
+      it 'returns updated hash with applied functions' do
+        map = described_class.t(:copy_keys!, 'foo' => :foo)
+
+        input = { 'foo' => 'bar', :bar => 'baz' }
+        output = { 'foo' => 'bar', foo: 'bar', bar: 'baz' }
+
+        map[input]
+
+        expect(input).to eql(output)
+      end
+    end
+
+    context 'with multiple destination keys' do
+      it 'returns updated hash with applied functions' do
+        map = described_class.t(:copy_keys!, 'foo' => [:foo, :baz])
+
+        input = { 'foo' => 'bar', :bar => 'baz' }
+        output = { 'foo' => 'bar', foo: 'bar', baz: 'bar', bar: 'baz' }
+
+        map[input]
+
+        expect(input).to eql(output)
+      end
+    end
+  end
 
   describe '.map_value' do
     it 'applies function to value under specified key' do
@@ -178,7 +241,7 @@ describe Transproc::HashTransformations do
 
   describe '.nest!' do
     it 'returns new hash with keys nested under a new key' do
-      nest = described_class.t(:nest!, :baz, ['one', 'two', 'not-here'])
+      nest = described_class.t(:nest!, :baz, %w(one two not-here))
 
       input = { 'foo' => 'bar', 'one' => nil, 'two' => false }
       output = { 'foo' => 'bar', baz: { 'one' => nil, 'two' => false } }
@@ -291,7 +354,7 @@ describe Transproc::HashTransformations do
   describe 'combining transformations' do
     it 'applies functions to the hash' do
       symbolize_keys = described_class.t(:symbolize_keys)
-      map = described_class.t(:rename_keys, user_name: :name, user_email: :email)
+      map = described_class.t :rename_keys, user_name: :name, user_email: :email
 
       transformation = symbolize_keys >> map
 
@@ -477,8 +540,8 @@ describe Transproc::HashTransformations do
       evaluate = described_class.t(:eval_values, 1)
 
       input = {
-        one: 1, two: -> i { i+1 },
-        three: -> i { i+2 }, four: 4,
+        one: 1, two: -> i { i + 1 },
+        three: -> i { i + 2 }, four: 4,
         more: [{ one: -> i { i }, two: 2 }]
       }
 
@@ -495,8 +558,8 @@ describe Transproc::HashTransformations do
       evaluate = described_class.t(:eval_values, 1, [:one, :two])
 
       input = {
-        one: 1, two: -> i { i+1 },
-        three: -> i { i+2 }, four: 4,
+        one: 1, two: -> i { i + 1 },
+        three: -> i { i + 2 }, four: 4,
         array: [{ one: -> i { i }, two: 2 }],
         hash: { one: -> i { i } }
       }
@@ -511,7 +574,7 @@ describe Transproc::HashTransformations do
   end
 
   describe '.deep_merge' do
-    let(:hash){
+    let(:hash) {
       {
         name: 'Jane',
         email: 'jane@doe.org',
@@ -522,7 +585,7 @@ describe Transproc::HashTransformations do
       }
     }
 
-    let(:update){
+    let(:update) {
       {
         email: 'jane@example.org',
         favorites:
@@ -534,7 +597,11 @@ describe Transproc::HashTransformations do
 
     it 'recursively merges hash values' do
       deep_merge = described_class.t(:deep_merge)
-      output = { name: 'Jane', email: 'jane@example.org', favorites: { food: 'stroopwafel', color: 'orange' } }
+      output = {
+        name: 'Jane',
+        email: 'jane@example.org',
+        favorites: { food: 'stroopwafel', color: 'orange' }
+      }
 
       expect(deep_merge[hash, update]).to eql(output)
     end

data/spec/unit/proc_transformations_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe Transproc::ProcTransformations do
+  describe '.bind' do
+    let(:fn) { described_class.t(:bind, binding, proc) }
+    let(:binding) { OpenStruct.new(prefix: prefix) }
+    let(:proc) { -> v { [prefix, v].join('_') } }
+    let(:prefix) { 'foo' }
+    let(:input) { 'bar' }
+    let(:output) { 'foo_bar' }
+
+    subject  { fn[input] }
+
+    it 'binds the given proc to the specified binding' do
+      is_expected.to eq(output)
+    end
+  end
+end

data/spec/unit/recursion_spec.rb

@@ -9,7 +9,7 @@ describe Transproc::Recursion do
         'foo' => 'bar',
         'bar' => {
           'foo' => 'bar',
-          'bar' => ['foo', 'bar', 'baz'],
+          'bar' => %w(foo bar baz),
           'baz' => 'foo'
         },
         'baz' => 'bar'
@@ -23,7 +23,7 @@ describe Transproc::Recursion do
         'foo' => 'bar',
         'bar' => {
           'foo' => 'bar',
-          'bar' => ['foo', 'bar'],
+          'bar' => %w(foo bar)
         }
       }
     end

data/spec/unit/transproc_spec.rb

@@ -57,20 +57,4 @@ describe Transproc do
       expect(fn.args).to include(Transproc(:to_string))
     end
   end
-
-  describe 'handling malformed input' do
-    it 'raises a Transproc::MalformedInputError' do
-      expect {
-        Transproc(:to_integer)[{}]
-      }.to raise_error(Transproc::MalformedInputError)
-
-      begin
-        Transproc(:to_integer)[{}]
-      rescue Transproc::MalformedInputError => e
-        expect(e.message).to include('to_integer')
-        expect(e.message).to include("undefined method `to_i'")
-        expect(e.backtrace).to eql(e.original_error.backtrace)
-      end
-    end
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: transproc
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-17 00:00:00.000000000 Z
+date: 2015-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -82,6 +82,7 @@ files:
 - lib/transproc/function.rb
 - lib/transproc/functions.rb
 - lib/transproc/hash.rb
+- lib/transproc/proc.rb
 - lib/transproc/recursion.rb
 - lib/transproc/registry.rb
 - lib/transproc/rspec.rb
@@ -100,6 +101,7 @@ files:
 - spec/unit/function_not_found_error_spec.rb
 - spec/unit/function_spec.rb
 - spec/unit/hash_transformations_spec.rb
+- spec/unit/proc_transformations_spec.rb
 - spec/unit/recursion_spec.rb
 - spec/unit/registry_spec.rb
 - spec/unit/store_spec.rb
@@ -140,7 +142,9 @@ test_files:
 - spec/unit/function_not_found_error_spec.rb
 - spec/unit/function_spec.rb
 - spec/unit/hash_transformations_spec.rb
+- spec/unit/proc_transformations_spec.rb
 - spec/unit/recursion_spec.rb
 - spec/unit/registry_spec.rb
 - spec/unit/store_spec.rb
 - spec/unit/transproc_spec.rb
+has_rdoc: