neatjson 0.4 → 0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffd7e1b6d8e702a1ac021f7c8dceb24bce52b4a6
-  data.tar.gz: 956fa2524dd0f720b04b932fef9ce133311b49bf
+  metadata.gz: a0459381e78a14d8183c5262ac82b70bc1337ffe
+  data.tar.gz: bf9ee16f7b298fe1c9d97373444c39ba5f31f7b5
 SHA512:
-  metadata.gz: c41fa707a6227ac5eec7673626f5e0dddcde3f37b946788b6625f9ac22613e93493f0fb02616215550c7af19eb22f33098a856778826238e7e62d3d9b9b73ec9
-  data.tar.gz: 8b1f03bdb86c45d6a6b28197b5e7cfd0091dd8f8feab2123d1a4a758da2c0341e5a533098c1a1a03ac49a04e2dc68a23a3cb5d453ce82c746e14f383e96ccce5
+  metadata.gz: 85c571efbf5b496201b0f9147e0e830346d3441c0aca0c2118cff978b48f66ec9e6f0ea5b11d4aa14ae43720bfb7863d9b5d39f9a99d279cb2099ce879448731
+  data.tar.gz: 87debda657ab8272bd8039f452c83c4f6083c491258918935e7aee0497fbbcfe8468070b8e32e6219c1362d4c594c95a33ecac797c3d8a634e63ea51fb3dabf8

data/README.md

@@ -62,10 +62,10 @@ puts JSON.neat_generate(o,sorted:true,wrap:40)
 #=>   "str":"yes\nplease"
 #=> }
 
-puts JSON.neat_generate(o,sorted:true,wrap:40,decimals:1)
+puts JSON.neat_generate(o,sorted:true,wrap:40,decimals:2)
 #=> {
-#=>   "a":[42.0,17.0],
-#=>   "b":42.0,
+#=>   "a":[42,17],
+#=>   "b":42.01,
 #=>   "longer":true,
 #=>   "str":"yes\nplease"
 #=> }
