morfo 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69e889d25298c9a89daa889b8f7f406e5849aace
-  data.tar.gz: 84167fea094d1c085e0c6328f44dcf7e174557b4
+  metadata.gz: 3500e5ec94def95ffed72498a8dcfee478e10e80
+  data.tar.gz: b543a2e81a8032f6bc5736b42761dbb08b822ab7
 SHA512:
-  metadata.gz: d22983ba7d6abfbd603dd924985495aaa29b3f580bf683971b1408ca0aeab062a14fa917a7830b623f70f63ce548bf71e352b8ef964627904b717f0ccfeac0f6
-  data.tar.gz: 02ab5712dfc027729f4d433adc23f9c54785569aeaecfeb211f8b3a159867b5f65f755dd0349501c6b4ef2a962475b912828823944e4c4e3d791218031ac8af0
+  metadata.gz: 7a373305e8dfd3add0b3070c66e1d357dde9b453746942f3b03afaa3c68b99e5124dac54147e499cf08c05c8489e79f8cbfa3538c5f36164213cb592f077f8e1
+  data.tar.gz: 5cde3c3dd8d6082817b1976c070e673045d9b1ff496b45c36330311888747910dc62de4ef1bb92a77d27154d99e4658b77cd04dbda9e1289ac04fae72057ae63

data/.travis.yml

@@ -3,12 +3,13 @@ cache: bundler
 env: JRUBY_OPTS=--2.0
 rvm:
   - 2.0.0
-  - 2.1.0
-  - jruby-1.7.10
+  - 2.1.3
+  - jruby-1.7.16
   - ruby-head
   - jruby-head
   - rbx-2.2.3
 matrix:
+  fast_finish: true
   allow_failures:
     - rvm: ruby-head
     - rvm: jruby-head

data/CONTRIBUTING.md

@@ -0,0 +1,7 @@
+# Contributing
+
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request

data/Guardfile

@@ -1,7 +1,7 @@
 # A sample Guardfile
 # More info at https://github.com/guard/guard#readme
 
-guard :rspec, all_on_start: true do
+guard :rspec, cmd: 'bundle exec rspec', all_on_start: true do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')  { 'spec' }

data/README.md

@@ -112,12 +112,3 @@ If the value of your field should be based on multiple fields of the input row,
     #   {:name=>"Robin Hood", :status=>"Best Friend"},
     #   {:name=>"Sherlock Holmes", :status=>'Best Friend'}
     # ]
-
-
-## Contributing
-
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request

data/benchmarks/data.rb

@@ -46,20 +46,20 @@ module BenchmarkData
 
   class SimpleMorferSymbol < Morfo::Base
     BenchmarkData.row.keys.each do |field|
-      field(:"#{field}_mapped", from: field)
+      field(:"#{field}_mapped").from(field)
     end
   end
 
   class SimpleMorferString < Morfo::Base
     BenchmarkData.row_string_keys.keys.each do |field|
-      field("#{field}_mapped", from: field)
+      field("#{field}_mapped").from(field)
     end
   end
 
   class NestedMorferSymbol < Morfo::Base
     BenchmarkData.row_nested.each do |key, value|
       value.keys.each do |field|
-        field(:"#{field}_mapped", from: [key, field])
+        field(:"#{field}_mapped").from(key, field)
       end
     end
   end
@@ -67,7 +67,7 @@ module BenchmarkData
   class NestedMorferString < Morfo::Base
     BenchmarkData.row_nested_string_keys.each do |key, value|
       value.keys.each do |field|
-        field("#{field}_mapped", from: [key, field])
+        field("#{field}_mapped").from(key, field)
       end
     end
   end

data/benchmarks/run.rb

@@ -34,6 +34,7 @@ definitions.each do |defintition|
     )
 end
 
+puts "running on: #{RUBY_ENGINE}:"
 Benchmark.bm(20) do |x|
   definitions.each do |defintition|
     x.report(defintition[:label]) do
@@ -43,4 +44,5 @@ Benchmark.bm(20) do |x|
     end
   end
 end
+puts "===="
 

data/lib/morfo.rb

@@ -10,13 +10,15 @@ module Morfo
     end
 
     def self.morf input
-      input.map {|row|
-        output_row = {}
-        mapping_actions.each do |field_path, action|
-          deep_merge!(output_row, store_value(action.execute(row), field_path))
-        end
-        output_row
-      }
+      input.map { |row| morf_single(row) }
+    end
+
+    def self.morf_single input
+      output = {}
+      mapping_actions.each do |field_path, action|
+        deep_merge!(output, store_value(action.execute(input), field_path))
+      end
+      output
     end
 
     private

data/lib/morfo/version.rb

@@ -1,3 +1,3 @@
 module Morfo
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

data/spec/lib/morfo_spec.rb

@@ -30,27 +30,40 @@ describe Morfo::Base do
     ]
   end
 
