neatjson 0.6 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bea172fb8129d16c9334bd5ffdce64be0841fea2
-  data.tar.gz: 09cb444f5bc31b69a08a89e82a45484865c3d5ab
+  metadata.gz: 25e68572d39dc687907b501288dee898cd91b0fe
+  data.tar.gz: 945e91700e9d4a0494efa3bf21f38a257580bcdb
 SHA512:
-  metadata.gz: 85b9b72bd66a09a29aa5f299d6febce537d103cef6ca023552004730a227f6db65ef05fa5c3a94d81d827f8bb31b4b242166fd4f2f5ef892fb185527bd45609b
-  data.tar.gz: 6fa5bce4bdffda217798aa340b0c273e0abb9d6d628049e1351eac01d52cc0aa77243ec59febaf7e9618e82563d3c06872b9d3dd1392ce6b48d92b197183c855
+  metadata.gz: 7eabc205eb0b9f291ff8d06d717b38c06abbaa43030811e09bd080db2fe5adb7c2e76df76f33e36c5db30b4c6cbb63fdb8cd5b59c1c59c8bcbf159a6b8d3e338
+  data.tar.gz: 642c88a6ca834738c8f095e3c17ede54570d07785f79a2a5c5e6a295a205e1580174a23ba724f6ddd41c62c392e6cff99198fcfc7e8d73173e03558cc3e139cf

data/README.md

