Issue 7: Correctly handles blank and comment only files (#8)

* Issue 7: Correctly handles blanks and comment only files * Update version numbers
hjson · Jun 9, 2017 · b3e3a04 · b3e3a04
1 parent 36b92ab
commit b3e3a04
Show file tree

Hide file tree

Showing 12 changed files with 32 additions and 23 deletions.
diff --git a/history.md b/history.md
@@ -1,5 +1,7 @@
 # History
 
+- v2.0.6
+  - add support for blank and comment only files
 - v2.0.5
   - fix stringify for strings staring with a punctuator char
 - v2.0.2

diff --git a/hjson/__init__.py b/hjson/__init__.py
@@ -36,7 +36,7 @@
 
 """
 from __future__ import absolute_import
-__version__ = "2.0.5"
+__version__ = "2.0.6"
 __all__ = [
     'dump', 'dumps', 'load', 'loads',
     'dumpJSON', 'dumpsJSON',

diff --git a/hjson/decoder.py b/hjson/decoder.py
@@ -542,8 +542,13 @@ def raw_decode(self, s, idx=0, _PY3=PY3):
             elif ord0 == 0xef and s[idx:idx + 3] == '\xef\xbb\xbf':
                 idx += 3
 
+        start_index = idx
         ch, idx = getNext(s, idx)
 
+        # If blank or comment only file, return dict
+        if start_index == 0 and ch == '':
+            return {}, 0
+
         if ch == '{' or ch == '[':
             return self.scan_once(s, idx)
         else:
@@ -556,5 +561,3 @@ def raw_decode(self, s, idx=0, _PY3=PY3):
                     return self.scan_once(s, idx)
                 except:
                     raise e
-
-
diff --git a/hjson/tests/assets/blank_file_result.hjson b/hjson/tests/assets/blank_file_result.hjson
@@ -0,0 +1 @@
+{}
diff --git a/hjson/tests/assets/blank_file_result.json b/hjson/tests/assets/blank_file_result.json
diff --git a/hjson/tests/assets/blank_file_test.hjson b/hjson/tests/assets/blank_file_test.hjson
diff --git a/hjson/tests/assets/comments_only_result.hjson b/hjson/tests/assets/comments_only_result.hjson
@@ -0,0 +1 @@
+{}
diff --git a/hjson/tests/assets/comments_only_result.json b/hjson/tests/assets/comments_only_result.json
@@ -0,0 +1 @@
+{}
diff --git a/hjson/tests/assets/comments_only_test.hjson b/hjson/tests/assets/comments_only_test.hjson
@@ -0,0 +1 @@
+// comments only file
diff --git a/hjson/tests/test_fail.py b/hjson/tests/test_fail.py
@@ -106,7 +106,6 @@ def test_array_decoder_issue46(self):
 
     def test_truncated_input(self):
         test_cases = [
-            ('', 'Bad key name (eof)', 0),
             ('[', "End of input while parsing an array", 1),
             # ('[42', "Expecting ',' delimiter", 3),
             ('[42,', 'Expecting value', 4),

diff --git a/hjson/tests/test_tool.py b/hjson/tests/test_tool.py
@@ -32,23 +32,23 @@ class TestTool(unittest.TestCase):
 
     expect = textwrap.dedent("""\
     [
-        [
-            "blorpie"
-        ],
-        [
-            "whoops"
-        ],
-        [],
-        "d-shtaeou",
-        "d-nthiouh",
-        "i-vhbjkhnth",
-        {
-            "nifty": 87
-        },
-        {
-            "field": "yes",
-            "morefield": false
-        }
+      [
+        blorpie
+      ]
+      [
+        whoops
+      ]
+      []
+      d-shtaeou
+      d-nthiouh
+      i-vhbjkhnth
+      {
+        nifty: 87
+      }
+      {
+        morefield: false
+        field: yes
+      }
     ]
     """)
 
@@ -78,7 +78,8 @@ def test_infile_stdout(self):
                 self.runTool(args=[infile.name]),
                 self.expect.encode())
 
-    def test_infile_outfile(self):
+    def x_test_infile_outfile(self):
+        """Not currently an option in tool"""
         with tempfile.NamedTemporaryFile() as infile:
             infile.write(self.data.encode())
             infile.flush()

diff --git a/setup.py b/setup.py
@@ -10,7 +10,7 @@
     DistutilsPlatformError
 
 IS_PYPY = hasattr(sys, 'pypy_translation_info')
-VERSION = "2.0.5"
+VERSION = "2.0.6"
 DESCRIPTION = "JSON for Humans. A configuration file format with relaxed syntax, fewer mistakes and more comments."
 
 with open('README.rst', 'r') as f: