hash_map 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ef09a5a9361c24f1699f79e236d3d0b08da994c3
-  data.tar.gz: eae0a632e2c1ba49782a5f22925bf86461e4e491
+SHA256:
+  metadata.gz: dc971280a4ffad89cb9b4f93132e673eae4412558bb5bde8e3f3748873c67f7f
+  data.tar.gz: '060278780641e8248af95dcd7cacd7d222f7a4bdc2f5b5f522b030c35a0433fa'
 SHA512:
-  metadata.gz: 808a0077718557db480351584190c2745f68dfb781f108bae18bf1e60c408f5722de02f63ed3fddd2b068391056d7b6a9baf2c330b48864ce3f01ce110801a12
-  data.tar.gz: f1dba0212065c7d2abd947c3ff78589dbe7255fdce9028abac8c62376bb84695092714887ad5e38cc35a43d23113284ee18db26f203bb4cbe7225b4cae8a0a78
+  metadata.gz: 44801fbd00a2c195e8583b977f8145d2552df02a361aab725d4677d7e5e4bbdfb551daba17d501fadb5995f354d89a05100d95002c78aa344746b2a05df2da0f
+  data.tar.gz: 3a4850f7da85c482f3d912913367b6c22389496fb11364c788402a00c97dfe6c96429a78fd84fc573bbb555fe0e7ead0666d6228551f03a2ad2f3f91b8a941f0

data/.travis.yml

@@ -8,6 +8,8 @@ rvm:
   - 2.1.6
   - 2.2
   - 2.3.0
+  - 2.4.4
+  - 2.5.1
   - ruby-head
   - jruby-19mode
   - jruby-9.0.1.0
@@ -18,6 +20,10 @@ env:
   - JRUBY_OPTS="--debug"
 matrix:
   allow_failures:
+    - rvm: 1.9.3
+    - rvm: 2.0.0
+    - rvm: 2.1
+    - rvm: 2.1.6
     - rvm: ruby-head
     - rvm: rbx-3
     - rvm: jruby-19mode

data/Gemfile

@@ -4,6 +4,7 @@ source 'https://rubygems.org'
 gemspec
 
 group :development, :test do
+  gem 'rails', '~> 5.2'
   gem 'simplecov', require: false
   gem 'rubocop', '~> 0.37.2', require: false unless RUBY_VERSION =~ /^1.8/
   gem 'coveralls', require: false

data/README.md

@@ -365,6 +365,26 @@ AfterEach.call(booleans)
 #=> {"name"=>true, "age"=>false}
 ```
 
+### `only_provided_keys`
+
+```ruby
+class RegularMapper < HashMap::Base
+  properties :name, :lastname, :phone
+  from_child :address do
+    to_child :address do
+      properties :street, :number
+    end
+  end
+end
+class OnlyProvidedKeysMapper < RegularMapper
+  only_provided_keys
+end
+
+input = { name: "john", address: {street: "Batu Mejan" }, phone: nil }
+RegularMapper.call(input) # => {"name"=>"john", "lastname"=>nil, "phone"=>nil, "address"=>{"street"=>"Batu Mejan", "number"=>nil}}
+OnlyProvidedKeysMapper.call(input) # => {"name"=>"john", phone: nil, "address"=>{"street"=>"Batu Mejan"}}
+```
+
 ### JSON Adapter
 ```ruby
 class UserMapper < HashMap::Base

data/hash_map.gemspec

@@ -19,8 +19,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.10"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
-  spec.add_dependency "fusu", "~> 0.2"
+  spec.add_dependency "fusu", "~> 0.2.1"
 end

data/lib/hash_map.rb

@@ -4,8 +4,33 @@ module HashMap
   def self.root
     File.expand_path '../..', __FILE__
   end
+
+  class KeyNotProvided
+    def to_s
+      'nil'
+    end
+    def to_json
+      nil
+    end
+    def as_json(arg = nil)
+      nil
+    end
+  end
+
+  def self.deep_reject(hash, &block)
+    hash.each_with_object(Fusu::HashWithIndifferentAccess.new) do |(k, v), memo|
+      unless block.call(k, v)
+        if v.is_a?(Hash)
+          memo[k] = deep_reject(v, &block)
+        else
+          memo[k] = v
+        end
+      end
+    end
+  end
 end
 require 'hash_map/dsl'
+require 'hash_map/after_each_context'
 require 'hash_map/mapper'
 require 'hash_map/base'
 require 'hash_map/json_adapter'

data/lib/hash_map/after_each_context.rb

@@ -0,0 +1,31 @@
+module HashMap
+  class AfterEachContext
+    attr_reader :original, :struct, :value
+    def initialize(original, struct, value)
+      @original = original
+      @struct = struct
+      @value = value
+    end
+
+    def provided?
+      has_key?
+    end
+
+    def block?
+      !!struct[:proc]
+    end
+
+    def has_key?
+      return true if block?
+      found = true
+      struct[:from].reduce(original) do |prv, nxt|
+        unless prv.respond_to?(:key?) && prv.key?(nxt)
+          found = false
+          break
+        end
+        prv.send(:[], nxt)
+      end
+      found
+    end
+  end
+end