-  describe '#morf' do
-    context 'errors' do
-      subject(:no_from) do
-        class NilMorfer < Morfo::Base
-          field(:my_field)
-        end
-        NilMorfer
+  let(:single_input) do
+    input.first
+  end
+
+  context 'errors' do
+    subject(:no_from) do
+      class NilMorfer < Morfo::Base
+        field(:my_field)
       end
+      NilMorfer
+    end
+
+    describe '#morf' do
       it 'raises error for nil field' do
         expect{no_from.morf([{my_field: :something}])}.to raise_error(ArgumentError)
       end
     end
 
-    context '1 to 1 conversion' do
-      subject do
-        class TitleMorfer < Morfo::Base
-          field(:tv_show_title).from(:title)
-        end
-        TitleMorfer
+    describe '#morf_single' do
+      it 'raises error for nil field' do
+        expect{no_from.morf_single({my_field: :something})}.to raise_error(ArgumentError)
+      end
+    end
+  end
+
+  context '1 to 1 conversion' do
+    subject do
+      class TitleMorfer < Morfo::Base
+        field(:tv_show_title).from(:title)
       end
+      TitleMorfer
+    end
 
+    describe '#morf' do
       it 'maps title correctly' do
         expected_output = input.map{|v| {tv_show_title: v[:title]} }
         expect(subject.morf(input)).to eq(expected_output)
@@ -63,58 +76,91 @@ describe Morfo::Base do
       end
     end
 
-    context '1 to 1 conversion with transformation' do
-      subject do
-        class NumCastMorfer < Morfo::Base
-          field(:cast_num).from(:cast).transformed{|v| v.size}
-        end
-        NumCastMorfer
+    describe '#morf_single' do
+      it 'maps title correctly' do
+        expected_output = { tv_show_title: single_input[:title] }
+        expect(subject.morf_single(single_input)).to eq(expected_output)
       end
 
+      it 'leaves out nil values in result' do
+        expected_output = {}
+        modified_input = single_input.reject { |k, v| k == :title }
+        expect(subject.morf_single(modified_input)).to eq(expected_output)
+      end
+    end
+  end
+
+  context '1 to 1 conversion with transformation' do
+    subject do
+      class NumCastMorfer < Morfo::Base
+        field(:cast_num).from(:cast).transformed{|v| v.size}
+      end
+      NumCastMorfer
+    end
+
+    describe '#morf' do
       it 'calls transformation correctly' do
         expected_output = input.map{|v| {cast_num: v[:cast].size} }
         expect(subject.morf(input)).to eq(expected_output)
       end
     end
 
-    context '1 to many conversion' do
-      subject do
-        class MutliTitleMorfer < Morfo::Base
-          field(:title).from(:title)
-          field(:also_title).from(:title)
-        end
-        MutliTitleMorfer
+    describe '#morf_single' do
+      it 'calls transformation correctly' do
+        expected_output = { cast_num: single_input[:cast].size }
+        expect(subject.morf_single(single_input)).to eq(expected_output)
       end
+    end
+  end
 
+  context '1 to many conversion' do
+    subject do
+      class MutliTitleMorfer < Morfo::Base
+        field(:title).from(:title)
+        field(:also_title).from(:title)
+      end
+      MutliTitleMorfer
+    end
+
+    describe '#morf' do
       it 'maps title to multiple fields' do
         expected_output = input.map{|v| {title: v[:title], also_title: v[:title]} }
         expect(subject.morf(input)).to eq(expected_output)
       end
     end
 
-    context 'nested conversion' do
-      context 'nested source' do
-        subject(:valid_path) do
-          class ImdbRatingMorfer < Morfo::Base
-            field(:rating).from(:ratings, :imdb)
-          end
-          ImdbRatingMorfer
+    describe '#morf_single' do
+      it 'maps title to multiple fields' do
+        expected_output = {title: single_input[:title], also_title: single_input[:title]}
+        expect(subject.morf_single(single_input)).to eq(expected_output)
+      end
+    end
+  end
+
+  context 'nested conversion' do
+    context 'nested source' do
+      subject(:valid_path) do
+        class ImdbRatingMorfer < Morfo::Base
+          field(:rating).from(:ratings, :imdb)
         end
+        ImdbRatingMorfer
+      end
 
-        subject(:valid_path_with_transformation) do
-          class ImdbRatingMorferWithTransformation < Morfo::Base
-            field(:rating).from(:ratings, :imdb).transformed {|v| "Rating: #{v}"}
-          end
-          ImdbRatingMorferWithTransformation
+      subject(:valid_path_with_transformation) do
+        class ImdbRatingMorferWithTransformation < Morfo::Base
+          field(:rating).from(:ratings, :imdb).transformed {|v| "Rating: #{v}"}
         end
+        ImdbRatingMorferWithTransformation
+      end
 
-        subject(:invalid_path) do
-          class InvalidImdbRatingMorfer < Morfo::Base
-            field(:rating).from(:very, :long, :path, :that, :might, :not, :exist)
-          end
-          InvalidImdbRatingMorfer
+      subject(:invalid_path) do
+        class InvalidImdbRatingMorfer < Morfo::Base
+          field(:rating).from(:very, :long, :path, :that, :might, :not, :exist)
         end
