dense 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ed96330107ec5b3b678ea1d9c9d2fdcb74cf4a2
-  data.tar.gz: d24c69b183a0dd1ce40f727c009d627f732e77ca
+  metadata.gz: cfc698913c3d5e9fcc87f8af83dea003df39e71d
+  data.tar.gz: a81ecccdad7be0875a560025022b00c28b97558a
 SHA512:
-  metadata.gz: befe48f094c27f9afdde046065958629ab654cc3a289cc113b1b1aa0a904256a3303f22cde16f7551f38099d631859d387577fb600f12b2e3bc820bab5bceb4d
-  data.tar.gz: b825d845e36ee28d6f8b9b58c67a4df06809c49bd64238c36f3ae6bfa60bd028550866dc001bec4bfb18ba923f56c10d1d795ab8173e14ab59fed584630514b9
+  metadata.gz: 332efedf4c5fe21336898ff830f90dda169a3fce2da5984b553e9ca61c8d5bd855e3e62bf40e403286f66ed922212928ee46209a9dedbc187079b4af97608270
+  data.tar.gz: 5b4806c891b739b277c2c7447b232d3c9a0d974c1aea8ea5749541f5bbd77a85ec0f3aa70d27217161ff7ddde1b637969721a57a099400792509373cd20e9eaf

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 # dense
 
 
+## dense 1.1.5 released 2018-12-04
+
+* Differentiate KeyError and IndexError upon miss
+
+
 ## dense 1.1.4  released 2018-11-08
 
 * Fix `Dense.fetch({ 'a' => nil }, 'a')`

data/lib/dense.rb

@@ -1,7 +1,7 @@
 
 module Dense
 
-  VERSION = '1.1.4'
+  VERSION = '1.1.5'
 end
 
 require 'raabro'

data/lib/dense/methods.rb

@@ -12,22 +12,22 @@ module Dense; class << self
   def fetch(o, path, default=::KeyError, &block)
 
     pa = Dense::Path.make(path)
-    r = pa.gather(o).partition(&:first)
+    hits, misses = pa.gather(o).partition(&:first)
 
-    if r[0].empty?
+    if hits.empty?
 
       return pa.narrow(
-        r[1].collect { |m| call_default_block(o, path, block, m) }
+        misses.collect { |m| call_default_block(o, path, block, m) }
       ) if block
 
       return pa.narrow(
-        r[1].collect { |m| default }
+        misses.collect { |m| default }
       ) if default != KeyError
 
-      fail miss_error(path, r[1].first)
+      fail miss_error(path, misses.first)
     end
 
-    pa.narrow(r[0].collect { |e| e[2][e[3]] })
+    pa.narrow(hits.collect { |e| e[2][e[3]] })
   end
 
   def set(o, path, value)
@@ -35,7 +35,7 @@ module Dense; class << self
     Dense::Path.make(path)
       .gather(o)
       .each { |hit|
-        fail_miss_error(path, hit) if hit[0] == false
+        validate(path, hit) if hit[0] == false
         hit[2][hit[3]] = value }
 
     value
@@ -67,7 +67,7 @@ module Dense; class << self
       .each { |hit|
         if hit[0] == false
           n = hit[4].first
-          fail_miss_error(path, hit) \
+          validate(path, hit) \
             if n.nil? && ! key_matches_collection?(hit[3], hit[2])
           hit[2][hit[3]] =
             if n.is_a?(String)
@@ -87,7 +87,7 @@ module Dense; class << self
     Dense::Path.make(path)
       .gather(o)
       .each { |hit|
-        fail_miss_error(path, hit) if hit[0] == false
+        validate(path, hit) if hit[0] == false
         if hit[2].is_a?(Array)
           hit[2].insert(hit[3], value)
         else
@@ -149,15 +149,33 @@ module Dense; class << self
     err
   end
 
-  def key_error(path, miss)
+  # IndexError:
+  #   Raised when the given index is invalid.
+  # KeyError:
+  #   Raised when the specified key is not found. It is a subclass of IndexError.
 
-    path1 = Dense::Path.make(miss[1] + [ miss[3] ]).to_s.inspect
-    path2 = Dense::Path.make(miss[4]).to_s.inspect
+  def index_error(path, miss)
 
-    msg = "found nothing at #{path1}"
-    msg = "#{msg} (#{path2} remains)" if path2 != '""'
+    if miss[2].is_a?(Array) || miss[2].is_a?(Hash)
 
-    make_error(KeyError, msg, path, miss)
+      path1 = Dense::Path.make(miss[1] + [ miss[3] ]).to_s.inspect
+      path2 = Dense::Path.make(miss[4]).to_s.inspect
+
+      msg = "found nothing at #{path1}"
+      msg = "#{msg} (#{path2} remains)" if path2 != '""'
+
+      make_error(KeyError, msg, path, miss)
+
+    else
+
+      path1 = Dense::Path.make(miss[1]).to_s.inspect
+      path2 = Dense::Path.make(miss[4]).to_s.inspect
+
+      msg = "found no collection at #{path1} for key #{miss[3].inspect}"
+      msg = "#{msg} (#{path2} remains)" if path2 != '""'
+
+      make_error(IndexError, msg, path, miss)
+    end
   end
 
   def type_error(path, miss)
@@ -174,16 +192,18 @@ module Dense; class << self
     if miss[2].is_a?(Array) && ! miss[3].is_a?(Integer)
       type_error(path, miss)
     else
-      key_error(path, miss)
+      index_error(path, miss)
     end
   end
 
-  def fail_miss_error(path, miss)
+  def validate(path, miss)
 
     fail miss_error(path, miss) \
       if miss[4].any?
     fail type_error(path, miss) \
       if miss[2].is_a?(Array) && ! miss[2].is_a?(Integer)
+
+    # else, no failure, carry on!
   end
 
   def call_default_block(o, path, block, miss)

data/lib/dense/path.rb

@@ -295,7 +295,7 @@ class Dense::Path
       if k.nil?
 
 #puts RD + ind + "| 2-> " + [ false, path0[0..-2], data0, path0.last, path ].inspect unless data.is_a?(Array) || data.is_a?(Hash)
-    return acc.push([ false, path0[0..-2], data0, path0.last, path ]) \
+    return acc.push([ false, path0, data, path.first, path[1..-1] ]) \
       unless data.is_a?(Array) || data.is_a?(Hash)
 
     return _dot_gather(depth, path0, data0, data, path[1..-1], acc) \

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dense
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - John Mettraux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-07 00:00:00.000000000 Z
+date: 2018-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: raabro
@@ -80,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 2.6.14.3
 signing_key: 
 specification_version: 4
 summary: fetching deep in a dense structure