modular_tree 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6913b33ae629fa98c3832ba7ae313e9948c581a53811d49648233f349b85b64
-  data.tar.gz: eaaec7d8f9f85924c3064c18b5a88c7805baa0c70e2a7db21e798d217348b67f
+  metadata.gz: 70c50cd21f7eb027dcb0560bb164268c929860f61e2912dfbb1a0fd1576f5869
+  data.tar.gz: 120a0efd4e6dda689412e3618267645e4252ba6b24c8949203162a2c0b979fdf
 SHA512:
-  metadata.gz: de1721efbd56c4fe8abdfb54f7d044273daf1938612e4316ef6d1344bc9b1e13bddda02da8f8b0f757d75e45f27a20674b365f28c5ecbc19c53c269217a2d7e5
-  data.tar.gz: a9c68cf3df5204e568a575b1e510fa8974cd39baddead8a52f83edceee865284729a808e8065c898a1e717f2dc7ddfccc1b7a74056c50ff9e368199780c84e29
+  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,7 +27,8 @@ 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, "Expected either an argument or a block"
       @expr = (expr.nil? ? block : expr)

data/lib/modular_tree/version.rb

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

metadata

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