Add use LaratrustUserTrait with a command call + some fixes

composer.json

@@ -33,7 +33,8 @@
         "php": ">=5.5.0",
         "illuminate/console": "~5.0",
         "illuminate/support": "~5.0",
-        "illuminate/cache": "~5.0"
+        "illuminate/cache": "~5.0",
+        "kkszymanowski/traitor": "^0.2.0"
     },
     "require-dev": {
         "phpunit/phpunit": "~4.1",

src/Laratrust/LaratrustServiceProvider.php

@@ -11,6 +11,7 @@
  */
 
 use Illuminate\Support\ServiceProvider;
+use Illuminate\View\Factory;
 
 class LaratrustServiceProvider extends ServiceProvider
 {
@@ -21,23 +22,33 @@ class LaratrustServiceProvider extends ServiceProvider
      */
     protected $defer = false;
 
+    /**
+     * The commands to be registered.
+     *
+     * @var array
+     */
+    protected $commands = [
+        'Migration' => 'command.laratrust.migration',
+        'MakeRole' => 'command.laratrust.make-role',
+        'MakePermission' => 'command.laratrust.make-permission',
+        'AddLaratrustUserTraitUse' => 'command.laratrust.add-trait',
+        'Setup' => 'command.laratrust.setup'
+    ];
+
     /**
      * Bootstrap the application events.
      *
+     * @param  Factory $view
      * @return void
      */
-    public function boot()
+    public function boot(Factory $view)
     {
-        // Publish config files
+        // Register published configuration.
         $this->publishes([
             __DIR__.'/../config/config.php' => config_path('laratrust.php'),
         ]);
 
-        // Register commands
-        $this->commands('command.laratrust.migration');
-
-        // Register blade directives
-        $this->bladeDirectives();
+        $this->registerBladeDirectives($view);
     }
 
     /**
@@ -57,35 +68,41 @@ public function register()
     /**
      * Register the blade directives
      *
+     * @param  Factory $view
      * @return void
      */
-    private function bladeDirectives()
+    private function registerBladeDirectives(Factory $view)
     {
+        // Fetch Blade Compiler off of the View\Factory
+        $bladeCompiler = $view->getEngineResolver()
+                              ->resolve('blade')
+                              ->getCompiler();
+
         // Call to Laratrust::hasRole
-        \Blade::directive('role', function ($expression) {
-            return "<?php if (\\Laratrust::hasRole{$expression}) : ?>";
+        $bladeCompiler->directive('role', function ($expression) {
+            return "<?php if (app('laratrust')->hasRole{$expression}) : ?>";
         });
 
-        \Blade::directive('endrole', function ($expression) {
-            return "<?php endif; // Laratrust::hasRole ?>";
+        $bladeCompiler->directive('endrole', function () {
+            return "<?php endif; // app('laratrust')->hasRole ?>";
         });
 
         // Call to Laratrust::can
-        \Blade::directive('permission', function ($expression) {
-            return "<?php if (\\Laratrust::can{$expression}) : ?>";
+        $bladeCompiler->directive('permission', function ($expression) {
+            return "<?php if (app('laratrust')->can{$expression}) : ?>";
         });
 
-        \Blade::directive('endpermission', function ($expression) {
-            return "<?php endif; // Laratrust::can ?>";
+        $bladeCompiler->directive('endpermission', function () {
+            return "<?php endif; // app('laratrust')->can ?>";
         });
 
         // Call to Laratrust::ability
-        \Blade::directive('ability', function ($expression) {
-            return "<?php if (\\Laratrust::ability{$expression}) : ?>";
+        $bladeCompiler->directive('ability', function ($expression) {
+            return "<?php if (app('laratrust')->ability{$expression}) : ?>";
         });
 
-        \Blade::directive('endability', function ($expression) {
-            return "<?php endif; // Laratrust::ability ?>";
+        $bladeCompiler->directive('endability', function () {
+            return "<?php endif; // app('laratrust')->ability ?>";
         });
     }
 
@@ -99,21 +116,60 @@ private function registerLaratrust()
         $this->app->bind('laratrust', function ($app) {
             return new Laratrust($app);
         });
-        
+
         $this->app->alias('laratrust', 'Santigarcor\Laratrust\Laratrust');
     }
 
     /**
-     * Register the artisan commands.
+     * Register the given commands.
      *
      * @return void
      */
-    private function registerCommands()
+    protected function registerCommands()
     {
-        $this->app->singleton('command.laratrust.migration', function ($app) {
+        foreach (array_keys($this->commands) as $command) {
+            $method = "register{$command}Command";
+
+            call_user_func_array([$this, $method], []);
+        }
+
+        $this->commands(array_values($this->commands));
+    }
+
+    protected function registerMigrationCommand()
+    {
+        $this->app->singleton('command.laratrust.migration', function () {
             return new MigrationCommand();
         });
     }
+
+    protected function registerMakeRoleCommand()
+    {
+        $this->app->singleton('command.laratrust.make-role', function ($app) {
+            return new MakeRoleCommand($app['files']);
+        });
+    }
+
+    protected function registerMakePermissionCommand()
+    {
+        $this->app->singleton('command.laratrust.make-permission', function ($app) {
+            return new MakePermissionCommand($app['files']);
+        });
+    }
+
+    protected function registerAddLaratrustUserTraitUseCommand()
+    {
+        $this->app->singleton('command.laratrust.add-trait', function () {
+            return new AddLaratrustUserTraitUseCommand();
+        });
+    }
+
+    protected function registerSetupCommand()
+    {
+        $this->app->singleton('command.laratrust.setup', function () {
+            return new SetupCommand();
+        });
+    }
 
     /**
      * Merges user's and laratrust's configs.
@@ -135,8 +191,6 @@ private function mergeConfig()
      */
     public function provides()
     {
-        return [
-            'command.laratrust.migration'
-        ];
+        return array_values($this->commands);
     }
 }

src/commands/AddLaratrustUserTraitUseCommand.php

@@ -0,0 +1,81 @@
+<?php
+
+namespace Santigarcor\Laratrust;
+
+/**
+ * This file is part of Laratrust,
+ * a role & permission management solution for Laravel.
+ *
+ * @license MIT
+ * @package Santigarcor\Laratrust
+ */
+
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Config;
+use Santigarcor\Laratrust\Traits\LaratrustUserTrait;
+use Traitor\Traitor;
+
+class AddLaratrustUserTraitUseCommand extends Command
+{
+    /**
+     * The console command name.
+     *
+     * @var string
+     */
+    protected $name = 'laratrust:add-trait';
+
+    /**
+     * Trait added to User model
+     *
+     * @var string
+     */
+    protected $targetTrait = LaratrustUserTrait::class;
+
+    /**
+     * Execute the console command.
+     *
+     * @return void
+     */
+    public function fire()
+    {
+        $userModel = $this->getUserModel();
+
+        if (! class_exists($userModel)) {
+            $this->error("Class $userModel does not exist.");
+            return;
+        }
+
+        if ($this->alreadyUsesLaratrustUserTrait()) {
+            $this->error("Class $userModel already uses LaratrustUserTrait.");
+            return;
+        }
+
+        Traitor::addTrait($this->targetTrait)->toClass($userModel);
+
+        $this->info("LaratrustUserTrait added successfully");
+    }
+
+    /**
+     * @return bool
+     */
+    protected function alreadyUsesLaratrustUserTrait()
+    {
+        return in_array(LaratrustUserTrait::class, class_uses($this->getUserModel()));
+    }
+
+    /**
+     * @return string
+     */
+    public function getDescription()
+    {
+        return "Add LaratrustUserTrait to {$this->getUserModel()} class";
+    }
+
+    /**
+     * @return string
+     */
+    protected function getUserModel()
+    {
+        return Config::get('auth.providers.users.model', 'App\User');
+    }
+}

src/commands/MakePermissionCommand.php

@@ -0,0 +1,88 @@
+<?php
+
+namespace Santigarcor\Laratrust;
+
+/**
+ * This file is part of Laratrust,
+ * a role & permission management solution for Laravel.
+ *
+ * @license MIT
+ * @package Santigarcor\Laratrust
+ */
+
+use Illuminate\Console\GeneratorCommand;
+
+class MakePermissionCommand extends GeneratorCommand
+{
+    /**
+     * The console command name.
+     *
+     * @var string
+     */
+    protected $name = 'laratrust:make-permission';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Create Permission model if it does not exist';
+
+    /**
+     * The type of class being generated.
+     *
+     * @var string
+     */
+    protected $type = 'Permission model';
+
+    /**
+     * Execute the console command.
+     *
+     * @return void
+     */
+    public function fire()
+    {
+        parent::fire();
+    }
+
+    /**
+     * Get the stub file for the generator.
+     *
+     * @return string
+     */
+    protected function getStub()
+    {
+        return __DIR__.'/stubs/permission.stub';
+    }
+
+    /**
+     * Get the desired class name from the input.
+     *
+     * @return string
+     */
+    protected function getNameInput()
+    {
+        return 'Permission';
+    }
+
+    /**
+     * Get the default namespace for the class.
+     *
+     * @param  string  $rootNamespace
+     * @return string
+     */
+    protected function getDefaultNamespace($rootNamespace)
+    {
+        return $rootNamespace;
+    }
+
+    /**
+     * Get the console command arguments.
+     *
+     * @return array
+     */
+    protected function getArguments()
+    {
+        return [];
+    }
+}