Fix fixed width extractor

Author: leomarquine

src/Extractors/FixedWidth.php

@@ -2,6 +2,8 @@
 
 namespace Marquine\Etl\Extractors;
 
+use Marquine\Etl\Row;
+
 class FixedWidth extends Extractor
 {
     /**
@@ -11,13 +13,6 @@ class FixedWidth extends Extractor
      */
     protected $columns;
 
-    /**
-     * The source file.
-     *
-     * @var string
-     */
-    protected $file;
-
     /**
      * Properties that can be set via the options method.
      *
@@ -28,27 +23,16 @@ class FixedWidth extends Extractor
     ];
 
     /**
-     * Set up the extraction from the given source.
-     *
-     * @param  mixed  $source
-     * @return void
-     */
-    public function extract($source)
-    {
-        $this->file = $source;
-    }
-
-    /**
-     * Get the extractor iterator.
+     * Extract data from the input.
      *
      * @return \Generator
      */
-    public function getIterator()
+    public function extract()
     {
-        $handle = fopen($this->file, 'r');
+        $handle = fopen($this->input, 'r');
 
         while ($row = fgets($handle)) {
-            yield $this->makeRow($row);
+            yield new Row($this->makeRow($row));
         }
 
         fclose($handle);

tests/Extractors/FixedWidthTest.php

@@ -3,6 +3,7 @@
 namespace Tests\Extractors;
 
 use Tests\TestCase;
+use Marquine\Etl\Row;
 use Marquine\Etl\Extractors\FixedWidth;
 
 class FixedWidthTest extends TestCase
@@ -11,16 +12,15 @@ class FixedWidthTest extends TestCase
     public function columns_start_and_length()
     {
         $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 FixedWidth;
 
+        $extractor->input(__DIR__.'/../data/fixed-width.txt');
         $extractor->options(['columns' => ['id' => [0, 1], 'name' => [1, 8], 'email' => [9, 17]]]);
 
-        $extractor->extract(__DIR__.'/../data/fixed-width.txt');
-
-        $this->assertEquals($expected, iterator_to_array($extractor));
+        $this->assertEquals($expected, iterator_to_array($extractor->extract()));
     }
 }