Merge pull request #10 from half-pie/patch-half-parse

增加 处理 half-parse 为 object 的情况，以及做一些预测

Author: alingse

README.md

@@ -37,6 +37,7 @@ seq 1 10|xargs -I {} ./runtest.sh|grep ratio: |awk '{t += $3; h+= $6}{print h/t}
 7. 0.60  , 0.58             # 去掉了空行
 8. 0.6971, 0.6969, 0.6984   # 增加处理 StopIteration
 9. 0.7428, 0.7383, 0.7427   # 增加处理 half parse
+10. 0.7617,0.7631, 0.7558   # 细化处理 half parse
 
 ## 目前的缺点 && 发现
 
@@ -46,6 +47,9 @@ seq 1 10|xargs -I {} ./runtest.sh|grep ratio: |awk '{t += $3; h+= $6}{print h/t}
 4. 还不支持回溯 --> [{]
 5. 同一个 case, 处理空白的情况
 6. 也许可以统计 [] {} "" 的配合情况
+7. 突然想到, 应该反思一下, 这个是一个fixer, 而不是一个将任何字符串都转为 json 的东西
+   应该明确 JSONFixer 的能力范围, 对 runratio.sh 也应该比较前后两个的 json 相似程度。
+   (听起来像无能者的辩白?)
 
 ## TODO
 
@@ -54,5 +58,4 @@ seq 1 10|xargs -I {} ./runtest.sh|grep ratio: |awk '{t += $3; h+= $6}{print h/t}
 
 ## BadCase
 
-1. {}}
-2.
+1. 1, [""], -1]

checks/debug.py

@@ -1,10 +1,8 @@
 # coding=utf8
-import sys
-
 from half_json.main import fixjson
 
+
 if __name__ == '__main__':
-    if len(sys.argv) >= 4:
-        import pdb
-        pdb.set_trace()
+    import pdb
+    pdb.set_trace()
     fixjson()

checks/oneline.json

@@ -1 +1 @@
-[]]
+"a":

half_json/core.py

@@ -80,7 +80,7 @@ def patch_value_error(self, line, err_info):
             if lastchar == "," and nextchar == "}":
                 return False, remove_line(line, pos - 1, pos)
             # {[ or {"a":1,[ --> "":[
-            if nextchar == "[":
+            if nextchar in "[{":
                 return False, insert_line(line, "\"\":", pos)
             # dosomething
             # if lastchar == "{":
@@ -151,8 +151,16 @@ def patch_stop_iteration(self, line):
 
     def patch_half_parse(self, line, err_info):
         obj, end = err_info
-        nextline = line[end:]
+        nextline = line[end:].strip()
+        nextchar = nextline[:1]
         left = patch_left_object_and_array(nextline)
+        # ??
+        if left == "":
+            if nextchar == ",":
+                left = "["
+            elif nextchar == ":" and isinstance(obj, basestring):
+                left = "{"
+
         new_line = left + line[:end] + nextline
         return False, new_line
 

setup.py

@@ -13,7 +13,7 @@
 
 setup(
     name='jsonfixer',
-    version='0.1.4a',
+    version='0.1.4b',
     url='https://github.com/half-pie/half-json',
     description='jsonfixer: fix invalid json: broken-json / truncated-json.',
     long_description=readme,

tests/test_stop.py

@@ -24,3 +24,39 @@ def test_patch_half_array(self):
         ok, newline, _ = JSONFixer().fix(line)
         self.assertTrue(ok)
         self.assertEqual('[[]]', newline)
+
+    def test_patch_half_object(self):
+        line = '{}}'
+        ok, newline, _ = JSONFixer().fix(line)
+        self.assertTrue(ok)
+        self.assertEqual('{"":{}}', newline)
+
+    def test_patch_half_object_array(self):
+        line = '{}]'
+        ok, newline, _ = JSONFixer().fix(line)
+        self.assertTrue(ok)
+        self.assertEqual('[{}]', newline)
+
+    def test_patch_half_array_object(self):
+        line = '[]}'
+        ok, newline, _ = JSONFixer().fix(line)
+        self.assertTrue(ok)
+        self.assertEqual('{"":[]}', newline)
+
+    def test_patch_half_array_with_coma(self):
+        line = '1, [""], -1]'
+        ok, newline, _ = JSONFixer().fix(line)
+        self.assertTrue(ok)
+        self.assertEqual('[1, [""], -1]', newline)
+
+    def test_patch_half_array_with_coma_v2(self):
+        line = '1, 2'
+        ok, newline, _ = JSONFixer().fix(line)
+        self.assertTrue(ok)
+        self.assertEqual('[1, 2]', newline)
+
+    def test_patch_half_object_with_colon(self):
+        line = '"a":'
+        ok, newline, _ = JSONFixer().fix(line)
+        self.assertTrue(ok)
+        self.assertEqual('{"a":null}', newline)