data/lib/hash_map/base.rb

@@ -10,7 +10,7 @@ module HashMap
       subclass.extend ToDSL
       return unless self < HashMap::Base
       unless dsl.attributes.empty?
-        subclass._set_attributes_from_inheritance(attributes)
+        subclass._set_attributes_from_inheritance(attributes.deep_dup)
       end
     end
 

data/lib/hash_map/dsl.rb

@@ -17,7 +17,7 @@ module HashMap
     end
 
     def _set_attributes_from_inheritance(attrs)
-      dsl._set_attributes(attrs.dup)
+      dsl._set_attributes(attrs.deep_dup)
     end
   end
 
@@ -28,23 +28,28 @@ module HashMap
 
     def initialize
       @attributes = []
+      @after_each = Set.new
+      @transform_output = Set.new
+      @transform_input = Set.new
     end
 
     def after_each(*middlewares)
-      @after_each ||= []
       @after_each += middlewares
     end
 
     def transforms_output(*middlewares)
-      @transform_output ||= []
       @transform_output += middlewares
     end
 
     def transforms_input(*middlewares)
-      @transform_input ||= []
       @transform_input += middlewares
     end
 
+    def only_provided_keys
+      @transform_output << RemoveUnprovideds
+      @after_each << MarkUnprovided
+    end
+
     def _set_attributes(attrs)
       @attributes = attrs
     end

data/lib/hash_map/mapper.rb

@@ -28,9 +28,10 @@ module HashMap
       nil_to_default(value, struct)
     end
 
-    def after_each_middleware(value, _key)
+    def after_each_middleware(value, struct)
+      contx = AfterEachContext.new(original, struct, value)
       after_each_callbacks.inject(value) do |output, middle|
-        middle.call(output)
+        middle.call(output, contx)
       end
     end
 
@@ -51,7 +52,7 @@ module HashMap
         break unless output.respond_to?(:[])
         output.send(:[], k)
       end
-      after_each_middleware(value, struct[:key].last)
+      after_each_middleware(value, struct)
     end
 
     def execute_block(struct)
@@ -62,7 +63,7 @@ module HashMap
               else
                 hash_map.instance_exec original, original, &block
               end
-      after_each_middleware(value, struct[:key].last)
+      after_each_middleware(value, struct)
     end
 
     def build_keys(ary, value)

data/lib/hash_map/matchers.rb

@@ -40,6 +40,10 @@ module HashMap
         self
       end
 
+      def failure_message_when_negated
+        "expect to not #{description}"
+      end
+
       private
 
       def mapped_has_key?
@@ -109,7 +113,7 @@ module HashMap
 
       def equality
         return true unless expected_provided
-        if mapped_value == expected
+        if matches_equality?(mapped_value, expected)
           description_messages << "and eq `#{expected}`"
         else
           failure_messages << "key #{key_to_message} expected to eq `#{expected}`"
@@ -117,6 +121,14 @@ module HashMap
         end
       end
 
+      def matches_equality?(value, expected)
+        if expected.is_a?(Proc)
+          expected.call(value)
+        else
+          value == expected
+        end
+      end
+
       def _nested_keys(hash, keys)
         keys.inject({ value: hash, has_key: true }) do |out, key|
           return { value: nil, has_key: false } unless out[:value]

data/lib/hash_map/plugins.rb

@@ -1,14 +1,26 @@
 module HashMap
-  BlankToNil = lambda do |v|
+  BlankToNil = lambda do |v, ctx|
     Fusu.blank?(v) ? nil : v
   end
 
-  StringToBoolean = lambda do |v|
+  StringToBoolean = lambda do |v, ctx|
     return false if v == 'false'
     return true if v == 'true'
     v
   end
 
+  MarkUnprovided = lambda do |v, ctx|
+    if !ctx.provided?
+      KeyNotProvided.new
+    else
+      v
+    end
+  end
+
+  RemoveUnprovideds = lambda do |o|
+    HashMap.deep_reject(o){ |k, v| v.is_a?(HashMap::KeyNotProvided) }
+  end
+
   UnderscoreKeys = lambda do |output|
     Fusu::Hash.deep_transform_keys(output){ |k| Fusu::String.underscore(k).to_sym }
   end

data/lib/hash_map/version.rb

@@ -1,3 +1,3 @@
 module HashMap
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: hash_map
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Artur Pañach
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-12 00:00:00.000000000 Z
+date: 2019-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 0.2.1
 description: Nice DSL to convert hash structure to different one.
 email:
 - arturictus@gmail.com
@@ -88,6 +88,7 @@ files:
 - bin/setup
 - hash_map.gemspec
 - lib/hash_map.rb
+- lib/hash_map/after_each_context.rb
 - lib/hash_map/base.rb
 - lib/hash_map/dsl.rb
 - lib/hash_map/json_adapter.rb
@@ -115,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Library to map easily hashes.