Merge pull request #112 from ARCANEDEV/patch-1

Extracting the supported locales to a new dedicated class
ARCANEDEV · Feb 6, 2018 · c6c52b8 · c6c52b8
2 parents a54affc + 9c8bf8c
commit c6c52b8
Show file tree

Hide file tree

Showing 3 changed files with 88 additions and 7 deletions.
diff --git a/src/Entities/LocaleCollection.php b/src/Entities/LocaleCollection.php
@@ -1,6 +1,6 @@
 <?php namespace Arcanedev\Localization\Entities;
 
-use Arcanedev\Support\Collection;
+use Illuminate\Support\Collection;
 
 /**
  * Class     LocaleCollection
@@ -62,13 +62,27 @@ public function first(callable $callback = null, $default = null)
     /**
      * Get supported locales collection.
      *
-     * @return self
+     * @return \Arcanedev\Localization\Entities\SupportedLocaleCollection
      */
     public function getSupported()
     {
-        return $this->filter(function(Locale $locale) {
-            return in_array($locale->key(), $this->supported);
-        });
+        return new SupportedLocaleCollection(
+            $this->filter(function(Locale $locale) {
+                return in_array($locale->key(), $this->supported);
+            })
+        );
+    }
+
+    /**
+     * Transform the collection with only locale's native name.
+     *
+     * @return \Illuminate\Support\Collection
+     */
+    public function toNative()
+    {
+        return $this->map(function (Locale $locale) {
+            return $locale->native();
+        })->toBase();
     }
 
     /**
@@ -97,7 +111,7 @@ public function loadFromConfig()
      */
     public function loadFromArray(array $locales)
     {
-        $this->reset();
+        $this->items = [];
 
         foreach ($locales as $key => $locale) {
             $this->put($key, Locale::make($key, $locale));

diff --git a/src/Entities/SupportedLocaleCollection.php b/src/Entities/SupportedLocaleCollection.php
@@ -0,0 +1,29 @@
+<?php namespace Arcanedev\Localization\Entities;
+
+use Illuminate\Support\Collection;
+
+/**
+ * Class     SupportedLocaleCollection
+ *
+ * @package  Arcanedev\Localization\Entities
+ * @author   ARCANEDEV <arcanedev.maroc@gmail.com>
+ */
+class SupportedLocaleCollection extends Collection
+{
+    /* -----------------------------------------------------------------
+     |  Main Methods
+     | -----------------------------------------------------------------
+     */
+
+    /**
+     * Transform the collection with only locale's native name.
+     *
+     * @return \Illuminate\Support\Collection
+     */
+    public function toNative()
+    {
+        return $this->map(function (Locale $locale) {
+            return $locale->native();
+        })->toBase();
+    }
+}
diff --git a/tests/Entities/LocaleCollectionTest.php b/tests/Entities/LocaleCollectionTest.php
@@ -47,7 +47,15 @@ public function tearDown()
     /** @test */
     public function it_can_be_instantiated()
     {
-        $this->assertInstanceOf(LocaleCollection::class, $this->locales);
+        $expectations = [
+            \Illuminate\Support\Collection::class,
+            \Arcanedev\Localization\Entities\LocaleCollection::class,
+        ];
+
+        foreach ($expectations as $expected) {
+            $this->assertInstanceOf($expected, $this->locales);
+        }
+
         $this->assertTrue($this->locales->isEmpty());
         $this->assertCount(0, $this->locales);
         $this->assertSame(0, $this->locales->count());
@@ -73,12 +81,42 @@ public function it_can_get_supported_locales()
 
         $supported = $this->locales->getSupported();
 
+        $expectations = [
+            \Illuminate\Support\Collection::class,
+            \Arcanedev\Localization\Entities\SupportedLocaleCollection::class,
+        ];
+
+        foreach ($expectations as $expected) {
+            $this->assertInstanceOf($expected, $supported);
+        }
+
         $count = count($this->supportedLocales);
         $this->assertFalse($supported->isEmpty());
         $this->assertCount($count, $supported);
         $this->assertSame($count, $supported->count());
     }
 
+    /** @test */
+    public function it_can_transform_locales_to_native_names()
+    {
+        $this->locales
+            ->loadFromArray(config('localization.locales', []))
+            ->setSupportedKeys(config('localization.supported-locales', []));
+
+        foreach ($this->locales->toNative() as $key => $native) {
+            $this->assertTrue($this->locales->has($key), "Locale [$key] not found");
+            $this->assertSame($this->locales->get($key)->native(), $native);
+        }
+
+        $expected = [
+            'en' => 'English',
+            'es' => 'Español',
+            'fr' => 'Français',
+        ];
+
+        $this->assertEquals($expected, $this->locales->getSupported()->toNative()->toArray());
+    }
+
     /** @test */
     public function it_can_load_locales_from_config()
     {