Merge pull request #10 from clue-labs/contains

Add new $contains comparator from spec v0.4

Author: clue

src/QueryExpressionFilter.php

@@ -111,6 +111,18 @@ private function matchValue($data, $column, $expectation)
             return ($actualValue === $expectedValue);
         } elseif ($comparator === '$in') {
             return in_array($actualValue, $expectedValue, true);
+        } elseif ($comparator === '$contains') {
+            if ($this->isObject($actualValue)) {
+                if (is_object($actualValue)) {
+                    return property_exists($actualValue, $expectedValue);
+                } else {
+                    return array_key_exists($expectedValue, $actualValue);
+                }
+            } elseif ($this->isVector($actualValue)) {
+                return in_array($expectedValue, $actualValue, true);
+            } else {
+                return (strpos($actualValue, $expectedValue) !== false);
+            }
         } elseif ($comparator === '$lt') {
             return ($actualValue < $expectedValue);
         } elseif ($comparator === '$lte') {

tests/QueryExpressionFilterTest.php

@@ -349,6 +349,78 @@ public function testAttributeNotList()
         $this->assertTrue($filter->doesMatch(array('id' => 300)));
     }
 
+    public function testAttributeContainsString()
+    {
+        $filter = new QueryExpressionFilter(array(
+            'key' => array(
+                '$contains' => 'value'
+            )
+        ));
+
+        $this->assertTrue($filter->doesMatch(array(
+            'key' => 'the value exist'
+        )));
+        $this->assertFalse($filter->doesMatch(array(
+            'key' => 'empty'
+        )));
+    }
+
+    public function testAttributeContainsArray()
+    {
+        $filter = new QueryExpressionFilter(array(
+            'key' => array(
+                '$contains' => 'value'
+            )
+        ));
+
+        $this->assertTrue($filter->doesMatch(array(
+            'key' => array('the', 'value', 'exists')
+        )));
+        $this->assertFalse($filter->doesMatch(array(
+            'key' => array('not', 'present')
+        )));
+    }
+
+    public function testAttributeContainsAssoc()
+    {
+        $filter = new QueryExpressionFilter(array(
+            'key' => array(
+                '$contains' => 'value'
+            )
+        ));
+
+        $this->assertTrue($filter->doesMatch(array(
+            'key' => array(
+                'value' => 123
+            )
+        )));
+        $this->assertFalse($filter->doesMatch(array(
+            'key' => array(
+                'not' => 'present'
+            )
+        )));
+    }
+
+    public function testAttributeContainsObject()
+    {
+        $filter = new QueryExpressionFilter(array(
+            'key' => array(
+                '$contains' => 'value'
+            )
+        ));
+
+        $this->assertTrue($filter->doesMatch((object)array(
+            'key' => (object)array(
+                'value' => 123
+            )
+        )));
+        $this->assertFalse($filter->doesMatch((object)array(
+            'key' => (object)array(
+                'not' => 'present'
+            )
+        )));
+    }
+
     /**
      * @expectedException DomainException
      */
@@ -407,6 +479,24 @@ public function testInvalidOr()
         $filter->doesMatch(array('id' => 100));
     }
 
+    public function testAttributeContains()
+    {
+        $filter = new QueryExpressionFilter(array(
+            'name' => array(
+                '$contains' => 'Fried'
+            )
+        ));
+
+        $this->assertFalse($filter->doesMatch(array(
+            'id' => 100,
+            'name' => 'Smith, George'
+        )));
+        $this->assertTrue($filter->doesMatch(array(
+            'id' => 300,
+            'name' => 'Smith, Friedrich'
+        )));
+    }
+
     /**
      * @dataProvider dpFetchValue
      */