Use factory to create record on collection

Author: henriquemoody

src/Collection.php

@@ -19,12 +19,7 @@ public function __construct(Factory $factory)
 
     public function record($record = null)
     {
-        if (! $record instanceof Record) {
-            $data = (array) $record;
-            $record = new Record($data);
-        }
-
-        return $record;
+        return $this->factory->record($record);
     }
 
     public function criteria($criteria = null)

src/Factory.php

@@ -12,4 +12,14 @@ public function collection($collection = null)
 
         return $collection;
     }
+
+    public function record($record = null)
+    {
+        if (! $record instanceof Record) {
+            $data = (array) $record;
+            $record = new Record($data);
+        }
+
+        return $record;
+    }
 }

tests/CollectionTest.php

@@ -15,47 +15,33 @@ public function testShouldAcceptAnInstanceOfFactoryOnConstructor()
         $this->assertAttributeSame($factory, 'factory', $collection);
     }
 
-    public function testShouldCreateNewRecord()
+    public function testShouldUseFactoryToCreateRecords()
     {
-        $collection = new Collection(new Factory());
-        $record = $collection->record();
-
-        $this->assertInstanceOf(__NAMESPACE__ . '\\Record', $record);
-    }
+        $data = array('foo' => true);
+        $record = new Record($data);
 
-    public function testShouldCreateNewCriteria()
-    {
-        $collection = new Collection(new Factory());
-        $criteria = $collection->criteria();
-
-        $this->assertInstanceOf(__NAMESPACE__ . '\\Criteria', $criteria);
-    }
-
-    public function testShouldCreateNewRecordFromArray()
-    {
-        $collection = new Collection(new Factory());
-        $data = array();
-        $record = $collection->record($data);
+        $factory = $this
+            ->getMockBuilder('PHPFluent\\ArrayStorage\\Factory')
+            ->disableOriginalConstructor()
+            ->getMock();
 
-        $this->assertInstanceOf(__NAMESPACE__ . '\\Record', $record);
-    }
+        $factory
+            ->expects($this->once())
+            ->method('record')
+            ->with($data)
+            ->will($this->returnValue($record));
 
-    public function testShouldCreateNewRecordFromStdClass()
-    {
-        $collection = new Collection(new Factory());
-        $data = new \stdClass();
-        $record = $collection->record($data);
+        $collection = new Collection($factory);
 
-        $this->assertInstanceOf(__NAMESPACE__ . '\\Record', $record);
+        $this->assertSame($record, $collection->record($data));
     }
 
-    public function testShouldReturnTheSameInstanceWhenDataIsAlreadyARecordInstance()
+    public function testShouldCreateNewCriteria()
     {
         $collection = new Collection(new Factory());
-        $data = new Record();
-        $record = $collection->record($data);
+        $criteria = $collection->criteria();
 
-        $this->assertSame($data, $record);
+        $this->assertInstanceOf(__NAMESPACE__ . '\\Criteria', $criteria);
     }
 
     public function testShouldCountRecordsInCollection()

tests/FactoryTest.php

@@ -25,4 +25,39 @@ public function testShouldReturnInputIfInputIsAlreadyACollection()
 
         $this->assertSame($collection, $factory->collection($collection));
     }
+
+    public function testShouldCreateNewRecord()
+    {
+        $factory = new Factory();
+        $record = $factory->record();
+
+        $this->assertInstanceOf(__NAMESPACE__ . '\\Record', $record);
+    }
+
+    public function testShouldCreateNewRecordFromArray()
+    {
+        $factory = new Factory();
+        $data = array();
+        $record = $factory->record($data);
+
+        $this->assertInstanceOf(__NAMESPACE__ . '\\Record', $record);
+    }
+
+    public function testShouldCreateNewRecordFromStdClass()
+    {
+        $factory = new Factory();
+        $data = new \stdClass();
+        $record = $factory->record($data);
+
+        $this->assertInstanceOf(__NAMESPACE__ . '\\Record', $record);
+    }
+
+    public function testShouldReturnTheSameInstanceWhenDataIsAlreadyARecordInstance()
+    {
+        $factory = new Factory();
+        $data = new Record();
+        $record = $factory->record($data);
+
+        $this->assertSame($data, $record);
+    }
 }