[#163] Fixed a bug in the regex for extracting transChoice.

Extractor/CoffeeExtractor.php

@@ -4,7 +4,7 @@
 
 final class CoffeeExtractor extends Extractor
 {
-    protected $sequence = '\\.trans[Choice]*\\s';
+    protected $sequence = '\\.trans(?:Choice)?\\s';
 
     protected $supportedFileExtensions = [
         'coffee',

Extractor/JsExtractor.php

@@ -4,7 +4,7 @@
 
 final class JsExtractor extends Extractor
 {
-    protected $sequence = '\\.trans[Choice]*\\(';
+    protected $sequence = '\\.trans(?:Choice)?\\(';
 
     protected $supportedFileExtensions = [
         'js',

Tests/Extractor/CoffeeExtractorTest.php

@@ -17,7 +17,7 @@ final class CoffeeExtractorTest extends PHPUnit_Framework_TestCase
     const TRANSLATION_PATH_PUBLIC = '/translation-path/public';
 
     /**
-     * @var JsExtractor
+     * @var CoffeeExtractor
      */
     private $sut;
 
@@ -52,24 +52,53 @@ public function setUp()
         );
     }
 
+    public function testExtractShouldNotRetrieveTransKey()
+    {
+        $this->givenASourceFolderWithNotValidTransFunctionUsage();
+        $this->thenTheFinderWillFindACoffeeFile();
+        $this->andTheFilesystemWillGrabItsContent();
+        $this->whenUsingTheExtractFromTheSut();
+        $this->assertTheMessageCatalogueIsEmpty();
+    }
+
     public function testExtractShouldRetrieveTransKey()
     {
         $this->givenASourceFolderWithATransFunctionUsage();
-        $this->thenTheFinderWillFindAJsFile();
+        $this->thenTheFinderWillFindACoffeeFile();
         $this->andTheFilesystemWillGrabItsContent();
         $this->whenUsingTheExtractFromTheSut();
         $this->assertTheTransKeyIsInMessageCatalogue();
     }
 
+    public function testExtractShouldNotRetrieveTransChoiceKey()
+    {
+        $this->givenASourceFolderWithNotValidTransChoiceFunctionUsage();
+        $this->thenTheFinderWillFindACoffeeFile();
+        $this->andTheFilesystemWillGrabItsContent();
+        $this->whenUsingTheExtractFromTheSut();
+        $this->assertTheMessageCatalogueIsEmpty();
+    }
+
     public function testExtractShouldRetrieveTransChoiceKey()
     {
         $this->givenASourceFolderWithATransChoiceFunctionUsage();
-        $this->thenTheFinderWillFindAJsFile();
+        $this->thenTheFinderWillFindACoffeeFile();
         $this->andTheFilesystemWillGrabItsContent();
         $this->whenUsingTheExtractFromTheSut();
         $this->assertTheTransChoiceKeyIsInMessageCatalogue();
     }
 
+    private function givenASourceFolderWithNotValidTransFunctionUsage()
+    {
+        $this->givenASourceFolder();
+
+        $this->fileContent = <<<STRING
+        Translator.tras 'test-key-1'
+        Translator.tans
+        Translator.tran variable
+STRING;
+    }
+
     private function givenASourceFolderWithATransFunctionUsage()
     {
         $this->givenASourceFolder();
@@ -81,6 +110,7 @@ private function givenASourceFolderWithATransFunctionUsage()
 STRING;
     }
 
+
     private function givenASourceFolderWithATransChoiceFunctionUsage()
     {
         $this->givenASourceFolder();
@@ -92,6 +122,17 @@ private function givenASourceFolderWithATransChoiceFunctionUsage()
 STRING;
     }
 
+    private function givenASourceFolderWithNotValidTransChoiceFunctionUsage()
+    {
+        $this->givenASourceFolder();
+
+        $this->fileContent = <<<STRING
+        Translator.transChice 'test-key-1', 5
+        Translator.transChoce
+        Translator.transCoice variable, 5
+STRING;
+    }
+
     private function givenASourceFolder()
     {
         $this->folder = self::TRANSLATION_PATH_VIEWS;
@@ -101,7 +142,7 @@ private function givenASourceFolder()
             ->willReturn(true);
     }
 
-    private function thenTheFinderWillFindAJsFile()
+    private function thenTheFinderWillFindACoffeeFile()
     {
         $finder = $this->prophesize(Finder::class);
 
@@ -133,6 +174,11 @@ private function whenUsingTheExtractFromTheSut()
         $this->sut->extract($this->folder, $this->messageCatalogue);
     }
 
+    private function assertTheMessageCatalogueIsEmpty()
+    {
+        $this->assertEmpty($this->messageCatalogue->all());
+    }
+
     private function assertTheTransKeyIsInMessageCatalogue()
     {
         $this->assertTrue($this->messageCatalogue->has(self::TEST_KEY_1));

Tests/Extractor/JsExtractorTest.php

@@ -52,6 +52,15 @@ public function setUp()
         );
     }
 
+    public function testExtractShouldNotRetrieveTransKey()
+    {
+        $this->givenASourceFolderWithNotValidTransFunctionUsage();
+        $this->thenTheFinderWillFindAJsFile();
+        $this->andTheFilesystemWillGrabItsContent();
+        $this->whenUsingTheExtractFromTheSut();
+        $this->assertTheMessageCatalogueIsEmpty();
+    }
+
     public function testExtractShouldRetrieveTransKey()
     {
         $this->givenASourceFolderWithATransFunctionUsage();
@@ -61,6 +70,15 @@ public function testExtractShouldRetrieveTransKey()
         $this->assertTheTransKeyIsInMessageCatalogue();
     }
 
+    public function testExtractShouldNotRetrieveTransChoiceKey()
+    {
+        $this->givenASourceFolderWithNotValidTransChoiceFunctionUsage();
+        $this->thenTheFinderWillFindAJsFile();
+        $this->andTheFilesystemWillGrabItsContent();
+        $this->whenUsingTheExtractFromTheSut();
+        $this->assertTheMessageCatalogueIsEmpty();
+    }
+
     public function testExtractShouldRetrieveTransChoiceKey()
     {
         $this->givenASourceFolderWithATransChoiceFunctionUsage();
@@ -81,6 +99,29 @@ private function givenASourceFolderWithATransFunctionUsage()
 STRING;
     }
 
+
+    private function givenASourceFolderWithNotValidTransFunctionUsage()
+    {
+        $this->givenASourceFolder();
+
+        $this->fileContent = <<<STRING
+        Translator.tras('test-key-1');
+        Translator.trns();
+        Translator.tans(variable);
+STRING;
+    }
+
+    private function givenASourceFolderWithNotValidTransChoiceFunctionUsage()
+    {
+        $this->givenASourceFolder();
+
+        $this->fileContent = <<<STRING
+        Translator.transChice('test-key-1', 5);
+        Translator.transCohie();
+        Translator.transChoce(variable, 5);
+STRING;
+    }
+
     private function givenASourceFolderWithATransChoiceFunctionUsage()
     {
         $this->givenASourceFolder();
@@ -137,6 +178,11 @@ private function whenUsingTheExtractFromTheSut()
         $this->sut->extract($this->folder, $this->messageCatalogue);
     }
 
+    private function assertTheMessageCatalogueIsEmpty()
+    {
+        $this->assertEmpty($this->messageCatalogue->all());
+    }
+
     private function assertTheTransKeyIsInMessageCatalogue()
     {
         $this->assertTrue($this->messageCatalogue->has(self::TEST_KEY_1));