neatjson 0.9 → 0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 993364bb8a9a2afda35c7a298954472e96bb3e0d
-  data.tar.gz: 781ace75559493a25110d01b51471bfee5304cca
+SHA256:
+  metadata.gz: d2820b11ac77b92de38f28231d4826cd1e77ad0f9140da5b9e41eaf995dee5ce
+  data.tar.gz: b5cdc8378b227f574f8de0d517e7964ca6cfe96e40ff30873d6a412cda5844f4
 SHA512:
-  metadata.gz: f65b6adc2a60f76b2ab0b18824d9f5586cf411db7efe2a59004df1848168af390f3572e35bcc41b4df276e35d970591860eeb7b5f3f9f62ccbdc0f92e6edb15c
-  data.tar.gz: e3de0825b58bbf313414e64508df9113c174ca5cfd9c9f9e73b5dc007eba0429b222d82c18ec7d6f53c248e0ac96a3e8c92ced94de1884605b5337ae418a2a8d
+  metadata.gz: 1681f5edb27ec6075e5bfd1d9c8a9e806b3ee4d2f76dea65d97a45d5b22fa4feefa20b2507ff060dd424cca346b4bee6ebdcd05735543dde71170f4ad2d55125
+  data.tar.gz: 14a3138ab4eb40fce7f9052e250f7c1ca7394c460b3d3f4cc8ccd87d8b91bed870d395719c3c3a0343990284af37589ef5e3abc86bd0f58c2b40ed946197c8ba

data/LICENSE.txt

