morfo 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7bb20ae90a7b011588d8e096694b69fab5664684
-  data.tar.gz: 00b3eb367ac96a797105118974ca2562a35d4163
+  metadata.gz: 69e889d25298c9a89daa889b8f7f406e5849aace
+  data.tar.gz: 84167fea094d1c085e0c6328f44dcf7e174557b4
 SHA512:
-  metadata.gz: c84f9323b71740ee3056033a25974a7daefedd3e29e92b40138bf5591e1b3a186349527d4cf13865c8a91bcbd260f01587857917dae74eca157351250de3f321
-  data.tar.gz: d052cce267ede1514bb6bb70c2db3eabbc3c4f01273d337c95b399986a683f0516ea2175fc43b0ad6fbf9003a1789fc62054ac498d6cc5747a886c564985db9e
+  metadata.gz: d22983ba7d6abfbd603dd924985495aaa29b3f580bf683971b1408ca0aeab062a14fa917a7830b623f70f63ce548bf71e352b8ef964627904b717f0ccfeac0f6
+  data.tar.gz: 02ab5712dfc027729f4d433adc23f9c54785569aeaecfeb211f8b3a159867b5f65f755dd0349501c6b4ef2a962475b912828823944e4c4e3d791218031ac8af0

data/.travis.yml

@@ -3,14 +3,15 @@ cache: bundler
 env: JRUBY_OPTS=--2.0
 rvm:
   - 2.0.0
-  - jruby-1.7.9
+  - 2.1.0
+  - jruby-1.7.10
   - ruby-head
   - jruby-head
-  - rbx-2.2.1
+  - rbx-2.2.3
 matrix:
   allow_failures:
     - rvm: ruby-head
     - rvm: jruby-head
-    - rvm: rbx-2.2.1
+    - rvm: rbx-2.2.3
 script:
   - bundle exec rake spec

data/Gemfile

@@ -9,8 +9,11 @@ group :test, :development do
   gem 'guard-rspec'
   gem 'simplecov'
   gem 'pry'
+  gem 'rubinius-coverage', platform: :rbx
 
   gem 'rb-inotify', require: false
   gem 'rb-fsevent', require: false
   gem 'rb-fchange', require: false
 end
+
+gem 'json'

data/README.md

@@ -30,10 +30,10 @@ Use the `field` method to specify what fields exist and where they will get thei
 
 ### Simple Mapping
 
-The most basic form is, just define another field from the input hash. The value will just be copied.
+The most basic form is copying the value from another field.
 
     class Title < Morfo::Base
-      field :tv_show_title, from: :title
+      field(:tv_show_title)from(:title)
     end
 
 Afterwards use the `morf` method to morf all hashes in one array to the end result:
@@ -48,12 +48,12 @@ Afterwards use the `morf` method to morf all hashes in one array to the end resu
     #   {tv_show_title: 'Breaking Bad'},
     # ]
 
-If you want to have access to nested values, you'll have to provide an array as the key:
+If you want to have access to nested values, just provide the path to that field comma separated.
 
 
     class Name < Morfo::Base