+        InvalidImdbRatingMorfer
+      end
 
+      describe '#morf' do
         it 'maps nested attributes' do
           expected_output = input.map{|v| {rating: v[:ratings][:imdb]} }
           expect(valid_path.morf(input)).to eq(expected_output)
@@ -131,15 +177,34 @@ describe Morfo::Base do
         end
       end
 
-      context 'nested destination' do
-        subject do
-          class WrapperMorfer < Morfo::Base
-            field(:tv_show, :title).from(:title)
-            field(:tv_show, :channel).from(:channel).transformed {|v| "Channel: #{v}"}
-          end
-          WrapperMorfer
+      describe '#morf_single' do
+        it 'maps nested attributes' do
+          expected_output = {rating: single_input[:ratings][:imdb]}
+          expect(valid_path.morf_single(single_input)).to eq(expected_output)
+        end
+
+        it 'maps nested attributes with transformation' do
+          expected_output = {rating: "Rating: #{single_input[:ratings][:imdb]}"}
+          expect(valid_path_with_transformation.morf_single(single_input)).to eq(expected_output)
+        end
+
+        it 'doesn\'t raise error for invalid path' do
+          expected_output = { }
+          expect(invalid_path.morf_single(single_input)).to eq(expected_output)
         end
+      end
+    end
 
+    context 'nested destination' do
+      subject do
+        class WrapperMorfer < Morfo::Base
+          field(:tv_show, :title).from(:title)
+          field(:tv_show, :channel).from(:channel).transformed {|v| "Channel: #{v}"}
+        end
+        WrapperMorfer
+      end
+
+      describe '#morf' do
         it 'maps to nested destination' do
           expected_output = input.map{|v|
             {
@@ -152,16 +217,30 @@ describe Morfo::Base do
           expect(subject.morf(input)).to eq(expected_output)
         end
       end
-    end
 
-    context 'calculations' do
-      subject do
-        class TitlePrefixMorfer < Morfo::Base
-          field(:title_with_channel).calculated{|r| "#{r[:title]}, (#{r[:channel]})"}
+      describe '#morf_single' do
+        it 'maps to nested destination' do
+          expected_output = {
+            tv_show: {
+              title: single_input[:title],
+              channel: "Channel: #{single_input[:channel]}",
+            }
+          }
+          expect(subject.morf_single(single_input)).to eq(expected_output)
         end
-        TitlePrefixMorfer
       end
+    end
+  end
+
+  context 'calculations' do
+    subject do
+      class TitlePrefixMorfer < Morfo::Base
+        field(:title_with_channel).calculated{|r| "#{r[:title]}, (#{r[:channel]})"}
+      end
+      TitlePrefixMorfer
+    end
 
+    describe '#morf' do
       it 'maps calculation correctly' do
         expected_output = input.map{|r|
           {
@@ -172,18 +251,37 @@ describe Morfo::Base do
       end
     end
 
-    context 'static values' do
-      subject do
-        class StaticTitleMorfer < Morfo::Base
-          field(:new_title).calculated{ 'Static Title' }
-        end
-        StaticTitleMorfer
+    describe '#morf_single' do
+      it 'maps calculation correctly' do
+        expected_output = {
+          title_with_channel: "#{single_input[:title]}, (#{single_input[:channel]})"
+        }
+
+        expect(subject.morf_single(single_input)).to eq(expected_output)
       end
+    end
+  end
+
+  context 'static values' do
+    subject do
+      class StaticTitleMorfer < Morfo::Base
+        field(:new_title).calculated{ 'Static Title' }
+      end
+      StaticTitleMorfer
+    end
 
+    describe '#morf' do
       it 'maps static value correctly' do
         expected_output = input.map{|r| {new_title: 'Static Title'} }
         expect(subject.morf(input)).to eq(expected_output)
       end
     end
+
+    describe '#morf_single' do
+      it 'maps static value correctly' do
+        expected_output = { new_title: 'Static Title' }
+        expect(subject.morf_single(single_input)).to eq(expected_output)
+      end
+    end
   end
 end

metadata

@@ -1,77 +1,77 @@
 --- !ruby/object:Gem::Specification
 name: morfo
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Leif Gensert
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-16 00:00:00.000000000 Z
+date: 2014-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: json
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: bundler
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
-  prerelease: false
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rspec
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.14'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '4.0'
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.14'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '4.0'
-  prerelease: false
-  type: :development
 description: This gem provides a DSL for converting one hash into another
 email:
 - leif@propertybase.com
@@ -79,9 +79,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
+- CONTRIBUTING.md
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -99,24 +100,24 @@ homepage: ''
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.1.9
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.2.2
+signing_key: 
 specification_version: 4
 summary: Inspired by ActiveImporter, this gem generically converts an array of hashes
 test_files: