modular_tree 0.4.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6fec58fa42f91715e9a59438b1bf403976618ead4f433d70b39c8458c9396fe5
-  data.tar.gz: 255a5d2ae6daaf623f5f6adfa7d9b7206a66e3f9613a11f061e9c2336feec943
+  metadata.gz: b6913b33ae629fa98c3832ba7ae313e9948c581a53811d49648233f349b85b64
+  data.tar.gz: eaaec7d8f9f85924c3064c18b5a88c7805baa0c70e2a7db21e798d217348b67f
 SHA512:
-  metadata.gz: 74f3701071758d0fce55d9e103142532e760c861c96b2ca2835894b4c2e298f2a1190e4901db36dfcb5aa8cdfadb73ea976aad38551d58a452c1d1b0d8dc09e0
-  data.tar.gz: 21785c97fe07687be2c55eb1e3f5c7c9377db855392eeaa9caa490621512ef0ba930202eb63a0b0b8d50a45e6f854217955b2eeb3db4044264bcc978da821319
+  metadata.gz: de1721efbd56c4fe8abdfb54f7d044273daf1938612e4316ef6d1344bc9b1e13bddda02da8f8b0f757d75e45f27a20674b365f28c5ecbc19c53c269217a2d7e5
+  data.tar.gz: a9c68cf3df5204e568a575b1e510fa8974cd39baddead8a52f83edceee865284729a808e8065c898a1e717f2dc7ddfccc1b7a74056c50ff9e368199780c84e29

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)
@@ -101,9 +116,9 @@ module Tree
 
     # Return array of [previous-matching-node, matching-node] tuples. Returns
     # the empty array ff there is no matching set of nodes
-    def pairs(first_matcher_expr, second_matcher_expr, this: true)
-      first_matcher = Matcher.new(first_matcher_expr)
-      second_matcher = Matcher.new(second_matcher_expr)
+    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|

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/matcher.rb

@@ -29,7 +29,7 @@ module Tree
 
     def initialize(expr = nil, &block)
       constrain expr, Proc, Symbol, Class, [Class], true, false, nil
-      expr.nil? == block_given? or raise ArgumentError
+      expr.nil? == block_given? or raise ArgumentError, "Expected either an argument or a block"
       @expr = (expr.nil? ? block : expr)
     end
 

data/lib/modular_tree/pool.rb

@@ -18,6 +18,8 @@ module Tree
       def key?(uid) = @pool.key?(uid)
       def keys = @pool.keys
       def nodes = @pool.values
+      def size = @pool.size
+      def empty? = @pool.empty?
       def [](uid) = @pool[uid]
       def []=(uid, node) @pool[uid] = node end
     end

data/lib/modular_tree/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: modular_tree
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-12-15 00:00:00.000000000 Z
+date: 2022-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: constrain