modular_tree 0.10.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae3499e0ea36c7f7dd44068616ec8dd566e43be82c0e728dae86da829b085d7f
-  data.tar.gz: f1c35152a0b97dad0b50e85cf2061baf9bad2fed42ca4bc2bb8df3b000b81468
+  metadata.gz: a78d523f964aaf9e819f8620dbaafbad5facc1848f1baa511bf3e71625a1b0c9
+  data.tar.gz: 59e201fe0e71be312e3f1b2545b1dbcfbccb72c7fa04465d33d6da6ed8c14acb
 SHA512:
-  metadata.gz: 71c8a99e260fe03d2453371b0afe9bc79c22234fe74a79ddf61036affd1a3129c84597006c9b5648831f1b3f469f79f26f73fd1c6263c277cee3bcea91905480
-  data.tar.gz: cb5feecaf6a795c91011fbafca901bb1fea9814e9b1283407b623052d9b33b801d1935d9e5594115154384ab2f49763dd5bd672dba1a3b490d800b4a9129bf3b
+  metadata.gz: 55c87a6034b013fe0f424dee4d7b2192eb1cd863c9d96085beebfbfbace4efcdaf4ac1137dcd8a1941679479502e4ef3f6b29f2d26ced05aa82f872a28c568cd
+  data.tar.gz: f34c14d5cfc770cd2ad502370e17411396fc290aef2988bcccdeb931456add73819a8d7d7a1c5b75565c3565549859e2cbcaeae28960353a2a567bd843841cbf

data/lib/modular_tree/algorithms.rb

@@ -69,11 +69,18 @@ module Tree
 
     # Implementation of Enumerable#select extended with a single filter. As
     # #each, the block is called with value, key, and parent arguments
-    def select(filter = nil, this: true, &block)
+    #
+    # The match expression can also be a list of classes (instead of an array of classes)
+    #
+    def select(*expr, this: true, &block)
+      !block_given? || expr.empty? or raise ArgumentError, "Can't use both match expression and block"
       if block_given?
-        each(block, true, this: this).to_a
+        each.select { |branch| yield branch }
+      elsif !expr.empty?
+        matcher = Matcher.new(*expr, &block)
+        each.select { |branch| matcher.match? branch }
       else
-        each(filter || true, true, this: this)
+        each
       end
     end
 
@@ -83,14 +90,15 @@ module Tree
     # The match expression can also be a list of classes (instead of an array of classes)
     #
     # TODO: Maybe make #children an Array extended with filtering
-    def choose(*args, &block)
-      matcher = Matcher.new(*args, &block)
+    def choose(*expr, &block)
+      !block_given? || expr.empty? or raise ArgumentError, "Can't use both match expression and block"
       if block_given?
-        a = []
-        each_branch { |branch, key| a << branch if matcher.match? branch }
-        a
+        each_branch.select { |branch| yield branch }
+      elsif !expr.empty?
+        matcher = Matcher.new(*expr, &block)
+        each_branch.select { |branch| matcher.match? branch }
       else
-        Enumerator.new { |enum| each_branch { |branch, key| enum << branch if matcher.match? branch } }
+        each
       end
     end
 
@@ -104,10 +112,14 @@ module Tree
     # Post-order enumerator of selected nodes
     def postorder(*filter, this: true) = common_each(*filter, :node_value, :each_postorder, this)
 
+    # TODO IDEA: 
+    #   edges -> parent/child nodes
+    #   pairs -> parent/.../descendant nodes
+
     # Enumerator of edges in the tree. Edges are [previous-matching-node,
     # matching-node] tuples. Top-level nodes have previous-matching-node set to
-    # nil. If the filter matches all nodes the value is an edge-representation
-    # of the tree
+    # nil (the result is a forrest). 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 }
@@ -117,7 +129,7 @@ module Tree
     end
 
     # Return array of [previous-matching-node, matching-node] tuples. Returns
-    # the empty array ff there is no matching set of nodes
+    # the empty array iff 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)

data/lib/modular_tree/implementations.rb

@@ -53,6 +53,12 @@ module Tree
     include ParentImplementation
   end
 
+  module InternalRootImplementation
+    include RootProperty
+    include InternalParentImplementation
+    def root = @root ||= parent&.root || self
+  end
+
   module ChildrenImplementation
     include ChildrenProperty
     include BranchesProperty
@@ -153,6 +159,9 @@ module Tree
     attr_writer :next_sibling
   end
 
+  # TODO: A ChildrenArrayImplementation that defines #insert and #append and
+  # adds an optional index argument to #attach
+
   module InternalChildrenArrayImplementation
     include InternalChildrenImplementation
 
@@ -177,6 +186,8 @@ module Tree
     # index or an object
     #
     # TODO: Rename #attach. #insert & #append are Enumerable operations
+    #
+    # TODO: Default where argument - insert: 0, append: -1
     def insert(where, child) = insert_append(:insert, where, child)
     def append(where, child) = insert_append(:append, where, child)
 

data/lib/modular_tree/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: modular_tree
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-12-18 00:00:00.000000000 Z
+date: 2023-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: constrain