Use factory to create criteria on collection

Also move the responsibility of parse array as filters to the factory.

Author: henriquemoody

src/Collection.php

@@ -24,12 +24,7 @@ public function record($record = null)
 
     public function criteria($criteria = null)
     {
-        if (! $criteria instanceof Criteria) {
-            $filters = (array) $criteria;
-            $criteria = new Criteria($filters);
-        }
-
-        return $criteria;
+        return $this->factory->criteria($criteria);
     }
 
     public function count()

src/Criteria.php

@@ -16,18 +16,6 @@ class Criteria implements Countable, Filter
     protected $currentIndex = null;
     protected $filters = array();
 
-    public function __construct(array $filters = array())
-    {
-        foreach ($filters as $index => $value) {
-            if ($value instanceof Filter) {
-                $this->addFilter($index, $value);
-                continue;
-            }
-
-            $this->addFilter($index, new EqualTo($value));
-        }
-    }
-
     public function getFilters()
     {
         return $this->filters;

src/Factory.php

@@ -2,6 +2,9 @@
 
 namespace PHPFluent\ArrayStorage;
 
+use PHPFluent\ArrayStorage\Filter\Filter;
+use PHPFluent\ArrayStorage\Filter\EqualTo;
+
 class Factory
 {
     public function collection($collection = null)
@@ -22,4 +25,22 @@ public function record($record = null)
 
         return $record;
     }
+
+    public function criteria($criteria = null)
+    {
+        if (! $criteria instanceof Criteria) {
+            $filters = (array) $criteria;
+            $criteria = new Criteria();
+            foreach ($filters as $key => $value) {
+                if ($value instanceof Filter) {
+                    $criteria->addFilter($key, $value);
+                    continue;
+                }
+
+                $criteria->addFilter($key, new EqualTo($value));
+            }
+        }
+
+        return $criteria;
+    }
 }

tests/CollectionTest.php

@@ -36,12 +36,27 @@ public function testShouldUseFactoryToCreateRecords()
         $this->assertSame($record, $collection->record($data));
     }
 
-    public function testShouldCreateNewCriteria()
+    public function testShouldUseFactoryToCreateCriteria()
     {
-        $collection = new Collection(new Factory());
-        $criteria = $collection->criteria();
+        $factory = $this
+            ->getMockBuilder('PHPFluent\\ArrayStorage\\Factory')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $filters = array('foo' => $this->getMock('PHPFluent\\ArrayStorage\\Filter\\Filter'));
+
+        $criteria = new Criteria();
+        $criteria->addFilter('foo', $filters['foo']);
+
+        $factory
+            ->expects($this->once())
+            ->method('criteria')
+            ->with($filters)
+            ->will($this->returnValue($criteria));
+
+        $collection = new Collection($factory);
 
-        $this->assertInstanceOf(__NAMESPACE__ . '\\Criteria', $criteria);
+        $this->assertSame($criteria, $collection->criteria($filters));
     }
 
     public function testShouldCountRecordsInCollection()

tests/CriteriaTest.php

@@ -20,30 +20,6 @@ public function testShouldAddFilter()
         $this->assertCount(1, $criteria);
     }
 
-    public function testShouldAcceptFiltersOnConstructor()
-    {
-        $filters = array(
-            'foo' => $this->filter(),
-            'bar' => $this->filter(),
-        );
-        $criteria = new Criteria($filters);
-
-        $this->assertCount(2, $criteria);
-    }
-
-    public function testShouldAcceptFiltersAsKeyValueOnConstructor()
-    {
-        $filters = array(
-            'foo' => true,
-        );
-        $criteria = new Criteria($filters);
-        $filters = $criteria->getFilters();
-        list($index, $filter) = $filters[0];
-
-        $this->assertEquals('foo', $index);
-        $this->assertInstanceOf('PHPFluent\\ArrayStorage\\Filter\\EqualTo', $filter);
-    }
-
     public function testShouldReturnSelfWhenGettingANonExistentProperty()
     {
         $criteria = new Criteria();

tests/FactoryTest.php

@@ -2,6 +2,8 @@
 
 namespace PHPFluent\ArrayStorage;
 
+use PHPFluent\ArrayStorage\Filter\EqualTo;
+
 /**
  * @covers PHPFluent\ArrayStorage\Factory
  */
@@ -60,4 +62,39 @@ public function testShouldReturnTheSameInstanceWhenDataIsAlreadyARecordInstance(
 
         $this->assertSame($data, $record);
     }
+
+    public function testShouldCreateACriteria()
+    {
+        $factory = new Factory();
+        $criteria = $factory->criteria();
+
+        $this->assertInstanceOf(__NAMESPACE__ . '\\Criteria', $criteria);
+    }
+
+    public function testShouldCreateACriteriaFromAKeyValueArrayOfFilters()
+    {
+        $inputFilters = array(
+            'foo' => $this->getMock(__NAMESPACE__ . '\\Filter\\Filter'),
+        );
+        $factory = new Factory();
+        $criteria = $factory->criteria($inputFilters);
+        $actualFilters = $criteria->getFilters();
+
+        $this->assertEquals('foo', $actualFilters[0][0]);
+        $this->assertSame($inputFilters['foo'], $actualFilters[0][1]);
+    }
+
+    public function testShouldCreateACriteriaFromAKeyValueArrayOfNonFilters()
+    {
+        $inputFilters = array(
+            'foo' => true,
+        );
+        $factory = new Factory();
+        $criteria = $factory->criteria($inputFilters);
+        $actualFilters = $criteria->getFilters();
+        $expectedFilter = new EqualTo($inputFilters['foo']);
+
+        $this->assertEquals('foo', $actualFilters[0][0]);
+        $this->assertEquals($expectedFilter, $actualFilters[0][1]);
+    }
 }