Fix json encode transformer

Author: leomarquine

src/Transformers/JsonEncode.php

@@ -2,14 +2,16 @@
 
 namespace Marquine\Etl\Transformers;
 
+use Marquine\Etl\Row;
+
 class JsonEncode extends Transformer
 {
     /**
      * Transformer columns.
      *
      * @var array
      */
-    protected $columns;
+    protected $columns = [];
 
     /**
      * Options.
@@ -35,24 +37,15 @@ class JsonEncode extends Transformer
     ];
 
     /**
-     * Get the transformer handler.
+     * Transform the given row.
      *
-     * @return callable
+     * @param  \Marquine\Etl\Row  $row
+     * @return void
      */
-    public function transform()
+    public function transform(Row $row)
     {
-        return function ($row) {
-            if ($this->columns) {
-                foreach ($this->columns as $column) {
-                    $row[$column] = json_encode($row[$column], $this->options, $this->depth);
-                }
-            } else {
-                foreach ($row as $column => $value) {
-                    $row[$column] = json_encode($value, $this->options, $this->depth);
-                }
-            }
-
-            return $row;
-        };
+        $row->transform($this->columns, function ($column) {
+            return json_encode($column, $this->options, $this->depth);
+        });
     }
 }

tests/Transformers/JsonEncodeTest.php

@@ -3,40 +3,50 @@
 namespace Tests\Transformers;
 
 use Tests\TestCase;
+use Marquine\Etl\Row;
 use Marquine\Etl\Transformers\JsonEncode;
 
 class JsonEncodeTest extends TestCase
 {
-    protected $data = [
-        ['id' => '1', 'data' => ['name' => 'John Doe', 'email' => 'johndoe@email.com']],
-        ['id' => '2', 'data' => ['name' => 'Jane Doe', 'email' => 'janedoe@email.com']],
-    ];
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->data = [
+            new Row(['id' => '1', 'data' => ['name' => 'John Doe', 'email' => 'johndoe@email.com']]),
+            new Row(['id' => '2', 'data' => ['name' => 'Jane Doe', 'email' => 'janedoe@email.com']]),
+        ];
+    }
 
     /** @test */
     public function default_options()
     {
         $expected = [
-            ['id' => '"1"', 'data' => '{"name":"John Doe","email":"johndoe@email.com"}'],
-            ['id' => '"2"', 'data' => '{"name":"Jane Doe","email":"janedoe@email.com"}'],
+            new Row(['id' => '"1"', 'data' => '{"name":"John Doe","email":"johndoe@email.com"}']),
+            new Row(['id' => '"2"', 'data' => '{"name":"Jane Doe","email":"janedoe@email.com"}']),
         ];
 
         $transformer = new JsonEncode;
 
-        $this->assertEquals($expected, array_map($transformer->transform(), $this->data));
+        array_map([$transformer, 'transform'], $this->data);
+
+        $this->assertEquals($expected, $this->data);
     }
 
     /** @test */
     public function custom_columns()
     {
         $expected = [
-            ['id' => '1', 'data' => '{"name":"John Doe","email":"johndoe@email.com"}'],
-            ['id' => '2', 'data' => '{"name":"Jane Doe","email":"janedoe@email.com"}'],
+            new Row(['id' => '1', 'data' => '{"name":"John Doe","email":"johndoe@email.com"}']),
+            new Row(['id' => '2', 'data' => '{"name":"Jane Doe","email":"janedoe@email.com"}']),
         ];
 
         $transformer = new JsonEncode;
 
         $transformer->options(['columns' => ['data']]);
 
-        $this->assertEquals($expected, array_map($transformer->transform(), $this->data));
+        array_map([$transformer, 'transform'], $this->data);
+
+        $this->assertEquals($expected, $this->data);
     }
 }