Allow passing names/ids/models directly in an abilities map

Fixes #197
JosephSilber · Sep 1, 2017 · d6b4073 · d6b4073
1 parent cc73893
commit d6b4073
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/src/Conductors/Concerns/FindsAndCreatesAbilities.php b/src/Conductors/Concerns/FindsAndCreatesAbilities.php
@@ -52,10 +52,13 @@ protected function getAbilityIds($abilities, $model, array $attributes)
      */
     protected function getAbilityIdsFromMap(array $map, array $attributes)
     {
-        return (new Collection($map))
-            ->map(function ($entity, $ability) use ($attributes) {
-                return $this->getAbilityIds($ability, $entity, $attributes);
-            })->flatten(1)->all();
+        list($map, $list) = Helpers::partition($map, function ($value, $key) {
+            return ! is_int($key);
+        });
+
+        return $map->map(function ($entity, $ability) use ($attributes) {
+            return $this->getAbilityIds($ability, $entity, $attributes);
+        })->collapse()->merge($this->getAbilityIdsFromArray($list, $attributes))->all();
     }
 
     /**

diff --git a/src/Helpers.php b/src/Helpers.php
@@ -137,7 +137,7 @@ public static function partition($items, callable $callback)
         $partitions = [new Collection, new Collection];
 
         foreach ($items as $key => $item) {
-            $partitions[(int) ! $callback($item)][$key] = $item;
+            $partitions[(int) ! $callback($item, $key)][$key] = $item;
         }
 
         return new Collection($partitions);

diff --git a/tests/MultipleAbilitiesTest.php b/tests/MultipleAbilitiesTest.php
@@ -79,6 +79,7 @@ public function test_allowing_multiple_abilities_via_a_map()
             'delete' => $user1,
             'view'   => Account::class,
             'update' => $account1,
+            'access-dashboard',
         ]);
 
         $this->assertTrue($bouncer->allows('edit', User::class));
@@ -90,6 +91,8 @@ public function test_allowing_multiple_abilities_via_a_map()
         $this->assertTrue($bouncer->denies('update', Account::class));
         $this->assertTrue($bouncer->allows('update', $account1));
         $this->assertTrue($bouncer->denies('update', $account2));
+
+        $this->assertTrue($bouncer->allows('access-dashboard'));
     }
 
     public function test_disallowing_multiple_abilties()