hashie_mappy 0.1.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5625f342352443e40d3e719abcf21d367f3f7893
-  data.tar.gz: 1680ecca284dc1b43bb011024c20989fb0ad88ef
+SHA256:
+  metadata.gz: 9ba4d0ece8c4ca9c48eab3d744413e822cee6418ee8bd10ae3ab809af2a97a32
+  data.tar.gz: 35dec5980d7e368d423a948eef8a81731707e9ab6c2f51c2c359dbb427a2034e
 SHA512:
-  metadata.gz: ca3e97edf6852f3550552ef75b47f9c1a7519103746f74fddbdaeaa7995b2633e026a94a7d060dfd23be60bc00b791f69286f17fbb7490258d5c45d129869dc3
-  data.tar.gz: 1391dcdfda479097fcc1533f2cf888050e497a48bc94d5fa85a600df7860ef0f07eac8734de3d22677ab6e8cbb5b057b7c6bec0092cfc4287b11a0da1ec9b61c
+  metadata.gz: b8b444bacc366c41c24c27c1f5b8c14292e4b40d59049b5046f607ffd956325bc2ca10b438a345cbb2431a214f574ec5bead4f763e48feb783852e033ac76acc
+  data.tar.gz: eb9cc2cbecfa75ea77a7fe4bf0e6cd05e186bb545982f730866e4c14e82d79713121d850a1134ee0e2a1c795198ea8d1c9287d32f3775334c1744c2ef0c615c0

data/Gemfile.lock

@@ -0,0 +1,34 @@
+PATH
+  remote: .
+  specs:
+    hashie_mappy (0.3.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (5.2.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    concurrent-ruby (1.1.4)
+    i18n (1.5.3)
+      concurrent-ruby (~> 1.0)
+    minitest (5.11.3)
+    rake (10.5.0)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activesupport (= 5.2.0)
+  bundler (~> 1.16)
+  hashie_mappy!
+  minitest (~> 5.0)
+  rake (~> 10.0)
+
+BUNDLED WITH
+   1.16.6

data/README.md

@@ -1,8 +1,5 @@
 # HashieMappy
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/hashie_mappy`. To experiment with that code, run `bin/console` for an interactive prompt.
-
-TODO: Delete this and the text above, and describe your gem
 
 ## Installation
 

data/hashie_mappy.gemspec

@@ -35,4 +35,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"
+  spec.add_development_dependency "activesupport", "5.2.0"
 end

data/lib/hashie_mappy/version.rb

@@ -1,3 +1,3 @@
 module HashieMappy
-  VERSION = "0.1.1"
+  VERSION = "0.3.0"
 end

data/lib/hashie_mappy.rb

@@ -1,8 +1,11 @@
 require "hashie_mappy/version"
+require "active_support/core_ext/hash"
 
 module HashieMappy
   attr_accessor :target_map, :output, :after
 
+  ALLOWED_TYPES = [Fixnum, String, Float, Bignum]
+
   def self.extended(base)
     base.class_eval do
       self.target_map = nil
@@ -18,16 +21,33 @@ module HashieMappy
   end
 
   def normalize(input_hash)
-    output = normalize_hash(self.target_map, input_hash)
+    input_hash = convert_to_hash(input_hash) unless input_hash.is_a?(Hash)
+    output = normalize_hash(self.target_map, input_hash) if input_hash.keys.any?
     output = after.call(input_hash, output) if after
-    output
+    output.with_indifferent_access
+  end
+
+  def convert_to_hash(input)
+    hash = input.instance_variables.each_with_object({}) do |var, obj|
+      if ALLOWED_TYPES.include?(input.instance_variable_get(var).class)
+        obj[var.to_s.delete('@')] = input.instance_variable_get(var)
+      else
+        obj[var.to_s.delete('@')] = convert_to_hash(input.instance_variable_get(var))
+      end
+    end
+    hash
   end
 
   def normalize_hash(target_map, input, buried_keys = [], output = {})
     target_map.keys.each do |key|
       if key.include?('*')
         keys = key.split('*')
-        handle_array(input[keys[1]], target_map[key], keys[0], output)
+        handle_array(input[keys[1]], target_map[key], keys[0], output) if input.is_a?(Hash)
+        begin
+          handle_array(input.send(keys[1]), target_map[key], keys[0], output)
+        rescue NoMethodError
+          nil
+        end
       else
         buried_keys.push(key)
         if target_map[key].is_a?(Hash)
@@ -43,26 +63,39 @@ module HashieMappy
 
   def handle_array(input, target_map, key, output)
     output[key] = input.map {|i| normalize_hash(target_map, i)}
+  rescue NoMethodError
+    nil
   end
 
   def find_input_value(obj, key)
     return recurse_dig(key.split('#'), obj) if key.split('#').count > 1
     if obj.respond_to?(:key?) && obj.key?(key)
       obj[key]
+    elsif obj.respond_to?(:key?) && obj.key?(key.to_sym)
+      obj[key.to_sym]
     elsif obj.respond_to?(:each)
       r = nil
       obj.find{ |*a| r = find_input_value(a.last, key) }
       r
+    else
+      begin
+        obj.send(key)
+      rescue NoMethodError
+        nil
+      end
     end
   end
 
   def recurse_dig(keys, obj)
     if keys.count > 1
       key = keys.shift
-      recurse_dig(keys, obj.dig(key))
+      return recurse_dig(keys, obj.dig(key)) if obj.is_a?(Hash)
+      recurse_dig(keys, obj.send(key))
     else
       return obj.dig(keys.shift)
     end
+  rescue NoMethodError
+    nil
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hashie_mappy
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Nik Weinmeister
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-06 00:00:00.000000000 Z
+date: 2019-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 5.2.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 5.2.0
 description: Easy way to map hashes
 email:
 - nik.weinmeister@excella.com
@@ -63,6 +77,7 @@ files:
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -91,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: Easy way of mapping hashes