refactoring

Author: themsaid

src/Commands/MissingCommand.php

@@ -95,42 +95,36 @@ private function collectValues(array $missing)
         $values = [];
 
         foreach ($missing as $missingKey) {
-            // var_dump($this->getDefaultValueFor($missingKey));
             $values[$missingKey] = $this->ask(
-                "<fg=yellow>{$missingKey}</> translation", $this->getDefaultValueFor($missingKey)
+                "<fg=yellow>{$missingKey}</> translation", $this->getDefaultValue($missingKey)
             );
         }
 
         return $values;
     }
 
     /**
-    * Get default value for the current translation request.
-    * @param string $missingKey
-    * @return mixed
-    */
+     * Get translation in default locale for the given key.
+     *
+     * @param string $missingKey
+     * @return string
+     */
     private function getDefaultValue($missingKey)
     {
-        return $this->option('default') ? $this->getTranslationInDefaultLocaleFor($missingKey) : null;
-    }
+        if (! $this->option('default')) {
+            return null;
+        }
 
-    /**
-    * Get translation in default locale for given key
-    * @param string $missingKey
-    * @return string
-    */
-    private function getTranslationInDefaultLocaleFor($missingKey)
-    {
         try {
-            list($langKey, $lang) = explode(':', $missingKey);
+            $missingKey = explode(':', $missingKey)[0];
 
-            list($file, $key) = explode('.', $langKey);
+            list($file, $key) = explode('.', $missingKey);
 
             $filePath = $this->manager->files()[$file][config('app.locale')];
 
-            return config('app.locale') . ":{$this->manager->getFileContent($filePath)[$key]}";
+            return config('app.locale').":{$this->manager->getFileContent($filePath)[$key]}";
         } catch (\Exception $e) {
-            return "Sorry. File Language not exists for default locale.";
+            return null;
         }
     }
 

tests/MissingCommandTest.php

@@ -22,7 +22,6 @@ public function testCommandOutput()
         ]);
 
         $command = m::mock('\Themsaid\Langman\Commands\MissingCommand[ask]', [$manager]);
-        $command->shouldReceive('getDefaultValueFor')->times(7)->with(m::any())->andReturn(null);
         $command->shouldReceive('ask')->once()->with('/user\.age:nl/', null)->andReturn('fill_age');
         $command->shouldReceive('ask')->once()->with('/product\.name:en/', null)->andReturn('fill_name');
         $command->shouldReceive('ask')->once()->with('/product\.color:nl/', null)->andReturn('fill_color');
@@ -51,7 +50,10 @@ public function testCommandOutput()
 
     public function testAllowSeeTranslationInDefaultLanguage()
     {
+        $manager = $this->app[Manager::class];
+
         $this->app['config']->set('app.locale', 'en');
+
         $this->createTempFiles([
             'en' => [
                 'user' => "<?php\n return ['name' => 'Name', 'age' => 'Age'];",
@@ -60,18 +62,21 @@ public function testAllowSeeTranslationInDefaultLanguage()
                 'user' => "<?php\n return ['name' => 'Naam'];",
             ],
         ]);
-        $manager = $this->app[Manager::class];
+
         $command = m::mock('\Themsaid\Langman\Commands\MissingCommand[ask]', [$manager]);
-        $command->shouldReceive('getDefaultValueFor')->once()->with('/user\.age/')->andReturn('en:Age');
         $command->shouldReceive('ask')->once()->with('/<fg=yellow>user\.age:nl<\/> translation/', '/en:Age/');
+
         $this->app['artisan']->add($command);
 
         $this->artisan('langman:missing', ['--default' => true]);
     }
 
-    public function testThrowDefaultMessageWhenLanguageFileIsNotFound()
+    public function testShowsNoDefaultWhenDefaultLanguageFileIsNotFound()
     {
+        $manager = $this->app[Manager::class];
+
         $this->app['config']->set('app.locale', 'es');
+
         $this->createTempFiles([
             'en' => [
                 'user' => "<?php\n return ['name' => 'Name', 'age' => 'Age'];",
@@ -80,10 +85,10 @@ public function testThrowDefaultMessageWhenLanguageFileIsNotFound()
                 'user' => "<?php\n return ['name' => 'Naam'];",
             ],
         ]);
-        $manager = $this->app[Manager::class];
+
         $command = m::mock('\Themsaid\Langman\Commands\MissingCommand[ask]', [$manager]);
-        $command->shouldReceive('getDefaultValueFor')->once()->with('/user\.age/')->andReturn("Sorry. File Language not exists for default locale.");
-        $command->shouldReceive('ask')->once()->with('/<fg=yellow>user\.age:nl<\/> translation/', '/Sorry\. File Language not exists for default locale\./');
+        $command->shouldReceive('ask')->once()->with('/<fg=yellow>user\.age:nl<\/> translation/', null);
+
         $this->app['artisan']->add($command);
 
         $this->artisan('langman:missing', ['--default' => true]);