Add hasMoved() and save in transaction

Author: lazychaser

src/Kalnoy/Nestedset/Node.php

@@ -61,6 +61,13 @@ class Node extends Eloquent {
      */
     protected $pending = [ 'root' ];
 
+    /**
+     * Whether the node has moved since last save.
+     * 
+     * @var bool
+     */
+    protected $moved = false;
+
     /**
      * Keep track of the number of performed operations.
      * 
@@ -117,6 +124,20 @@ protected static function signOnEvents()
         }
     }
 
+    /**
+     * {@inheritdoc}
+     * 
+     * Saves a node in a transaction.
+     * 
+     */
+    public function save(array $options = array())
+    {
+        return $this->getConnection()->transaction(function () use ($options)
+        {
+            return parent::save($options);
+        });
+    }
+
     /**
      * Set an action.
      * 
@@ -144,14 +165,16 @@ protected function clearAction()
      */
     protected function callPendingAction()
     {
+        $this->moved = false;
+
         if ( ! $this->pending) return;
 
         $method = 'action'.ucfirst(array_shift($this->pending));
         $parameters = $this->pending;
 
         $this->pending = null;
 
-        return call_user_func_array([ $this, $method ], $parameters);
+        $this->moved = call_user_func_array([ $this, $method ], $parameters);
     }
 
     /**
@@ -170,6 +193,8 @@ protected function actionRoot()
             return true;
         }
 
+        if ($this->isRoot()) return false;
+
         // Reset parent object
         $this->setParent(null);
 
@@ -290,7 +315,6 @@ public function refreshNode()
         $attributes = $this->newServiceQuery()->getNodeData($this->getKey());
 
         $this->attributes = array_merge($this->attributes, $attributes);
-        $this->original = array_merge($this->original, $attributes);
     }
 
     /**
@@ -595,11 +619,11 @@ protected function insertAt($position)
      */
     protected function moveNode($position)
     {
-        $updated = $this->newServiceQuery()->moveNode($this->getKey(), $position);
+        $updated = $this->newServiceQuery()->moveNode($this->getKey(), $position) > 0;
 
         if ($updated) $this->refreshNode();
 
-        return $updated > 0;
+        return $updated;
     }
 
     /**
@@ -941,4 +965,14 @@ public function isBroken()
     {
         return $this->getTotalErrors() > 0;
     }
+
+    /**
+     * Get whether the node has moved since last save.
+     * 
+     * @return bool
+     */
+    public function hasMoved()
+    {
+        return $this->moved;
+    }
 }

src/Kalnoy/Nestedset/QueryBuilder.php

@@ -375,6 +375,9 @@ public function moveNode($key, $position)
         // The distance that our node will travel to reach it's destination
         $distance = $to - $from + 1 - $height;
 
+        // If no distance to travel, just return
+        if ($distance === 0) return 0;
+
         if ($position > $lft) $height *= -1; else $distance *= -1;
 
         $params = compact('lft', 'rgt', 'from', 'to', 'height', 'distance');