morfo 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7648a07af68be99b680d1934f0e50e547bd5c7f7
-  data.tar.gz: 854a69a7cd5841cd2ccfb92268c34a06c2098e02
+  metadata.gz: 274682378ec985cb600c6e60c15ccb701fa0f4c1
+  data.tar.gz: 9fc638a481c23d29566b4dccf2436338435c9f3e
 SHA512:
-  metadata.gz: 591c1bfa68847887bc2f34d21a586132cd84e853dc8651a5d5c86aaff6a7f8bcaeb104fb1c90ac6623eec6814f93d8873fe9edbde126b4d3bf4ae889361f9add
-  data.tar.gz: debde19fa3a8a6278760876cfa89a9c6b52b984af6aaf68676b30fabf55c1c6e34a73ea726bfd86dc4ef6c68484bc6eb36a71e6918bf26a43f7d02d92b75680b
+  metadata.gz: a1fcc4810aaf55617f73f449cb9499d3b40f6e2b67bb196b336a3042e1d71d474449ae32635d02574067f86791c4e1a80b30f82091472ea460103f08e4cd6732
+  data.tar.gz: a45b4fac0a9cfe7721b485361dd6480c88121ef9078a11ad44c81f503b17e0c3dccf3e148c8f86936a69ed6ea3c5b25daf409ae62ff6e72d62c38cec309bdb47

data/.travis.yml

@@ -1,11 +1,13 @@
 sudo: false
 language: ruby
 cache: bundler
+bundler_args: --without development
 rvm:
   - 2.0.0
   - 2.1.8
   - 2.2.4
   - 2.3.0
+  - 2.4.0
   - jruby-9.0.5.0
   - ruby-head
   - jruby-head

data/Gemfile

@@ -4,16 +4,18 @@ source "https://rubygems.org"
 gemspec
 
 group :test, :development do
+  gem "rspec", ">= 2.14", "< 4.0"
   gem "coveralls", require: false
+  gem "simplecov"
+  gem "rubinius-coverage", platform: :rbx
+end
+
+group :development do
   gem "guard"
   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/lib/morfo.rb

@@ -1,4 +1,4 @@
-require "active_support/core_ext/hash"
+require 'deep_merge/rails_compat'
 require "morfo/version"
 require "morfo/tools"
 require "morfo/actions"
@@ -20,7 +20,7 @@ module Morfo
     def self.morf_single input, options = {}
       output = {}
       mapping_actions.each do |field_path, action|
-        output.deep_merge!(store_value(action.execute(input), field_path, options))
+        output.deeper_merge!(store_value(action.execute(input), field_path, options))
       end
       output
     end

data/lib/morfo/builder.rb

@@ -7,7 +7,7 @@ module Morfo
     def build
       # WTF??? `definitions` is not accessible inside class
       # so this javascript technique is necesseray
-      tmp_definitions = definitions.map { |h| h.symbolize_keys }
+      tmp_definitions = definitions.map { |h| Morfo::Tools::ExtendedHash.symbolize_keys(h) }
       Class.new(Morfo::Base) do
         tmp_definitions.each do |definition|
           f = field(*definition[:field])

data/lib/morfo/tools.rb

@@ -1,5 +1,22 @@
 module Morfo
   module Tools
+    module ExtendedHash
+      extend self
+
+      def symbolize_keys(hash)
+        transform_keys(hash) { |key| key.to_sym rescue key }
+      end
+
+      def transform_keys(hash)
+        return hash.enum_for(:transform_keys) { size } unless block_given?
+        result = {}
+        hash.each_key do |key|
+          result[yield(key)] = hash[key]
+        end
+        result
+      end
+    end
+
     class FlattenHashKeys
       attr_reader :input_hash
 
@@ -10,10 +27,10 @@ module Morfo
       def flatten
         input_hash.inject({}) do |result_hash, (key, value)|
           inner_hash = false
-          if value.is_a?(Hash)
+          if value.is_a?(::Hash)
             inner_hash = true
             value.each do |inner_key, inner_value|
-              if inner_value.is_a?(Hash)
+              if inner_value.is_a?(::Hash)
                 inner_hash = true
               end
               result_hash.merge!("#{key}.#{inner_key}".to_sym => inner_value)

data/lib/morfo/version.rb

@@ -1,3 +1,3 @@
 module Morfo
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

data/morfo.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |spec|
   spec.name          = "morfo"
   spec.version       = Morfo::VERSION
   spec.authors       = ["Leif Gensert"]
-  spec.email         = ["leif@propertybase.com"]
+  spec.email         = ["leif@leif.io"]
   spec.description   = %q{This gem provides a DSL for converting one hash into another}
   spec.summary       = %q{Inspired by ActiveImporter, this gem generically converts an array of hashes}
   spec.homepage      = ""
@@ -17,12 +17,12 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features|benchmarks)/})
   spec.require_paths = ["lib"]
+  spec.required_ruby_version = '>= 2.0.0'
 
-  spec.add_dependency "rake"
-  spec.add_dependency "json"
-  spec.add_dependency "activesupport", "< 5.1"
-  spec.add_dependency "rubysl" if RUBY_ENGINE == "rbx"
+  spec.add_runtime_dependency "json"
+  spec.add_runtime_dependency "deep_merge"
+  spec.add_runtime_dependency "rubysl" if RUBY_ENGINE == "rbx"
 
+  spec.add_development_dependency "rake"
   spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rspec", ">= 2.14", "< 4.0"
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: morfo
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Leif Gensert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-02 00:00:00.000000000 Z
+date: 2017-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: deep_merge
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -66,29 +66,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !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
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.14'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.0'
 description: This gem provides a DSL for converting one hash into another
 email:
-- leif@propertybase.com
+- leif@leif.io
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -129,7 +109,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -137,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Inspired by ActiveImporter, this gem generically converts an array of hashes