modular_tree 0.2.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 420d72c774f0602ebf2b50b7346ee64759aaf48f89b8e041c80fe76464dbd379
-  data.tar.gz: 4ceb72733d99138a6244c4b163b46d0fb10fcdf20b8f7d61e582903bab750bc8
+  metadata.gz: 6fec58fa42f91715e9a59438b1bf403976618ead4f433d70b39c8458c9396fe5
+  data.tar.gz: 255a5d2ae6daaf623f5f6adfa7d9b7206a66e3f9613a11f061e9c2336feec943
 SHA512:
-  metadata.gz: a5b2b90bcaaa71fd2754093cbd3ccca1fea3c9193c3261a82911bd10c7c8c6e74476804006238215aaf448062424dbfeef606550b69f378fd742d159d58b05b2
-  data.tar.gz: 8330f74bf4368cc7d56f35b42e48ff4f1dd51641ed94f05f4340f222eef22d62d0a3b32c883e2e6d916b78762a3d23870e62131b3e2f461c10ccabf16070d6ce
+  metadata.gz: 74f3701071758d0fce55d9e103142532e760c861c96b2ca2835894b4c2e298f2a1190e4901db36dfcb5aa8cdfadb73ea976aad38551d58a452c1d1b0d8dc09e0
+  data.tar.gz: 21785c97fe07687be2c55eb1e3f5c7c9377db855392eeaa9caa490621512ef0ba930202eb63a0b0b8d50a45e6f854217955b2eeb3db4044264bcc978da821319

data/lib/modular_tree/algorithms.rb

@@ -89,9 +89,8 @@ module Tree
 
     # Enumerator of edges in the tree. Edges are [previous-matching-node,
     # matching-node] tuples. Top-level nodes have previous-matching-node set to
-    # nil
-    #
-    # FIXME: Not working right now. Not sure how #edges relates to #pairs
+    # nil. 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 }
@@ -100,6 +99,19 @@ module Tree
       end
     end
 
+    # 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)
+      or_matcher = first_matcher | second_matcher # avoids re-computing this value over and over
+      result = []
+      nodes(first_matcher, false, this: this) { |node|
+        node.do_pairs(result, first_matcher, or_matcher)
+      }
+      result
+    end
+
     # Find nodes matching +filter+ and call +traverse_block+ with a node and a
     # block argument. +traverse_block+ can recurse into children by calling the
     # supplied inner block
@@ -117,18 +129,6 @@ module Tree
       nodes(filter, this: this).map { |node| traverse_block.call(node, inner_block) }
     end
     
-    # Return array of [previous-matching-node, matching-node] tuples
-    def pairs(first_matcher_expr, second_matcher_expr, this: true)
-      first_matcher = Matcher.new(first_matcher_expr)
-      second_matcher = Matcher.new(second_matcher_expr)
-      or_matcher = first_matcher | second_matcher # avoids re-computing this value over and over
-      result = []
-      nodes(first_matcher, false, this: this) { |node|
-        node.do_pairs(result, first_matcher, or_matcher)
-      }
-      result
-    end
-
     # Traverse the tree top-down while accumulating information in an
     # accumulator object. The block takes a [accumulator, node] tuple and is
     # responsible for adding itself to the accumulator. The return value from

data/lib/modular_tree/implementations.rb

@@ -15,8 +15,6 @@
 #
 # Internal trees adds a parent/children relation
 #
-#
-#
 # Only internal trees have parent/child relations. External trees have only branch/branches relations
 
 module Tree
@@ -167,6 +165,12 @@ module Tree
 
     def each_child(&block) = @children.map(&block)
     def attach(child) = @children << child
+    def detach(arg)
+      key = arg.is_a?(Integer) ? arg : @children.index(arg)
+      child = @children.delete_at(key) or raise ArgumentError, "Can't find object"
+      child.send(:instance_variable_set, :@parent, nil)
+      child
+    end
 
     # Can be used with any array implementation. +where+ is either an Integer
     # index or an object

data/lib/modular_tree/properties.rb

@@ -35,6 +35,12 @@ module Tree
     def children = abstract_method
     def each_child(&block) = children.each(&block)
     def attach(child) = abstract_method
+
+    # :call-seq:
+    #   detach(key)
+    #   detach(child)
+    #
+    def detach(arg) = abstract_method
   end
 
   # TODO

data/lib/modular_tree/version.rb

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

metadata

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