moved models into respective directory

Author: kodeine

src/Kodeine/Acl/AclServiceProvider.php

@@ -4,6 +4,12 @@
 
 class AclServiceProvider extends ServiceProvider
 {
+    /**
+     * Indicates if loading of the provider is deferred.
+     *
+     * @var bool
+     */
+    protected $defer = false;
 
     /**
      * Bootstrap any application services.
@@ -12,10 +18,8 @@ class AclServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        $this->publishes([
-            __DIR__ . '/../../config/acl.php' => config_path('acl.php'),
-            __DIR__ . '/../../migrations/'    => base_path('/database/migrations'),
-        ], 'migrations');
+        $this->publishConfig();
+        $this->publishMigration();
     }
 
     /**
@@ -27,4 +31,24 @@ public function register()
     {
         //
     }
+
+    /**
+     * Publish the config file to the application config directory
+     */
+    public function publishConfig()
+    {
+        $this->publishes([
+            __DIR__ . '/../../config/acl.php' => config_path('acl.php'),
+        ], 'config');
+    }
+
+    /**
+     * Publish the migration to the application migration folder
+     */
+    public function publishMigration()
+    {
+        $this->publishes([
+            __DIR__ . '/../../migrations/' => base_path('/database/migrations'),
+        ], 'migrations');
+    }
 }

src/Kodeine/Acl/Models/Eloquent/Permission.php

@@ -0,0 +1,71 @@
+<?php namespace Kodeine\Acl;
+
+use Config;
+use Illuminate\Database\Eloquent\Model;
+
+class Permission extends Model
+{
+    /**
+     * The attributes that are fillable via mass assignment.
+     *
+     * @var array
+     */
+    protected $fillable = ['name', 'slug', 'description'];
+
+    /**
+     * The database table used by the model.
+     *
+     * @var string
+     */
+    protected $table = 'permissions';
+
+    /**
+     * Permissions can belong to many roles.
+     *
+     * @return Model
+     */
+    public function roles()
+    {
+        $model = Config::get('acl.role', 'Kodeine\Acl\Models\Eloquent\Role');
+        return $this->belongsToMany($model)->withTimestamps();
+    }
+
+    /**
+     * Permissions can belong to many users.
+     *
+     * @return Model
+     */
+    public function users()
+    {
+        return $this->belongsToMany(Config::get('auth.model'))->withTimestamps();
+    }
+
+    /**
+     * @param $value
+     * @return array
+     */
+    public function getSlugAttribute($value)
+    {
+        return json_decode($value, true);
+    }
+
+    /**
+     * @param $value
+     */
+    public function setSlugAttribute($value)
+    {
+        $value = is_array($value) ? $value : [$value => true];
+
+        // if attribute is being updated.
+        if ( isset($this->original['slug']) ) {
+            $value = $value + json_decode($this->original['slug'], true);
+        }
+
+        // remove null values.
+        $value = array_filter($value, 'is_bool');
+
+        // store as json.
+        $this->attributes['slug'] = json_encode($value);
+    }
+
+}

src/Kodeine/Acl/Models/Eloquent/Role.php

@@ -0,0 +1,70 @@
+<?php namespace Kodeine\Acl;
+
+use Config;
+use Illuminate\Database\Eloquent\Model;
+use Kodeine\Acl\Traits\HasPermission;
+
+class Role extends Model
+{
+    use HasPermission;
+
+    /**
+     * The attributes that are fillable via mass assignment.
+     *
+     * @var array
+     */
+    protected $fillable = ['name', 'slug', 'description'];
+
+    /**
+     * The database table used by the model.
+     *
+     * @var string
+     */
+    protected $table = 'roles';
+
+    /**
+     * Roles can belong to many users.
+     *
+     * @return Model
+     */
+    public function users()
+    {
+        return $this->belongsToMany(Config::get('auth.model'))->withTimestamps();
+    }
+
+    /**
+     * List all permissions
+     *
+     * @return mixed
+     */
+    public function getPermissions()
+    {
+        return $this->permissions->lists('slug', 'name');
+    }
+
+    /**
+     * Checks if the role has the given permission.
+     *
+     * @param string $permission
+     * @param array  $mergePermissions
+     * @return bool
+     */
+    public function can($permission, $mergePermissions = [])
+    {
+        $permission = $this->hasDelimiterToArray($permission);
+        $permissions = $this->getPermissions() + $mergePermissions;
+
+        // make permissions to dot notation.
+        // create.user, delete.admin etc.
+        $permissions = $this->toDotPermissions($permissions);
+
+        if ( is_array($permission) ) {
+            $intersect = array_intersect_key($permissions, array_flip($permission));
+
+            return count($permission) == count($intersect);
+        }
+
+        return isset($permissions[$permission]) && $permissions[$permission] == true;
+    }
+
+}

src/Kodeine/Acl/Traits/HasPermission.php

@@ -20,7 +20,7 @@ trait HasPermission
      */
     public function permissions()
     {
-        $model = \Config::get('acl.permission', 'Kodeine\Acl\Permission');
+        $model = \Config::get('acl.permission', 'Kodeine\Acl\Models\Eloquent\Permission');
         return $this->belongsToMany($model)->withTimestamps();
     }
 
@@ -149,7 +149,7 @@ public function revokeAllPermissions()
     protected function parsePermissionId($permission)
     {
         if ( is_string($permission) ) {
-            $model = new \Kodeine\Acl\Permission;
+            $model = new \Kodeine\Acl\Models\Eloquent\Permission;
             $find = $model->whereSlug($permission)->first();
 
             if ( ! is_object($find) ) {

src/Kodeine/Acl/Traits/HasRole.php

@@ -19,7 +19,7 @@ trait HasRole
      */
     public function roles()
     {
-        $model = \Config::get('acl.role', 'Kodeine\Acl\Role');
+        $model = \Config::get('acl.role', 'Kodeine\Acl\Models\Eloquent\Role');
         return $this->belongsToMany($model)->withTimestamps();
     }
 
@@ -130,7 +130,7 @@ public function revokeAllRoles()
     protected function parseRoleId($role)
     {
         if ( is_string($role) ) {
-            $model = new \Kodeine\Acl\Role;
+            $model = new \Kodeine\Acl\Models\Eloquent\Role;
             $find = $model->whereSlug($role)->first();
 
             if ( ! is_object($find) ) {

src/config/acl.php

@@ -1,6 +1,6 @@
 <?php
 
 return [
-    'role'       => 'Kodeine\Acl\Role',
-    'permission' => 'Kodeine\Acl\Permission',
+    'role'       => 'Kodeine\Acl\Models\Eloquent\Role',
+    'permission' => 'Kodeine\Acl\Models\Eloquent\Permission',
 ];