@@ -1,190 +1,194 @@
-# NeatJSON
-
-[![Gem Version](https://badge.fury.io/rb/neatjson.svg)](http://badge.fury.io/rb/neatjson)
-[![Gem Downloads](http://ruby-gem-downloads-badge.herokuapp.com/neatjson?type=total&color=brightgreen)](https://rubygems.org/gems/neatjson)
-
-Pretty-print your JSON in Ruby with more power than is provided by `JSON.pretty_generate`. In particular, like Ruby's `pp` (pretty print), NeatJSON will keep objects on one line if they fit, but break them over multiple lines if needed.
-
-Here's an excerpt (from a much larger JSON):
-
-~~~ json
-{
-  "navigation.createroute.poi":[
-    {"text":"Lay in a course to the Hilton","params":{"poi":"Hilton"}},
-    {"text":"Take me to the airport","params":{"poi":"airport"}},
-    {"text":"Let's go to IHOP","params":{"poi":"IHOP"}},
-    {"text":"Show me how to get to The Med","params":{"poi":"The Med"}},
-    {"text":"Create a route to Arby's","params":{"poi":"Arby's"}},
-    {
-      "text":"Go to the Hilton by the Airport",
-      "params":{"poi":"Hilton","location":"Airport"}
-    },
-    {
-      "text":"Take me to the Fry's in Fresno",
-      "params":{"poi":"Fry's","location":"Fresno"}
-    }
-  ],
-  "navigation.eta":[
-    {"text":"When will we get there?"},
-    {"text":"When will I arrive?"},
-    {"text":"What time will I get to the destination?"},
-    {"text":"What time will I reach the destination?"},
-    {"text":"What time will it be when I arrive?"}
-  ]
-}
-~~~
-
-## Installation
-
-`gem install neatjson`
-
-## Examples
-
-~~~ ruby
-require 'neatjson'
-
-o = { b:42.005, a:[42,17], longer:true, str:"yes
-please" }
-
-puts JSON.neat_generate(o)
-#=> {"b":42.005,"a":[42,17],"longer":true,"str":"yes\nplease"}
-
-puts JSON.neat_generate(o,sorted:true)
-#=> {"a":[42,17],"b":42.005,"longer":true,"str":"yes\nplease"}
-
-puts JSON.neat_generate(o,sorted:true,padding:1,after_comma:1)
-#=> { "a":[ 42, 17 ], "b":42.005, "longer":true, "str":"yes\nplease" }
-
-puts JSON.neat_generate(o,sorted:true,wrap:40)
-#=> {
-#=>   "a":[42,17],
-#=>   "b":42.005,
-#=>   "longer":true,
-#=>   "str":"yes\nplease"
-#=> }
-
-puts JSON.neat_generate(o,sorted:true,wrap:40,decimals:2)
-#=> {
-#=>   "a":[42,17],
-#=>   "b":42.01,
-#=>   "longer":true,
-#=>   "str":"yes\nplease"
-#=> }
-
-puts JSON.neat_generate(o,sorted:true,wrap:40,aligned:true)
-#=> {
-#=>   "a"     :[42,17],
-#=>   "b"     :42.005,
-#=>   "longer":true,
-#=>   "str"   :"yes\nplease"
-#=> }
-
-puts JSON.neat_generate(o,sorted:true,wrap:40,aligned:true,around_colon:1)
-#=> {
-#=>   "a"      : [42,17],
-#=>   "b"      : 42.005,
-#=>   "longer" : true,
-#=>   "str"    : "yes\nplease"
-#=> }
-
-puts JSON.neat_generate(o,sorted:true,wrap:40,aligned:true,around_colon:1,short:true)
-#=> {"a"      : [42,17],
-#=>  "b"      : 42.005,
-#=>  "longer" : true,
-#=>  "str"    : "yes\nplease"}
-
-a = [1,2,[3,4,[5]]]
-puts JSON.neat_generate(a)
-#=> [1,2,[3,4,[5]]]
-
-puts JSON.pretty_generate(a) # oof!
-#=> [
-#=>   1,
-#=>   2,
-#=>   [
-#=>     3,
-#=>     4,
-#=>     [
-#=>       5
-#=>     ]
-#=>   ]
-#=> ]
-
-puts JSON.neat_generate( a, wrap:true, short:true )
-#=> [1,
-#=>  2,
-#=>  [3,
-#=>   4,
-#=>   [5]]]
-~~~
-
-## Options
-You may pass any of the following option symbols to `neat_generate`:
-
-* `:wrap`           — The maximum line width before wrapping. Use `false` to never wrap, or `true` (or `-1`) to always wrap. Default: `80`
-* `:indent`         — Whitespace used to indent each level when wrapping. Default: `"  "` (two spaces)
-* `:short`          — Keep the output 'short' when wrapping? This puts opening brackets on the same line as the first value, and closing brackets on the same line as the last. Default: `false`
-  * _This causes the `:indent` option to be ignored, instead basing indentation on array and object padding._
-* `:sorted`         — Sort the keys for objects to be in alphabetical order? Default: `false`
-* `:aligned`        — When wrapping objects, line up the colons (per object)? Default: `false`
-* `:decimals`       — Decimal precision to use for non-integer numbers; use `false` to keep float values precise. Default: `false`
-* `:array_padding`  — Number of spaces to put inside brackets for arrays. Default: `0`
-* `:object_padding` — Number of spaces to put inside braces for objects.  Default: `0`
-* `:padding`        — Shorthand to set both `:array_padding` and `:object_padding`. Default: `0`
-* `:before_comma`   — Number of spaces to put before commas (for both arrays and objects). Default: `0`
-* `:after_comma`    — Number of spaces to put after commas (for both arrays and objects). Default: `0`
-* `:around_comma`   — Shorthand to set both `:before_comma` and `:after_comma`. Default: `0`
-* `:before_colon_1` — Number of spaces before a colon when the object is on one line. Default: `0`
-* `:after_colon_1`  — Number of spaces after a colon when the object is on one line. Default: `0`
-* `:before_colon_n` — Number of spaces before a colon when the object is on multiple lines. Default: `0`
-* `:after_colon_n`  — Number of spaces after a colon when the object is on multiple lines. Default: `0`
-* `:before_colon`   — Shorthand to set both `:before_colon_1` and `:before_colon_n`. Default: `0`
-* `:after_colon`    — Shorthand to set both `:after_colon_1` and `:after_colon_n`. Default: `0`
-* `:around_colon`   — Shorthand to set both `:before_colon` and `:after_colon`. Default: `0`
-
-
-## License & Contact
-
-NeatJSON is copyright ©2015 by Gavin Kistner and is released under
-the [MIT License](http://www.opensource.org/licenses/mit-license.php).
-See the LICENSE.txt file for more details.
-
-For bugs or feature requests please open [issues on GitHub][1].
-For other communication you can [email the author directly](mailto:!@phrogz.net?subject=NeatJSON).
-
-## TODO (aka Known Limitations)
-
-* Figure out the best way to play with custom objects that use `to_json` for their representation.
-* Detect circular references.
-* Possibly allow illegal JSON values like `NaN` or `Infinity`.
-* Possibly allow "JSON5" output (legal identifiers unquoted, etc.)
-
-## HISTORY
-
-* **v0.6** - April 26th, 2015
-  * Added `before_colon_1` and `before_colon_n` to distinguish between single-line and multi-line objects.
-
-* **v0.5** - April 19th, 2015
-  * Do not format integers (or floats that equal their integer) using `decimals` option.
-  * Make `neatJSON()` JavaScript available to Node.js as well as web browsers.
-  * Add (Node-based) testing for the JavaScript version.
-
-* **v0.4** - April 18th, 2015
-  * Add JavaScript version with online runner.
-
-* **v0.3.2** - April 16th, 2015
-  * Force YARD to use Markdown for documentation.
-
-* **v0.3.1** - April 16th, 2015
-  * Remove some debugging code accidentally left in.
-
-* **v0.3** - April 16th, 2015
-  * Fix another bug with `short:true` and wrapping array values inside objects.
-
-* **v0.2** - April 16th, 2015
-  * Fix bug with `short:true` and wrapping values inside objects.
-
-* **v0.1** - April 15th, 2015
-  * Initial release.
-
-[1]: https://github.com/Phrogz/NeatJSON/issues
+# NeatJSON
+
+[![Gem Version](https://badge.fury.io/rb/neatjson.svg)](http://badge.fury.io/rb/neatjson)
+[![Gem Downloads](http://ruby-gem-downloads-badge.herokuapp.com/neatjson?type=total&color=brightgreen)](https://rubygems.org/gems/neatjson)
+
+Pretty-print your JSON in Ruby with more power than is provided by `JSON.pretty_generate`. In particular, like Ruby's `pp` (pretty print), NeatJSON will keep objects on one line if they fit, but break them over multiple lines if needed.
+
+Here's an excerpt (from a much larger JSON):
+
+~~~ json
+{
+  "navigation.createroute.poi":[
+    {"text":"Lay in a course to the Hilton","params":{"poi":"Hilton"}},
+    {"text":"Take me to the airport","params":{"poi":"airport"}},
+    {"text":"Let's go to IHOP","params":{"poi":"IHOP"}},
+    {"text":"Show me how to get to The Med","params":{"poi":"The Med"}},
+    {"text":"Create a route to Arby's","params":{"poi":"Arby's"}},
+    {
+      "text":"Go to the Hilton by the Airport",
+      "params":{"poi":"Hilton","location":"Airport"}
+    },
+    {
+      "text":"Take me to the Fry's in Fresno",
+      "params":{"poi":"Fry's","location":"Fresno"}
+    }
+  ],
+  "navigation.eta":[
+    {"text":"When will we get there?"},
+    {"text":"When will I arrive?"},
+    {"text":"What time will I get to the destination?"},
+    {"text":"What time will I reach the destination?"},
+    {"text":"What time will it be when I arrive?"}
+  ]
+}
+~~~
+
+## Installation
+
+`gem install neatjson`
+
+## Examples
+
+~~~ ruby
+require 'neatjson'
+
+o = { b:42.005, a:[42,17], longer:true, str:"yes
+please" }
+
+puts JSON.neat_generate(o)
+#=> {"b":42.005,"a":[42,17],"longer":true,"str":"yes\nplease"}
+
+puts JSON.neat_generate(o,sorted:true)
+#=> {"a":[42,17],"b":42.005,"longer":true,"str":"yes\nplease"}
+
+puts JSON.neat_generate(o,sorted:true,padding:1,after_comma:1)
+#=> { "a":[ 42, 17 ], "b":42.005, "longer":true, "str":"yes\nplease" }
+
+puts JSON.neat_generate(o,sorted:true,wrap:40)
+#=> {
+#=>   "a":[42,17],
+#=>   "b":42.005,
+#=>   "longer":true,
+#=>   "str":"yes\nplease"
+#=> }
+
+puts JSON.neat_generate(o,sorted:true,wrap:40,decimals:2)
+#=> {
+#=>   "a":[42,17],
+#=>   "b":42.01,
+#=>   "longer":true,
+#=>   "str":"yes\nplease"
+#=> }
+
+puts JSON.neat_generate(o,sorted:true,wrap:40,aligned:true)
+#=> {
+#=>   "a"     :[42,17],
+#=>   "b"     :42.005,
+#=>   "longer":true,
+#=>   "str"   :"yes\nplease"
+#=> }
+
+puts JSON.neat_generate(o,sorted:true,wrap:40,aligned:true,around_colon:1)
+#=> {
+#=>   "a"      : [42,17],
+#=>   "b"      : 42.005,
+#=>   "longer" : true,
+#=>   "str"    : "yes\nplease"
+#=> }
+
+puts JSON.neat_generate(o,sorted:true,wrap:40,aligned:true,around_colon:1,short:true)
+#=> {"a"      : [42,17],
+#=>  "b"      : 42.005,
+#=>  "longer" : true,
+#=>  "str"    : "yes\nplease"}
+
+a = [1,2,[3,4,[5]]]
+puts JSON.neat_generate(a)
+#=> [1,2,[3,4,[5]]]
+
+puts JSON.pretty_generate(a) # oof!
+#=> [
+#=>   1,
+#=>   2,
+#=>   [
+#=>     3,
+#=>     4,
+#=>     [
+#=>       5
+#=>     ]
+#=>   ]
+#=> ]
+
+puts JSON.neat_generate( a, wrap:true, short:true )
+#=> [1,
+#=>  2,
+#=>  [3,
+#=>   4,
+#=>   [5]]]
+~~~
+
+## Options
+You may pass any of the following option symbols to `neat_generate`:
+
+* `:wrap`           — The maximum line width before wrapping. Use `false` to never wrap, or `true` (or `-1`) to always wrap. Default: `80`
+* `:indent`         — Whitespace used to indent each level when wrapping. Default: `"  "` (two spaces)
+* `:short`          — Keep the output 'short' when wrapping? This puts opening brackets on the same line as the first value, and closing brackets on the same line as the last. Default: `false`
+  * _This causes the `:indent` option to be ignored, instead basing indentation on array and object padding._
+* `:sorted`         — Sort the keys for objects to be in alphabetical order? Default: `false`
+* `:aligned`        — When wrapping objects, line up the colons (per object)? Default: `false`
+* `:decimals`       — Decimal precision to use for non-integer numbers; use `false` to keep float values precise. Default: `false`
+* `:array_padding`  — Number of spaces to put inside brackets for arrays. Default: `0`
+* `:object_padding` — Number of spaces to put inside braces for objects.  Default: `0`
+* `:padding`        — Shorthand to set both `:array_padding` and `:object_padding`. Default: `0`
+* `:before_comma`   — Number of spaces to put before commas (for both arrays and objects). Default: `0`
+* `:after_comma`    — Number of spaces to put after commas (for both arrays and objects). Default: `0`
+* `:around_comma`   — Shorthand to set both `:before_comma` and `:after_comma`. Default: `0`
+* `:before_colon_1` — Number of spaces before a colon when the object is on one line. Default: `0`
+* `:after_colon_1`  — Number of spaces after a colon when the object is on one line. Default: `0`
+* `:before_colon_n` — Number of spaces before a colon when the object is on multiple lines. Default: `0`
+* `:after_colon_n`  — Number of spaces after a colon when the object is on multiple lines. Default: `0`
+* `:before_colon`   — Shorthand to set both `:before_colon_1` and `:before_colon_n`. Default: `0`
+* `:after_colon`    — Shorthand to set both `:after_colon_1` and `:after_colon_n`. Default: `0`
+* `:around_colon`   — Shorthand to set both `:before_colon` and `:after_colon`. Default: `0`
+
+
+## License & Contact
+
+NeatJSON is copyright ©2015 by Gavin Kistner and is released under
+the [MIT License](http://www.opensource.org/licenses/mit-license.php).
+See the LICENSE.txt file for more details.
+
+For bugs or feature requests please open [issues on GitHub][1].
+For other communication you can [email the author directly](mailto:!@phrogz.net?subject=NeatJSON).
+
+## TODO (aka Known Limitations)
+
+* Figure out the best way to play with custom objects that use `to_json` for their representation.
+* Detect circular references.
+* Possibly allow illegal JSON values like `NaN` or `Infinity`.
+* Possibly allow "JSON5" output (legal identifiers unquoted, etc.)
+
+## HISTORY
+
+* **v0.6.1** - October 12th, 2015
+  * Fix handling of nested empty objects and arrays. (Would cause a runtime error in many cases.)
+    * _This change causes empty arrays in a tight wrapping scenario to appear on a single line where they would previously take up three lines._
+
+* **v0.6** - April 26th, 2015
+  * Added `before_colon_1` and `before_colon_n` to distinguish between single-line and multi-line objects.
+
+* **v0.5** - April 19th, 2015
+  * Do not format integers (or floats that equal their integer) using `decimals` option.
+  * Make `neatJSON()` JavaScript available to Node.js as well as web browsers.
+  * Add (Node-based) testing for the JavaScript version.
+
+* **v0.4** - April 18th, 2015
+  * Add JavaScript version with online runner.
+
+* **v0.3.2** - April 16th, 2015
+  * Force YARD to use Markdown for documentation.
+
+* **v0.3.1** - April 16th, 2015
+  * Remove some debugging code accidentally left in.
+
+* **v0.3** - April 16th, 2015
+  * Fix another bug with `short:true` and wrapping array values inside objects.
+
+* **v0.2** - April 16th, 2015
+  * Fix bug with `short:true` and wrapping values inside objects.
+
+* **v0.1** - April 15th, 2015
+  * Initial release.
+
+[1]: https://github.com/Phrogz/NeatJSON/issues

data/lib/neatjson.rb

@@ -66,6 +66,7 @@ module JSON
 					end
 
 				when Array
+					return "#{indent}[]" if o.empty?
 					pieces = o.map{ |v| build[v,''] }
 					one_line = "#{indent}[#{apad}#{pieces.join comma}#{apad}]"
 					if !opts[:wrap] || (one_line.length <= opts[:wrap])
@@ -82,6 +83,7 @@ module JSON
 					end
 
 				when Hash
+					return "#{indent}{}" if o.empty?
 					keyvals = o.map{ |k,v| [ k.to_s.inspect, build[v,''] ] }
 					keyvals = keyvals.sort_by(&:first) if opts[:sorted]
 					keyvals = keyvals.map{ |kv| kv.join(colon1) }.join(comma)

data/neatjson.gemspec

@@ -1,17 +1,17 @@
-# encoding: UTF-8
-require 'date'
-Gem::Specification.new do |s|
-	s.name          = "neatjson"
-	s.version       = "0.6"
-	s.date          = Date.today.iso8601
-	s.authors       = ["Gavin Kistner"]
-	s.email         = "gavin@phrogz.net"
-	s.homepage      = "http://github.com/Phrogz/NeatJSON"
-	s.summary       = "Pretty, powerful, flexible JSON generation."
-	s.description   = "Generate JSON strings from Ruby objects with flexible formatting options. Key features: keep arrays and objects on a single line when they fit; format floats to specific precision; sort and align object keys; adjust whitespace padding of arrays and objects, inside and around commas and colons. JavaScript version included."
-	s.license       = "MIT license (MIT)"
-  s.platform      = Gem::Platform::RUBY
-  s.require_paths = ['lib']
-  s.files         = Dir.glob("{lib,test,html}/**/*") + ['LICENSE.txt', 'README.md', '.yardopts', __FILE__]
-	s.has_rdoc      = 'yard'
-end
+# encoding: UTF-8
+require 'date'
+Gem::Specification.new do |s|
+	s.name          = "neatjson"
+	s.version       = "0.6.1"
+	s.date          = Date.today.iso8601
+	s.authors       = ["Gavin Kistner"]
+	s.email         = "gavin@phrogz.net"
+	s.homepage      = "http://github.com/Phrogz/NeatJSON"
+	s.summary       = "Pretty, powerful, flexible JSON generation."
+	s.description   = "Generate JSON strings from Ruby objects with flexible formatting options. Key features: keep arrays and objects on a single line when they fit; format floats to specific precision; sort and align object keys; adjust whitespace padding of arrays and objects, inside and around commas and colons. JavaScript version included."
+	s.license       = "MIT license (MIT)"
+  s.platform      = Gem::Platform::RUBY
+  s.require_paths = ['lib']
+  s.files         = Dir.glob("{lib,test,html}/**/*") + ['LICENSE.txt', 'README.md', '.yardopts', __FILE__]
+	s.has_rdoc      = 'yard'
+end

data/test/test_neatjson.js

@@ -4,23 +4,28 @@ var count=0, pass=0;
 require('./tests.js').tests.forEach(function(valTest){
 	var value = valTest.value;
 	valTest.tests.forEach(function(test){
-		var mesg = "neatJSON("+JSON.stringify(value);
-		if (test.opts){
-			var opts = {};
-			for (var k in test.opts) opts[k] = test.opts[k];
-			var json = neatJSON(value,opts);
-			mesg += ","+JSON.stringify(test.opts);
-		}else{
-			var json = neatJSON(value);
-		}
-		var success = (test.json.constructor==RegExp) ? test.json.test(json) : json==test.json;
-		if (success) pass+=1;
-		else{
-			console.log(mesg+")");
-			console.log('EXPECTED');
-			console.log(test.json);
-			console.log('ACTUAL');
-			console.log(json,"\n");
+		var cmd = "neatJSON("+JSON.stringify(value)+(test.opts?","+JSON.stringify(test.opts):'')+")";
+		try{
+			if (test.opts){
+				var opts = {};
+				for (var k in test.opts) opts[k] = test.opts[k];
+				var json = neatJSON(value,opts);
+			}else{
+				var json = neatJSON(value);
+			}
+			var success = (test.json.constructor==RegExp) ? test.json.test(json) : json==test.json;
+			if (success) pass+=1;
+			else{
+				console.log(cmd);
+				console.log('EXPECTED');
+				console.log(test.json);
+				console.log('ACTUAL');
+				console.log(json,"\n");
+			}
+		} catch (e){
+			console.log("Error running "+cmd);
+			console.log(e.stack);
+			console.log("")
 		}
 		count+=1;
 	});

data/test/test_neatjson.rb

@@ -7,16 +7,17 @@ count = 0
 TESTS.each do |value_tests|
 	val, tests = value_tests[:value], value_tests[:tests]
 	tests.each do |test|
+		cmd = test[:opts] ? "JSON.neat_generate(#{val.inspect},#{test[:opts].inspect})" : "JSON.neat_generate(#{val.inspect})"
 		begin
-			count += 1
 			json = test[:opts] ? JSON.neat_generate(val,test[:opts].dup) : JSON.neat_generate(val)
-			mesg = test[:opts] ? "JSON.neat_generate(#{val.inspect},#{test[:opts].inspect})" : "JSON.neat_generate(#{val.inspect})"
-			raise "#{mesg}\nEXPECTED:\n#{test[:json]}\nACTUAL:\n#{json}\n\n" unless test[:json]===json
+			raise "EXPECTED:\n#{test[:json]}\nACTUAL:\n#{json}" unless test[:json]===json
 			pass += 1
 		rescue StandardError => e
-			puts e
+			puts "Error running #{cmd}", e, ""
 		end
+		count += 1
 	end
 end
 elapsed = Time.now-start
+elapsed = 0.0001 if elapsed==0
 puts "%d/%d test#{:s if count!=1} passed in %.2fms (%d tests per second)" % [pass, count, elapsed*1000, count/elapsed]

data/test/tests.js

@@ -1,135 +1,161 @@
-exports.tests = [
-	{value:true,  tests:[{json:"true"  }]},
-	{value:false, tests:[{json:"false" }]},
-	// {value:nil,   tests:[{json:"null"  }]},
-	{value:null,     tests:[{json:"null"  }]},
-	{value:undefined,tests:[{json:"null"  }]},
-	{value:5,     tests:[
-		{json:"5"},
-		{json:"5", opts:{decimals:3}}
-	]},
-	{value:5.0, tests:[
-		{json:"5"},
-		{json:"5", opts:{decimals:3}}
-	]},
-	{value:5.0001, tests:[
-		{json:"5.0001"},
-		{json:"5.000", opts:{decimals:3}}
-	]},
-	{value:4.2, tests:[
-		{json:"4.2"},
-		{json:"4",   opts:{decimals:0}},
-		{json:"4.20",opts:{decimals:2}},
-	]},
-	{value:4.199, tests:[{json:"4.20", opts:{decimals:2}}]},
-	{value:4.204, tests:[{json:"4.20", opts:{decimals:2}}]},
-	{value:-1.9,  tests:[{json:"-2",   opts:{decimals:0}}]},
-	{value:-2.4,  tests:[{json:"-2",   opts:{decimals:0}}]},
-	{value:1e23,  tests:[{json:/1(?:\.0+)?e\+23/i}]},
-	{value:1e-9,  tests:[{json:/1(?:\.0+)?e-0*9/i}]},
-	{value:-2.4,  tests:[{json:"-2",   opts:{decimals:0}}]},
-
-	{value:"foo",       tests:[{json:"\"foo\""}]},
-	// {value: :foo,       tests:[{json:"\"foo\""}]},
-	{value:"foo\nbar",  tests:[{json:"\"foo\\nbar\""}]},
-
-	{value:[1,2,3,4,[5,6,7,[8,9,10],11,12]], tests:[
-		{ json:"[1,2,3,4,[5,6,7,[8,9,10],11,12]]" },
-		{ json:"[\n  1,\n  2,\n  3,\n  4,\n  [5,6,7,[8,9,10],11,12]\n]", opts:{wrap:30} },
-		{ json:"[\n  1,\n  2,\n  3,\n  4,\n  [\n    5,\n    6,\n    7,\n    [8,9,10],\n    11,\n    12\n  ]\n]", opts:{wrap:20} },
-		{ json:"[\n  1,\n  2,\n  3,\n  4,\n  [\n    5,\n    6,\n    7,\n    [\n      8,\n      9,\n      10\n    ],\n    11,\n    12\n  ]\n]", opts:{wrap:true} },
-		{ json:"[\n\t1,\n\t2,\n\t3,\n\t4,\n\t[\n\t\t5,\n\t\t6,\n\t\t7,\n\t\t[\n\t\t\t8,\n\t\t\t9,\n\t\t\t10\n\t\t],\n\t\t11,\n\t\t12\n\t]\n]", opts:{wrap:true,indent:"\t"} },
-		{ json:"[1,2,3,4,[5,6,7,[8,9,10],11,12]]", opts:{arrayPadding:0} },
-		{ json:"[ 1,2,3,4,[ 5,6,7,[ 8,9,10 ],11,12 ] ]", opts:{arrayPadding:1} },
-		{ json:"[  1,2,3,4,[  5,6,7,[  8,9,10  ],11,12  ]  ]", opts:{arrayPadding:2} },
-		{ json:"[1, 2, 3, 4, [5, 6, 7, [8, 9, 10], 11, 12]]", opts:{afterComma:1} },
-		{ json:"[ 1, 2, 3, 4, [ 5, 6, 7, [ 8, 9, 10 ], 11, 12 ] ]", opts:{afterComma:1,arrayPadding:1} },
-		{ json:"[1,\n 2,\n 3,\n 4,\n [5,\n  6,\n  7,\n  [8,\n   9,\n   10],\n  11,\n  12]]", opts:{short:true,wrap:true} },
-		{ json:"[1,\n 2,\n 3,\n 4,\n [5,\n  6,\n  7,\n  [8,\n   9,\n   10],\n  11,\n  12]]", opts:{short:true,wrap:true,afterComma:1} },
-		{ json:"[ 1,\n  2,\n  3,\n  4,\n  [ 5,\n    6,\n    7,\n    [ 8,\n      9,\n      10 ],\n    11,\n    12 ] ]", opts:{short:true,wrap:true,arrayPadding:1} },
-	]},
-
-	{value:[1,2,3], tests:[
-		{ json:"[1,2,3]" },
-		{ json:"[1 ,2 ,3]",   opts:{beforeComma:1} },
-		{ json:"[1 , 2 , 3]", opts:{aroundComma:1} }
-	]},
-
-	{value:{b:1,a:2}, tests:[
-		{ json:'{"b":1,"a":2}' },
-		{ json:'{"a":2,"b":1}',              opts:{sorted:true} },
-		{ json:'{"a":2, "b":1}',             opts:{sorted:true,afterComma:1} },
-		{ json:'{"a" :2,"b" :1}',            opts:{sorted:true,beforeColon:1} },
-		{ json:'{"a": 2,"b": 1}',            opts:{sorted:true,afterColon:1} },
-		{ json:'{"a" : 2,"b" : 1}',          opts:{sorted:true,beforeColon:1,afterColon:1} },
-		{ json:'{"a" : 2, "b" : 1}',         opts:{sorted:true,beforeColon:1,afterColon:1,afterComma:1} },
-		{ json:'{ "a" : 2, "b" : 1 }',       opts:{sorted:true,beforeColon:1,afterColon:1,afterComma:1,padding:1} },
-		{ json:'{ "a" : 2, "b" : 1 }',       opts:{sorted:true,aroundColon:1,afterComma:1,objectPadding:1} },
-		{ json:'{"a" : 2, "b" : 1}',         opts:{sorted:true,beforeColon:1,afterColon:1,afterComma:1,arrayPadding:1} },
-		{ json:'{  "a"  :  2, "b"  :  1  }', opts:{sorted:true,aroundColon:2,afterComma:1,padding:2} },
-		{ json:'{  "a":2, "b":1  }',         opts:{sorted:true,afterComma:1,padding:2} },
-		{ json:'{"b":  1,"a":  2}',               opts:{afterColon1:2} },
-		{ json:'{"b"  :  1,"a"  :  2}',           opts:{aroundColon1:2} },
-		{ json:"{\n  \"b\":1,\n  \"a\":2\n}",     opts:{wrap:true,aroundColon1:2} },
-		{ json:"{\n  \"b\": 1,\n  \"a\": 2\n}",   opts:{wrap:true,afterColon:1} },
-		{ json:"{\n  \"b\": 1,\n  \"a\": 2\n}",   opts:{wrap:true,afterColonN:1} },
-		{ json:"{\"b\":1,\n \"a\":2}",            opts:{wrap:true,short:true} },
-		{ json:"{\"b\": 1,\n \"a\": 2}",          opts:{wrap:true,short:true,afterColon:1} },
-		{ json:"{\"b\": 1,\n \"a\": 2}",          opts:{wrap:true,short:true,afterColonN:1} },
-		{ json:"{\"b\":1,\n \"a\":2}",            opts:{wrap:true,short:true,afterColon1:1} }
-	]},
-
-	{value:{b:1,aaa:2,cc:3}, tests:[
-		{ json:"{\n  \"b\":1,\n  \"aaa\":2,\n  \"cc\":3\n}",    opts:{wrap:true} },
-		{ json:"{\n  \"b\"  :1,\n  \"aaa\":2,\n  \"cc\" :3\n}", opts:{wrap:true,aligned:true} },
-		{ json:"{\"b\":1,\"aaa\":2,\"cc\":3}",                  opts:{aligned:true} },
-		{ json:"{\n  \"aaa\":2,\n  \"b\"  :1,\n  \"cc\" :3\n}", opts:{wrap:true,aligned:true,sorted:true} }
-	]},
-
-	{value:{a:1}, tests:[
-		{ json:'{"a":1}' },
-		{ json:"{\n  \"a\":1\n}", opts:{wrap:true} }
-	]},
-
-	{value:{ b:17, a:42 }, tests:[
-		{ json:"{\"a\":42,\n \"b\":17}", opts:{wrap:10,sorted:true,short:true} }
-	]},
-
-	{value:[1,{a:2},3], tests:[
-		{ json:'[1,{"a":2},3]' },
-		{ json:'[ 1,{ "a":2 },3 ]',                       opts:{padding:1} },
-		{ json:'[ 1, { "a":2 }, 3 ]',                     opts:{padding:1,afterComma:1} },
-		{ json:"[\n  1,\n  {\n    \"a\":2\n  },\n  3\n]", opts:{wrap:true} },
-		{ json:"[\n  1,\n  {\"a\":2},\n  3\n]",           opts:{wrap:10} }
-	]},
-
-	{value:[1,{a:2,b:3},4], tests:[
-		{ json:"[1,\n {\"a\":2,\n  \"b\":3},\n 4]", opts:{wrap:0,short:true} },
-	]},
-
-	{value:{a:1,b:[2,3,4],c:3}, tests:[
-		{ json:'{"a":1,"b":[2,3,4],"c":3}' },
-		{ json:"{\n  \"a\":1,\n  \"b\":[2,3,4],\n  \"c\":3\n}",                       opts:{wrap:10} },
-		{ json:"{\n  \"a\":1,\n  \"b\":[\n    2,\n    3,\n    4\n  ],\n  \"c\":3\n}", opts:{wrap:true} }
-	]},
-
-	{value:{hooo:42,whee:['yaaa','oooo','booy'],zoop:"whoop"}, tests:[
-		{ json:"{\"hooo\":42,\n \"whee\":[\"yaaa\",\n         \"oooo\",\n         \"booy\"],\n \"zoop\":\"whoop\"}", opts:{wrap:20,short:true} }
-	]},
-
-	{value:{ a:[ {x:"foo",y:"jim"}, {x:"bar",y:"jam"} ] }, tests:[
-		{ json:"{\"a\":[{\"x\":\"foo\",\n       \"y\":\"jim\"},\n      {\"x\":\"bar\",\n       \"y\":\"jam\"}]}", opts:{wrap:true,short:true} }
-	]},
-
-	// {value:Class.new{ def to_json(*a); {a:1}.to_json(*a); end }.new, tests:[
-	// 	{ json:'{  "a":1}' },
-	// 	{ json:'{  "a":1}', opts:{wrap:true} },
-	// 	{ json:'{"a":1}',   opts:{indent:''} },
-	// ]},
-
-	// {value:Class.new{ def to_json(*a); JSON.neat_generate({a:1},*a); end }.new, tests:[
-	// 	{ json:'{"a":1}' },
-	// 	{ json:"{\n  \"a\":1\n}", opts:{wrap:true} }
-	// ]}
-]
-
+exports.tests = [
+	{value:true,  tests:[{json:"true"  }]},
+	{value:false, tests:[{json:"false" }]},
+	// {value:nil,   tests:[{json:"null"  }]},
+	{value:null,     tests:[{json:"null"  }]},
+	{value:undefined,tests:[{json:"null"  }]},
+	{value:5,     tests:[
+		{json:"5"},
+		{json:"5", opts:{decimals:3}}
+	]},
+	{value:5.0, tests:[
+		{json:"5"},
+		{json:"5", opts:{decimals:3}}
+	]},
+	{value:5.0001, tests:[
+		{json:"5.0001"},
+		{json:"5.000", opts:{decimals:3}}
+	]},
+	{value:4.2, tests:[
+		{json:"4.2"},
+		{json:"4",   opts:{decimals:0}},
+		{json:"4.20",opts:{decimals:2}},
+	]},
+	{value:4.199, tests:[{json:"4.20", opts:{decimals:2}}]},
+	{value:4.204, tests:[{json:"4.20", opts:{decimals:2}}]},
+	{value:-1.9,  tests:[{json:"-2",   opts:{decimals:0}}]},
+	{value:-2.4,  tests:[{json:"-2",   opts:{decimals:0}}]},
+	{value:1e23,  tests:[{json:/1(?:\.0+)?e\+23/i}]},
+	{value:1e-9,  tests:[{json:/1(?:\.0+)?e-0*9/i}]},
+	{value:-2.4,  tests:[{json:"-2",   opts:{decimals:0}}]},
+
+	{value:"foo",       tests:[{json:"\"foo\""}]},
+	// {value: :foo,       tests:[{json:"\"foo\""}]},
+	{value:"foo\nbar",  tests:[{json:"\"foo\\nbar\""}]},
+
+	{value:[1,2,3,4,[5,6,7,[8,9,10],11,12]], tests:[
+		{ json:"[1,2,3,4,[5,6,7,[8,9,10],11,12]]" },
+		{ json:"[\n  1,\n  2,\n  3,\n  4,\n  [5,6,7,[8,9,10],11,12]\n]", opts:{wrap:30} },
+		{ json:"[\n  1,\n  2,\n  3,\n  4,\n  [\n    5,\n    6,\n    7,\n    [8,9,10],\n    11,\n    12\n  ]\n]", opts:{wrap:20} },
+		{ json:"[\n  1,\n  2,\n  3,\n  4,\n  [\n    5,\n    6,\n    7,\n    [\n      8,\n      9,\n      10\n    ],\n    11,\n    12\n  ]\n]", opts:{wrap:true} },
+		{ json:"[\n\t1,\n\t2,\n\t3,\n\t4,\n\t[\n\t\t5,\n\t\t6,\n\t\t7,\n\t\t[\n\t\t\t8,\n\t\t\t9,\n\t\t\t10\n\t\t],\n\t\t11,\n\t\t12\n\t]\n]", opts:{wrap:true,indent:"\t"} },
+		{ json:"[1,2,3,4,[5,6,7,[8,9,10],11,12]]", opts:{arrayPadding:0} },
+		{ json:"[ 1,2,3,4,[ 5,6,7,[ 8,9,10 ],11,12 ] ]", opts:{arrayPadding:1} },
+		{ json:"[  1,2,3,4,[  5,6,7,[  8,9,10  ],11,12  ]  ]", opts:{arrayPadding:2} },
+		{ json:"[1, 2, 3, 4, [5, 6, 7, [8, 9, 10], 11, 12]]", opts:{afterComma:1} },
+		{ json:"[ 1, 2, 3, 4, [ 5, 6, 7, [ 8, 9, 10 ], 11, 12 ] ]", opts:{afterComma:1,arrayPadding:1} },
+		{ json:"[1,\n 2,\n 3,\n 4,\n [5,\n  6,\n  7,\n  [8,\n   9,\n   10],\n  11,\n  12]]", opts:{short:true,wrap:true} },
+		{ json:"[1,\n 2,\n 3,\n 4,\n [5,\n  6,\n  7,\n  [8,\n   9,\n   10],\n  11,\n  12]]", opts:{short:true,wrap:true,afterComma:1} },
+		{ json:"[ 1,\n  2,\n  3,\n  4,\n  [ 5,\n    6,\n    7,\n    [ 8,\n      9,\n      10 ],\n    11,\n    12 ] ]", opts:{short:true,wrap:true,arrayPadding:1} },
+	]},
+
+	{value:[1,2,3], tests:[
+		{ json:"[1,2,3]" },
+		{ json:"[1 ,2 ,3]",   opts:{beforeComma:1} },
+		{ json:"[1 , 2 , 3]", opts:{aroundComma:1} }
+	]},
+
+	{value:{b:1,a:2}, tests:[
+		{ json:'{"b":1,"a":2}' },
+		{ json:'{"a":2,"b":1}',              opts:{sorted:true} },
+		{ json:'{"a":2, "b":1}',             opts:{sorted:true,afterComma:1} },
+		{ json:'{"a" :2,"b" :1}',            opts:{sorted:true,beforeColon:1} },
+		{ json:'{"a": 2,"b": 1}',            opts:{sorted:true,afterColon:1} },
+		{ json:'{"a" : 2,"b" : 1}',          opts:{sorted:true,beforeColon:1,afterColon:1} },
+		{ json:'{"a" : 2, "b" : 1}',         opts:{sorted:true,beforeColon:1,afterColon:1,afterComma:1} },
+		{ json:'{ "a" : 2, "b" : 1 }',       opts:{sorted:true,beforeColon:1,afterColon:1,afterComma:1,padding:1} },
+		{ json:'{ "a" : 2, "b" : 1 }',       opts:{sorted:true,aroundColon:1,afterComma:1,objectPadding:1} },
+		{ json:'{"a" : 2, "b" : 1}',         opts:{sorted:true,beforeColon:1,afterColon:1,afterComma:1,arrayPadding:1} },
+		{ json:'{  "a"  :  2, "b"  :  1  }', opts:{sorted:true,aroundColon:2,afterComma:1,padding:2} },
+		{ json:'{  "a":2, "b":1  }',         opts:{sorted:true,afterComma:1,padding:2} },
+		{ json:'{"b":  1,"a":  2}',               opts:{afterColon1:2} },
+		{ json:'{"b"  :  1,"a"  :  2}',           opts:{aroundColon1:2} },
+		{ json:"{\n  \"b\":1,\n  \"a\":2\n}",     opts:{wrap:true,aroundColon1:2} },
+		{ json:"{\n  \"b\": 1,\n  \"a\": 2\n}",   opts:{wrap:true,afterColon:1} },
+		{ json:"{\n  \"b\": 1,\n  \"a\": 2\n}",   opts:{wrap:true,afterColonN:1} },
+		{ json:"{\"b\":1,\n \"a\":2}",            opts:{wrap:true,short:true} },
+		{ json:"{\"b\": 1,\n \"a\": 2}",          opts:{wrap:true,short:true,afterColon:1} },
+		{ json:"{\"b\": 1,\n \"a\": 2}",          opts:{wrap:true,short:true,afterColonN:1} },
+		{ json:"{\"b\":1,\n \"a\":2}",            opts:{wrap:true,short:true,afterColon1:1} }
+	]},
+
+	{value:{b:1,aaa:2,cc:3}, tests:[
+		{ json:"{\n  \"b\":1,\n  \"aaa\":2,\n  \"cc\":3\n}",    opts:{wrap:true} },
+		{ json:"{\n  \"b\"  :1,\n  \"aaa\":2,\n  \"cc\" :3\n}", opts:{wrap:true,aligned:true} },
+		{ json:"{\"b\":1,\"aaa\":2,\"cc\":3}",                  opts:{aligned:true} },
+		{ json:"{\n  \"aaa\":2,\n  \"b\"  :1,\n  \"cc\" :3\n}", opts:{wrap:true,aligned:true,sorted:true} }
+	]},
+
+	{value:{a:1}, tests:[
+		{ json:'{"a":1}' },
+		{ json:"{\n  \"a\":1\n}", opts:{wrap:true} }
+	]},
+
+	{value:{ b:17, a:42 }, tests:[
+		{ json:"{\"a\":42,\n \"b\":17}", opts:{wrap:10,sorted:true,short:true} }
+	]},
+
+	{value:[1,{a:2},3], tests:[
+		{ json:'[1,{"a":2},3]' },
+		{ json:'[ 1,{ "a":2 },3 ]',                       opts:{padding:1} },
+		{ json:'[ 1, { "a":2 }, 3 ]',                     opts:{padding:1,afterComma:1} },
+		{ json:"[\n  1,\n  {\n    \"a\":2\n  },\n  3\n]", opts:{wrap:true} },
+		{ json:"[\n  1,\n  {\"a\":2},\n  3\n]",           opts:{wrap:10} }
+	]},
+
+	{value:[1,{a:2,b:3},4], tests:[
+		{ json:"[1,\n {\"a\":2,\n  \"b\":3},\n 4]", opts:{wrap:0,short:true} },
+	]},
+
+	{value:{a:1,b:[2,3,4],c:3}, tests:[
+		{ json:'{"a":1,"b":[2,3,4],"c":3}' },
+		{ json:"{\n  \"a\":1,\n  \"b\":[2,3,4],\n  \"c\":3\n}",                       opts:{wrap:10} },
+		{ json:"{\n  \"a\":1,\n  \"b\":[\n    2,\n    3,\n    4\n  ],\n  \"c\":3\n}", opts:{wrap:true} }
+	]},
+
+	{value:{hooo:42,whee:['yaaa','oooo','booy'],zoop:"whoop"}, tests:[
+		{ json:"{\"hooo\":42,\n \"whee\":[\"yaaa\",\n         \"oooo\",\n         \"booy\"],\n \"zoop\":\"whoop\"}", opts:{wrap:20,short:true} }
+	]},
+
+	{value:{ a:[ {x:"foo",y:"jim"}, {x:"bar",y:"jam"} ] }, tests:[
+		{ json:"{\"a\":[{\"x\":\"foo\",\n       \"y\":\"jim\"},\n      {\"x\":\"bar\",\n       \"y\":\"jam\"}]}", opts:{wrap:true,short:true} }
+	]},
+
+	{value:{"abcdefghij":[{"abcdefghijklmnop":{}}]}, tests:[
+		{ json:'{"abcdefghij":[{"abcdefghijklmnop":{}}]}' },
+		{ json:'{"abcdefghij" : [{"abcdefghijklmnop" : {}}]}', opts:{wrap:1, short:true, aroundColonN:1} },
+	]},
+
+	{value:{"foo":{}}, tests:[
+		{ json:'{"foo":{}}' },
+		{ json:'{"foo":{}}',        opts:{wrap:false} },
+		{ json:'{\n  "foo":{}\n}',  opts:{wrap:5}    },
+		{ json:'{"foo":{}}',        opts:{wrap:1, short:true} }
+	]},
+
+	{value:["foo",{},"bar"], tests:[
+		{ json:'[\n  "foo",\n  {},\n  "bar"\n]',  opts:{wrap:1} },
+		{ json:'["foo",\n {},\n "bar"]',          opts:{wrap:1, short:true} }
+	]},
+
+	{value:["foo",[],"bar"], tests:[
+		{ json:'[\n  "foo",\n  [],\n  "bar"\n]',  opts:{wrap:1} },
+		{ json:'["foo",\n [],\n "bar"]',          opts:{wrap:1, short:true} }
+	]},
+
+	{value:["foo",[{},[{"foo":[]},42]],"bar"], tests:[
+		{ json:'["foo",\n [{},\n  [{"foo":[]},\n   42]],\n "bar"]',  opts:{wrap:1, short:true} },
+	]}
+
+	// {value:Class.new{ def to_json(*a); {a:1}.to_json(*a); end }.new, tests:[
+	// 	{ json:'{  "a":1}' },
+	// 	{ json:'{  "a":1}', opts:{wrap:true} },
+	// 	{ json:'{"a":1}',   opts:{indent:''} },
+	// ]},
+
+	// {value:Class.new{ def to_json(*a); JSON.neat_generate({a:1},*a); end }.new, tests:[
+	// 	{ json:'{"a":1}' },
+	// 	{ json:"{\n  \"a\":1\n}", opts:{wrap:true} }
+	// ]}
+]
+

data/test/tests.rb

@@ -1,133 +1,160 @@
-TESTS = [
-	{value:true,  tests:[{json:"true"  }]},
-	{value:false, tests:[{json:"false" }]},
-	{value:nil,   tests:[{json:"null"  }]},
-	{value:5,     tests:[
-		{json:"5"},
-		{json:"5", opts:{decimals:3}}
-	]},
-	{value:5.0, tests:[
-		{json:"5"},
-		{json:"5", opts:{decimals:3}}
-	]},
-	{value:5.0001, tests:[
-		{json:"5.0001"},
-		{json:"5.000", opts:{decimals:3}}
-	]},
-	{value:4.2, tests:[
-		{json:"4.2"},
-		{json:"4",   opts:{decimals:0}},
-		{json:"4.20",opts:{decimals:2}},
-	]},
-	{value:4.199, tests:[{json:"4.20", opts:{decimals:2}}]},
-	{value:4.204, tests:[{json:"4.20", opts:{decimals:2}}]},
-	{value:-1.9,  tests:[{json:"-2",   opts:{decimals:0}}]},
-	{value:-2.4,  tests:[{json:"-2",   opts:{decimals:0}}]},
-	{value:1e23,  tests:[{json:/1(?:\.0+)?e\+23/i}]},
-	{value:1e-9,  tests:[{json:/1(?:\.0+)?e-0*9/i}]},
-	{value:-2.4,  tests:[{json:"-2",   opts:{decimals:0}}]},
-
-	{value:"foo",       tests:[{json:"\"foo\""}]},
-	{value: :foo,       tests:[{json:"\"foo\""}]},
-	{value:"foo\nbar",  tests:[{json:"\"foo\\nbar\""}]},
-
-	{value:[1,2,3,4,[5,6,7,[8,9,10],11,12]], tests:[
-		{ json:"[1,2,3,4,[5,6,7,[8,9,10],11,12]]" },
-		{ json:"[\n  1,\n  2,\n  3,\n  4,\n  [5,6,7,[8,9,10],11,12]\n]", opts:{wrap:30} },
-		{ json:"[\n  1,\n  2,\n  3,\n  4,\n  [\n    5,\n    6,\n    7,\n    [8,9,10],\n    11,\n    12\n  ]\n]", opts:{wrap:20} },
-		{ json:"[\n  1,\n  2,\n  3,\n  4,\n  [\n    5,\n    6,\n    7,\n    [\n      8,\n      9,\n      10\n    ],\n    11,\n    12\n  ]\n]", opts:{wrap:true} },
-		{ json:"[\n\t1,\n\t2,\n\t3,\n\t4,\n\t[\n\t\t5,\n\t\t6,\n\t\t7,\n\t\t[\n\t\t\t8,\n\t\t\t9,\n\t\t\t10\n\t\t],\n\t\t11,\n\t\t12\n\t]\n]", opts:{wrap:true,indent:"\t"} },
-		{ json:"[1,2,3,4,[5,6,7,[8,9,10],11,12]]", opts:{array_padding:0} },
-		{ json:"[ 1,2,3,4,[ 5,6,7,[ 8,9,10 ],11,12 ] ]", opts:{array_padding:1} },
-		{ json:"[  1,2,3,4,[  5,6,7,[  8,9,10  ],11,12  ]  ]", opts:{array_padding:2} },
-		{ json:"[1, 2, 3, 4, [5, 6, 7, [8, 9, 10], 11, 12]]", opts:{after_comma:1} },
-		{ json:"[ 1, 2, 3, 4, [ 5, 6, 7, [ 8, 9, 10 ], 11, 12 ] ]", opts:{after_comma:1,array_padding:1} },
-		{ json:"[1,\n 2,\n 3,\n 4,\n [5,\n  6,\n  7,\n  [8,\n   9,\n   10],\n  11,\n  12]]", opts:{short:true,wrap:true} },
-		{ json:"[1,\n 2,\n 3,\n 4,\n [5,\n  6,\n  7,\n  [8,\n   9,\n   10],\n  11,\n  12]]", opts:{short:true,wrap:true,after_comma:1} },
-		{ json:"[ 1,\n  2,\n  3,\n  4,\n  [ 5,\n    6,\n    7,\n    [ 8,\n      9,\n      10 ],\n    11,\n    12 ] ]", opts:{short:true,wrap:true,array_padding:1} },
-	]},
-
-	{value:[1,2,3], tests:[
-		{ json:"[1,2,3]" },
-		{ json:"[1 ,2 ,3]",   opts:{before_comma:1} },
-		{ json:"[1 , 2 , 3]", opts:{around_comma:1} }
-	]},
-
-	{value:{b:1,a:2}, tests:[
-		{ json:'{"b":1,"a":2}' },
-		{ json:'{"a":2,"b":1}',                   opts:{sorted:true} },
-		{ json:'{"a":2, "b":1}',                  opts:{sorted:true,after_comma:1} },
-		{ json:'{"a" :2,"b" :1}',                 opts:{sorted:true,before_colon:1} },
-		{ json:'{"a": 2,"b": 1}',                 opts:{sorted:true,after_colon:1} },
-		{ json:'{"a" : 2,"b" : 1}',               opts:{sorted:true,before_colon:1,after_colon:1} },
-		{ json:'{"a" : 2, "b" : 1}',              opts:{sorted:true,before_colon:1,after_colon:1,after_comma:1} },
-		{ json:'{ "a" : 2, "b" : 1 }',            opts:{sorted:true,before_colon:1,after_colon:1,after_comma:1,padding:1} },
-		{ json:'{ "a" : 2, "b" : 1 }',            opts:{sorted:true,around_colon:1,after_comma:1,object_padding:1} },
-		{ json:'{"a" : 2, "b" : 1}',              opts:{sorted:true,before_colon:1,after_colon:1,after_comma:1,array_padding:1} },
-		{ json:'{  "a"  :  2, "b"  :  1  }',      opts:{sorted:true,around_colon:2,after_comma:1,padding:2} },
-		{ json:'{  "a":2, "b":1  }',              opts:{sorted:true,after_comma:1,padding:2} },
-		{ json:'{"b":  1,"a":  2}',               opts:{after_colon_1:2} },
-		{ json:'{"b"  :  1,"a"  :  2}',           opts:{around_colon_1:2} },
-		{ json:"{\n  \"b\":1,\n  \"a\":2\n}",     opts:{wrap:true,around_colon_1:2} },
-		{ json:"{\n  \"b\": 1,\n  \"a\": 2\n}",   opts:{wrap:true,after_colon:1} },
-		{ json:"{\n  \"b\": 1,\n  \"a\": 2\n}",   opts:{wrap:true,after_colon_n:1} },
-		{ json:"{\"b\":1,\n \"a\":2}",            opts:{wrap:true,short:true} },
-		{ json:"{\"b\": 1,\n \"a\": 2}",          opts:{wrap:true,short:true,after_colon:1} },
-		{ json:"{\"b\": 1,\n \"a\": 2}",          opts:{wrap:true,short:true,after_colon_n:1} },
-		{ json:"{\"b\":1,\n \"a\":2}",            opts:{wrap:true,short:true,after_colon_1:1} },
-	]},
-
-	{value:{b:1,aaa:2,cc:3}, tests:[
-		{ json:"{\n  \"b\":1,\n  \"aaa\":2,\n  \"cc\":3\n}",    opts:{wrap:true} },
-		{ json:"{\n  \"b\"  :1,\n  \"aaa\":2,\n  \"cc\" :3\n}", opts:{wrap:true,aligned:true} },
-		{ json:"{\"b\":1,\"aaa\":2,\"cc\":3}",                  opts:{aligned:true} },
-		{ json:"{\n  \"aaa\":2,\n  \"b\"  :1,\n  \"cc\" :3\n}", opts:{wrap:true,aligned:true,sorted:true} }
-	]},
-
-	{value:{a:1}, tests:[
-		{ json:'{"a":1}' },
-		{ json:"{\n  \"a\":1\n}", opts:{wrap:true} }
-	]},
-
-	{value:{ b:17, a:42 }, tests:[
-		{ json:"{\"a\":42,\n \"b\":17}", opts:{wrap:10,sorted:true,short:true} }
-	]},
-
-	{value:[1,{a:2},3], tests:[
-		{ json:'[1,{"a":2},3]' },
-		{ json:'[ 1,{ "a":2 },3 ]',                       opts:{padding:1} },
-		{ json:'[ 1, { "a":2 }, 3 ]',                     opts:{padding:1,after_comma:1} },
-		{ json:"[\n  1,\n  {\n    \"a\":2\n  },\n  3\n]", opts:{wrap:true} },
-		{ json:"[\n  1,\n  {\"a\":2},\n  3\n]",           opts:{wrap:10} }
-	]},
-
-	{value:[1,{a:2,b:3},4], tests:[
-		{ json:"[1,\n {\"a\":2,\n  \"b\":3},\n 4]", opts:{wrap:0,short:true} },
-	]},
-
-	{value:{a:1,b:[2,3,4],c:3}, tests:[
-		{ json:'{"a":1,"b":[2,3,4],"c":3}' },
-		{ json:"{\n  \"a\":1,\n  \"b\":[2,3,4],\n  \"c\":3\n}",                       opts:{wrap:10} },
-		{ json:"{\n  \"a\":1,\n  \"b\":[\n    2,\n    3,\n    4\n  ],\n  \"c\":3\n}", opts:{wrap:true} }
-	]},
-
-	{value:{hooo:42,whee:['yaaa','oooo','booy'],zoop:"whoop"}, tests:[
-		{ json:"{\"hooo\":42,\n \"whee\":[\"yaaa\",\n         \"oooo\",\n         \"booy\"],\n \"zoop\":\"whoop\"}", opts:{wrap:20,short:true} }
-	]},
-
-	{value:{ a:[ {x:"foo",y:"jim"}, {x:"bar",y:"jam"} ] }, tests:[
-		{ json:"{\"a\":[{\"x\":\"foo\",\n       \"y\":\"jim\"},\n      {\"x\":\"bar\",\n       \"y\":\"jam\"}]}", opts:{wrap:true,short:true} }
-	]},
-
-	{value:Class.new{ def to_json(*a); {a:1}.to_json(*a); end }.new, tests:[
-		{ json:'{  "a":1}' },
-		{ json:'{  "a":1}', opts:{wrap:true} },
-		{ json:'{"a":1}',   opts:{indent:''} },
-	]},
-
-	{value:Class.new{ def to_json(*a); JSON.neat_generate({a:1},*a); end }.new, tests:[
-		{ json:'{"a":1}' },
-		{ json:"{\n  \"a\":1\n}", opts:{wrap:true} }
-	]}
-]
-
+TESTS = [
+	{value:true,  tests:[{json:"true"  }]},
+	{value:false, tests:[{json:"false" }]},
+	{value:nil,   tests:[{json:"null"  }]},
+	{value:5,     tests:[
+		{json:"5"},
+		{json:"5", opts:{decimals:3}}
+	]},
+	{value:5.0, tests:[
+		{json:"5"},
+		{json:"5", opts:{decimals:3}}
+	]},
+	{value:5.0001, tests:[
+		{json:"5.0001"},
+		{json:"5.000", opts:{decimals:3}}
+	]},
+	{value:4.2, tests:[
+		{json:"4.2"},
+		{json:"4",   opts:{decimals:0}},
+		{json:"4.20",opts:{decimals:2}},
+	]},
+	{value:4.199, tests:[{json:"4.20", opts:{decimals:2}}]},
+	{value:4.204, tests:[{json:"4.20", opts:{decimals:2}}]},
+	{value:-1.9,  tests:[{json:"-2",   opts:{decimals:0}}]},
+	{value:-2.4,  tests:[{json:"-2",   opts:{decimals:0}}]},
+	{value:1e23,  tests:[{json:/1(?:\.0+)?e\+23/i}]},
+	{value:1e-9,  tests:[{json:/1(?:\.0+)?e-0*9/i}]},
+	{value:-2.4,  tests:[{json:"-2",   opts:{decimals:0}}]},
+
+	{value:"foo",       tests:[{json:"\"foo\""}]},
+	{value: :foo,       tests:[{json:"\"foo\""}]},
+	{value:"foo\nbar",  tests:[{json:"\"foo\\nbar\""}]},
+
+	{value:[1,2,3,4,[5,6,7,[8,9,10],11,12]], tests:[
+		{ json:"[1,2,3,4,[5,6,7,[8,9,10],11,12]]" },
+		{ json:"[\n  1,\n  2,\n  3,\n  4,\n  [5,6,7,[8,9,10],11,12]\n]", opts:{wrap:30} },
+		{ json:"[\n  1,\n  2,\n  3,\n  4,\n  [\n    5,\n    6,\n    7,\n    [8,9,10],\n    11,\n    12\n  ]\n]", opts:{wrap:20} },
+		{ json:"[\n  1,\n  2,\n  3,\n  4,\n  [\n    5,\n    6,\n    7,\n    [\n      8,\n      9,\n      10\n    ],\n    11,\n    12\n  ]\n]", opts:{wrap:true} },
+		{ json:"[\n\t1,\n\t2,\n\t3,\n\t4,\n\t[\n\t\t5,\n\t\t6,\n\t\t7,\n\t\t[\n\t\t\t8,\n\t\t\t9,\n\t\t\t10\n\t\t],\n\t\t11,\n\t\t12\n\t]\n]", opts:{wrap:true,indent:"\t"} },
+		{ json:"[1,2,3,4,[5,6,7,[8,9,10],11,12]]", opts:{array_padding:0} },
+		{ json:"[ 1,2,3,4,[ 5,6,7,[ 8,9,10 ],11,12 ] ]", opts:{array_padding:1} },
+		{ json:"[  1,2,3,4,[  5,6,7,[  8,9,10  ],11,12  ]  ]", opts:{array_padding:2} },
+		{ json:"[1, 2, 3, 4, [5, 6, 7, [8, 9, 10], 11, 12]]", opts:{after_comma:1} },
+		{ json:"[ 1, 2, 3, 4, [ 5, 6, 7, [ 8, 9, 10 ], 11, 12 ] ]", opts:{after_comma:1,array_padding:1} },
+		{ json:"[1,\n 2,\n 3,\n 4,\n [5,\n  6,\n  7,\n  [8,\n   9,\n   10],\n  11,\n  12]]", opts:{short:true,wrap:true} },
+		{ json:"[1,\n 2,\n 3,\n 4,\n [5,\n  6,\n  7,\n  [8,\n   9,\n   10],\n  11,\n  12]]", opts:{short:true,wrap:true,after_comma:1} },
+		{ json:"[ 1,\n  2,\n  3,\n  4,\n  [ 5,\n    6,\n    7,\n    [ 8,\n      9,\n      10 ],\n    11,\n    12 ] ]", opts:{short:true,wrap:true,array_padding:1} },
+	]},
+
+	{value:[1,2,3], tests:[
+		{ json:"[1,2,3]" },
+		{ json:"[1 ,2 ,3]",   opts:{before_comma:1} },
+		{ json:"[1 , 2 , 3]", opts:{around_comma:1} }
+	]},
+
+	{value:{b:1,a:2}, tests:[
+		{ json:'{"b":1,"a":2}' },
+		{ json:'{"a":2,"b":1}',                   opts:{sorted:true} },
+		{ json:'{"a":2, "b":1}',                  opts:{sorted:true,after_comma:1} },
+		{ json:'{"a" :2,"b" :1}',                 opts:{sorted:true,before_colon:1} },
+		{ json:'{"a": 2,"b": 1}',                 opts:{sorted:true,after_colon:1} },
+		{ json:'{"a" : 2,"b" : 1}',               opts:{sorted:true,before_colon:1,after_colon:1} },
+		{ json:'{"a" : 2, "b" : 1}',              opts:{sorted:true,before_colon:1,after_colon:1,after_comma:1} },
+		{ json:'{ "a" : 2, "b" : 1 }',            opts:{sorted:true,before_colon:1,after_colon:1,after_comma:1,padding:1} },
+		{ json:'{ "a" : 2, "b" : 1 }',            opts:{sorted:true,around_colon:1,after_comma:1,object_padding:1} },
+		{ json:'{"a" : 2, "b" : 1}',              opts:{sorted:true,before_colon:1,after_colon:1,after_comma:1,array_padding:1} },
+		{ json:'{  "a"  :  2, "b"  :  1  }',      opts:{sorted:true,around_colon:2,after_comma:1,padding:2} },
+		{ json:'{  "a":2, "b":1  }',              opts:{sorted:true,after_comma:1,padding:2} },
+		{ json:'{"b":  1,"a":  2}',               opts:{after_colon_1:2} },
+		{ json:'{"b"  :  1,"a"  :  2}',           opts:{around_colon_1:2} },
+		{ json:"{\n  \"b\":1,\n  \"a\":2\n}",     opts:{wrap:true,around_colon_1:2} },
+		{ json:"{\n  \"b\": 1,\n  \"a\": 2\n}",   opts:{wrap:true,after_colon:1} },
+		{ json:"{\n  \"b\": 1,\n  \"a\": 2\n}",   opts:{wrap:true,after_colon_n:1} },
+		{ json:"{\"b\":1,\n \"a\":2}",            opts:{wrap:true,short:true} },
+		{ json:"{\"b\": 1,\n \"a\": 2}",          opts:{wrap:true,short:true,after_colon:1} },
+		{ json:"{\"b\": 1,\n \"a\": 2}",          opts:{wrap:true,short:true,after_colon_n:1} },
+		{ json:"{\"b\":1,\n \"a\":2}",            opts:{wrap:true,short:true,after_colon_1:1} },
+	]},
+
+	{value:{b:1,aaa:2,cc:3}, tests:[
+		{ json:"{\n  \"b\":1,\n  \"aaa\":2,\n  \"cc\":3\n}",    opts:{wrap:true} },
+		{ json:"{\n  \"b\"  :1,\n  \"aaa\":2,\n  \"cc\" :3\n}", opts:{wrap:true,aligned:true} },
+		{ json:"{\"b\":1,\"aaa\":2,\"cc\":3}",                  opts:{aligned:true} },
+		{ json:"{\n  \"aaa\":2,\n  \"b\"  :1,\n  \"cc\" :3\n}", opts:{wrap:true,aligned:true,sorted:true} }
+	]},
+
+	{value:{a:1}, tests:[
+		{ json:'{"a":1}' },
+		{ json:"{\n  \"a\":1\n}", opts:{wrap:true} }
+	]},
+
+	{value:{ b:17, a:42 }, tests:[
+		{ json:"{\"a\":42,\n \"b\":17}", opts:{wrap:10,sorted:true,short:true} }
+	]},
+
+	{value:[1,{a:2},3], tests:[
+		{ json:'[1,{"a":2},3]' },
+		{ json:'[ 1,{ "a":2 },3 ]',                       opts:{padding:1} },
+		{ json:'[ 1, { "a":2 }, 3 ]',                     opts:{padding:1,after_comma:1} },
+		{ json:"[\n  1,\n  {\n    \"a\":2\n  },\n  3\n]", opts:{wrap:true} },
+		{ json:"[\n  1,\n  {\"a\":2},\n  3\n]",           opts:{wrap:10} }
+	]},
+
+	{value:[1,{a:2,b:3},4], tests:[
+		{ json:"[1,\n {\"a\":2,\n  \"b\":3},\n 4]", opts:{wrap:0,short:true} },
+	]},
+
+	{value:{a:1,b:[2,3,4],c:3}, tests:[
+		{ json:'{"a":1,"b":[2,3,4],"c":3}' },
+		{ json:"{\n  \"a\":1,\n  \"b\":[2,3,4],\n  \"c\":3\n}",                       opts:{wrap:10} },
+		{ json:"{\n  \"a\":1,\n  \"b\":[\n    2,\n    3,\n    4\n  ],\n  \"c\":3\n}", opts:{wrap:true} }
+	]},
+
+	{value:{hooo:42,whee:['yaaa','oooo','booy'],zoop:"whoop"}, tests:[
+		{ json:"{\"hooo\":42,\n \"whee\":[\"yaaa\",\n         \"oooo\",\n         \"booy\"],\n \"zoop\":\"whoop\"}", opts:{wrap:20,short:true} }
+	]},
+
+	{value:{ a:[ {x:"foo",y:"jim"}, {x:"bar",y:"jam"} ] }, tests:[
+		{ json:"{\"a\":[{\"x\":\"foo\",\n       \"y\":\"jim\"},\n      {\"x\":\"bar\",\n       \"y\":\"jam\"}]}", opts:{wrap:true,short:true} }
+	]},
+
+	{value:{"abcdefghij"=>[{"abcdefghijklmnop"=>{}}]}, tests:[
+		{ json:"{\"abcdefghij\":[{\"abcdefghijklmnop\":{}}]}" },
+		{ json:"{\"abcdefghij\" : [{\"abcdefghijklmnop\" : {}}]}", opts:{wrap:1, short:true, around_colon_n:1} },
+	]},
+
+	{value:{foo:{}}, tests:[
+		{ json:"{\"foo\":{}}" },
+		{ json:"{\"foo\":{}}",        opts:{wrap:false} },
+		{ json:"{\n  \"foo\":{}\n}",  opts:{wrap:5}    },
+		{ json:"{\"foo\":{}}",        opts:{wrap:1, short:true} }
+	]},
+
+	{value:["foo",{},"bar"], tests:[
+		{ json:"[\n  \"foo\",\n  {},\n  \"bar\"\n]",  opts:{wrap:1} },
+		{ json:"[\"foo\",\n {},\n \"bar\"]",          opts:{wrap:1, short:true} }
+	]},
+
+	{value:["foo",[],"bar"], tests:[
+		{ json:"[\n  \"foo\",\n  [],\n  \"bar\"\n]",  opts:{wrap:1} },
+		{ json:"[\"foo\",\n [],\n \"bar\"]",          opts:{wrap:1, short:true} }
+	]},
+
+	{value:["foo",[{},[{foo:[]},42]],"bar"], tests:[
+		{ json:"[\"foo\",\n [{},\n  [{\"foo\":[]},\n   42]],\n \"bar\"]",  opts:{wrap:1, short:true} },
+	]},
+
+	{value:Class.new{ def to_json(*a); {a:1}.to_json(*a); end }.new, tests:[
+		{ json:'{  "a":1}' },
+		{ json:'{  "a":1}', opts:{wrap:true} },
+		{ json:'{"a":1}',   opts:{indent:''} },
+	]},
+
+	{value:Class.new{ def to_json(*a); JSON.neat_generate({a:1},*a); end }.new, tests:[
+		{ json:'{"a":1}' },
+		{ json:"{\n  \"a\":1\n}", opts:{wrap:true} }
+	]}
+
+]
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neatjson
 version: !ruby/object:Gem::Version
-  version: '0.6'
+  version: 0.6.1
 platform: ruby
 authors:
 - Gavin Kistner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-26 00:00:00.000000000 Z
+date: 2015-10-12 00:00:00.000000000 Z
 dependencies: []
 description: 'Generate JSON strings from Ruby objects with flexible formatting options.
   Key features: keep arrays and objects on a single line when they fit; format floats
@@ -48,8 +48,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4
 summary: Pretty, powerful, flexible JSON generation.
 test_files: []
+has_rdoc: yard