Fix collection extractor

Author: leomarquine

src/Extractors/Collection.php

@@ -2,6 +2,8 @@
 
 namespace Marquine\Etl\Extractors;
 
+use Marquine\Etl\Row;
+
 class Collection extends Extractor
 {
     /**
@@ -11,13 +13,6 @@ class Collection extends Extractor
      */
     protected $columns;
 
-    /**
-     * The extractor data collection.
-     *
-     * @var mixed
-     */
-    protected $data;
-
     /**
      * Properties that can be set via the options method.
      *
@@ -28,29 +23,18 @@ class Collection extends Extractor
     ];
 
     /**
-     * Set up the extraction from the given source.
-     *
-     * @param  mixed  $source
-     * @return void
-     */
-    public function extract($source)
-    {
-        $this->data = $source;
-    }
-
-    /**
-     * Get the extractor iterator.
+     * Extract data from the input.
      *
      * @return \Generator
      */
-    public function getIterator()
+    public function extract()
     {
-        foreach ($this->data as $row) {
+        foreach ($this->input as $row) {
             if ($this->columns) {
-                yield array_intersect_key($row, array_flip($this->columns));
-            } else {
-                yield $row;
+                $row = array_intersect_key($row, array_flip($this->columns));
             }
+
+            yield new Row($row);
         }
     }
 }

tests/Extractors/CollectionTest.php

@@ -3,11 +3,12 @@
 namespace Tests\Extractors;
 
 use Tests\TestCase;
+use Marquine\Etl\Row;
 use Marquine\Etl\Extractors\Collection;
 
 class CollectionTest extends TestCase
 {
-    protected $source = [
+    protected $input = [
         ['id' => 1, 'name' => 'John Doe', 'email' => 'johndoe@email.com'],
         ['id' => 2, 'name' => 'Jane Doe', 'email' => 'janedoe@email.com'],
     ];
@@ -16,31 +17,29 @@ class CollectionTest extends TestCase
     public function default_options()
     {
         $expected = [
-            ['id' => 1, 'name' => 'John Doe', 'email' => 'johndoe@email.com'],
-            ['id' => 2, 'name' => 'Jane Doe', 'email' => 'janedoe@email.com'],
+            new Row(['id' => 1, 'name' => 'John Doe', 'email' => 'johndoe@email.com']),
+            new Row(['id' => 2, 'name' => 'Jane Doe', 'email' => 'janedoe@email.com']),
         ];
 
         $extractor = new Collection;
 
-        $extractor->extract($this->source);
+        $extractor->input($this->input);
 
-        $this->assertEquals($expected, iterator_to_array($extractor));
+        $this->assertEquals($expected, iterator_to_array($extractor->extract()));
     }
 
     /** @test */
     public function custom_columns()
     {
         $expected = [
-            ['id' => 1, 'name' => 'John Doe'],
-            ['id' => 2, 'name' => 'Jane Doe'],
+            new Row(['id' => 1, 'name' => 'John Doe']),
+            new Row(['id' => 2, 'name' => 'Jane Doe']),
         ];
 
         $extractor = new Collection;
 
-        $extractor->options(['columns' => ['id', 'name']]);
+        $extractor->input($this->input)->options(['columns' => ['id', 'name']]);
 
-        $extractor->extract($this->source);
-
-        $this->assertEquals($expected, iterator_to_array($extractor));
+        $this->assertEquals($expected, iterator_to_array($extractor->extract()));
     }
 }