added Jed tests, and other bugfixes #90

Author: oscarotero

src/Extractors/Jed.php

@@ -18,9 +18,11 @@ public static function fromString($string, Translations $translations = null, $f
             $translations = new Translations();
         }
 
-        $content = json_decode($string);
+        $content = json_decode($string, true);
 
-        return PhpArray::handleArray($content, $translations);
+        PhpArray::handleArray($content, $translations);
+
+        return $translations;
     }
 
     /**

src/Extractors/PhpArray.php

@@ -47,7 +47,7 @@ public static function fromString($string, Translations $translations = null, $f
      */
     public static function handleArray(array $content, Translations $translations)
     {
-        $content = $content['messages'];
+        $content = current($content);
 
         $translations_info = isset($content['']) ? $content[''] : null;
         unset($content['']);

tests/JedGeneratorTest.php

@@ -0,0 +1,20 @@
+<?php
+
+class JedGeneratorTest extends PHPUnit_Framework_TestCase
+{
+    public function testOne()
+    {
+        //Extract translations
+        $translations = Gettext\Extractors\Po::fromFile(__DIR__.'/files/po.po');
+
+
+        $jed = $translations->toJedString();
+        $expect = file_get_contents(__DIR__.'/files/jed.json');
+
+        $this->assertEquals(json_decode($jed), json_decode($expect));
+
+        $jed2 = Gettext\Extractors\Jed::fromString($expect);
+
+        $this->assertEquals($translations->count(), $jed2->count());
+    }
+}

tests/files/jed.json

@@ -0,0 +1,53 @@
+{
+    "testingdomain":{
+        "":{
+            "domain":"testingdomain",
+            "lang":"bs",
+            "plural-forms":"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
+        },
+        "Ensure this value has at least %(limit_value)d character (it has %sd).":[
+            "Ensure this value has at least %(limit_value)d characters (it has %sd).",
+            ""
+        ],
+        "Ensure this value has at most %(limit_value)d character (it has %sd).":[
+            "Ensure this value has at most %(limit_value)d characters (it has %sd).",
+            ""
+        ],
+        "%ss must be unique for %ss %ss.":[
+            "",
+            "%ss mora da bude jedinstven za %ss %ss."
+        ],
+        "and":[
+            "",
+            "i"
+        ],
+        "Value %sr is not a valid choice.":[
+            "",
+            ""
+        ],
+        "This field cannot be null.":[
+            "",
+            "Ovo polje ne mo\u017ee ostati prazno."
+        ],
+        "This field cannot be blank.":[
+            "",
+            "Ovo polje ne mo\u017ee biti prazno."
+        ],
+        "Field of type: %ss":[
+            "",
+            "Polje tipa: %ss"
+        ],
+        "Integer":[
+            "",
+            "Cijeo broj"
+        ],
+        "{test1}":[
+            "",
+            "test1\n<div>\n test2\n<\/div>\ntest3"
+        ],
+        "{test2}":[
+            "",
+            "test1\n<div>\n test2\n<\/div>\ntest3"
+        ]
+    }
+}