hm 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85ac2c1b29c041f8981babe3497828dbd74008c8
-  data.tar.gz: 96f500ecd4ef021b715600546817df1527520f4d
+  metadata.gz: 961322aa7a75865b2a121c00cbbce0466e33b4c7
+  data.tar.gz: abbed53e1e18cf39ea449ada51c1faf93f16e940
 SHA512:
-  metadata.gz: 3c4ca16a574f0ee40b33e1c7c2798143d1214afb454d3c151045e8777318d4e41f0cfbdbfc1f7ac8eafe5c365e630d78503bed91f6a25c6afb614f334858b203
-  data.tar.gz: 9123c53633102d932b602635afe18bf42e739ee4ab432a823ee909fd4126b6189497085077280673bfc97487e9880087a9561e1a54017c2e9ba286078dd04355
+  metadata.gz: f88373127529d12668a8997e74673f897d082c67cce381d522c7c2dd694a85559d66e9eaef2230821b3611fd3c496f4df8bb53d0328f41b3b10ce4c5b217e3e7
+  data.tar.gz: 315cf2616d6028b3694b7f477dfc10a25f624ea3063bce6cd10eca08e2bf61aff206fc86e875e35e4fdd2eb1f065abb3e14fd65df03ae8b429b391ace3d4bd2a

data/lib/hm/algo.rb

@@ -48,6 +48,7 @@ class Hm
 
     def nest_hashes(value, *keys)
       return value if keys.empty?
+
       key = keys.shift
       val = keys.empty? ? value : nest_hashes(value, *keys)
       key.is_a?(Integer) ? [].tap { |arr| arr[key] = val } : {key => val}
@@ -81,7 +82,11 @@ class Hm
     end
 
     def visit_regular(what, key, rest, path, found:, not_found:) # rubocop:disable Metrics/ParameterLists
-      internal = Dig.dig(what, key) or return not_found.(what, [*path, key], rest)
+      internal = Dig.dig(what, key)
+
+      # NB: NotFound is signified by special value, because `nil` can still be legitimate value in hash
+      return not_found.(what, [*path, key], rest) if internal == Dig::NotFound
+
       rest.empty? and return found.(what, [*path, key], internal)
       visit(internal, rest, [*path, key], not_found: not_found, &found)
     end

data/lib/hm/dig.rb

@@ -3,13 +3,29 @@ class Hm
   module Dig
     # TODO: Struct/OpenStruct are also diggable in Ruby core, can be added for future implementation
     DIGGABLE_CLASSES = [Hash, Array].freeze
+    NotFound = Object.new.freeze
 
-    def self.dig(what, *keys)
-      return what.dig(*keys) if what.respond_to?(:dig)
+    def self.dig(what, key, *keys)
+      # We want to return special value when key is not present, because
+      # 1. "at some point in path, we have a value, and this value is `nil`", and
+      # 2. "at some point in path, we don't have a value (key is absent)"
+      # ...should be different in Algo.visit
+      return NotFound unless key?(what, key)
 
-      diggable?(what) or fail TypeError, "#{value.class} is not diggable"
-      value = what[keys.shift]
-      value.nil? || keys.empty? ? value : dig(value, *keys)
+      return what.dig(key, *keys) if what.respond_to?(:dig)
+
+      ensure_diggable?(what) or fail TypeError, "#{value.class} is not diggable"
+      value = what[key]
+      keys.empty? ? value : dig(value, *keys)
+    end
+
+    def self.key?(what, key)
+      case what
+      when Array
+        (0...what.size).cover?(key)
+      when Hash
+        what.key?(key)
+      end
     end
 
     def self.diggable?(what)

data/lib/hm/version.rb

@@ -1,7 +1,7 @@
 class Hm
   MAJOR = 0
   MINOR = 0
-  PATCH = 3
+  PATCH = 4
   PRE = nil
   VERSION = [MAJOR, MINOR, PATCH, PRE].compact.join('.')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hm
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Victor Shepelev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-08 00:00:00.000000000 Z
+date: 2019-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard