modular_tree 0.6.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6913b33ae629fa98c3832ba7ae313e9948c581a53811d49648233f349b85b64
-  data.tar.gz: eaaec7d8f9f85924c3064c18b5a88c7805baa0c70e2a7db21e798d217348b67f
+  metadata.gz: 29780afe3a4d0303217b66719daebdc62292f504a4581f19e11bac43c131a92b
+  data.tar.gz: d712c143c16fa5957b03bd4f5a21b8e6e6a48e6ef3c09597d8f25ab3ed596a02
 SHA512:
-  metadata.gz: de1721efbd56c4fe8abdfb54f7d044273daf1938612e4316ef6d1344bc9b1e13bddda02da8f8b0f757d75e45f27a20674b365f28c5ecbc19c53c269217a2d7e5
-  data.tar.gz: a9c68cf3df5204e568a575b1e510fa8974cd39baddead8a52f83edceee865284729a808e8065c898a1e717f2dc7ddfccc1b7a74056c50ff9e368199780c84e29
+  metadata.gz: b94f7f70d4777df66e1a4391ac55aa9117e23d8fc389763d3959c7b9650e1572a39bf73e6b05ce522b0371276cb8e7eba024594cc9b688ef36d1a497cfc9a87f
+  data.tar.gz: 75ab4ec990bcf11d1f18b056eb0c1579b4fa58a7af241c7e270641bf4762085eb063428c995c390cd5baecb8df69ec6435e3609f626746a5313ed627fc607e65

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

@@ -1,5 +1,8 @@
 module Tree
-  # For internal trees with a global namespace for nodes
+  # A pool assumes objects has a unique identifier
+  #
+  # Pool adds a @pool class variable to the including class and all of its
+  # subclasses
   module Pool
     include PathAlgorithms
 
@@ -9,9 +12,9 @@ module Tree
       super
     end
 
-    def initialize(_parent)
+    def initialize(*args)
       super
-      self.class[self.uid] = self
+      self.class.send(:[]=, self.uid, self)
     end
 
     module ClassMethods
@@ -22,6 +25,11 @@ module Tree
       def empty? = @pool.empty?
       def [](uid) = @pool[uid]
       def []=(uid, node) @pool[uid] = node end
+
+      def inherited(subclass)
+        subclass.instance_variable_set(:@pool, @pool)
+        super
+      end
     end
   end
 end

data/lib/modular_tree/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Tree
-  VERSION = "0.6.0"
+  VERSION = "0.8.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.8.0
 platform: ruby
 authors:
 - Claus Rasmussen