modular_tree 0.3.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7ec15f5d6c64bba85a09321d1fcb7c1a22cd91fea24b1db49a2217a4dc73f08
-  data.tar.gz: '08cf720767c7c907e3b7d8007125fafe5a8b51abe8701d4d0a0c5d5736df5ccd'
+  metadata.gz: '0900ab1e0482487fcb6b63c28fccb0d7dc7f71e5ce54230f3ee551ff67f0dfb5'
+  data.tar.gz: bf6b30a19df1fa8211b355bf06392dbefad2950a2a52bd494dad99605f392669
 SHA512:
-  metadata.gz: 171988f0d2150f15a555d035fa7833e53b64784fcbbf3a4d5c3c4dc7ab352ce3aa816dee8a281c802bb236f57951112e0c1b18e451ad62b001e26f66340c3beb
-  data.tar.gz: 23cefa409742a9926b83fb9f1f7aecdae78b78905d7ed765c1f4fdc0044730594d1ffda4ef806c513856b75ac40ba4d788f16c13312521d333d9a73ec0be036f
+  metadata.gz: 52d2ea9f3c82c6e7578f50b51804c223d267b1757f0709776addf39752e1034a57b14354f6877236d12017f2368300c5f3064537a3592f2fcf72bd69e2f991de
+  data.tar.gz: ad298843f7e45b03654ef53b96c507cf51ee0219c01abc4f30619a9396b17c9e775b64fb10b4fa9d3a9bbce0232f7235e2de2e283632a1cba38690634b9c909b

data/lib/modular_tree/algorithms.rb

@@ -77,6 +77,21 @@ module Tree
       end
     end
 
+    # Filter children. Doesn't recurse. If a block is given, it should return
+    # truish to select a child node
+    #
+    # TODO: Maybe make #children an Array extended with filtering
+    def choose(match_expr = nil, &block)
+      matcher = Matcher.new(match_expr, &block)
+      if block_given?
+        a = []
+        each_branch { |branch, key| a << branch if matcher.match? branch }
+        a
+      else
+        Enumerator.new { |enum| each_branch { |branch, key| enum << branch if matcher.match? branch } }
+      end
+    end
+
     # Like #each but the block is called with node, key, and parent instead of
     # value, key, and parent
     def nodes(*filter, this: true, &block) = common_each(*filter, :node, :do_each_preorder, this, &block)
@@ -89,9 +104,8 @@ module Tree
 
     # Enumerator of edges in the tree. Edges are [previous-matching-node,
     # matching-node] tuples. Top-level nodes have previous-matching-node set to
-    # nil
-    #
-    # FIXME: Not working right now. Not sure how #edges relates to #pairs
+    # nil. If the filter matches all nodes the value is an edge-representation
+    # of the tree
     def edges(*filter, this: true, &block)
       if block_given?
         each(*filter, this: this) { |node, _, parent| yield parent, node }
@@ -100,6 +114,19 @@ module Tree
       end
     end
 
+    # Return array of [previous-matching-node, matching-node] tuples. Returns
+    # the empty array ff there is no matching set of nodes
+    def pairs(first_match_expr, second_match_expr, this: true)
+      first_matcher = Matcher.new(first_match_expr)
+      second_matcher = Matcher.new(second_match_expr)
+      or_matcher = first_matcher | second_matcher # avoids re-computing this value over and over
+      result = []
+      nodes(first_matcher, false, this: this) { |node|
+        node.do_pairs(result, first_matcher, or_matcher)
+      }
+      result
+    end
+
     # Find nodes matching +filter+ and call +traverse_block+ with a node and a
     # block argument. +traverse_block+ can recurse into children by calling the
     # supplied inner block
@@ -117,18 +144,6 @@ module Tree
       nodes(filter, this: this).map { |node| traverse_block.call(node, inner_block) }
     end
     
-    # Return array of [previous-matching-node, matching-node] tuples
-    def pairs(first_matcher_expr, second_matcher_expr, this: true)
-      first_matcher = Matcher.new(first_matcher_expr)
-      second_matcher = Matcher.new(second_matcher_expr)
-      or_matcher = first_matcher | second_matcher # avoids re-computing this value over and over
-      result = []
-      nodes(first_matcher, false, this: this) { |node|
-        node.do_pairs(result, first_matcher, or_matcher)
-      }
-      result
-    end
-
     # Traverse the tree top-down while accumulating information in an
     # accumulator object. The block takes a [accumulator, node] tuple and is
     # responsible for adding itself to the accumulator. The return value from

data/lib/modular_tree/filter.rb

@@ -22,7 +22,7 @@ module Tree
     #
     #   when +traverse+ is
     #     true    Traverse always. This is the default
-    #     false   Traverse only if select didn't match
+    #     false   Traverse only if select didn't match # TODO: Never traverse to be able to use filters on children
     #     nil     Expects +select+ to be a Proc object that returns a [select,
     #             traverse] tuple of booleans
     #
@@ -33,7 +33,7 @@ module Tree
     # It is not an error if the method doesn't exists on the a given node but
     # the node is not selected/traversed. If the expression is a class or an
     # array of classes, a given node matches if it is an instance of one of the
-    # classes or any subclass
+    # classes and their subclasses
     #
     # If a block is given, it is supposed to return a [select, traverse] tuple
     # of booleans
@@ -42,6 +42,7 @@ module Tree
     # enumerators that doesn't execute the filter unless the enumerator is
     # evaluated
     #
+    # TODO: Accept RegExp -> use to_s to match
     def initialize(select_expr = nil, traverse_expr = nil, &block)
       if select_expr.nil? && block_given?
         @matcher = block

data/lib/modular_tree/implementations.rb

@@ -164,6 +164,7 @@ module Tree
     end
 
     def each_child(&block) = @children.map(&block)
+
     def attach(child) = @children << child
     def detach(arg)
       key = arg.is_a?(Integer) ? arg : @children.index(arg)

data/lib/modular_tree/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Tree
-  VERSION = "0.3.0"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: modular_tree
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Claus Rasmussen