Allow to create filters from operators

PHPFluent · Sep 5, 2014 · 0f4c1f7 · 0f4c1f7
1 parent b7aeb2e
commit 0f4c1f7
Show file tree

Hide file tree

Showing 3 changed files with 71 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -101,13 +101,13 @@ The example above convert all Record objects into an array.
 ## Finding multiple records into a collection
 
 ```php
-$storage->users->findAll(array('name' => 'Henrique Moody')); // Return an Collection object with the partial result (if any)
+$storage->users->findAll(array('status !=' => false)); // Return an Collection object with the partial result (if any)
 ```
 
 ## Finding single record into a collection
 
 ```php
-$storage->users->find(array('name' => 'Henrique Moody')); // Return an Record object with the first matched result (if any) or NULL
+$storage->users->find(array('priority >=' => 4)); // Return an Record object with the first matched result (if any) or NULL
 ```
 
 ## Using Criteria object

diff --git a/src/Factory.php b/src/Factory.php
@@ -11,6 +11,25 @@
 
 class Factory
 {
+    protected $operatorsToFilters = array(
+        '=' => 'equalTo',
+        '!=' => 'notEqualTo',
+        '<' => 'lessThan',
+        '<=' => 'lessThanOrEqualTo',
+        '>' => 'greaterThan',
+        '>=' => 'greaterThanOrEqualTo',
+        'BETWEEN' => 'between',
+        'NOT BETWEEN' => 'notBetween',
+        'ILIKE' => 'iLike',
+        'NOT ILIKE' => 'notILike',
+        'IN' => 'in',
+        'NOT IN' => 'notIn',
+        'LIKE' => 'like',
+        'NOT LIKE' => 'notLike',
+        'REGEX' => 'regex',
+        'NOT REGEX' => 'notRegex',
+    );
+
     public function collection($collection = null)
     {
         if (! $collection instanceof Collection) {
@@ -41,7 +60,14 @@ public function criteria($criteria = null)
                     continue;
                 }
 
-                $criteria->addFilter($key, new EqualTo($value));
+                $index = strstr($key, ' ', true) ?: $key;
+                $operator = trim(strstr($key, ' ') ?: '=');
+                if (false === strpos($operator, 'BETWEEN')) {
+                    $value = array($value);
+                }
+                $filter = $this->filter($operator, $value);
+
+                $criteria->addFilter($index, $filter);
             }
         }
 
@@ -51,6 +77,11 @@ public function criteria($criteria = null)
     public function filter($filter, array $arguments = array())
     {
         if (! $filter instanceof Filter) {
+
+            if (isset($this->operatorsToFilters[$filter])) {
+                return $this->filter($this->operatorsToFilters[$filter], $arguments);
+            }
+
             if (0 === strpos($filter, 'not')) {
                 $filterName = substr($filter, 3);
                 $filter = $this->filter($filterName, $arguments);

diff --git a/tests/FactoryTest.php b/tests/FactoryTest.php
@@ -98,6 +98,43 @@ public function testShouldCreateACriteriaFromAKeyValueArrayOfNonFilters()
         $this->assertEquals($expectedFilter, $actualFilters[0][1]);
     }
 
+    public function operatorsProvider()
+    {
+        return array(
+            array('=', 42, new Filter\EqualTo(42)),
+            array('!=', 42, new Filter\Not(new Filter\EqualTo(42))),
+            array('<', 42, new Filter\LessThan(42)),
+            array('<=', 42, new Filter\OneOf(array(new Filter\LessThan(42), new Filter\EqualTo(42)))),
+            array('>', 42, new Filter\GreaterThan(42)),
+            array('>=', 42, new Filter\OneOf(array(new Filter\GreaterThan(42), new Filter\EqualTo(42)))),
+            array('BETWEEN', array(1, 3), new Filter\Between(1, 3)),
+            array('NOT BETWEEN', array(1, 3), new Filter\Not(new Filter\Between(1, 3))),
+            array('ILIKE', 'String%', new Filter\ILike('String%')),
+            array('NOT ILIKE', 'String%', new Filter\Not(new Filter\ILike('String%'))),
+            array('IN', array(1, 2, 3), new Filter\In(array(1, 2, 3))),
+            array('NOT IN', array(1, 2, 3), new Filter\Not(new Filter\In(array(1, 2, 3)))),
+            array('LIKE', 'String%', new Filter\Like('String%')),
+            array('NOT LIKE', 'String%', new Filter\Not(new Filter\Like('String%'))),
+            array('REGEX', '/[a-z]/', new Filter\Regex('/[a-z]/')),
+            array('NOT REGEX', '/[a-z]/', new Filter\Not(new Filter\Regex('/[a-z]/'))),
+        );
+    }
+
+    /**
+     * @dataProvider operatorsProvider
+     */
+    public function testShouldCreateACriteriaFromAKeyValueArrayOfNonFiltersUsingOperator($operator, $value, $expectedFilter)
+    {
+        $inputFilters = array(
+            'name ' . $operator => $value,
+        );
+        $factory = new Factory();
+        $criteria = $factory->criteria($inputFilters);
+        $actualFilters = $criteria->getFilters();
+
+        $this->assertEquals($expectedFilter, $actualFilters[0][1]);
+    }
+
     public function testShouldReturnInputIfInputIsAlreadyAFilter()
     {
         $filter = new Filter\EqualTo(42, 'identical');