Assert same scope

Author: lazychaser

src/NodeTrait.php

@@ -189,7 +189,7 @@ protected function actionAppendOrPrepend(self $parent, $prepend = false)
     protected function setParent($value)
     {
         $this->setParentId($value ? $value->getKey() : null)
-             ->setRelation('parent', $value);
+            ->setRelation('parent', $value);
 
         return $this;
     }
@@ -230,7 +230,7 @@ public function refreshNode()
     public function parent()
     {
         return $this->belongsTo(get_class($this), $this->getParentIdName())
-                    ->setModel($this);
+            ->setModel($this);
     }
 
     /**
@@ -241,7 +241,7 @@ public function parent()
     public function children()
     {
         return $this->hasMany(get_class($this), $this->getParentIdName())
-                    ->setModel($this);
+            ->setModel($this);
     }
 
     /**
@@ -262,25 +262,25 @@ public function descendants()
     public function siblings()
     {
         return $this->newScopedQuery()
-                    ->where($this->getKeyName(), '<>', $this->getKey())
-                    ->where($this->getParentIdName(), '=', $this->getParentId());
+            ->where($this->getKeyName(), '<>', $this->getKey())
+            ->where($this->getParentIdName(), '=', $this->getParentId());
     }
 
-   /**
+    /**
      * Get the node siblings and the node itself.
      *
      * @return \Kalnoy\Nestedset\QueryBuilder
      */
     public function siblingsAndSelf()
     {
         return $this->newScopedQuery()
-                    ->where($this->getParentIdName(), '=', $this->getParentId());
+            ->where($this->getParentIdName(), '=', $this->getParentId());
     }
 
     /**
      * Get query for the node siblings and the node itself.
      *
-     * @param  array  $columns
+     * @param  array $columns
      *
      * @return \Illuminate\Database\Eloquent\Collection
      */
