Merge pull request #6 from intelliapps/fix_reverse_conversion

Implement Nested Reverse Conversion Method - fixes issue #5

Author: ozdemirburak

src/File/Csv.php

@@ -15,7 +15,9 @@ class Csv extends AbstractFile
         'options' => 0,
         'delimiter' => ',',
         'enclosure' => '"',
-        'escape' => '\\'
+        'escape' => '\\',
+        'join' => '_',
+        'numbers' => 'strings'
     ];
 
     /**
@@ -25,9 +27,40 @@ public function convert(): string
     {
         $data = $this->parseData();
         $keys = $this->parseCsv(array_shift($data));
-        return json_encode(array_map(function ($line) use ($keys) {
-            return array_combine($keys, $this->parseCsv($line));
-        }, $data), $this->conversion['options']);
+        $splitKeys = array_map(function ($key) {
+            return explode($this->conversion['join'], $key);
+        }, $keys);
+
+        $jsonObjects = array_map(function ($line) use ($splitKeys) {
+            $values = $this->parseCsv($line);
+            $jsonObject = [];
+            for ($valueIndex = 0, $count = count($values); $valueIndex < $count; $valueIndex++) {
+                if ($values[$valueIndex] == "") {
+                    continue;
+                }
+                $this->setJsonValue($splitKeys[$valueIndex], 0, $jsonObject, $values[$valueIndex]);
+            }
+            return $jsonObject;
+        }, $data);
+
+        return json_encode($jsonObjects, $this->conversion['options']);
+    }
+
+    private function setJsonValue($splitKey, $splitKeyIndex, &$jsonObject, $value)
+    {
+        $keyPart = $splitKey[$splitKeyIndex];
+
+        if (count($splitKey) > $splitKeyIndex+1) {
+            if (!array_key_exists($keyPart, $jsonObject)) {
+                $jsonObject[$keyPart] = [];
+            }
+            $this->setJsonValue($splitKey, $splitKeyIndex+1, $jsonObject[$keyPart], $value);
+        } else {
+            if ($this->conversion['numbers'] == 'numbers' && is_numeric($value)) {
+                $value = 0 + $value;
+            }
+            $jsonObject[$keyPart] = $value;
+        }
     }
 
     private function parseCsv($line)

src/File/Json.php

@@ -15,6 +15,7 @@ class Json extends AbstractFile
         'delimiter' => ',',
         'enclosure' => '"',
         'escape' => '\\',
+        'join' => '_',
         'null' => null
     ];
 
@@ -63,7 +64,7 @@ protected function flatten(array $array = [], $prefix = '', array $result = []):
     {
         foreach ($array as $key => $value) {
             if (\is_array($value)) {
-                $result = array_merge($result, $this->flatten($value, $prefix . $key . '_'));
+                $result = array_merge($result, $this->flatten($value, $prefix . $key . $this->conversion['join']));
             } else {
                 $result[$prefix . $key] = $value;
             }

tests/JsonReverseTest.php

@@ -0,0 +1,76 @@
+<?php
+
+namespace OzdemirBurak\JsonCsv\Tests;
+
+use OzdemirBurak\JsonCsv\Tests\Traits\TestTrait;
+use PHPUnit\Framework\TestCase;
+
+class JsonReverseTest extends TestCase
+{
+    use TestTrait;
+
+    /**
+     * @param string $file
+     * @param string $join
+     */
+    private function checkReverseConversion($file, $join = '_')
+    {
+        $pathCsvOut = $this->path($file . '.out', 'csv');
+
+        $jsonConverter = $this->initJson($file);
+        $jsonConverter->setConversionKey('join', $join);
+        $jsonConverter->convertAndSave($pathCsvOut);
+
+        $pathJsonOut = $this->path($file . '.out', 'json');
+
+        $csvConverter = $this->initCsv($file . '.out');
+        $csvConverter->setConversionKey('join', $join);
+        $csvConverter->setConversionKey('numbers', 'numbers');
+        $csvConverter->convertAndSave($pathJsonOut);
+
+        try {
+            $this->assertJsonFileEqualsJsonFile($this->path($file, 'json'), $pathJsonOut);
+        } finally {
+            unlink($pathCsvOut);
+            $this->assertFileNotExists($pathCsvOut);
+            unlink($pathJsonOut);
+            $this->assertFileNotExists($pathJsonOut);
+        }
+    }
+
+    /**
+     * @group json-conversion-test
+     */
+    public function testWhatever()
+    {
+        $this->checkReverseConversion('example');
+    }
+
+    /**
+     * @group json-conversion-test
+     */
+    public function testPeople()
+    {
+        $this->checkReverseConversion('people', '-');
+    }
+
+    /**
+     * @group json-conversion-test
+     */
+    public function testProperties()
+    {
+        $this->checkReverseConversion('properties');
+    }
+
+    /**
+     * @group json-conversion-test
+     */
+/**
+ * @TODO resolve issues which cause this test to fail
+ *
+    public function testStats()
+    {
+        $this->checkReverseConversion('stats');
+    }
+ */
+}

tests/data/example.json

@@ -0,0 +1,20 @@
+[
+  {
+    "name": {
+      "common": "Turkey",
+      "official": "Republic of Turkey",
+      "native": "T\u00fcrkiye"
+    },
+    "area": 783562,
+    "latlng": [39, 35]
+  },
+  {
+    "name": {
+      "common": "Israel",
+      "official": "State of Israel",
+      "native": "\u05d9\u05e9\u05e8\u05d0\u05dc"
+    },
+    "area": 20770,
+    "latlng": [31.30, 34.45]
+  }
+]