key_tree 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee519ff161881da7c9d53d57fe1e762a9e89df557e5f5bb4d3df58e5de1731dd
-  data.tar.gz: 84b2e06bf6c70acfed4f466a72da5222b9fba028cf551fa7d82a3bbce90351a0
+  metadata.gz: 9cfde9ce8a431f8ce658b0d092958dcb97cf237fd1132b459a80191b72ef002b
+  data.tar.gz: f51c7e7ce679a1830d929e24114089820f8c1a79082c3e487ef5ac4fa23fa81f
 SHA512:
-  metadata.gz: 4d644e3a3d63f34f6edbc0fbc17a2c8f26499d2fe508e186274698b2ff733100f97e5efe62ce2bb4e7c1b35f07282fe5994447e1f7171c57f0cd8408798bbbf8
-  data.tar.gz: 6dd6f1e13e04bd7a8cbe8cce7d9b36a9ff76ac05c3ffc3fffa5bd12a38fc620f115ff94c37e913b6683aa2980d3c4ddd871b16cebfa622d71a3413fa6a2adf1d
+  metadata.gz: a904cca7e3be01bfb902b5c144685fc8c6dd3b52227f22fbd048e8d9e98e1675473bf766cc159ed422b6ac1c35a3b94969beea50dd29bdb528e4242a149a0c77
+  data.tar.gz: c9f17cdd2fff51099699d625a72a57bec483859369518c1b273db0478099320426aa24292a71eb07234d8f92ccabcda06875319356c9dae209b267be2657e75e

data/RELEASE_NOTES.md

@@ -1,5 +1,18 @@
 # Release Notes
 
+## v0.5.3 – 2018-05-25
+
+### Bug fixes
+
+#### Fix forest default values
+Previous release broke default value propagation for forests.
+
+  * c0eccde4 Update forest specs vs default values
+  * 35367fd1 Consider Tree default values for Forest#[]
+  * 7e10dda5 Add method to find trees with default values
+  * 57a320ac Revert "Use proper method to retreive values from trees"
+  * 8173775d Make tree_with_key methods private
+
 ## v0.5.2 – 2018-05-19
 
 ### Bug fixes

data/lib/key_tree/forest.rb

@@ -22,35 +22,20 @@ module KeyTree
     # key path matches in trees further away, returning nil. This preserves
     # the constraints that only leaves may contain a value.
     #
-    def [](key, &merger)
+    def [](key)
       return super(key) if key.is_a?(Numeric)
-      fetch(key, &merger)
+      tree_with_default_key(key)[key]
     rescue KeyError
       nil
     end
 
     def fetch(key)
-      return tree_with_key(key)[key] unless block_given?
+      return tree_with_key(key).fetch(key) unless block_given?
 
-      values = trees_with_key(key).map { |tree| tree[key] }
+      values = trees_with_key(key).map { |tree| tree.fetch(key) }
       values.reverse.reduce { |left, right| yield(key, left, right) }
     end
 
-    def tree_with_key(key)
-      result = trees.detect do |tree|
-        tree.prefix?(key) || tree.default_key?(key)
-      end
-      result || raise(KeyError, "key not found: #{key}")
-    end
-
-    def trees_with_key(key)
-      result = trees.select do |tree|
-        tree.prefix?(key) || tree.default_key?(key)
-      end
-      raise(KeyError, "key not found: #{key}") if result.empty?
-      result
-    end
-
     def key?(key)
       trees.any? { |tree| tree.key?(key) }
     end
@@ -78,5 +63,29 @@ module KeyTree
         end
       end
     end
+
+    private
+
+    def tree_with_default_key(key)
+      result = trees.detect do |tree|
+        tree.prefix?(key) || tree.default_key?(key)
+      end
+      result || raise(KeyError, %(key not found: "#{key}"))
+    end
+
+    def tree_with_key(key)
+      result = trees.detect do |tree|
+        tree.prefix?(key)
+      end
+      result || raise(KeyError, %(key not found: "#{key}"))
+    end
+
+    def trees_with_key(key)
+      result = trees.select do |tree|
+        tree.prefix?(key)
+      end
+      raise(KeyError, %(key not found: "#{key}")) if result.empty?
+      result
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: key_tree
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Calle Englund
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-19 00:00:00.000000000 Z
+date: 2018-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git-version-bump