is() now supports and/or operators, updated can/is methods

Author: kodeine

src/Kodeine/Acl/Helper/Helper.php

@@ -52,7 +52,8 @@ protected function parseOperator($str)
 
     /**
      * Converts strings having comma
-     * or pipe to an array
+     * or pipe to an array in
+     * lowercase
      *
      * @param $str
      * @return array
@@ -61,9 +62,10 @@ protected function hasDelimiterToArray($str)
     {
         if ( is_string($str) && preg_match('/[,|]/is', $str) ) {
             $str = preg_split('/ ?[,|] ?/', $str);
+            $str = array_filter($str, 'strtolower');
         }
 
-        return $str;
+        return strtolower($str);
     }
 
     /**

src/Kodeine/Acl/Middleware/HasPermission.php

@@ -36,9 +36,9 @@ public function handle($request, Closure $next)
     {
         $this->request = $request;
 
-        if ( ( ! $this->getAction('is') or $this->hasRole())
-            and ( ! $this->getAction('can') and ! $this->getAction('protect_alias')
-                or $this->hasPermission())
+        if ( ( ! $this->getAction('is') or $this->hasRole() ) and
+             ( ! $this->getAction('can') or $this->hasPermission() ) and
+             ( ! $this->getAction('protect_alias') or $this->protectMethods() )
         ) {
             return $next($request);
         }
@@ -79,11 +79,6 @@ protected function hasPermission()
         $request = $this->request;
         $do = $this->getAction('can');
 
-        // if method protection is needed.
-        if ( ! $do && $this->getAction('protect_alias') ) {
-            return $this->protectMethods();
-        }
-
         return ! $this->forbiddenRoute() && $request->user()->can($do);
     }
 

src/Kodeine/Acl/Traits/HasRole.php

@@ -40,11 +40,28 @@ public function getRoles()
      * @param  string $slug
      * @return bool
      */
-    public function is($slug)
+    public function is($slug, $operator = null)
     {
-        $slug = strtolower($slug);
+        $operator = is_null(null) ? $this->parseOperator($slug) : $operator;
 
-        return in_array($slug, $this->getRoles());
+        $roles = $this->getRoles();
+        $slug = $this->hasDelimiterToArray($slug);
+
+        // array of slugs
+        if ( is_array($slug) ) {
+
+            if ( ! in_array($operator, ['and', 'or']) ) {
+                $e = 'Invalid operator, available operators are "and", "or".';
+                throw new \InvalidArgumentException($e);
+            }
+
+            $call = 'isWith' . ucwords($operator);
+
+            return $this->$call($slug, $roles);
+        }
+
+        // single slug
+        return in_array($slug, $roles);
     }
 
     /**
@@ -121,6 +138,38 @@ public function revokeAllRoles()
     |
     */
 
+    /**
+     * @param $slug
+     * @param $roles
+     * @return bool
+     */
+    protected function isWithAnd($slug, $roles)
+    {
+        foreach ($slug as $check) {
+            if ( ! in_array($check, $roles) ) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * @param $slug
+     * @param $roles
+     * @return bool
+     */
+    protected function isWithOr($slug, $roles)
+    {
+        foreach ($slug as $check) {
+            if ( in_array($check, $roles) ) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     /**
      * Parses role id from object, array
      * or a string.
@@ -168,15 +217,16 @@ protected function parseRoleId($role)
     public function __call($method, $arguments = [])
     {
         // Handle isRoleSlug() methods
-        if ( starts_with($method, 'is') and $method !== 'is' ) {
+        if ( starts_with($method, 'is') and $method !== 'is' and ! starts_with($method, 'isWith') ) {
             $role = substr($method, 2);
 
             return $this->is($role);
         }
 
         // Handle canDoSomething() methods
-        if ( starts_with($method, 'can') and $method !== 'can' ) {
+        if ( starts_with($method, 'can') and $method !== 'can' and ! starts_with($method, 'canWith') ) {
             $permission = substr($method, 3);
+            $permission = snake_case($permission, '.');
 
             return $this->can($permission);
         }