Backport bugfixes from master.

CHANGELOG.md

@@ -1,5 +1,10 @@
+## 1.0.15
+_Mar 4 2015_
+* bug fixes
+  - Backport minor bugfixes from master.
+
 ## 1.0.14
-_Mar 3 2014_
+_Mar 3 2015_
 * bug fixes
   - Backwards compatible version for Laravel 4.2.x.
 

README.md

@@ -332,7 +332,7 @@ You can ask some questions to your Baum nodes:
 * `isAncestorOf($other)`: Returns true if node is an ancestor of the other.
 * `isSelfOrAncestorOf($other)`: Returns true if node is self or an ancestor.
 * `equals($node)`: current node instance equals the other.
-* `insideSubtree($node)`: Checks wether the given node is inside the subtree
+* `insideSubtree($node)`: Checks whether the given node is inside the subtree
 defined by the left and right indices.
 * `inSameScope($node)`: Returns true if the given node is in the same scope
 as the current one. That is, if *every* column in the `scoped` property has
@@ -475,7 +475,7 @@ Retrieving a complete tree hierarchy into a regular `Collection` object with
 its children *properly nested* is as simple as:
 
 ```php
-$tree = Category::where('name', '=', Books)->first()->getDescendantsAndSelf()->toHierarchy();
+$tree = Category::where('name', '=', 'Books')->first()->getDescendantsAndSelf()->toHierarchy();
 ```
 
 <a name="node-model-events"></a>

src/Baum/BaumServiceProvider.php

@@ -14,7 +14,7 @@ class BaumServiceProvider extends ServiceProvider {
    *
    * @var string
    */
-  const VERSION = '1.0.14';
+  const VERSION = '1.0.15';
 
   /**
    * Indicates if loading of the provider is deferred.

src/Baum/Node.php

@@ -500,8 +500,9 @@ public function scopeWithoutRoot($query) {
   public function scopeLimitDepth($query, $limit) {
     $depth  = $this->exists ? $this->getDepth() : $this->getLevel();
     $max    = $depth + $limit;
+    $scopes = array($depth, $max);
 
-    return $query->whereBetween($this->getDepthColumnName(), array($depth, $max));
+    return $query->whereBetween($this->getDepthColumnName(), array(min($scopes), max($scopes)));
   }
 
   /**

src/Baum/SetValidator.php

@@ -71,7 +71,7 @@ protected function validateBounds() {
           $qualifiedRgtCol >= parent.$rgtCol)))";
 
     $query = $this->node->newQuery()
-      ->join($connection->raw($grammar->wrap($tableName).' AS parent'),
+      ->join($connection->raw($grammar->wrapTable($tableName).' AS parent'),
              $parentColumn, '=', $connection->raw('parent.'.$grammar->wrap($primaryKeyName)),
              'left outer')
       ->whereRaw($whereStm);