Merge branch 'max_nesting_for_prettify_json' of https://github.com/spk/json into development

1 files changed, 12 insertions, 9 deletions

diff --git a/bin/prettify_json.rb b/bin/prettify_json.rb
index 5e1f806..943546f 100755
--- a/bin/prettify_json.rb
+++ b/bin/prettify_json.rb
@@ -53,18 +53,21 @@ EOT
 end
 
 filename = nil
-json = JSON[
-  if args.empty?
-    STDIN.read
-  else
-    File.read filename = args.first
-  end
-]
+str = nil
+json_opts = {:max_nesting => false, :create_additions => false}
+
+if args.empty?
+  str = STDIN.read
+else
+  str = File.read(filename = args.first)
+end
+
+json = JSON[str, json_opts]
 
 output = if opts['s']
-  JSON.fast_generate json
+  JSON.fast_generate json, json_opts
 else # default is -l
-  JSON.pretty_generate json
+  JSON.pretty_generate json, json_opts
 end
 
 if opts['i'] && filename