Updating json_reformat to model yajl's json_reformat.

Author: pykler

.gitignore

@@ -15,3 +15,8 @@ tmp/
 dist/
 build/
 *.egg-info/
+
+# developer specifics
+.virtualenv/
+.vagrant/
+Vagrantfile

examples/json_reformat.py

@@ -5,62 +5,115 @@
 import os
 import sys
 BASEPATH = os.path.dirname(os.path.realpath(__file__))
-sys.path = [BASEPATH, '%s/..' %BASEPATH] + sys.path
+sys.path = [BASEPATH, '%s/..' % BASEPATH] + sys.path
 from yajl import __version__ as yajl_version
-from yajl import *
+from yajl import (
+    __version__ as yajl_version,
+    YajlContentHandler, YajlGen, YajlParser,
+    YajlGenException,
+)
 
 import optparse
 
+
 class ReformatContentHandler(YajlContentHandler):
     '''
     Content handler to reformat a json file using yajl_gen
     '''
-    def __init__(self, beautify=True, indent_string="  "):
+    def __init__(self, beautify=True, indent_string="  ", stream=False):
         self.out = sys.stdout
         self.beautify = beautify
         self.indent_string = indent_string
+        self.stream = stream
     def parse_start(self):
-        self.g = YajlGen(beautify=self.beautify, indent_string=self.indent_string)
+        self.g = YajlGen(
+            beautify=self.beautify,
+            indent_string=self.indent_string,
+        )
     def parse_buf(self):
         self.out.write(self.g.yajl_gen_get_buf())
     def parse_complete(self):
-        # not necessary, gc will do this @ python shutdown
-        del self.g
+        if not stream:
+            # not necessary, gc will do this @ python shutdown
+            del self.g
+    def check_and_return(self, func, *args, **kwargs):
+        try:
+            func(*args, **kwargs)
+        except YajlGenException as e:
+            if self.stream and e.value == 'yajl_gen_generation_complete':
+                self.g.yajl_gen_reset('\n')
+                func(*args, **kwargs)
+            else:
+                raise
     def yajl_null(self, ctx):
-        self.g.yajl_gen_null()
+        self.check_and_return(
+            self.g.yajl_gen_null,
+        )
     def yajl_boolean(self, ctx, boolVal):
-        self.g.yajl_gen_bool(boolVal)
+        self.check_and_return(
+            self.g.yajl_gen_bool,
+            boolVal
+        )
     def yajl_number(self, ctx, stringNum):
-        self.g.yajl_gen_number(stringNum)
+        self.check_and_return(
+            self.g.yajl_gen_number,
+            stringNum
+        )
     def yajl_string(self, ctx, stringVal):
-        self.g.yajl_gen_string(stringVal)
+        self.check_and_return(
+            self.g.yajl_gen_string,
+            stringVal
+        )
     def yajl_start_map(self, ctx):
-        self.g.yajl_gen_map_open()
+        self.check_and_return(
+            self.g.yajl_gen_map_open,
+        )
     def yajl_map_key(self, ctx, stringVal):
-        self.g.yajl_gen_string(stringVal)
+        self.check_and_return(
+            self.g.yajl_gen_string,
+            stringVal
+        )
     def yajl_end_map(self, ctx):
-        self.g.yajl_gen_map_close()
+        self.check_and_return(
+            self.g.yajl_gen_map_close,
+        )
     def yajl_start_array(self, ctx):
-        self.g.yajl_gen_array_open()
+        self.check_and_return(
+            self.g.yajl_gen_array_open,
+        )
     def yajl_end_array(self, ctx):
-        self.g.yajl_gen_array_close()
+        self.check_and_return(
+            self.g.yajl_gen_array_close,
+        )
 
 
 def main():
     opt_parser = optparse.OptionParser(
         description='reformat json from stdin',
-        version='Yajl-Py for Yajl %s' %yajl_version)
+        version='Yajl-Py for Yajl %s' % yajl_version)
     opt_parser.add_option("-m",
         dest="beautify", action="store_false", default=True,
         help="minimize json rather than beautify (default)")
     opt_parser.add_option("-u",
         dest="dont_validate_strings", action='store_true', default=False,
         help="allow invalid UTF8 inside strings during parsing")
+    opt_parser.add_option("-e",
+        dest="escape_solidus", action='store_true', default=False,
+        help="escape any forward slashes (for embedding in HTML)")
+    opt_parser.add_option("-s",
+        dest="stream", action='store_true', default=False,
+        help="reformat a stream of multiple json entites")
     (options, args) = opt_parser.parse_args()
-    ch = ReformatContentHandler(beautify=options.beautify)
+    # initialize the content handler (creates a Yajl Gen)
+    ch = ReformatContentHandler(
+        beautify=options.beautify,
+        stream=options.stream,
+    )
+    # initialize the parser
     yajl_parser = YajlParser(ch)
-    yajl_parser.allow_comments = True # let's allow comments by default
+    yajl_parser.allow_comments = True  # let's allow comments by default
     yajl_parser.dont_validate_strings = options.dont_validate_strings
+    yajl_parser.allow_multiple_values = options.stream
     yajl_parser.parse()
 
 if __name__ == "__main__":

examples/yajl_py_example.py

@@ -2,7 +2,7 @@
 import sys
 BASEPATH = os.path.dirname(os.path.realpath(__file__))
 sys.path = [BASEPATH, '%s/..' %BASEPATH] + sys.path
-from yajl import *
+from yajl import YajlContentHandler, YajlParser
 
 # Sample callbacks, which output some debug info
 # these are examples to show off the yajl parser
@@ -37,6 +37,7 @@ def yajl_end_array(self, ctx):
 
 def main(args):
     parser = YajlParser(ContentHandler())
+    parser.allow_multiple_values = True
     if args:
         for fn in args:
             f = open(fn)