dense 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b6c4757eb42ba1584a291acb7e2c0426db0a43f
-  data.tar.gz: 5567f5ee46fac038b6e6e5c988dc9002cb6b1d1f
+  metadata.gz: 6ed96330107ec5b3b678ea1d9c9d2fdcb74cf4a2
+  data.tar.gz: d24c69b183a0dd1ce40f727c009d627f732e77ca
 SHA512:
-  metadata.gz: cb779199b152af22d6876f12cbef33ccec64e38bfd8a44619a78c8a94cfb1b80e40fa26d22dd1da1c05902c239f64a3b5f2e05f81f4873e25b74cbc6873fbabf
-  data.tar.gz: c6d0ce7601c1ad87f51563a4635b81af10528a2287541bd6916e37beeb321f71af30f918f8f282af07d8382ec7985a73f54f52e2976d8c739fcd332fe024ac2d
+  metadata.gz: befe48f094c27f9afdde046065958629ab654cc3a289cc113b1b1aa0a904256a3303f22cde16f7551f38099d631859d387577fb600f12b2e3bc820bab5bceb4d
+  data.tar.gz: b825d845e36ee28d6f8b9b58c67a4df06809c49bd64238c36f3ae6bfa60bd028550866dc001bec4bfb18ba923f56c10d1d795ab8173e14ab59fed584630514b9

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 # dense
 
 
+## dense 1.1.4  released 2018-11-08
+
+* Fix `Dense.fetch({ 'a' => nil }, 'a')`
+* Implement Dense.force_set(coll, k, v)
+
+
 ## dense 1.1.3  released 2018-08-13
 
 * Accept '!' in names

data/README.md

@@ -228,6 +228,26 @@ c
   # => { 'h' => { 'k0' => 123, 'k1' => 123, 'k2' => 123 } }
 ```
 
+### `Dense.force_set(collection, path, value)`
+
+Creates the necessary collections on the way. A bit like `mkdir -f x/y/z/`
+
+```ruby
+c = {}
+r = Dense.force_set(c, 'a', 1)
+r # => 1
+c # => { 'a' => 1 }
+
+c = {}
+r = Dense.force_set(c, 'a.b.3.d.0', 1)
+r # => 1
+c # => { 'a' => { 'b' => [ nil, nil, nil, { 'd' => [ 1 ] } ] } }
+
+c = { 'a' => [] }
+Dense.force_set(c, 'a.b', 1)
+  # => TypeError: no key "b" for Array at "a"
+```
+
 
 ### `Dense.insert(collection, path, value)`
 

data/lib/dense.rb

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

data/lib/dense/methods.rb

@@ -60,6 +60,28 @@ module Dense; class << self
     pa.narrow(r)
   end
 
+  def force_set(o, path, value)
+
+    Dense::Path.make(path)
+      .gather(o)
+      .each { |hit|
+        if hit[0] == false
+          n = hit[4].first
+          fail_miss_error(path, hit) \
+            if n.nil? && ! key_matches_collection?(hit[3], hit[2])
+          hit[2][hit[3]] =
+            if n.is_a?(String)
+              {}
+            else
+              []
+            end
+          return force_set(o, path, value)
+        end
+        hit[2][hit[3]] = value }
+
+    value
+  end
+
   def insert(o, path, value)
 
     Dense::Path.make(path)
@@ -92,6 +114,12 @@ module Dense; class << self
 
   protected
 
+  def key_matches_collection?(k, c)
+
+    (c.is_a?(Hash) && k.is_a?(String)) ||
+    (c.is_a?(Array) && k.is_a?(Integer))
+  end
+
   module DenseError
 
     attr_accessor :full_path, :miss

data/lib/dense/path.rb

@@ -264,39 +264,50 @@ class Dense::Path
     end
   end
 
+  def _has_key?(data, key)
+
+    if data.is_a?(Array)
+      l = data.length
+      key.is_a?(Integer) && (key < 0 ? (key >= -l) : (key < l))
+    else
+      data.has_key?(key)
+    end
+  end
+
   def _gather(depth, path0, data0, data, path, acc)
 
     k = path.first
 #ind = '  ' * depth
-#print [ LG, DG, LB ][depth % 3]
+#col = [ LG, DG, LB ][depth % 3]
+#print col
 #puts ind + "+--- _gather()"
 #puts ind + "| path0: #{path0.inspect}"
 #puts ind + "| data: #{data.inspect}"
 #puts ind + "| depth: #{depth} / path: #{path.inspect}"
 #puts ind + "| k: " + k.inspect
 
-#puts RD + ind + "| -> " + [ false, path0[0..-2], data0, path0.last, path ].inspect if k.nil? && data.nil?
+#puts RD + ind + "| 0-> " + [ false, path0[0..-2], data0, path0.last, path ].inspect if data.nil? && ! _has_key?(data0, path0.last)
     return acc.push([ false, path0[0..-2], data0, path0.last, path ]) \
-      if data.nil?
+      if data.nil? && ! _has_key?(data0, path0.last)
 
-#puts GN + ind + "| -> " + [ true, path0[0..-2], data0, path0.last ].inspect if k.nil? && data.nil?
+#puts GN + ind + "| 1-> " + [ true, path0[0..-2], data0, path0.last ].inspect if k.nil?
     return acc.push([ true, path0[0..-2], data0, path0.last ]) \
       if k.nil?
 
-#puts RD + ind + "| -> " + [ false, path0[0..-2], data0, path0.last, path ].inspect unless data.is_a?(Array) || data.is_a?(Hash)
+#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 ]) \
       unless data.is_a?(Array) || data.is_a?(Hash)
 
     return _dot_gather(depth, path0, data0, data, path[1..-1], acc) \
       if k == :dot
 
-#puts ind + "| stars:\n" + _stars(data0, data, k).collect(&:first).to_pp if k == :star || k == :dotstar
+#puts col + ind + "| stars:\n" + _stars(data0, data, k).collect(&:first).to_pp if k == :star || k == :dotstar
     return _stars(data0, data, k).inject(acc) { |a, (pa, da0, da)|
       _gather(depth + 1, path0 + pa, da0, da, path[1..-1], a)
     } if k == :star || k == :dotstar
 
     keys = _resolve_keys(data, k)
-#puts ind + "| keys: " + keys.inspect
+#puts col + ind + "| keys: " + keys.inspect
 
     keys.inject(acc) { |a, kk|
       _gather(

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dense
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - John Mettraux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-13 00:00:00.000000000 Z
+date: 2018-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: raabro