Merge pull request #22 from nextapps-be/feature/remove_empty_translat…

…ions_on_download

remove empty translation strings on poeditor download

UPGRADING.md

@@ -0,0 +1,5 @@
+# Upgrading
+
+## From v1 to v2
+
+- Translation keys with '.' in the key i.e. 'user.name' will result in duplicate translation entries after upload and download from poeditor. To prevent this convert all keys with '.' to arrays.

src/Poeditor/Poeditor.php

@@ -25,7 +25,7 @@ public function download(string $language) : array
             'type' => 'key_value_json',
         ])->json('result.url');
 
-        return Http::get($exportUrl)->json();
+        return collect(Http::get($exportUrl)->json())->dot()->filter()->undot()->toArray();
     }
 
     public function upload(string $language, array $translations, bool $overwrite = false) : UploadResponse

tests/PoeditorTest.php

@@ -12,7 +12,7 @@
 class PoeditorTest extends TestCase
 {
     /** @test */
-    public function it_requests_export_url_and_downloads_it_content()
+    public function it_requests_export_url_and_downloads_its_content()
     {
         Http::fake([
             'https://api.poeditor.com/v2/projects/export' => Http::response([
@@ -47,6 +47,40 @@ public function it_requests_export_url_and_downloads_it_content()
         });
     }
 
+    /** @test */
+    public function it_downloads_its_content_and_filters_empty_strings_out()
+    {
+        Http::fake([
+            'https://api.poeditor.com/v2/projects/export' => Http::response([
+                'response' => [
+                    'status' => 'success',
+                    'code' => 200,
+                    'message' => 'OK',
+                ],
+                'result' => [
+                    'url' => $exportUrl = $this->faker->url(),
+                ],
+            ]),
+            $exportUrl => Http::response([
+                'foo' => 'bar',
+                'empty' => '',
+                'nested' => [
+                    'empty' => [
+                        'value' => '',
+                    ],
+                    'not_empty' => [
+                        'bar' => 'baz',
+                        'empty' => '',
+                    ],
+                ],
+            ]),
+        ]);
+
+        $translations = app(Poeditor::class)->download($this->faker->locale());
+
+        $this->assertEquals(['foo' => 'bar', 'nested' => ['not_empty' => ['bar' => 'baz']]], $translations);
+    }
+
     /** @test */
     public function it_throws_an_error_if_api_key_is_empty()
     {