Edits the role_user pivot table

Author: denismitr

README.md

@@ -55,10 +55,6 @@ To check for a role:
 ```php
 $user->hasRole('admin');
 ```
-or
-```php
-$user->is('admin');
-```
 
 To check for permissions:
 ```php

migrations/2017_02_05_092833_create_roles_table.php

@@ -15,7 +15,7 @@ public function up()
     {
         Schema::create('roles', function (Blueprint $table) {
             $table->increments('id');
-            $table->string('name');
+            $table->string('name')->unique();
             $table->timestamps();
         });
     }

migrations/2017_02_05_093559_create_users_roles_table.php renamed to migrations/2017_02_05_093559_create_role_user_table.php

@@ -4,7 +4,7 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
 
-class CreateUsersRolesTable extends Migration
+class CreateRoleUserTable extends Migration
 {
     /**
      * Run the migrations.
@@ -13,14 +13,16 @@ class CreateUsersRolesTable extends Migration
      */
     public function up()
     {
-        Schema::create('users_roles', function (Blueprint $table) {
-            $table->integer('user_id')->unsigned();
-            $table->integer('role_id')->unsigned();
+        Schema::create('role_user', function (Blueprint $table) {
+            $table->increments('id');
+            $table->integer('user_id')->unsigned()->index();
+            $table->integer('role_id')->unsigned()->index();
+            $table->timestamps();
 
             $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade');
             $table->foreign('role_id')->references('id')->on('roles')->onDelete('cascade');
 
-            $table->primary(['user_id', 'role_id']);
+            $table->unique(['user_id', 'role_id']);
         });
     }
 

src/HasRolesAndPermissions.php

@@ -2,6 +2,7 @@
 
 namespace Denismitr\Permissions;
 
+use App\User;
 use Denismitr\Permissions\Models\Permission;
 use Denismitr\Permissions\Models\Role;
 
@@ -90,26 +91,17 @@ public function assignRole(...$roles)
     {
         foreach ($roles as $role) {
             if ( ! $this->hasRole($role) ) {
-                $this->roles()->create([
-                    'name' => $role
-                ]);
+                $role = Role::fromName($role);
+
+                $this->roles()->attach($role);
+
+                $this->load('roles');
             }
         }
 
         return $this;
     }
 
-    /**
-     * Alias for hasRole
-     *
-     * @param  string $roles
-     * @return bool
-     */
-    public function is(...$roles)
-    {
-        return $this->hasRole(...$roles);
-    }
-
     /**
      * Check if user has role
      *
@@ -127,11 +119,13 @@ public function hasRole(...$roles)
         return false;
     }
 
+
     public function roles()
     {
-        return $this->belongsToMany(Role::class, 'users_roles');
+        return $this->belongsToMany(Role::class);
     }
 
+
     public function permissions()
     {
         return $this->belongsToMany(Permission::class, 'users_permissions');

src/Models/Role.php

@@ -2,14 +2,40 @@
 
 namespace Denismitr\Permissions\Models;
 
+use App\User;
 use Illuminate\Database\Eloquent\Model;
 
 class Role extends Model
 {
     protected $guarded = [];
 
+    /**
+     *  Create new instance of Role with new name or old
+     *  one if not unique
+     *
+     * @param  string $name
+     * @return Illuminate\Database\Eloquent\Model
+     */
+    public static function fromName($name)
+    {
+        return self::updateOrCreate([
+            'name' => $name
+        ]);
+    }
+
+    /**
+     * Belongs to many permissions
+     *
+     * @return Illuminate\Database\Eloquent\Relations\BelongsToMany
+     */
     public function permissions()
     {
         return $this->belongsToMany(Permission::class, 'roles_permissions');
     }
+
+
+    public function users()
+    {
+        return $this->belongsToMany(User::class);
+    }
 }