Issue #11: Improve the NaryNode.

loophp · Jun 15, 2019 · c3de5fc · c3de5fc
1 parent 1ce4437
commit c3de5fc
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 21 deletions.
diff --git a/spec/drupol/phptree/Node/NaryNodeSpec.php b/spec/drupol/phptree/Node/NaryNodeSpec.php
@@ -55,15 +55,15 @@ public function it_can_have_children()
         $child2 = new NaryNode(2);
         $child3 = new Node();
         $child4 = new Node();
-        $child5 = new Node();
-        $child6 = new Node();
-        $child7 = new Node();
 
         $this
-            ->add($child1, $child2, $child3, $child4, $child5, $child6, $child7);
+            ->add($child1, $child2, $child3, $child4);
 
         $this->degree()->shouldReturn(2);
         $this->count()->shouldReturn(4);
+
+        $this->shouldThrow(\Exception::class)
+            ->during('add', [new Node()]);
     }
 
     public function it_can_throw_an_error_when_capacity_is_invalid()
@@ -72,7 +72,10 @@ public function it_can_throw_an_error_when_capacity_is_invalid()
 
         $this
             ->capacity()
-            ->shouldReturn(0);
+            ->shouldReturn(-5);
+
+        $this->shouldThrow(\Exception::class)
+            ->during('add', [new NaryNode()]);
     }
 
     public function it_can_use_a_different_traverser()

diff --git a/src/Node/NaryNode.php b/src/Node/NaryNode.php
@@ -26,10 +26,6 @@ public function __construct(int $capacity = 0, NodeInterface $parent = null, Tra
     {
         parent::__construct($parent);
 
-        $capacity = 0 > $capacity ?
-            0 :
-            $capacity;
-
         $this->storage()->set(
             'capacity',
             $capacity
@@ -56,18 +52,10 @@ public function add(NodeInterface ...$nodes): NodeInterface
                 continue;
             }
 
-            foreach ($this->getTraverser()->traverse($this) as $candidate) {
-                if (!($candidate instanceof NaryNodeInterface)) {
-                    continue;
-                }
-
-                if ($candidate->degree() >= $candidate->capacity()) {
-                    continue;
-                }
-
-                $candidate->add($node);
-
-                break;
+            if (null !== $parent = $this->findFirstAvailableNode($this)) {
+                $parent->add($node);
+            } else {
+                throw new \Exception('Unable to add the node to the tree.');
             }
         }
 
@@ -105,4 +93,39 @@ public function offsetSet($offset, $value)
             parent::offsetSet($offset, $value);
         }
     }
+
+    /**
+     * Find the first available node in the tree.
+     *
+     * When adding nodes to a NaryNode based tree, you must traverse the tree
+     * and find the first node that can be used as a parent for the node to add.
+     *
+     * @param \drupol\phptree\Node\NodeInterface $tree
+     *   The base node.
+     *
+     * @return null|\drupol\phptree\Node\NodeInterface
+     *   A node, null if none are found.
+     */
+    protected function findFirstAvailableNode(NodeInterface $tree): ?NodeInterface
+    {
+        foreach ($this->getTraverser()->traverse($tree) as $candidate) {
+            if (!($candidate instanceof NaryNodeInterface)) {
+                continue;
+            }
+
+            $capacity = $candidate->capacity();
+
+            if (0 > $capacity) {
+                continue;
+            }
+
+            if (0 !== $capacity && $candidate->degree() >= $capacity) {
+                continue;
+            }
+
+            return $candidate;
+        }
+
+        return null;
+    }
 }