forester 4.1.0 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21870a6a2f8976322af18cc53776dc41a6a1dbb9
-  data.tar.gz: 6947433f22479158ef6e08c8d965a2ce0de7a058
+  metadata.gz: 6f4bb170effc47626daaea911274299fb1ad6dcb
+  data.tar.gz: f16441506f8ef3111ba831e3ec487088c3e44e6d
 SHA512:
-  metadata.gz: 3bc863f4b9fdd51749c3bde9da3baea18265d61cf1f7a240571df07192a0d757fc187fcf1412cc94b1ca2304458e0d23f1de71bc951498496e3f25d177d753f0
-  data.tar.gz: dfdf878a13b18c54d14ce852d9cee9ac4d136b342c44f080032c8b71f82ad93c87cebfe90ff97a63ce14287b287d08ae84287471cba16c3a1370abee1495834d
+  metadata.gz: f38b5a46f316eb0fa0be20d350159cba296db9f1a7a8a1cfd52299ff7b88ca3333e5789719c4f9dd6f2964f1196752dd7d452f941a8ff1fb581d3a2fa8cfa4c7
+  data.tar.gz: 045cb745b6d6a868a9689f04764494cbc52e1babe42ea8eed2e33933c5aa9a79dabad37642fc9d06d77bc7c6a2b7b0e9f73b46f0d91273acbcb7b42d3f9902d1

data/forester.gemspec

@@ -6,7 +6,7 @@ require 'forester/version'
 Gem::Specification.new do |s|
   s.name        = 'forester'
   s.version     = Forester::Version
-  s.date        = '2016-08-28'
+  s.date        = '2016-10-01'
   s.summary     = "A gem to represent and interact with tree data structures"
   s.description = "Based on rubytree, this gem lets you build trees and run queries against them."
   s.authors     = ["Eugenio Bruno"]

data/lib/forester/tree_node_ext/mutators.rb

@@ -25,6 +25,37 @@ module Forester
       end
     end
 
+    def delete_values!(field, values, options = {})
+      default_options = {
+        percolate: false,
+        subtree:   true
+      }
+      options = default_options.merge(options)
+
+      target_nodes = options[:subtree] ? each_node : [self]
+
+      target_nodes.each { |node| node.delete_values_from_root!(field, values, options[:percolate]) }
+    end
+
+    def delete_values_from_root!(field, values, percolate)
+      return unless has?(field)
+      current_value = get(field)
+      return unless current_value.is_a?(Array)
+
+      new_value =
+        if percolate
+          current_value & Array(values)
+        else
+          current_value - Array(values)
+        end
+
+      put!(field, new_value)
+    end
+
+    def percolate_values!(field, values, options = {})
+      delete_values!(field, values, options.merge(percolate: true))
+    end
+
     def remove_levels_past!(last_level_to_keep)
       nodes_of_level(last_level_to_keep).map(&:remove_all!)
       self

data/lib/forester/version.rb

@@ -1,7 +1,7 @@
 module Forester
   class Version
     MAJOR = 4
-    MINOR = 1
+    MINOR = 2
     PATCH = 0
     PRE = nil
 

data/test/test_mutators.rb

@@ -31,4 +31,60 @@ class TestMutators < Minitest::Test
 
   end
 
+  def test_delete_values
+
+    node_1, node_2, node_3 = nodes_with_tags
+
+    @tree.delete_values!(:tags, [])
+    assert_equal ['First tag', 'Second tag', 'Third tag'], node_1.get(:tags)
+    assert_equal ['Second tag', 'Third tag'],              node_2.get(:tags)
+    assert_equal ['Third tag'],                            node_3.get(:tags)
+
+    @tree.delete_values!(:tags, ['First tag'])
+    assert_equal ['Second tag', 'Third tag'], node_1.get(:tags)
+    assert_equal ['Second tag', 'Third tag'], node_2.get(:tags)
+    assert_equal ['Third tag'],               node_3.get(:tags)
+
+    @tree.delete_values!(:tags, ['First tag', 'Second tag', 'Third tag'])
+    assert_equal [], node_1.get(:tags)
+    assert_equal [], node_2.get(:tags)
+    assert_equal [], node_3.get(:tags)
+
+  end
+
+  def test_percolate_values
+
+    node_1, node_2, node_3 = nodes_with_tags
+
+    @tree.percolate_values!(:tags, ['First tag', 'Second tag', 'Third tag'])
+    assert_equal ['First tag', 'Second tag', 'Third tag'], node_1.get(:tags)
+    assert_equal ['Second tag', 'Third tag'],              node_2.get(:tags)
+    assert_equal ['Third tag'],                            node_3.get(:tags)
+
+    @tree.percolate_values!(:tags, ['First tag'])
+    assert_equal ['First tag'], node_1.get(:tags)
+    assert_equal [],            node_2.get(:tags)
+    assert_equal [],            node_3.get(:tags)
+
+    @tree.percolate_values!(:tags, [])
+    assert_equal [], node_1.get(:tags)
+    assert_equal [], node_2.get(:tags)
+    assert_equal [], node_3.get(:tags)
+
+  end
+
+  protected
+
+  def nodes_with_tags
+    [1, 6, 9].map do |n|
+
+      @tree.search({
+        single_node: true,
+        by_field: :value,
+        keywords: n
+      }).first
+
+    end
+  end
+
 end

data/test/trees/simple_tree.yml

@@ -9,6 +9,10 @@ root:
     value: 1
     color: Green
     tone: Dark
+    tags:
+      - First tag
+      - Second tag
+      - Third tag
     children:
     - name: First node of level 2
       value: 2
@@ -32,6 +36,9 @@ root:
       children:
       - name: First node of level 3
         value: 6
+        tags:
+          - Second tag
+          - Third tag
         strings:
           - Reached level 3
           - It's dark
@@ -47,6 +54,8 @@ root:
         - name: Second node of level 4
           value: 9
           color: Yellow
+          tags:
+            - Third tag
           strings:
             - Could forester handle trees with hundreds of levels?
             - Maybe.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forester
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.2.0
 platform: ruby
 authors:
 - Eugenio Bruno
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-28 00:00:00.000000000 Z
+date: 2016-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubytree