Merge branch 'master' of github.com:etrepat/baum

Conflicts:
	README.md
	src/Baum/Console/InstallCommand.php
	src/Baum/Providers/BaumServiceProvider.php

Author: gjmh-unikent

CHANGELOG.md

@@ -1,3 +1,15 @@
+## 1.1.1
+_Mar 4 2015_
+* bug fixes
+  - Fix README.md typos [PR #134 and #131]
+  - Use table prefixes in `rebuild` command [PR #133]
+  - Fix `limitDepth` query scope [PR #125]
+
+## 1.1.0
+_Mar 3 2015_
+* enhancements
+  - Add support for Laravel 5.x, leave a [1.0.x](https://github.com/etrepat/baum/tree/1.0.x-stable) branch for backwards compatibility.
+
 ## 1.0.13
 _Sep 30 2014_
 * bug fixes

README.md

@@ -3,6 +3,8 @@
 Baum is an implementation of the [Nested Set](http://en.wikipedia.org/wiki/Nested_set_model)
 pattern for [Laravel 5's](http://laravel.com/) Eloquent ORM.
 
+For **Laravel 4.2.x compatibility**, check the [1.0.x branch](https://github.com/etrepat/baum/tree/1.0.x-stable) branch or use the latest [1.0.x tagged release](https://github.com/etrepat/baum/releases).
+
 ## Documentation
 
 * [About Nested Sets](#about)
@@ -91,18 +93,18 @@ ordinary trees are suddenly quite fast. Nifty, isn't it?
 <a name="installation"></a>
 ## Installation
 
-Baum works with Laravel 4 onwards. You can add it to your `composer.json` file
+Baum works with Laravel 5 onwards. You can add it to your `composer.json` file
 with:
 
-    "baum/baum": "~1.0"
+    "baum/baum": "~1.1"
 
 Run `composer install` to install it.
 
-As with most Laravel 4 packages you'll then need to register the Baum
-*service provider*. To do that, head over your `app/config/app.php` file and add
+As with most Laravel 5 packages you'll then need to register the Baum
+*service provider*. To do that, head over your `config/app.php` file and add
 the following line into the `providers` array:
 
-    'Baum\BaumServiceProvider',
+    'Baum\Providers\BaumServiceProvider',
 
 <a name="getting-started"></a>
 ## Getting started
@@ -329,7 +331,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
@@ -472,7 +474,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>

bootstrap.php

@@ -12,7 +12,7 @@
 
 $capsule->addConnection(require(__DIR__.'/tests/config/database.php'));
 
-$capsule->setEventDispatcher(new Illuminate\Events\Dispatcher);
+$capsule->setEventDispatcher(new Illuminate\Events\Dispatcher(new Illuminate\Container\Container));
 
 $capsule->bootEloquent();
 

composer.json

@@ -2,7 +2,7 @@
   "name": "unikent/baum",
   "type": "library",
   "description": "Baum is an implementation of the Nested Set pattern for Eloquent models.",
-  "keywords": ["nested set", "laravel", "laravel 4", "eloquent", "database"],
+  "keywords": ["nested set", "laravel", "laravel 4", "laravel 5", "eloquent", "database"],
   "license": "MIT",
   "authors": [
     {
@@ -12,16 +12,17 @@
     }
   ],
   "require": {
-    "php": ">=5.3.0",
-    "illuminate/support": "4.*|5.*",
-    "illuminate/console": "4.*|5.*",
-    "illuminate/filesystem": "4.*|5.*",
-    "illuminate/database": "4.*|5.*"
+    "php": ">=5.4.0",
+    "illuminate/console": "5.*",
+    "illuminate/database": "5.*",
+    "illuminate/events": "5.*",
+    "illuminate/filesystem": "5.*",
+    "illuminate/support": "5.*"
   },
   "require-dev": {
     "phpunit/phpunit": "~4.0",
     "mockery/mockery": "~0.9",
-    "d11wtq/boris": "~1.0"
+    "d11wtq/boris": "~1.0.10"
   },
   "autoload": {
     "psr-0": {

src/Baum/Console/InstallCommand.php

@@ -108,7 +108,7 @@ protected function writeModel($name) {
    * @return string
    */
   protected function getMigrationsPath() {
-    return $this->laravel['path.base'].'/database/migrations';
+    return $this->laravel['path.database'].'/migrations';
   }
 
   /**
@@ -117,7 +117,8 @@ protected function getMigrationsPath() {
    * @return string
    */
   protected function getModelsPath() {
-    return $this->laravel['path'];
+
+    return $this->laravel['path.base'];
   }
 
 }

src/Baum/Extensions/Eloquent/Model.php

@@ -1,9 +1,9 @@
 <?php
-
 namespace Baum\Extensions\Eloquent;
 
 use Illuminate\Database\Eloquent\Model as BaseModel;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
+use Illuminate\Database\Eloquent\SoftDeletingScope;
 use Baum\Extensions\Query\Builder as QueryBuilder;
 
 abstract class Model extends BaseModel {
@@ -50,8 +50,8 @@ public function getObservableEvents() {
    * @param  Closure|string  $callback
    * @return void
    */
-  public static function moving($callback) {
-    static::registerModelEvent('moving', $callback);
+  public static function moving($callback, $priority = 0) {
+    static::registerModelEvent('moving', $callback, $priority);
   }
 
   /**
@@ -60,8 +60,8 @@ public static function moving($callback) {
    * @param  Closure|string  $callback
    * @return void
    */
-  public static function moved($callback) {
-    static::registerModelEvent('moved', $callback);
+  public static function moved($callback, $priority = 0) {
+    static::registerModelEvent('moved', $callback, $priority);
   }
 
   /**
@@ -95,18 +95,15 @@ protected function getFreshInstance() {
    * @return boolean
    */
   public function areSoftDeletesEnabled() {
-    // Soft-delete functionality in 4.2 has been moved into a trait.
-    // The proper way to check if a model includes a global scope in >= 4.2
-    // should look similar to the following:
-    //
-    //    static::hasGlobalScope(new SoftDeletingScope);
-    //
-    // We are doing it this way (not the best probably) to keep backwards
-    // compatibility...
-    return (
-      (property_exists($this, 'softDelete') && $this->softDelete == true) ||
-      (!property_exists($this, 'softDelete') && method_exists($this, 'getDeletedAtColumn'))
-    );
+    // To determine if there's a global soft delete scope defined we must
+    // first determine if there are any, to workaround a non-existent key error.
+    $globalScopes = $this->getGlobalScopes();
+
+    if ( count($globalScopes) === 0 ) return false;
+
+    // Now that we're sure that the calling class has some kind of global scope
+    // we check for the SoftDeletingScope existance
+    return static::hasGlobalScope(new SoftDeletingScope);
   }
 
   /**

src/Baum/Generators/stubs/model.php

@@ -95,31 +95,8 @@ class {{class}} extends Node {
   // In the same way as Eloquent's model events, returning false from the
   // `moving` event handler will halt the operation.
   //
-  // Below is a sample `boot` method just for convenience, as an example of how
-  // one should hook into those events. This is the *recommended* way to hook
-  // into model events, as stated in the documentation. Please refer to the
-  // Laravel documentation for details.
-  //
-  // If you don't plan on using model events in your program you can safely
-  // remove all the commented code below.
-  //
-
-  // /**
-  //  * The "booting" method of the model.
-  //  *
-  //  * @return void
-  //  */
-  // protected static function boot() {
-  //   // Do not forget this!
-  //   parent::boot();
-
-  //   static::moving(function($node) {
-  //     // YOUR CODE HERE
-  //   });
-
-  //   static::moved(function($node) {
-  //     // YOUR CODE HERE
-  //   });
-  // }
+  // Please refer the Laravel documentation for further instructions on how
+  // to hook your own callbacks/observers into this events:
+  // http://laravel.com/docs/5.0/eloquent#model-events
 
 }

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/BaumServiceProvider.php src/Baum/Providers/BaumServiceProvider.php

@@ -1,5 +1,5 @@
 <?php
-namespace Baum;
+namespace Baum\Providers;
 
 use Baum\Generators\MigrationGenerator;
 use Baum\Generators\ModelGenerator;
@@ -14,14 +14,7 @@ class BaumServiceProvider extends ServiceProvider {
    *
    * @var string
    */
-  const VERSION = '1.0.13';
-
-  /**
-   * Indicates if loading of the provider is deferred.
-   *
-   * @var bool
-   */
-  protected $defer = false;
+  const VERSION = '1.1.1';
 
   /**
    * Register the service provider.
@@ -32,15 +25,6 @@ public function register() {
     $this->registerCommands();
   }
 
-  /**
-   * Get the services provided by the provider.
-   *
-   * @return array
-   */
-  public function provides() {
-    return array('node');
-  }
-
   /**
    * Register the commands.
    *
@@ -61,8 +45,8 @@ public function registerCommands() {
    * @return void
    */
   protected function registerBaumCommand() {
-    $this->app['command.baum'] = $this->app->share(function($app) {
-      return new BaumCommand();
+    $this->app->singleton('command.baum', function($app) {
+      return new BaumCommand;
     });
   }
 
@@ -72,12 +56,21 @@ protected function registerBaumCommand() {
    * @return void
    */
   protected function registerInstallCommand() {
-    $this->app['command.baum.install'] = $this->app->share(function($app) {
+    $this->app->singleton('command.baum.install', function($app) {
       $migrator = new MigrationGenerator($app['files']);
       $modeler  = new ModelGenerator($app['files']);
 
       return new InstallCommand($migrator, $modeler);
     });
   }
 
+  /**
+   * Get the services provided by the provider.
+   *
+   * @return array
+   */
+  public function provides() {
+    return array('command.baum', 'command.baum.install');
+  }
+
 }

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);

tests/models/Category.php

@@ -1,6 +1,6 @@
 <?php
 
-use Illuminate\Database\Eloquent\SoftDeletingTrait;
+use Illuminate\Database\Eloquent\SoftDeletes;
 use Baum\Node;
 
 class Category extends Node {
@@ -39,7 +39,7 @@ class OrderedScopedCategory extends Category {
 
 class SoftCategory extends Category {
 
-  use SoftDeletingTrait;
+  use SoftDeletes;
 
   public $timestamps = true;
 

tests/models/Cluster.php

@@ -1,6 +1,6 @@
 <?php
 
-use Illuminate\Database\Eloquent\SoftDeletingTrait;
+use Illuminate\Database\Eloquent\SoftDeletes;
 use Baum\Node;
 
 class Cluster extends Node {
@@ -58,7 +58,7 @@ class OrderedCluster extends Cluster {
 
 class SoftCluster extends Cluster {
 
-  use SoftDeletingTrait;
+  use SoftDeletes;
 
   public $timestamps = true;
 

tests/suite/NodeModelExtensionsTest.php

@@ -50,27 +50,29 @@ public function testSoftDeletesEnabledStatic() {
 
   public function testMoving() {
     $dispatcher = Category::getEventDispatcher();
-    Category::setEventDispatcher($events = m::mock('Illuminate\Events\Dispatcher'));
 
-    $closure = function() {};
-    $events->shouldReceive('listen')->once()->with('eloquent.moving: '.get_class(new Category), $closure);
+    Category::setEventDispatcher($events = m::mock('Illuminate\Contracts\Events\Dispatcher'));
 
+    $closure = function() {};
+    $events->shouldReceive('listen')->once()->with('eloquent.moving: '.get_class(new Category), $closure, 0);
     Category::moving($closure);
 
     Category::unsetEventDispatcher();
+
     Category::setEventDispatcher($dispatcher);
   }
 
   public function testMoved() {
     $dispatcher = Category::getEventDispatcher();
-    Category::setEventDispatcher($events = m::mock('Illuminate\Events\Dispatcher'));
 
-    $closure = function() {};
-    $events->shouldReceive('listen')->once()->with('eloquent.moved: '.get_class(new Category), $closure);
+    Category::setEventDispatcher($events = m::mock('Illuminate\Contracts\Events\Dispatcher'));
 
+    $closure = function() {};
+    $events->shouldReceive('listen')->once()->with('eloquent.moved: '.get_class(new Category), $closure, 0);
     Category::moved($closure);
 
     Category::unsetEventDispatcher();
+
     Category::setEventDispatcher($dispatcher);
   }