-      field :first_name, from: [:name, :first]
-      field :last_name, from: [:name, :last]
+      field(:first_name).from(:name, :first)
+      field(:last_name).from(:name, :last)
     end
 
     Name.morf([
@@ -78,10 +78,10 @@ If you want to have access to nested values, you'll have to provide an array as
 
 ## Transformations
 
-Every field can also take a transformation block, so that the original input can be transformed.
+It's also possible to transform the value in any way ruby lets you transform a value. just provide a block in the `transformed` method.
 
     class AndZombies < Morfo::Base
-      field(:title, from: :title) {|title| "#{title} and Zombies"}
+      field(:title).from(title).transformed {|title| "#{title} and Zombies"}
     end
 
     AndZombies.morf([
@@ -94,11 +94,13 @@ Every field can also take a transformation block, so that the original input can
     #     {title: 'Fifty Shades of Grey and Zombies'},
     # ]
 
-As the second argument, the whole row is passed into the block. So you can even do transformation based on the whole row. Or you can leave out all the arguments and return a static value.
+## Calculations
+
+If the value of your field should be based on multiple fields of the input row, yoy can specify a calculation block via the `calculated` method. As an argument the whole input row is passed in.
 
     class NameConcatenator < Morfo::Base
-      field(:name) {|_, row| "#{row[:first_name]} #{row[:last_name]}"}
-      field(:status) { 'Best Friend' }
+      field(:name).calculated {|row| "#{row[:first_name]} #{row[:last_name]}"}
+      field(:status).calculated {'Best Friend'}
     end
 
     NameConcatenator.morf([

data/lib/morfo/actions.rb

@@ -1,56 +1,91 @@
 module Morfo
   module Actions
-    module ValueMethods
-      def extract_value from, row
-        Array(from).inject(row) do |resulting_value, key|
-          resulting_value ? resulting_value[key] : nil
-        end
+    class Field
+      attr_reader :field_path
+      attr_reader :actions
+
+      def initialize field_path, actions
+        @field_path = field_path
+        @actions = actions
       end
 
-      def store_value to, value
-        return {} if value.nil?
+      def from *from_field_path
+        act = FromAction.new self, from_field_path
+        actions[field_path] = act
+        act
+      end
 
-        Array(to).reverse.inject({}) do |hash, key|
-          if hash.keys.first.nil?
-            hash.merge!(key => value)
-          else
-            { key => hash }
-          end
-        end
+      def calculated &calculate_blk
+        act = CalculationAction.new self, field_path, calculate_blk
+        actions[field_path] = act
+        act
       end
-    end
 
-    class MapAction
-      include ValueMethods
-      attr_reader :from
-      attr_reader :to
+      def execute row
+        raise ArgumentError,
+          "No field to get value from is specified for #{field_path.inspect}"
+      end
+    end
 
-      def initialize from, to
-        @from = from
-        @to = to
+    class CalculationAction
+      def initialize field, from_field_path, calculate_blk
+        @field = field
+        @from_field_path = from_field_path
+        @calculate_blk = calculate_blk
       end
 
       def execute row
-        store_value(to, extract_value(from, row))
+        calculate_blk.call(row)
       end
+
+      private
+      attr_reader :field
+      attr_reader :from_field_path
+      attr_reader :calculate_blk
     end
 
-    class TransformationAction
-      include ValueMethods
-      attr_reader :to
-      attr_reader :from
-      attr_reader :transformation
+    class FromAction
+      def initialize field, from_field_path
+        @field = field
+        @from_field_path = from_field_path
+      end
 
-      def initialize from, to, transformation
-        @from = from
-        @to = to
-        @transformation = transformation
+      def transformed &blk
+        act = TransformAction.new self, from_field_path, blk
+        field.actions[field.field_path] = act
+        act
       end
 
       def execute row
-        resulting_value = from ? extract_value(from, row) : nil
-        store_value(to, transformation.call(resulting_value,row))
+        extract_value(from_field_path, row)
       end
+
+      private
+      attr_reader :field
+      attr_reader :from_field_path
+
+      def extract_value from, row
+        from.inject(row) do |resulting_value, key|
+          resulting_value ? resulting_value[key] : nil
+        end
+      end
+    end
+
+    class TransformAction
+      def initialize previous_action, from_field_path, transform_blk
+        @previous_action = previous_action
+        @from_field_path = from_field_path
+        @transform_blk = transform_blk
+      end
+
+      def execute row
+        transform_blk.call(previous_action.execute(row))
+      end
+
+      private
+      attr_reader :previous_action
+      attr_reader :from_field_path
+      attr_reader :transform_blk
     end
   end
-end
+end

data/lib/morfo/version.rb

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

data/lib/morfo.rb

@@ -3,29 +3,37 @@ require 'morfo/actions'
 
 module Morfo
   class Base
-    def self.field field_name, definition={}, &blk
-      if blk
-        mapping_actions << Morfo::Actions::TransformationAction.new(definition[:from], field_name, blk)
-      else
-        raise(
-          ArgumentError,
-          "No field to get value from is specified for #{field_name.inspect}"
-        ) unless definition[:from]
-        mapping_actions << Morfo::Actions::MapAction.new(definition[:from], field_name)
-      end
+    def self.field *field_path
+      act = Morfo::Actions::Field.new(field_path, mapping_actions)
+      mapping_actions[field_path] = act
+      act
     end
 
     def self.morf input
-      input.map do |row|
-        mapping_actions.inject({}) do |output, action|
-          deep_merge!(output, action.execute(row))
+      input.map {|row|
+        output_row = {}
+        mapping_actions.each do |field_path, action|
+          deep_merge!(output_row, store_value(action.execute(row), field_path))
         end
-      end
+        output_row
+      }
     end
 
     private
     def self.mapping_actions
-      @actions ||= []
+      @actions ||= {}
+    end
+
+    def self.store_value value, to
+      return {} if value.nil?
+
+      to.reverse.inject({}) do |hash, key|
+        if hash.keys.first.nil?
+          hash.merge!(key => value)
+        else
+          { key => hash }
+        end
+      end
     end
 
     def self.deep_merge! hash, other_hash, &block

data/morfo.gemspec

@@ -19,6 +19,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'rake'
+  spec.add_dependency 'json'
+  spec.add_dependency 'rubysl' if RUBY_ENGINE == 'rbx'
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rspec', '>= 2.14', '< 4.0'

data/spec/lib/morfo_spec.rb

@@ -34,19 +34,19 @@ describe Morfo::Base do
     context 'errors' do
       subject(:no_from) do
         class NilMorfer < Morfo::Base
-          field :my_field, {}
+          field(:my_field)
         end
         NilMorfer
       end
       it 'raises error for nil field' do
-        expect{no_from.morf([])}.to raise_error(ArgumentError)
+        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
+          field(:tv_show_title).from(:title)
         end
         TitleMorfer
       end
@@ -66,7 +66,7 @@ describe Morfo::Base do
     context '1 to 1 conversion with transformation' do
       subject do
         class NumCastMorfer < Morfo::Base
-          field(:cast_num, from: :cast){|v,r| v.size}
+          field(:cast_num).from(:cast).transformed{|v| v.size}
         end
         NumCastMorfer
       end
@@ -80,8 +80,8 @@ describe Morfo::Base do
     context '1 to many conversion' do
       subject do
         class MutliTitleMorfer < Morfo::Base
-          field :title, from: :title
-          field :also_title, from: :title
+          field(:title).from(:title)
+          field(:also_title).from(:title)
         end
         MutliTitleMorfer
       end
@@ -96,21 +96,21 @@ describe Morfo::Base do
       context 'nested source' do
         subject(:valid_path) do
           class ImdbRatingMorfer < Morfo::Base
-            field :rating, from: [:ratings, :imdb]
+            field(:rating).from(:ratings, :imdb)
           end
           ImdbRatingMorfer
         end
 
         subject(:valid_path_with_transformation) do
-          class ImdbRatingMorfer < Morfo::Base
-            field(:rating, from: [:ratings, :imdb]){|v| "Rating: #{v}"}
+          class ImdbRatingMorferWithTransformation < Morfo::Base
+            field(:rating).from(:ratings, :imdb).transformed {|v| "Rating: #{v}"}
           end
-          ImdbRatingMorfer
+          ImdbRatingMorferWithTransformation
         end
 
         subject(:invalid_path) do
           class InvalidImdbRatingMorfer < Morfo::Base
-            field :rating, from: [:very, :long, :path, :that, :might, :not, :exist]
+            field(:rating).from(:very, :long, :path, :that, :might, :not, :exist)
           end
           InvalidImdbRatingMorfer
         end
@@ -134,8 +134,8 @@ describe Morfo::Base do
       context 'nested destination' do
         subject do
           class WrapperMorfer < Morfo::Base
-            field([:tv_show, :title], from: :title)
-            field([:tv_show, :channel], from: :channel){|v| "Channel: #{v}"}
+            field(:tv_show, :title).from(:title)
+            field(:tv_show, :channel).from(:channel).transformed {|v| "Channel: #{v}"}
           end
           WrapperMorfer
         end
@@ -157,7 +157,7 @@ describe Morfo::Base do
     context 'calculations' do
       subject do
         class TitlePrefixMorfer < Morfo::Base
-          field(:title_with_channel){|v,r| "#{r[:title]}, (#{r[:channel]})"}
+          field(:title_with_channel).calculated{|r| "#{r[:title]}, (#{r[:channel]})"}
         end
         TitlePrefixMorfer
       end
@@ -175,7 +175,7 @@ describe Morfo::Base do
     context 'static values' do
       subject do
         class StaticTitleMorfer < Morfo::Base
-          field(:new_title){ 'Static Title' }
+          field(:new_title).calculated{ 'Static Title' }
         end
         StaticTitleMorfer
       end

metadata

@@ -1,63 +1,77 @@
 --- !ruby/object:Gem::Specification
 name: morfo
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Leif Gensert
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-01-13 00:00:00.000000000 Z
+date: 2014-01-16 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'
-  type: :runtime
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: json
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
+        version: '0'
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: bundler
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '2.14'
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: '4.0'
-  type: :development
-  prerelease: false
-  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'
+  prerelease: false
+  type: :development
 description: This gem provides a DSL for converting one hash into another
 email:
 - leif@propertybase.com
@@ -65,9 +79,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .travis.yml
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -77,7 +91,6 @@ files:
 - benchmarks/run.rb
 - lib/morfo.rb
 - lib/morfo/actions.rb
-- lib/morfo/actions/base.rb
 - lib/morfo/version.rb
 - morfo.gemspec
 - spec/lib/morfo_spec.rb
@@ -86,24 +99,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.2.0
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.1.9
+signing_key:
 specification_version: 4
 summary: Inspired by ActiveImporter, this gem generically converts an array of hashes
 test_files: