diff options
author | Florian Frank <flori@ping.de> | 2011-07-04 22:44:22 +0200 |
---|---|---|
committer | Florian Frank <flori@ping.de> | 2011-07-04 22:44:22 +0200 |
commit | bba04b64715a0c6ca0d281e89f4c56a309e96ecd (patch) | |
tree | 2f006a418e08509afb15f1536d09ba06b30c0104 | |
parent | 05a1bcdce9af14dd9777ba7d15a760f5d98d7508 (diff) | |
parent | 0d8c191b4fab5d87f71f3d9e9b2b1269a8e618b8 (diff) | |
download | json-bba04b64715a0c6ca0d281e89f4c56a309e96ecd.tar.gz |
Merge branch 'max_nesting_for_prettify_json' of https://github.com/spk/json into development
-rwxr-xr-x | bin/prettify_json.rb | 21 |
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 |