Adds support for Closure rules (#45)

* Support Closure rules

* Test Closure rules

* Bug fix

* Fix test

* Fix test

src/Sanitizer.php

@@ -5,6 +5,7 @@
 use Closure;
 use Illuminate\Support\Arr;
 use Illuminate\Validation\ValidationRuleParser;
+use Illuminate\Validation\ClosureValidationRule;
 use InvalidArgumentException;
 
 class Sanitizer
@@ -49,7 +50,7 @@ class Sanitizer
     public function __construct(array $data, array $rules, array $customFilters = [])
     {
         $this->data    = $data;
-        $this->rules   = $this->parseRulesArray($rules);
+        $this->rules   = $this->parseRules($rules);
         $this->filters = array_merge($this->filters, $customFilters);
     }
 
@@ -59,15 +60,15 @@ public function __construct(array $data, array $rules, array $customFilters = []
      *  @param  array $rules
      *  @return array
      */
-    protected function parseRulesArray(array $rules)
+    protected function parseRules(array $rules)
     {
         $parsedRules = [];
 
         $rawRules = (new ValidationRuleParser($this->data))->explode($rules);
 
         foreach ($rawRules->rules as $attribute => $attributeRules) {
             foreach ($attributeRules as $attributeRule) {
-                $parsedRule = $this->parseRuleString($attributeRule);
+                $parsedRule = $this->parseRule($attributeRule);
                 if ($parsedRule) {
                     $parsedRules[$attribute][] = $parsedRule;
                 }
@@ -77,6 +78,23 @@ protected function parseRulesArray(array $rules)
         return $parsedRules;
     }
 
+    /**
+     *  Parse a rule.
+     *
+     *  @param  string|Closure $rule
+     *  @return array|Closure
+     */
+    protected function parseRule($rule)
+    {
+        if (is_string($rule)) {
+            return $this->parseRuleString($rule);
+        } elseif ($rule instanceof ClosureValidationRule) {
+            return $rule->callback;
+        } else {
+            throw new InvalidArgumentException("Unsupported rule type.");
+        }
+    }
+
     /**
      *  Parse a rule string formatted as filterName:option1, option2 into an array formatted as [name => filterName, options => [option1, option2]]
      *
@@ -100,27 +118,36 @@ protected function parseRuleString($rule)
 
     /**
      *  Apply the given filter by its name
-     *  @param  $name
+     *
+     *  @param  string|Closure $rule
      *  @return Filter
      */
-    protected function applyFilter($name, $value, $options = [])
+    protected function applyFilter($rule, $value)
     {
+        if ($rule instanceof Closure) {
+            return call_user_func($rule, $value);
+        }
+
+        $name    = $rule['name'];
+        $options = $rule['options'];
+
         // If the filter does not exist, throw an Exception:
         if (!isset($this->filters[$name])) {
             throw new InvalidArgumentException("No filter found by the name of $name");
         }
 
         $filter = $this->filters[$name];
+
         if ($filter instanceof Closure) {
             return call_user_func_array($filter, [$value, $options]);
         } else {
-            $filter = new $filter;
-            return $filter->apply($value, $options);
+            return (new $filter)->apply($value, $options);
         }
     }
 
     /**
      *  Sanitize the given data
+     *
      *  @return array
      */
     public function sanitize()
@@ -151,31 +178,4 @@ public function sanitize()
 
         return $sanitized;
     }
-
-    /**
-     *  Sanitize the given attribute
-     *
-     *  @param  string  $attribute  Attribute name
-     *  @param  mixed   $value      Attribute value
-     *  @return mixed   Sanitized value
-     */
-    protected function sanitizeAttribute($attribute, $value)
-    {
-        if (isset($this->rules[$attribute])) {
-            $sanitize = true;
-            $original = $value;
-            foreach ($this->rules[$attribute] as $rule) {
-                if ($rule['name'] === 'filter_if') {
-                    $sanitize = $this->applyFilter($rule['name'], $value, $rule['options']);
-                } else {
-                    $value = $this->applyFilter($rule['name'], $value, $rule['options']);
-                }
-            }
-
-            if (!$sanitize) {
-                return $original;
-            }
-        }
-        return $value;
-    }
 }

tests/SanitizerTest.php

@@ -40,7 +40,8 @@ public function test_input_unchanged_if_no_filter()
         $this->assertEquals('  HellO EverYboDy   ', $data['name']);
     }
 
-    public function test_array_filters() {
+    public function test_array_filters()
+    {
         $data = [
             'name' => '  HellO EverYboDy   ',
         ];
@@ -109,4 +110,20 @@ public function test_it_should_only_sanitize_passed_data()
         $this->assertArrayHasKey('title', $data);
         $this->assertEquals(1, count($data));
     }
+
+    public function test_closure_rule()
+    {
+        $data = [
+            'name' => ' Sina '
+        ];
+
+        $rules = [
+            'name' => ['trim', function ($value) {
+                return strtoupper($value);
+            }]
+        ];
+
+        $data = $this->sanitize($data, $rules);
+        $this->assertEquals('SINA', $data['name']);
+    }
 }