modular_tree 0.5.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0900ab1e0482487fcb6b63c28fccb0d7dc7f71e5ce54230f3ee551ff67f0dfb5'
-  data.tar.gz: bf6b30a19df1fa8211b355bf06392dbefad2950a2a52bd494dad99605f392669
+  metadata.gz: 70c50cd21f7eb027dcb0560bb164268c929860f61e2912dfbb1a0fd1576f5869
+  data.tar.gz: 120a0efd4e6dda689412e3618267645e4252ba6b24c8949203162a2c0b979fdf
 SHA512:
-  metadata.gz: 52d2ea9f3c82c6e7578f50b51804c223d267b1757f0709776addf39752e1034a57b14354f6877236d12017f2368300c5f3064537a3592f2fcf72bd69e2f991de
-  data.tar.gz: ad298843f7e45b03654ef53b96c507cf51ee0219c01abc4f30619a9396b17c9e775b64fb10b4fa9d3a9bbce0232f7235e2de2e283632a1cba38690634b9c909b
+  metadata.gz: 62af79315ea3ec5c46e47b9e8cd1807b0f6dd33ee914d1a12b37cf8e0006bd2a2be6381e033e1883da88884bcae2e4ffb5a4e66b4d3ca3026d09721ba4e5c9d0
+  data.tar.gz: 12a75c54c67fd37c920ec4c663cd6199038c713c86d79f14a11143432f79ab1621115e0af7a1266dfecb8a56e5c073d8bf5e30b485e17af21accf840c78f7b4c

data/lib/modular_tree/algorithms.rb

@@ -80,9 +80,11 @@ module Tree
     # Filter children. Doesn't recurse. If a block is given, it should return
     # truish to select a child node
     #
+    # 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(match_expr = nil, &block)
-      matcher = Matcher.new(match_expr, &block)
+    def choose(*args, &block)
+      matcher = Matcher.new(*args, &block)
       if block_given?
         a = []
         each_branch { |branch, key| a << branch if matcher.match? branch }

data/lib/modular_tree/matcher.rb

@@ -27,9 +27,10 @@ module Tree
       end
     end
 
-    def initialize(expr = nil, &block)
+    def initialize(*args, &block)
+      expr = args.size == 1 ? args.first : args
       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.5.0"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: modular_tree
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.7.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