@@ -126,7 +126,7 @@ You may pass any of the following option symbols to `neat_generate`:
   * _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 numbers; use `false` to keep numeric values precise. 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`
@@ -157,6 +157,11 @@ For other communication you can [email the author directly](mailto:!@phrogz.net?
 
 ## HISTORY
 
+* **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.
 

data/lib/neatjson.rb

@@ -11,7 +11,7 @@ module JSON
 	# @option opts [Boolean] :short      (false) Keep the output 'short' when wrapping, putting opening brackets on the same line as the first value, and closing brackets on the same line as the last item.
 	# @option opts [Boolean] :sorted     (false) Sort the keys for objects to be in alphabetical order.
 	# @option opts [Boolean] :aligned    (false) When wrapping objects, align the colons (only per object).
-	# @option opts [Integer] :decimals    (null) Decimal precision to use for numbers; omit to keep numberic values precise.
+	# @option opts [Integer] :decimals    (null) Decimal precision to use for floats; omit to keep numberic values precise.
 	# @option opts [Integer] :padding        (0) Number of spaces to put inside brackets/braces for both arrays and objects.
 	# @option opts [Integer] :array_padding  (0) Number of spaces to put inside brackets for arrays. Overrides `:padding`.
 	# @option opts [Integer] :object_padding (0) Number of spaces to put inside braces for objects. Overrides `:padding`.
@@ -41,12 +41,14 @@ module JSON
 
 		build = ->(o,indent) do
 			case o
-				when String               then "#{indent}#{o.inspect}"
+				when String,Integer       then "#{indent}#{o.inspect}"
 				when Symbol               then "#{indent}#{o.to_s.inspect}"
 				when TrueClass,FalseClass then "#{indent}#{o}"
 				when NilClass             then "#{indent}null"
-				when Numeric
-					if opts[:decimals]
+				when Float
+					if (o==o.to_i) && (o.to_s !~ /e/)
+						build[o.to_i,indent]
+					elsif opts[:decimals]
 						"#{indent}%.#{opts[:decimals]}f" % o
 					else
 						"#{indent}#{o}"

data/neatjson.gemspec

@@ -2,13 +2,13 @@
 require 'date'
 Gem::Specification.new do |s|
 	s.name          = "neatjson"
-	s.version       = "0.4"
+	s.version       = "0.5"
 	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. The most important feature is that it can behave like pp, keeping arrays and objects on a single line when they fit."
+	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']

data/test/test_neatjson.js

@@ -0,0 +1,23 @@
+var neatJSON = require('../javascript/neatjson.js').neatJSON;
+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){
+			console.log(mesg+")");
+			console.log('EXPECTED');
+			console.log(test.json);
+			console.log('ACTUAL');
+			console.log(json,"\n");
+		}
+	});
+});

data/test/test_neatjson.rb

@@ -1,138 +1,15 @@
-require 'minitest/autorun'
 require '../lib/neatjson'
-
-class Dummy
-	def to_json(*a)
-		{a:1}.to_json(*a)
-	end
-end
-
-class Flexi
-	def to_json(*a)
-		JSON.neat_generate({a:1},*a)
-	end
-end
-
-class TestFlexiJSON < Minitest::Unit::TestCase
-	def test_booleans
-		assert_equal "true",       JSON.neat_generate(true)
-		assert_equal "false",      JSON.neat_generate(false)
-		assert_equal "null",       JSON.neat_generate(nil)
-	end
-
-	def test_numbers
-		assert_equal "5",          JSON.neat_generate(5)
-		assert_equal "4.2",        JSON.neat_generate(4.2)
-		assert_equal "4.20",       JSON.neat_generate(4.2,  decimals:2)
-		assert_equal "4.20",       JSON.neat_generate(4.199,decimals:2)
-		assert_equal "4.20",       JSON.neat_generate(4.204,decimals:2)
-
-		assert_equal "4",          JSON.neat_generate(4.2, decimals:0)
-		assert_equal "5",          JSON.neat_generate(4.9, decimals:0)
-		assert_equal "-2",         JSON.neat_generate(-1.9,decimals:0)
-		assert_equal "-2",         JSON.neat_generate(-2.4,decimals:0)
-
-		assert_equal "1.0e+23",    JSON.neat_generate(1e23)
-		assert_equal "1.0e-09",    JSON.neat_generate(1e-9)
-	end
-
-	def test_strings
-		assert_equal '"foo"',      JSON.neat_generate('foo')
-		assert_equal '"foo"',      JSON.neat_generate(:foo)
-		assert_equal '"foo\nbar"', JSON.neat_generate("foo\nbar")
-	end
-
-	def test_arrays
-		@a1 = [1,2,3,4,[5,6,7,[8,9,10],11,12]]
-		assert_equal "[1,2,3,4,[5,6,7,[8,9,10],11,12]]", JSON.neat_generate(@a1)
-		assert_equal "[\n  1,\n  2,\n  3,\n  4,\n  [5,6,7,[8,9,10],11,12]\n]", JSON.neat_generate(@a1,wrap:30)
-		assert_equal "[\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]", JSON.neat_generate(@a1,wrap:20)
-		assert_equal "[\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]", JSON.neat_generate(@a1,wrap:true)
-		assert_equal "[\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]", JSON.neat_generate(@a1,wrap:true,indent:"\t")
-		assert_equal "[1,2,3,4,[5,6,7,[8,9,10],11,12]]", JSON.neat_generate(@a1,array_padding:0)
-		assert_equal "[ 1,2,3,4,[ 5,6,7,[ 8,9,10 ],11,12 ] ]", JSON.neat_generate(@a1,array_padding:1)
-		assert_equal "[  1,2,3,4,[  5,6,7,[  8,9,10  ],11,12  ]  ]", JSON.neat_generate(@a1,array_padding:2)
-		assert_equal "[1, 2, 3, 4, [5, 6, 7, [8, 9, 10], 11, 12]]", JSON.neat_generate(@a1,after_comma:1)
-		assert_equal "[ 1, 2, 3, 4, [ 5, 6, 7, [ 8, 9, 10 ], 11, 12 ] ]", JSON.neat_generate(@a1,after_comma:1,array_padding:1)
-		assert_equal "[1,\n 2,\n 3,\n 4,\n [5,\n  6,\n  7,\n  [8,\n   9,\n   10],\n  11,\n  12]]", JSON.neat_generate(@a1,short:true,wrap:true)
-		assert_equal "[1,\n 2,\n 3,\n 4,\n [5,\n  6,\n  7,\n  [8,\n   9,\n   10],\n  11,\n  12]]", JSON.neat_generate(@a1,short:true,wrap:true,after_comma:1)
-		assert_equal "[ 1,\n  2,\n  3,\n  4,\n  [ 5,\n    6,\n    7,\n    [ 8,\n      9,\n      10 ],\n    11,\n    12 ] ]", JSON.neat_generate(@a1,short:true,wrap:true,array_padding:1)
-
-		@a2 = [1,2,3]
-		assert_equal "[1,2,3]",     JSON.neat_generate(@a2)
-		assert_equal "[1 ,2 ,3]",   JSON.neat_generate(@a2,before_comma:1)
-		assert_equal "[1 , 2 , 3]", JSON.neat_generate(@a2,around_comma:1)
-	end
-
-	def test_hashes
-		@h1 = {b:1,a:2}
-		assert_equal '{"b":1,"a":2}', JSON.neat_generate(@h1)
-		assert_equal '{"a":2,"b":1}', JSON.neat_generate(@h1,sorted:true)
-
-		assert_equal '{"a":2, "b":1}',       JSON.neat_generate(@h1,sorted:true,after_comma:1)
-		assert_equal '{"a" :2,"b" :1}',      JSON.neat_generate(@h1,sorted:true,before_colon:1)
-		assert_equal '{"a": 2,"b": 1}',      JSON.neat_generate(@h1,sorted:true,after_colon:1)
-		assert_equal '{"a" : 2,"b" : 1}',    JSON.neat_generate(@h1,sorted:true,before_colon:1,after_colon:1)
-		assert_equal '{"a" : 2, "b" : 1}',   JSON.neat_generate(@h1,sorted:true,before_colon:1,after_colon:1,after_comma:1)
-		assert_equal '{ "a" : 2, "b" : 1 }', JSON.neat_generate(@h1,sorted:true,before_colon:1,after_colon:1,after_comma:1,padding:1)
-		assert_equal '{ "a" : 2, "b" : 1 }', JSON.neat_generate(@h1,sorted:true,around_colon:1,after_comma:1,object_padding:1)
-		assert_equal '{"a" : 2, "b" : 1}',   JSON.neat_generate(@h1,sorted:true,before_colon:1,after_colon:1,after_comma:1,array_padding:1)
-		assert_equal '{  "a"  :  2, "b"  :  1  }', JSON.neat_generate(@h1,sorted:true,around_colon:2,after_comma:1,padding:2)
-		assert_equal '{  "a":2, "b":1  }', JSON.neat_generate(@h1,sorted:true,after_comma:1,padding:2)
-
-		@h2 = {b:1,aaa:2,cc:3}
-		assert_equal %Q{{\n  "b":1,\n  "aaa":2,\n  "cc":3\n}},    JSON.neat_generate(@h2,wrap:true)
-		assert_equal %Q{{\n  "b"  :1,\n  "aaa":2,\n  "cc" :3\n}}, JSON.neat_generate(@h2,wrap:true,aligned:true)
-		assert_equal %Q{{"b":1,"aaa":2,"cc":3}},                  JSON.neat_generate(@h2,aligned:true)
-		assert_equal %Q{{\n  "aaa":2,\n  "b"  :1,\n  "cc" :3\n}}, JSON.neat_generate(@h2,wrap:true,aligned:true,sorted:true)
-
-		@h3 = {a:1}
-		assert_equal '{"a":1}', JSON.neat_generate(@h3)
-		assert_equal "{\n  \"a\":1\n}", JSON.neat_generate(@h3,wrap:true)
-
-		@h4 = { b:17, a:42 }
-		assert_equal "{\"a\":42,\n \"b\":17}", JSON.neat_generate(@h4,wrap:10,sorted:true,short:true)
-	end
-
-	def test_mixed
-		a = [1,{a:2},3]
-		assert_equal '[1,{"a":2},3]', JSON.neat_generate(a)
-		assert_equal '[ 1,{ "a":2 },3 ]', JSON.neat_generate(a,padding:1)
-		assert_equal '[ 1, { "a":2 }, 3 ]', JSON.neat_generate(a,padding:1,after_comma:1)
-		assert_equal %Q{[\n  1,\n  {\n    "a":2\n  },\n  3\n]}, JSON.neat_generate(a,wrap:true)
-		assert_equal %Q{[\n  1,\n  {"a":2},\n  3\n]}, JSON.neat_generate(a,wrap:10)
-
-		a = [1,{a:2,b:3},4]
-		assert_equal "[1,\n {\"a\":2,\n  \"b\":3},\n 4]", JSON.neat_generate(a,wrap:0,short:true)
-
-		h = {a:1,b:[2,3,4],c:3}
-		assert_equal '{"a":1,"b":[2,3,4],"c":3}', JSON.neat_generate(h)
-		assert_equal %Q{{\n  "a":1,\n  "b":[2,3,4],\n  "c":3\n}}, JSON.neat_generate(h,wrap:10)
-		assert_equal %Q{{\n  "a":1,\n  "b":[\n    2,\n    3,\n    4\n  ],\n  "c":3\n}}, JSON.neat_generate(h,wrap:true)
-
-		h = {hooo:42,whee:%w[yaaa oooo booy],zoop:"whoop"}
-		assert_equal <<-ENDFORMAT.chomp, JSON.neat_generate(h,wrap:20,short:true)
-{"hooo":42,
- "whee":["yaaa",
-         "oooo",
-         "booy"],
- "zoop":"whoop"}
-		ENDFORMAT
-
-		h = { a:[ {x:"foo",y:"jim"}, {x:"bar",y:"jam"} ] }
-		assert_equal <<-ENDFORMAT.chomp, JSON.neat_generate(h,wrap:true,short:true)
-{"a":[{"x":"foo",
-       "y":"jim"},
-      {"x":"bar",
-       "y":"jam"}]}
-		ENDFORMAT
-	end
-
-	def test_custom
-		assert_equal '{  "a":1}', JSON.neat_generate(Dummy.new)
-		assert_equal '{  "a":1}', JSON.neat_generate(Dummy.new,wrap:true)
-		assert_equal '{"a":1}',   JSON.neat_generate(Dummy.new,indent:'')
-		assert_equal '{"a":1}',   JSON.neat_generate(Flexi.new)
-		assert_equal "{\n  \"a\":1\n}", JSON.neat_generate(Flexi.new,wrap:true)
-	end
-end
+require './tests'
+
+TESTS.each do |value_tests|
+	val, tests = value_tests[:value], value_tests[:tests]
+	tests.each do |test|
+		begin
+			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
+		rescue StandardError => e
+			puts e
+		end
+	end
+end

data/test/tests.js

@@ -0,0 +1,126 @@
+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} }
+	]},
+
+	{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} }
+	// ]}
+]
+

data/test/tests.rb

@@ -0,0 +1,124 @@
+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} }
+	]},
+
+	{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} }
+	]}
+]
+

metadata

@@ -1,18 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: neatjson
 version: !ruby/object:Gem::Version
-  version: '0.4'
+  version: '0.5'
 platform: ruby
 authors:
 - Gavin Kistner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-18 00:00:00.000000000 Z
+date: 2015-04-19 00:00:00.000000000 Z
 dependencies: []
-description: Generate JSON strings from Ruby objects with flexible formatting options.
-  The most important feature is that it can behave like pp, keeping arrays and objects
-  on a single line when they fit.
+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.'
 email: gavin@phrogz.net
 executables: []
 extensions: []
@@ -21,11 +22,12 @@ files:
 - ".yardopts"
 - LICENSE.txt
 - README.md
-- html/neatjson.html
-- html/neatjson.js
 - lib/neatjson.rb
 - neatjson.gemspec
+- test/test_neatjson.js
 - test/test_neatjson.rb
+- test/tests.js
+- test/tests.rb
 homepage: http://github.com/Phrogz/NeatJSON
 licenses:
 - MIT license (MIT)

data/html/neatjson.html

@@ -1,151 +0,0 @@
-<!DOCTYPE html>
-<html><head>
-	<meta charset="utf-8">
-	<title>NeatJSON Online</title>
-	<style type="text/css">
-		h1 { background:#444; color:#ccc; text-align:center; margin:0; padding:0.2em 0; margin-bottom:1em; }
-		html, body { height:100%; min-height:100%; padding:0; margin:0; background:#eee; }
-		#input, #output, #code { display:block; width:90%; margin:1em auto; height:35%; background:#fff; }
-		#code { height:1em; background:none; }
-		#output { border:1px solid green; background:rgba(100,255,0,0.5); color:#080 }
-		label { padding-right:0.6em }
-		#options { width:90%; margin:1em auto }
-		.option { display:inline-block; margin-right:2em; user-select:none; -webkit-user-select:none; }
-		input[type="range"] { width:5em }
-		b { background:yellow }
-	</style>
-</head><body>
-<h1>NeatJSON Online v0.4</h1>
-<div id="options">
-	<div class="option-row">
-		<span class="option">
-			<label><input	type="checkbox" id="wrap" checked> Wrap?</label>
-			<label id="wrapopts1">width <input type="text" id="wrapSize" value="40" size="3"></label>
-			<label id="wrapopts2"><input type="checkbox" id="short"> Short?</label>
-			<label id="wrapopts3"><input type="checkbox" id="aligned"> Align Keys?</label>
-		</span>
-		<span class="option"><label><input type="checkbox" id="sorted"> Sort Keys?</label></span>
-		<span class="option">
-			<label><input	type="checkbox" id="useDecimals"> Format Decimals?</label>
-			<input type="text" id="decimals" value="3" size="3" min="0" max="10" style="visibility:hidden">
-		</span>
-	</div><div class="option-row">
-		<span class="option"><label>Indent Spaces <input type="range" id="indent" value="2" min="0" max="5" step="1"></label></span>
-		<span class="option"><label>Array Padding<input type="range" id="arrayPadding"  value="0" min="0" max="3" step="1"></label></span>
-		<span class="option"><label>Object Padding<input type="range" id="objectPadding"  value="0" min="0" max="3" step="1"></label></span>
-	</div><div class="option-row">
-		<span class="option"><label>Before Comma<input type="range" id="beforeComma"   value="0" min="0" max="3" step="1"></label></span>
-		<span class="option"><label>After Comma<input type="range" id="afterComma"   value="0" min="0" max="3" step="1"></label></span>
-		<span class="option"><label>Before Colon<input type="range" id="beforeColon"   value="0" min="0" max="3" step="1"></label></span>
-		<span class="option"><label>After Colon<input type="range" id="afterColon"   value="0" min="0" max="3" step="1"></label></span>
-	</div>
-</div>
-
-	<textarea id="input">["foo","bar",{"dogs":42,"piggies":0,"cats":7},{"jimmy":[1,2,3,4,5],"jammy":3.14159265358979,"hot":"pajammy"}]</textarea>
-	<pre id="code"></pre>
-	<pre id="output"></pre>
-	<script type="text/javascript" src="neatjson.js"></script>
-	<script type="text/javascript">
-	var opts = document.querySelectorAll('input');
-	[].forEach.call(opts,function(opt){
-		opt.addEventListener('input',neaten,false);
-		opt.addEventListener('change',neaten,false);
-		opt.addEventListener('click',neaten,false);
-	})
-
-	var inp = document.querySelector('#input'),
-	    cde = document.querySelector('#code'),
-	    out = document.querySelector('#output');
-	var opts;
-
-	var wrap  = document.querySelector('#wrap'),
-	    wdth  = document.querySelector('#wrapSize'),
-	    shrt  = document.querySelector('#short'),
-	    dec0  = document.querySelector('#useDecimals'),
-	    decN  = document.querySelector('#decimals'),
-	    sort  = document.querySelector('#sorted'),
-	    algn  = document.querySelector('#aligned'),
-	    indN  = document.querySelector('#indent'),
-	    arrayPadding  = document.querySelector('#arrayPadding'),
-	    objectPadding = document.querySelector('#objectPadding'),
-	    beforeComma   = document.querySelector('#beforeComma'),
-	    afterComma    = document.querySelector('#afterComma'),
-	    beforeColon   = document.querySelector('#beforeColon'),
-	    afterColon    = document.querySelector('#afterColon');
-
-	window.onload = neaten;
-	inp.addEventListener('input',neaten,false);
-
-	function neaten(){
-		try{
-			changeOptions();
-			if (isEmpty(opts)){
-				code.innerHTML = "var json = neatJSON(obj);";
-			}else{
-				var parts=[];
-				for (var k in opts) parts.push('<b>'+k+'</b>:'+JSON.stringify(opts[k]));
-				code.innerHTML = "var json = neatJSON(obj,{ "+parts.join(', ')+" });";
-			}
-			out.innerHTML = neatJSON(JSON.parse(inp.value),opts);
-		}catch(e){
-			out.innerHTML = e;
-		}
-	}
-
-	function changeOptions() {
-		opts = {};
-		if (!wrap.checked || wdth.value!=80) opts.wrap = wrap.checked ? (wdth.value=='' ? true : wdth.value*1) : false;
-		if (wrap.checked && shrt.checked) opts.short = true;
-		document.querySelector('#wrapopts1').style.visibility = wrap.checked ? '' : 'hidden';
-		document.querySelector('#wrapopts2').style.visibility = wrap.checked ? '' : 'hidden';
-		document.querySelector('#wrapopts3').style.visibility = wrap.checked ? '' : 'hidden';
-
-		if (indN.value!=2 && (wrap.checked && !shrt.checked)) opts.indent = repeat(' ',indN.value*1);
-
-		if (dec0.checked){
-			opts.decimals = decN.value*1;
-			decN.style.visibility = '';
-		}else{
-			decN.style.visibility = 'hidden';
-		}
-
-		if (sort.checked) opts.sorted = true;
-		if (wrap.checked && algn.checked) opts.aligned = true;
-
-		if (arrayPadding.value!=0 && objectPadding.value==arrayPadding.value){
-			opts.padding = arrayPadding.value*1;
-		}else{
-			if (arrayPadding.value!=0) opts.arrayPadding = arrayPadding.value*1;
-			if (objectPadding.value!=0) opts.objectPadding = objectPadding.value*1;
-		}
-		if (beforeComma.value!=0 && beforeComma.value==afterComma.value){
-			opts.aroundComma = beforeComma.value*1;
-		}else{
-			if (beforeComma.value!=0) opts.beforeComma = beforeComma.value*1;
-			if (afterComma.value!=0) opts.afterComma = afterComma.value*1;
-		}
-		if (beforeColon.value!=0 && beforeColon.value==afterColon.value){
-			opts.aroundColon = beforeColon.value*1;
-		}else{
-			if (beforeColon.value!=0) opts.beforeColon = beforeColon.value*1;
-			if (afterColon.value!=0) opts.afterColon = afterColon.value*1;
-		}
-	}
-
-	function repeat(str,times){ // http://stackoverflow.com/a/17800645/405017
-		var result = '';
-		while(true){
-			if (times & 1) result += str;
-			times >>= 1;
-			if (times) str += str;
-			else break;
-		}
-		return result;
-	}
-
-	function isEmpty(obj){
-		for (var k in obj) return false;
-		return true;
-	}
-</script>
-</body></html>

data/html/neatjson.js

@@ -1,106 +0,0 @@
-function neatJSON(value,opts){
-	opts = opts || {}
-	if (!('wrap'          in opts)) opts.wrap = 80;
-	if (opts.wrap==true) opts.wrap = -1;
-	if (!('indent'        in opts)) opts.indent = '  ';
-	if (!('arrayPadding'  in opts)) opts.arrayPadding  = ('padding' in opts) ? opts.padding : 0;
-	if (!('objectPadding' in opts)) opts.objectPadding = ('padding' in opts) ? opts.padding : 0;
-	if (!('afterComma'    in opts)) opts.afterComma    = ('aroundComma' in opts) ? opts.aroundComma : 0;
-	if (!('beforeComma'   in opts)) opts.beforeComma   = ('aroundComma' in opts) ? opts.aroundComma : 0;
-	if (!('afterColon'    in opts)) opts.afterColon    = ('aroundColon' in opts) ? opts.aroundColon : 0;
-	if (!('beforeColon'   in opts)) opts.beforeColon   = ('aroundColon' in opts) ? opts.aroundColon : 0;
-
-	var apad  = repeat(' ',opts.arrayPadding),
-	    opad  = repeat(' ',opts.objectPadding),
-	    comma = repeat(' ',opts.beforeComma)+','+repeat(' ',opts.afterComma),
-	    colon = repeat(' ',opts.beforeColon)+':'+repeat(' ',opts.afterColon);
-
-	return build(value,'');
-
-	function build(o,indent){
-		if (o===null || o===undefined) return indent+'null';
-		else{
-			switch(o.constructor){
-				case Number:
-					return indent + (('decimals' in opts) ? o.toFixed(opts.decimals) : (o+''));
-
-				case Array:
-					var pieces  = o.map(function(v){ return build(v,'') });
-					var oneLine = indent+'['+apad+pieces.join(comma)+apad+']';
-					if (opts.wrap===false || oneLine.length<=opts.wrap) return oneLine;
-					if (opts.short){
-						var indent2 = indent+' '+apad;
-						pieces = o.map(function(v){ return build(v,indent2) });
-						pieces[0] = pieces[0].replace(indent2,indent+'['+apad);
-						pieces[pieces.length-1] = pieces[pieces.length-1]+apad+']';
-						return pieces.join(',\n');
-					}else{
-						var indent2 = indent+opts.indent;
-						return indent+'[\n'+o.map(function(v){ return build(v,indent2) }).join(',\n')+'\n'+indent+']';
-					}
-
-				case Object:
-					var keyvals=[],i=0;
-					for (var k in o) keyvals[i++] = [JSON.stringify(k), build(o[k],'')];
-					if (opts.sorted) keyvals = keyvals.sort(function(kv1,kv2){ kv1=kv1[0]; kv2=kv2[0]; return kv1<kv2?-1:kv1>kv2?1:0 });
-					keyvals = keyvals.map(function(kv){ return kv.join(colon) }).join(comma);
-					var oneLine = indent+"{"+opad+keyvals+opad+"}";
-					if (opts.wrap===false || oneLine.length<opts.wrap) return oneLine;
-					if (opts.short){
-						var keyvals=[],i=0;
-						for (var k in o) keyvals[i++] = [indent+' '+opad+JSON.stringify(k),o[k]];
-						if (opts.sorted) keyvals = keyvals.sort(function(kv1,kv2){ kv1=kv1[0]; kv2=kv2[0]; return kv1<kv2?-1:kv1>kv2?1:0 });
-						keyvals[0][0] = keyvals[0][0].replace(indent+' ',indent+'{');
-						if (opts.aligned){
-							var longest = 0;
-							for (var i=keyvals.length;i--;) if (keyvals[i][0].length>longest) longest = keyvals[i][0].length;
-							var padding = repeat(' ',longest);
-							for (var i=keyvals.length;i--;) keyvals[i][0] = padRight(padding,keyvals[i][0]);
-						}
-						for (var i=keyvals.length;i--;){
-							var k=keyvals[i][0], v=keyvals[i][1];
-							var indent2 = repeat(' ',(k+colon).length);
-							var oneLine = k+colon+build(v,'');
-							// console.log(opts.wrap, oneLine.length, !v, typeof v)
-							keyvals[i] = (opts.wrap===false || oneLine.length<=opts.wrap || !v || typeof v!="object") ? oneLine : (k+colon+build(v,indent2).replace(/^\s+/,''));
-						}
-						return keyvals.join(',\n') + opad + '}';
-					}else{
-						var keyvals=[],i=0;
-						for (var k in o) keyvals[i++] = [indent+opts.indent+JSON.stringify(k),o[k]];
-						if (opts.sorted) keyvals = keyvals.sort(function(kv1,kv2){ kv1=kv1[0]; kv2=kv2[0]; return kv1<kv2?-1:kv1>kv2?1:0 });
-						if (opts.aligned){
-							var longest = 0;
-							for (var i=keyvals.length;i--;) if (keyvals[i][0].length>longest) longest = keyvals[i][0].length;
-							var padding = repeat(' ',longest);
-							for (var i=keyvals.length;i--;) keyvals[i][0] = padRight(padding,keyvals[i][0]);
-						}
-						var indent2 = indent+opts.indent;
-						for (var i=keyvals.length;i--;){
-							var k=keyvals[i][0], v=keyvals[i][1];
-							var oneLine = k+colon+build(v,'');
-							keyvals[i] = (opts.wrap===false || oneLine.length<=opts.wrap || !v || typeof v!="object") ? oneLine : (k+colon+build(v,indent2).replace(/^\s+/,''));
-						}
-						return indent+'{\n'+keyvals.join(',\n')+'\n'+indent+'}'
-					}
-
-				default:
-					return indent+JSON.stringify(o);
-			}
-		}
-	}
-
-	function repeat(str,times){ // http://stackoverflow.com/a/17800645/405017
-		var result = '';
-		while(true){
-			if (times & 1) result += str;
-			times >>= 1;
-			if (times) str += str;
-			else break;
-		}
-		return result;
-	}
-	function padRight(pad, str){
-		return (str + pad).substring(0, pad.length);
-	}
-}