Ignore empty strings in KEYVALUEJSON format

transifex · Apr 19, 2016 · 32bd6de · 32bd6de
1 parent 141d0af
commit 32bd6de
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 1 deletion.
diff --git a/openformats/formats/json.py b/openformats/formats/json.py
@@ -53,6 +53,8 @@ def _extract(self, parsed, nest=None):
                 self.existing_keys.add(key)
 
                 if isinstance(value, (str, unicode)):
+                    if not value.strip():
+                        continue
                     openstring = OpenString(key, value,
                                             order=next(self._order))
                     self.transcriber.copy_until(value_position)
@@ -71,6 +73,8 @@ def _extract(self, parsed, nest=None):
                 else:
                     key = u"{}..{}..".format(nest, index)
                 if isinstance(item, (str, unicode)):
+                    if not item.strip():
+                        continue
                     openstring = OpenString(key, item, order=next(self._order))
                     self.transcriber.copy_until(item_position)
                     self.transcriber.add(openstring.template_replacement)

diff --git a/openformats/tests/formats/json/__init__.py → ...sts/formats/beta_keyvaluejson/__init__.py b/openformats/tests/formats/json/__init__.py → ...sts/formats/beta_keyvaluejson/__init__.py
diff --git a/...ormats/tests/formats/json/files/1_el.json → ...formats/beta_keyvaluejson/files/1_el.json b/...ormats/tests/formats/json/files/1_el.json → ...formats/beta_keyvaluejson/files/1_el.json
diff --git a/...ormats/tests/formats/json/files/1_en.json → ...formats/beta_keyvaluejson/files/1_en.json b/...ormats/tests/formats/json/files/1_en.json → ...formats/beta_keyvaluejson/files/1_en.json
diff --git a/...rmats/tests/formats/json/files/1_tpl.json → ...ormats/beta_keyvaluejson/files/1_tpl.json b/...rmats/tests/formats/json/files/1_tpl.json → ...ormats/beta_keyvaluejson/files/1_tpl.json
diff --git a/openformats/tests/formats/json/test_json.py → ...ts/formats/beta_keyvaluejson/test_json.py b/openformats/tests/formats/json/test_json.py → ...ts/formats/beta_keyvaluejson/test_json.py
@@ -10,7 +10,7 @@
 
 class JsonTestCase(CommonFormatTestMixin, unittest.TestCase):
     HANDLER_CLASS = JsonHandler
-    TESTFILE_BASE = "openformats/tests/formats/json/files"
+    TESTFILE_BASE = "openformats/tests/formats/beta_keyvaluejson/files"
 
     def setUp(self):
         super(JsonTestCase, self).setUp()
@@ -32,6 +32,12 @@ def test_simple(self):
                           self.random_openstring.__dict__)
         self.assertEquals(compiled, '{"a": "%s"}' % self.random_string)
 
+    def test_empty_string_ignored(self):
+        template, stringset = self.handler.parse(
+            '{"not_empty": "hello there", "empty": ""}'
+        )
+        self.assertEquals(len(stringset), 1)
+
     def test_root_object_is_list(self):
         source = '["%s"]' % self.random_string
         random_openstring = OpenString('..0..', self.random_string, order=0)