@@ -297,7 +297,7 @@ public function getSiblingsAndSelf(array $columns = [ '*' ])
     public function nextSiblings()
     {
         return $this->nextNodes()
-                    ->where($this->getParentIdName(), '=', $this->getParentId());
+            ->where($this->getParentIdName(), '=', $this->getParentId());
     }
 
     /**
@@ -308,7 +308,7 @@ public function nextSiblings()
     public function prevSiblings()
     {
         return $this->prevNodes()
-                    ->where($this->getParentIdName(), '=', $this->getParentId());
+            ->where($this->getParentIdName(), '=', $this->getParentId());
     }
 
     /**
@@ -319,7 +319,7 @@ public function prevSiblings()
     public function nextNodes()
     {
         return $this->newScopedQuery()
-                    ->where($this->getLftName(), '>', $this->getLft());
+            ->where($this->getLftName(), '>', $this->getLft());
     }
 
     /**
@@ -330,7 +330,7 @@ public function nextNodes()
     public function prevNodes()
     {
         return $this->newScopedQuery()
-                    ->where($this->getLftName(), '<', $this->getLft());
+            ->where($this->getLftName(), '<', $this->getLft());
     }
 
     /**
@@ -426,7 +426,8 @@ public function prependToNode(self $parent)
     public function appendOrPrependTo(self $parent, $prepend = false)
     {
         $this->assertNodeExists($parent)
-             ->assertNotDescendant($parent);
+            ->assertNotDescendant($parent)
+            ->assertSameScope($parent);
 
         $this->setParent($parent)->dirtyBounds();
 
@@ -465,7 +466,9 @@ public function beforeNode(self $node)
      */
     public function beforeOrAfterNode(self $node, $after = false)
     {
-        $this->assertNodeExists($node)->assertNotDescendant($node);
+        $this->assertNodeExists($node)
+            ->assertNotDescendant($node)
+            ->assertSameScope($node);
 
         if ( ! $this->isSiblingOf($node)) {
             $this->setParent($node->getRelationValue('parent'));
@@ -529,9 +532,9 @@ public function rawNode($lft, $rgt, $parentId)
     public function up($amount = 1)
     {
         $sibling = $this->prevSiblings()
-                        ->defaultOrder('desc')
-                        ->skip($amount - 1)
-                        ->first();
+            ->defaultOrder('desc')
+            ->skip($amount - 1)
+            ->first();
 
         if ( ! $sibling) return false;
 
@@ -548,9 +551,9 @@ public function up($amount = 1)
     public function down($amount = 1)
     {
         $sibling = $this->nextSiblings()
-                        ->defaultOrder()
-                        ->skip($amount - 1)
-                        ->first();
+            ->defaultOrder()
+            ->skip($amount - 1)
+            ->first();
 
         if ( ! $sibling) return false;
 
@@ -587,7 +590,7 @@ protected function insertAt($position)
     protected function moveNode($position)
     {
         $updated = $this->newNestedSetQuery()
-                        ->moveNode($this->getKey(), $position) > 0;
+                ->moveNode($this->getKey(), $position) > 0;
 
         if ($updated) $this->refreshNode();
 
@@ -649,8 +652,8 @@ protected function deleteDescendants()
     protected function restoreDescendants($deletedAt)
     {
         $this->descendants()
-             ->where($this->getDeletedAtColumn(), '>=', $deletedAt)
-             ->restore();
+            ->where($this->getDeletedAtColumn(), '>=', $deletedAt)
+            ->restore();
     }
 
     /**
@@ -932,8 +935,8 @@ public function getPrevNode(array $columns = [ '*' ])
     public function getAncestors(array $columns = [ '*' ])
     {
         return $this->newScopedQuery()
-                    ->defaultOrder()
-                    ->ancestorsOf($this, $columns);
+            ->defaultOrder()
+            ->ancestorsOf($this, $columns);
     }
 
     /**
@@ -1006,7 +1009,7 @@ public function getPrevSibling(array $columns = [ '*' ])
     public function isDescendantOf(self $other)
     {
         return $this->getLft() > $other->getLft() &&
-               $this->getLft() < $other->getRgt();
+            $this->getLft() < $other->getRgt();
     }
 
     /**
@@ -1019,7 +1022,7 @@ public function isDescendantOf(self $other)
     public function isSelfOrDescendantOf(self $other)
     {
         return $this->getLft() >= $other->getLft() &&
-               $this->getLft() < $other->getRgt();
+            $this->getLft() < $other->getRgt();
     }
 
     /**
@@ -1186,4 +1189,19 @@ protected function assertNodeExists(self $node)
         return $this;
     }
 
+    /**
+     * @param self $node
+     */
+    protected function assertSameScope(self $node)
+    {
+        if ( ! $scoped = $this->getScopeAttributes()) {
+            return;
+        }
+
+        foreach ($scoped as $attr) {
+            if ($this->getAttribute($attr) != $node->getAttribute($attr)) {
+                throw new LogicException('Nodes must be in the same scope');
+            }
+        }
+    }
 }

tests/NodeTest.php

@@ -11,6 +11,8 @@ public static function setUpBeforeClass()
 
         $schema->dropIfExists('categories');
 
+        Capsule::disableQueryLog();
+
         $schema->create('categories', function (\Illuminate\Database\Schema\Blueprint $table) {
             $table->increments('id');
             $table->string('name');
@@ -27,6 +29,8 @@ public function setUp()
 
         Capsule::table('categories')->insert($data);
 
+        Capsule::flushQueryLog();
+
         Category::resetActionsPerformed();
 
         date_default_timezone_set('America/Denver');

tests/ScopedNodeTest.php

@@ -130,6 +130,7 @@ public function testSaveAsRoot()
         $node->saveAsRoot();
 
         $this->assertEquals(5, $node->getLft());
+        $this->assertEquals(null, $node->parent_id);
 
         $this->assertOtherScopeNotAffected();
     }
@@ -138,11 +139,14 @@ public function testInsertion()
     {
         $node = MenuItem::create([ 'menu_id' => 1, 'parent_id' => 5 ]);
 
+        $this->assertEquals(5, $node->parent_id);
+        $this->assertEquals(5, $node->getLft());
+
         $this->assertOtherScopeNotAffected();
     }
 
-    /*
-     * @expectedException
+    /**
+     * @expectedException \Illuminate\Database\Eloquent\ModelNotFoundException
      */
     public function testInsertionToParentFromOtherScope()
     {
@@ -180,4 +184,26 @@ public function testRebuildsTree()
         $data = [];
         MenuItem::scoped([ 'menu_id' => 2 ])->rebuildTree($data);
     }
+
+    /**
+     * @expectedException LogicException
+     */
+    public function testAppendingToAnotherScopeFails()
+    {
+        $a = MenuItem::find(1);
+        $b = MenuItem::find(3);
+
+        $a->appendToNode($b)->save();
+    }
+
+    /**
+     * @expectedException LogicException
+     */
+    public function testInsertingBeforeAnotherScopeFails()
+    {
+        $a = MenuItem::find(1);
+        $b = MenuItem::find(3);
+
+        $a->insertAfterNode($b);
+    }
 }

tests/models/MenuItem.php

@@ -7,7 +7,7 @@ class MenuItem extends \Illuminate\Database\Eloquent\Model
 
     public $timestamps = false;
 
-    protected $fillable = ['menu_id'];
+    protected $fillable = ['menu_id','parent_id'];
 
     public static function resetActionsPerformed()
     {