@@ -1,7 +1,7 @@
-Copyright (c) 2015-2018 Gavin Kistner
+Copyright (c) 2015-2019 Gavin Kistner
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -189,29 +189,33 @@ var json = neatJSON( myValue, { arrayPadding:1, afterComma:1, beforeColonN:2, in
 local json = neatJSON( myValue, { arrayPadding=1, afterComma=1, beforeColonN=2, indentLast=true } )
 ~~~
 
-* `wrap`           — Maximum line width before wrapping. Use `false` to never wrap, `true` to always wrap. default:`80`
-* `indent`         — Whitespace used to indent each level when wrapping. default:`"  "` (two spaces)
-* `indent_last`    — Indent the closing bracket/brace for arrays and objects? default:`false`
-* `short`          — Put opening brackets on the same line as the first value, closing brackets on the same line as the last? default:`false`
+* `wrap`                — Maximum line width before wrapping. Use `false` to never wrap, `true` to always wrap. default:`80`
+* `indent`              — Whitespace used to indent each level when wrapping. default:`"  "` (two spaces)
+* `indent_last`         — Indent the closing bracket/brace for arrays and objects? default:`false`
+* `short`               — Put opening brackets on the same line as the first value, closing brackets on the same line as the last? default:`false`
   * _This causes the `indent` and `indent_last` options to be ignored, instead basing indentation on array and object padding._
-* `sort`           — Sort objects' keys in alphabetical order (`true`), or supply a lambda for custom sorting. default:`false`
+* `sort`                — Sort objects' keys in alphabetical order (`true`), or supply a lambda for custom sorting. default:`false`
   * If you supply a lambda to the `sort` option, it will be passed three values: the (string) name of the key, the associated value, and the object being sorted, e.g. `{ sort:->(key,value,hash){ Float(value) rescue Float::MAX } }`
-* `aligned`        — When wrapping objects, line up the colons (per object)? default:`false`
-* `decimals`       — Decimal precision for non-integer numbers; use `false` to keep 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`
-* `lua`            — (Lua only) Output a Lua table literal instead of JSON? default:`false`
+* `aligned`             — When wrapping objects, line up the colons (per object)? default:`false`
+* `decimals`            — Decimal precision for non-integer numbers; use `false` to keep values precise. default:`false`
+* `trim_trailing_zeros` — Remove extra zeros at the end of floats, e.g. `1.2000` becomes `1.2`. default:`false`
+* `force_floats`        — Force every integer value written to the file to be a float, e.g. `12` becomes `12.0`. default:`false`
+* `force_floats_in`     — Specify an array of object key names under which all integer values are treated as floats.
+  For example, serializing `{a:[1, 2, {a:3, b:4}], c:{a:5, d:6}` with `force_floats_in:['a']` would produce `{"a":[1.0, 2.0, {"a":3.0, "b":4}], "c":{"a":5.0, "d":6}}`.
+* `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`
+* `lua`                 — (Lua only) Output a Lua table literal instead of JSON? default:`false`
 * `emptyTablesAreObjects` — (Lua only) Should `{}` in Lua become a JSON object (`{}`) or JSON array (`[]`)? default:`false` (array)
 
 You may omit the 'value' and/or 'object' parameters in your `sort` lambda if desired. For example:
@@ -257,7 +261,7 @@ _Note that the JavaScript and Lua versions of NeatJSON do not provide a mechanis
 
 ## License & Contact
 
-NeatJSON is copyright ©2015–2019 by Gavin Kistner and is released under
+NeatJSON is copyright ©2015–2022 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.
 
@@ -274,6 +278,11 @@ For other communication you can [email the author directly](mailto:!@phrogz.net?
 
 ## HISTORY
 
+* **v0.10** — August 29, 2022
+  * Add `force_floats` and `force_floats_in` to support serialization for non-standard parsers that differentiate between integers and floats.
+  * Add `trim_trailing_zeros` option to convert the `decimals` output from e.g. `5.40000` to `5.4`.
+  * Convert JavaScript version to require ECMAScript 6 for performance.
+
 * **v0.9** — July 29, 2019
   * Add Lua version, serializing to both JSON and Lua table literals
   * All languages serialize Infinity/-Infinity to JSON as `9e9999` and `-9e9999`

data/lib/neatjson.rb

@@ -6,13 +6,16 @@ module JSON
 	# @author Gavin Kistner <!@phrogz.net>
 	# @param object [Object] the object to serialize
 	# @param opts [Hash] the formatting options
-	# @option opts [Integer] :wrap        (80)    The maximum line width before wrapping. Use `false` to never wrap, or `true` to always wrap.
-	# @option opts [String]  :indent      ("  ")  Whitespace used to indent each level when wrapping (without the :short option).
-	# @option opts [Boolean] :indent_last (false) Indent the closing bracket for arrays and objects (without the :short option).
-	# @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] :sort        (false) Sort the keys for objects to be in alphabetical order (`true`), or supply a lambda to determine ordering.
-	# @option opts [Boolean] :aligned     (false) When wrapping objects, align the colons (only per object).
-	# @option opts [Integer] :decimals     (null) Decimal precision to use for floats; omit to keep numberic values precise.
+	# @option opts [Integer] :wrap            (80)    The maximum line width before wrapping. Use `false` to never wrap, or `true` to always wrap.
+	# @option opts [String]  :indent          ("  ")  Whitespace used to indent each level when wrapping (without the :short option).
+	# @option opts [Boolean] :indent_last     (false) Indent the closing bracket for arrays and objects (without the :short option).
+	# @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] :sort            (false) Sort the keys for objects to be in alphabetical order (`true`), or supply a lambda to determine ordering.
+	# @option opts [Boolean] :aligned         (false) When wrapping objects, align the colons (only per object).
+	# @option opts [Boolean] :force_floats    (false) Ensure that all integer values have `.0` after them.
+	# @option opts [Array]   :force_floats_in ([])    Array of object key names to force floats inside of.
+	# @option opts [Integer] :decimals        (null) Decimal precision to use for floats; omit to keep numeric values precise.
+	# @option opts [Boolean] :trim_trailing_zeros (false) Remove trailing zeros added by `decimals`` from the ends of floating point numbers.
 	# @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`.
@@ -37,6 +40,7 @@ module JSON
 		opts[:wrap] = 80 unless opts.key?(:wrap)
 		opts[:wrap] = -1 if opts[:wrap]==true
 		opts[:indent]         ||= "  "
+		opts[:force_floats_in]||= []
 		opts[:array_padding]  ||= opts[:padding]      || 0
 		opts[:object_padding] ||= opts[:padding]      || 0
 		opts[:after_comma]    ||= opts[:around_comma] || 0
@@ -56,21 +60,27 @@ module JSON
 		colonn= "#{' '*opts[:before_colon_n]}:#{' '*opts[:after_colon_n]}"
 
 		memoizer = {}
-		build = ->(o,indent) do
-			memoizer[[o,indent]] ||= case o
-				when String,Integer       then "#{indent}#{o.inspect}"
+		build = ->(o,indent,floats_forced) do
+			memoizer[[o,indent,floats_forced]] ||= case o
+				when String               then "#{indent}#{o.inspect}"
 				when Symbol               then "#{indent}#{o.to_s.inspect}"
 				when TrueClass,FalseClass then "#{indent}#{o}"
 				when NilClass             then "#{indent}null"
+				when Integer
+					floats_forced ? build[o.to_f, indent, floats_forced] : "#{indent}#{o.inspect}"
 				when Float
 					if o.infinite?
 						"#{indent}#{o<0 ? "-9e9999" : "9e9999"}"
 					elsif o.nan?
 						"#{indent}\"NaN\""
-					elsif (o==o.to_i) && (o.to_s !~ /e/)
-						build[o.to_i,indent]
+					elsif !floats_forced && (o==o.to_i) && (o.to_s !~ /e/)
+						build[o.to_i, indent, floats_forced]
 					elsif opts[:decimals]
-						"#{indent}%.#{opts[:decimals]}f" % o
+						if opts[:trim_trailing_zeros]
+							"#{indent}#{o.round(opts[:decimals])}"
+						else
+							"#{indent}%.#{opts[:decimals]}f" % o
+						end
 					else
 						"#{indent}#{o}"
 					end
@@ -79,19 +89,19 @@ module JSON
 					if o.empty?
 						"#{indent}[]"
 					else
-						pieces = o.map{ |v| build[v,''] }
+						pieces = o.map{ |v| build[v, '', floats_forced] }
 						one_line = "#{indent}[#{apad}#{pieces.join comma}#{apad}]"
 						if !opts[:wrap] || (one_line.length <= opts[:wrap])
 							one_line
 						elsif opts[:short]
 							indent2 = "#{indent} #{apad}"
-							pieces = o.map{ |v| build[ v,indent2 ] }
+							pieces = o.map{ |v| build[v, indent2, floats_forced] }
 							pieces[0] = pieces[0].sub indent2, "#{indent}[#{apad}"
 							pieces[pieces.length-1] = "#{pieces.last}#{apad}]"
 							pieces.join ",\n"
 						else
 							indent2 = "#{indent}#{opts[:indent]}"
-							"#{indent}[\n#{o.map{ |v| build[ v, indent2 ] }.join ",\n"}\n#{opts[:indent_last] ? indent2 : indent}]"
+							"#{indent}[\n#{o.map{ |v| build[v, indent2, floats_forced] }.join ",\n"}\n#{opts[:indent_last] ? indent2 : indent}]"
 						end
 					end
 
@@ -108,7 +118,8 @@ module JSON
 								when 3 then o.sort_by{ |k,v| sort[k,v,o] }
 								end
 						end
-						keyvals = o.map{ |k,v| [ k.to_s.inspect, build[v,''] ] }
+						keys = o.map{|x| x.first.to_s }
+						keyvals = o.map.with_index{ |(k,v),i| [ k.to_s.inspect, build[v, '', opts[:force_floats] || opts[:force_floats_in].include?(keys[i])] ] }
 						keyvals = keyvals.map{ |kv| kv.join(colon1) }.join(comma)
 						one_line = "#{indent}{#{opad}#{keyvals}#{opad}}"
 						if !opts[:wrap] || (one_line.length <= opts[:wrap])
@@ -122,11 +133,12 @@ module JSON
 									formatk = "%-#{longest}s"
 									keyvals.map!{ |k,v| [ formatk % k,v] }
 								end
-								keyvals.map! do |k,v|
+								keyvals.map!.with_index do |(k,v),i|
+									floats_forced = opts[:force_floats] || opts[:force_floats_in].include?(keys[i])
 									indent2 = " "*"#{k}#{colonn}".length
-									one_line = "#{k}#{colonn}#{build[v,'']}"
+									one_line = "#{k}#{colonn}#{build[v, '', floats_forced]}"
 									if opts[:wrap] && (one_line.length > opts[:wrap]) && (v.is_a?(Array) || v.is_a?(Hash))
-										"#{k}#{colonn}#{build[v,indent2].lstrip}"
+										"#{k}#{colonn}#{build[v, indent2, floats_forced].lstrip}"
 									else
 										one_line
 									end
@@ -141,9 +153,9 @@ module JSON
 								end
 								indent2 = "#{indent}#{opts[:indent]}"
 								keyvals.map! do |k,v|
-									one_line = "#{k}#{colonn}#{build[v,'']}"
+									one_line = "#{k}#{colonn}#{build[v, '', floats_forced]}"
 									if opts[:wrap] && (one_line.length > opts[:wrap]) && (v.is_a?(Array) || v.is_a?(Hash))
-										"#{k}#{colonn}#{build[v,indent2].lstrip}"
+										"#{k}#{colonn}#{build[v, indent2, floats_forced].lstrip}"
 									else
 										one_line
 									end
@@ -158,6 +170,6 @@ module JSON
 			end
 		end
 
-		build[object,'']
+		build[object, '', opts[:force_floats]]
 	end
 end

data/neatjson.gemspec

@@ -2,7 +2,7 @@
 require 'date'
 Gem::Specification.new do |s|
 	s.name          = "neatjson"
-	s.version       = "0.9"
+	s.version       = "0.10"
 	s.date          = Date.today.iso8601
 	s.authors       = ["Gavin Kistner"]
 	s.email         = "gavin@phrogz.net"

data/test/test_neatjson.lua

@@ -1,83 +1,83 @@
-local function dump(v)
-	local reserved = {["and"]=1,["break"]=1,["do"]=1,["else"]=1,["elseif"]=1,["end"]=1,["false"]=1,["for"]=1,["function"]=1,["goto"]=1,["if"]=1,["in"]=1,["local"]=1,["nil"]=1,["not"]=1,["or"]=1,["repeat"]=1,["return"]=1,["then"]=1,["true"]=1,["until"]=1,["while"]=1}
-	local t=type(v)
-	if t=='table' then
-		local s,r={},{}
-		for i,v2 in ipairs(v) do s[i]=true table.insert(r,dump(v2)) end
-		for k,v2 in pairs(v) do
-			if not s[k] then
-				if type(k)=='string' and not reserved[k] and string.match(k,'^[%a_][%w_]*$') then
-					table.insert(r,k..'='..dump(v2))
-				else
-					table.insert(r,'['..dump(k)..']='..dump(v2))
-				end
-			end
-		end
-		return '{'..table.concat(r,', ')..'}'
-	elseif t=='string' then
-		return string.format('%q',v)
-	else
-		return tostring(v)
-	end
-end
-
-
-package.path = '?.lua;../lua/?.lua'
-local tests = require'tests'
-local neatJSON = require'neatjson'
-local startTime = os.clock()
-local count,pass=0,0
-for _,valtest in ipairs(tests) do
-	local value = valtest.value
-	for _,test in ipairs(valtest.tests) do
-		local cmd = "neatJSON("..dump(value)..(test.opts and (", "..dump(test.opts)) or '')..")"
-		local ok,err = pcall(function()
-			local json, success
-			if test.opts then
-				local opts = {}
-				for k,v in pairs(test.opts) do opts[k]=v end
-				json = neatJSON(value,opts)
-			else
-				json = neatJSON(value)
-			end
-
-			if type(test.json)=='string' then
-				success = json==test.json
-			else
-				-- If it's not a string, assume it's an array of acceptable string patterns
-				success = false
-				for _,testPattern in ipairs(test.json) do
-					if json:match(testPattern) then
-						success = true
-						break
-					end
-				end
-			end
-
-			if success then
-				pass = pass + 1
-			else
-				local expected = type(test.json)=='string' and test.json or table.concat(test.json, ' or ')
-				print(cmd)
-				print('EXPECTED')
-				print(expected)
-				print('ACTUAL')
-				print(json==nil and '(nil)' or #json==0 and '(empty string)' or json)
-				print('')
-			end
-		end)
-		if not ok then
-			print('Error running '..cmd)
-			print(err)
-			print('')
-		end
-		count = count + 1
-	end
-end
-local elapsed = os.clock()-startTime
-print(("%d/%d test%s passed in %.2fms (%.0f tests per second)"):format(
-	pass, count,
-	count==1 and '' or 's',
-	elapsed,
-	1000 * count/elapsed
-))
+local function dump(v)
+	local reserved = {["and"]=1,["break"]=1,["do"]=1,["else"]=1,["elseif"]=1,["end"]=1,["false"]=1,["for"]=1,["function"]=1,["goto"]=1,["if"]=1,["in"]=1,["local"]=1,["nil"]=1,["not"]=1,["or"]=1,["repeat"]=1,["return"]=1,["then"]=1,["true"]=1,["until"]=1,["while"]=1}
+	local t=type(v)
+	if t=='table' then
+		local s,r={},{}
+		for i,v2 in ipairs(v) do s[i]=true table.insert(r,dump(v2)) end
+		for k,v2 in pairs(v) do
+			if not s[k] then
+				if type(k)=='string' and not reserved[k] and string.match(k,'^[%a_][%w_]*$') then
+					table.insert(r,k..'='..dump(v2))
+				else
+					table.insert(r,'['..dump(k)..']='..dump(v2))
+				end
+			end
+		end
+		return '{'..table.concat(r,', ')..'}'
+	elseif t=='string' then
+		return string.format('%q',v)
+	else
+		return tostring(v)
+	end
+end
+
+
+package.path = '?.lua;../lua/?.lua'
+local tests = require'tests'
+local neatJSON = require'neatjson'
+local startTime = os.clock()
+local count,pass=0,0
+for _,valtest in ipairs(tests) do
+	local value = valtest.value
+	for _,test in ipairs(valtest.tests) do
+		local cmd = "neatJSON("..dump(value)..(test.opts and (", "..dump(test.opts)) or '')..")"
+		local ok,err = pcall(function()
+			local json, success
+			if test.opts then
+				local opts = {}
+				for k,v in pairs(test.opts) do opts[k]=v end
+				json = neatJSON(value,opts)
+			else
+				json = neatJSON(value)
+			end
+
+			if type(test.json)=='string' then
+				success = json==test.json
+			else
+				-- If it's not a string, assume it's an array of acceptable string patterns
+				success = false
+				for _,testPattern in ipairs(test.json) do
+					if json:match(testPattern) then
+						success = true
+						break
+					end
+				end
+			end
+
+			if success then
+				pass = pass + 1
+			else
+				local expected = type(test.json)=='string' and test.json or table.concat(test.json, ' or ')
+				print(cmd)
+				print('EXPECTED')
+				print(expected)
+				print('ACTUAL')
+				print(json==nil and '(nil)' or #json==0 and '(empty string)' or json)
+				print('')
+			end
+		end)
+		if not ok then
+			print('Error running '..cmd)
+			print(err)
+			print('')
+		end
+		count = count + 1
+	end
+end
+local elapsed = os.clock()-startTime
+print(("%d/%d test%s passed in %.2fms (%.0f tests per second)"):format(
+	pass, count,
+	count==1 and '' or 's',
+	elapsed,
+	1000 * count/elapsed
+))

data/test/tests.js

@@ -15,6 +15,9 @@ exports.tests = [
 	{value:5.0001, tests:[
 		{json:"5.0001"},
 		{json:"5.000", opts:{decimals:3}},
+		{json:"5",     opts:{decimals:3, trimTrailingZeros:true}},
+		{json:"5.0",   opts:{decimals:3, trimTrailingZeros:true, forceFloats:true}},
+		{json:"5.000", opts:{decimals:3, trimTrailingZeros:false, forceFloats:true}},
 	]},
 	{value:4.2, tests:[
 		{json:"4.2"},
@@ -30,7 +33,6 @@ exports.tests = [
 	{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:[
@@ -173,6 +175,33 @@ exports.tests = [
 		{ json:'{"inf":9e9999,"nan":"NaN","neginf":-9e9999}', opts:{sort:true} },
 	]},
 
+	{value:[0, 1, 1.1, 1.555555], tests:[
+		{ json:'[0,1,1.1,1.555555]', opts:{forceFloats:false} },
+		{ json:'[0.0,1.0,1.1,1.555555]', opts:{forceFloats:true} },
+		{ json:'[0.000,1.000,1.100,1.556]', opts:{forceFloats:true, decimals:3} },
+		{ json:'[0.0,1.0,1.1,1.556]', opts:{forceFloats:true, decimals:3, trimTrailingZeros:true} },
+		{ json:'[0,1,1.1,1.556]', opts:{forceFloats:false, decimals:3, trimTrailingZeros:true} },
+	]},
+
+	{value:{floats:[0, 1, 0.1, 1.555555], raw:[0, 1, 0.1, 1.555555]}, tests:[
+		{ json:'{"floats":[0,1,0.1,1.555555],"raw":[0,1,0.1,1.555555]}', opts:{forceFloats:false} },
+		{ json:'{"floats":[0.0,1.0,0.1,1.555555],"raw":[0.0,1.0,0.1,1.555555]}', opts:{forceFloats:true} },
+		{ json:'{"floats":[0.0,1.0,0.1,1.555555],"raw":[0,1,0.1,1.555555]}', opts:{forceFloatsIn:['floats']} },
+
+		{ json:'{"floats":[0,1,0.100,1.556],"raw":[0,1,0.100,1.556]}', opts:{forceFloats:false, decimals:3} },
+		{ json:'{"floats":[0.000,1.000,0.100,1.556],"raw":[0.000,1.000,0.100,1.556]}', opts:{forceFloats:true, decimals:3} },
+		{ json:'{"floats":[0.000,1.000,0.100,1.556],"raw":[0,1,0.100,1.556]}', opts:{forceFloatsIn:['floats'], decimals:3} },
+
+		{ json:'{"floats":[0,1,0.1,1.556],"raw":[0,1,0.1,1.556]}', opts:{forceFloats:false, decimals:3, trimTrailingZeros:true} },
+		{ json:'{"floats":[0.0,1.0,0.1,1.556],"raw":[0.0,1.0,0.1,1.556]}', opts:{forceFloats:true, decimals:3, trimTrailingZeros:true} },
+		{ json:'{"floats":[0.0,1.0,0.1,1.556],"raw":[0,1,0.1,1.556]}', opts:{forceFloatsIn:['floats'], decimals:3, trimTrailingZeros:true} },
+	]},
+
+	{value:[1,2,3,{a:[4,5,{a:6, b:7}], b:[8,9,{a:10, b:11}]}], tests:[
+		{ json:'[1,2,3,{"a":[4,5,{"a":6,"b":7}],"b":[8,9,{"a":10,"b":11}]}]', opts:{} },
+		{ json:'[1.0,2.0,3.0,{"a":[4.0,5.0,{"a":6.0,"b":7.0}],"b":[8.0,9.0,{"a":10.0,"b":11.0}]}]', opts:{forceFloats:true, wrap:false} },
+		{ json:'[1,2,3,{"a":[4.0,5.0,{"a":6.0,"b":7}],"b":[8,9,{"a":10.0,"b":11}]}]', opts:{forceFloatsIn:['a'], wrap:false} },
+	]},
 
 	// {value:Class.new{ def to_json(*a); {a:1}.to_json(*a); end }.new, tests:[
 	// 	{ json:'{  "a":1}' },

data/test/tests.lua

@@ -14,6 +14,9 @@ return {
 	{value=5.0001, tests={
 		{json="5.0001"},
 		{json="5.000", opts={decimals=3}},
+		{json="5",     opts={decimals=3, trimTrailingZeros=true}},
+		{json="5.0",   opts={decimals=3, trimTrailingZeros=true, forceFloats=true}},
+		{json="5.000", opts={decimals=3, trimTrailingZeros=false, forceFloats=true}},
 	}},
 	{value=4.2, tests={
 		{json="4.2"},
@@ -174,11 +177,40 @@ return {
 	}},
 
 	{value={1,2,3,a=4,['for']=5}, tests={
-		{ json='{[1]=1,[2]=2,[3]=3,a=4,["for"]=5}', opts={lua=true, sort=true} }
+		{ json='{[1]=1,[2]=2,[3]=3,a=4,["for"]=5}', opts={lua=true, sort=true} },
+		{ json='{\n  [1]=1,\n  [2]=2,\n  [3]=3,\n  a=4,\n  ["for"]=5\n}', opts={lua=true, sort=true, wrap=true} },
 	}},
 
 	{value={inf=1/0, neginf=-1/0, nan=0/0}, tests={
 		{ json='{"inf":9e9999,"nan":"NaN","neginf":-9e9999}', opts={sort=true} },
 		{ json='{inf=1/0,nan=0/0,neginf=-1/0}', opts={sort=true, lua=true} },
-	}}
+	}},
+
+	{value={0, 1, 1.1, 1.555555}, tests={
+		{ json='[0,1,1.1,1.555555]', opts={forceFloats=false} },
+		{ json='[0.0,1.0,1.1,1.555555]', opts={forceFloats=true} },
+		{ json='[0.000,1.000,1.100,1.556]', opts={forceFloats=true, decimals=3} },
+		{ json='[0.0,1.0,1.1,1.556]', opts={forceFloats=true, decimals=3, trimTrailingZeros=true} },
+		{ json='[0,1,1.1,1.556]', opts={forceFloats=false, decimals=3, trimTrailingZeros=true} },
+	}},
+
+	{value={floats={0, 1, 0.1, 1.555555}, raw={0, 1, 0.1, 1.555555}}, tests={
+		{ json='{"floats":[0,1,0.1,1.555555],"raw":[0,1,0.1,1.555555]}', opts={forceFloats=false, sort=true} },
+		{ json='{"floats":[0.0,1.0,0.1,1.555555],"raw":[0.0,1.0,0.1,1.555555]}', opts={forceFloats=true, sort=true} },
+		{ json='{"floats":[0.0,1.0,0.1,1.555555],"raw":[0,1,0.1,1.555555]}', opts={forceFloatsIn={'floats'}, sort=true} },
+
+		{ json='{"floats":[0,1,0.100,1.556],"raw":[0,1,0.100,1.556]}', opts={forceFloats=false, decimals=3, sort=true} },
+		{ json='{"floats":[0.000,1.000,0.100,1.556],"raw":[0.000,1.000,0.100,1.556]}', opts={forceFloats=true, decimals=3, sort=true} },
+		{ json='{"floats":[0.000,1.000,0.100,1.556],"raw":[0,1,0.100,1.556]}', opts={forceFloatsIn={'floats'}, decimals=3, sort=true} },
+
+		{ json='{"floats":[0,1,0.1,1.556],"raw":[0,1,0.1,1.556]}', opts={forceFloats=false, decimals=3, trimTrailingZeros=true, sort=true} },
+		{ json='{"floats":[0.0,1.0,0.1,1.556],"raw":[0.0,1.0,0.1,1.556]}', opts={forceFloats=true, decimals=3, trimTrailingZeros=true, sort=true} },
+		{ json='{"floats":[0.0,1.0,0.1,1.556],"raw":[0,1,0.1,1.556]}', opts={forceFloatsIn={'floats'}, decimals=3, trimTrailingZeros=true, sort=true} },
+	}},
+
+	-- {value={1,2,3,{a={4,5,{a=6, b=7}}, b={8,9,{a=10, b=11}}}}, tests={
+	-- 	{ json='[1,2,3,{"a":[4,5,{"a":6,"b":7}],"b":[8,9,{"a":10,"b":11}]}]', opts={} },
+	-- 	{ json='[1.0,2.0,3.0,{"a":[4.0,5.0,{"a":6.0,"b":7.0}],"b":[8.0,9.0,{"a":10.0,"b":11.0}]}]', opts={forceFloats=true, wrap=false} },
+	-- 	{ json='[1,2,3,{"a":[4.0,5.0,{"a":6.0,"b":7}],"b":[8,9,{"a":10.0,"b":11}]}]', opts={forceFloatsIn={'a'}, wrap=false} },
+	-- }},
 }

data/test/tests.rb

@@ -13,6 +13,8 @@ TESTS = [
 	{value:5.0001, tests:[
 		{json:"5.0001"},
 		{json:"5.000", opts:{decimals:3}},
+		{json:"5.0",   opts:{decimals:3, trim_trailing_zeros:true, force_floats:true}},
+		{json:"5.000", opts:{decimals:3, trim_trailing_zeros:false, force_floats:true}},
 	]},
 	{value:4.2, tests:[
 		{json:"4.2"},
@@ -188,5 +190,33 @@ TESTS = [
 	{value:{inf:1.0/0, neginf:-1.0/0, nan:0.0/0}, tests:[
 		{ json:'{"inf":9e9999,"nan":"NaN","neginf":-9e9999}', opts:{sort:true} },
 	]},
+
+	{value:[0, 1, 1.1, 1.555555], tests:[
+		{ json:'[0,1,1.1,1.555555]', opts:{force_floats:false} },
+		{ json:'[0.0,1.0,1.1,1.555555]', opts:{force_floats:true} },
+		{ json:'[0.000,1.000,1.100,1.556]', opts:{force_floats:true, decimals:3} },
+		{ json:'[0.0,1.0,1.1,1.556]', opts:{force_floats:true, decimals:3, trim_trailing_zeros:true} },
+		{ json:'[0,1,1.1,1.556]', opts:{force_floats:false, decimals:3, trim_trailing_zeros:true} },
+	]},
+
+	{value:{floats:[0, 1, 0.1, 1.555555], raw:[0, 1, 0.1, 1.555555]}, tests:[
+		{ json:'{"floats":[0,1,0.1,1.555555],"raw":[0,1,0.1,1.555555]}', opts:{force_floats:false} },
+		{ json:'{"floats":[0.0,1.0,0.1,1.555555],"raw":[0.0,1.0,0.1,1.555555]}', opts:{force_floats:true} },
+		{ json:'{"floats":[0.0,1.0,0.1,1.555555],"raw":[0,1,0.1,1.555555]}', opts:{force_floats_in:['floats']} },
+
+		{ json:'{"floats":[0,1,0.100,1.556],"raw":[0,1,0.100,1.556]}', opts:{force_floats:false, decimals:3} },
+		{ json:'{"floats":[0.000,1.000,0.100,1.556],"raw":[0.000,1.000,0.100,1.556]}', opts:{force_floats:true, decimals:3} },
+		{ json:'{"floats":[0.000,1.000,0.100,1.556],"raw":[0,1,0.100,1.556]}', opts:{force_floats_in:['floats'], decimals:3} },
+
+		{ json:'{"floats":[0,1,0.1,1.556],"raw":[0,1,0.1,1.556]}', opts:{force_floats:false, decimals:3, trim_trailing_zeros:true} },
+		{ json:'{"floats":[0.0,1.0,0.1,1.556],"raw":[0.0,1.0,0.1,1.556]}', opts:{force_floats:true, decimals:3, trim_trailing_zeros:true} },
+		{ json:'{"floats":[0.0,1.0,0.1,1.556],"raw":[0,1,0.1,1.556]}', opts:{force_floats_in:['floats'], decimals:3, trim_trailing_zeros:true} },
+	]},
+
+	{value:[1,2,3,{a:[4,5,{a:6, b:7}], b:[8,9,{a:10, b:11}]}], tests:[
+		{ json:'[1,2,3,{"a":[4,5,{"a":6,"b":7}],"b":[8,9,{"a":10,"b":11}]}]', opts:{} },
+		{ json:'[1.0,2.0,3.0,{"a":[4.0,5.0,{"a":6.0,"b":7.0}],"b":[8.0,9.0,{"a":10.0,"b":11.0}]}]', opts:{force_floats:true, wrap:false} },
+		{ json:'[1,2,3,{"a":[4.0,5.0,{"a":6.0,"b":7}],"b":[8,9,{"a":10.0,"b":11}]}]', opts:{force_floats_in:['a'], wrap:false} },
+	]},
 ]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neatjson
 version: !ruby/object:Gem::Version
-  version: '0.9'
+  version: '0.10'
 platform: ruby
 authors:
 - Gavin Kistner
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-07-29 00:00:00.000000000 Z
+date: 2022-08-29 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
@@ -35,7 +35,7 @@ homepage: http://github.com/Phrogz/NeatJSON
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -50,9 +50,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Pretty, powerful, flexible JSON generation.
 test_files: []