neatjson 0.10.4 → 0.10.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e29bd247652e7a911282fd3556f0a19cdb3e1fca0f83b04892ae961e11394ea
-  data.tar.gz: c3b4105091a863dc151e49e7d4af197f247af17eb5bdfaf9cc42c584ba76114b
+  metadata.gz: a57868f948eff5015d2e142f5bdc73c543e8a8710c321109eb2e1b2ca2017a87
+  data.tar.gz: 388c42b8860c5800293fcf8e7a2a5b64d2e327f4823390266f7916edc40c0553
 SHA512:
-  metadata.gz: 372b882820a3ea8288c214e305254b54d1234798baa949c4a4b4f3a442d6043c488b14ff160d6323be8cc3ef12c89bac90bf8bcec2312bff40cf9e00ef9e04aa
-  data.tar.gz: cc97ed7a14dea8224747c405213fcefefdc3866aef0a6686d73fa9c9259bf87b3c0cc573786c9ad1fcdf4652a6a045cd7554c922854390d119d49b5b7dd5bcc4
+  metadata.gz: 8b30fb0651981e4e4fc9c7ce6f1af90472355dc8828e51468b90b132542e13fb98e096a072775f7ebc2195e319587fa08dfd1437a35e2176413c279b68969f8c
+  data.tar.gz: b9093235f1b70a569d11066e0fd4602ea0bf100d0bae156cee2e764d24b32f2d05674d31c99860ee3611b75345ef4571ffe16ac3f913436c5d3ff9f9099507d2

data/README.md

@@ -280,6 +280,9 @@ For other communication you can [email the author directly](mailto:!@phrogz.net?
 
 ## History
 
+* **v0.10.5** — November 17, 2022
+  * Fix issue #21: Strings containing `#` get an invalid escape added (Ruby only)
+
 * **v0.10.4** — November 17, 2022
   * Online tool shows input/output bytes
 

data/lib/neatjson.rb

@@ -28,7 +28,7 @@ module JSON
 	# @option opts [Integer] :around_colon_1  (0) Number of spaces to put before/after colons for single-line objects.
 	# @option opts [Integer] :before_colon_1  (0) Number of spaces to put before colons for single-line objects.
 	# @option opts [Integer] :after_colon_1   (0) Number of spaces to put after colons for single-line objects.
-	# @option opts [Integer] :aroun_n  (0) Number of spaces to put before/after colons for multi-line objects.
+	# @option opts [Integer] :around_colon_n  (0) Number of spaces to put before/after colons for multi-line objects.
 	# @option opts [Integer] :before_colon_n  (0) Number of spaces to put before colons for multi-line objects.
 	# @option opts [Integer] :after_colon_n   (0) Number of spaces to put after colons for multi-line objects.
 	# @return [String] the JSON representation of the object.
@@ -62,8 +62,8 @@ module JSON
 		memoizer = {}
 		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 String               then "#{indent}#{self.generate(o)}"
+				when Symbol               then "#{indent}#{self.generate(o.to_s)}"
 				when TrueClass,FalseClass then "#{indent}#{o}"
 				when NilClass             then "#{indent}null"
 				when Integer
@@ -119,14 +119,14 @@ module JSON
 								end
 						end
 						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 = o.map.with_index{ |(k,v),i| [ self.generate(k.to_s), 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])
 							one_line
 						else
 							if opts[:short]
-								keyvals = o.map{ |k,v| ["#{indent} #{opad}#{k.to_s.inspect}",v] }
+								keyvals = o.map{ |k,v| ["#{indent} #{opad}#{self.generate(k.to_s)}",v] }
 								keyvals[0][0] = keyvals[0][0].sub "#{indent} ", "#{indent}{"
 								if opts[:aligned]
 									longest = keyvals.map(&:first).map(&:length).max
@@ -145,7 +145,7 @@ module JSON
 								end
 								"#{keyvals.join(",\n")}#{opad}}"
 							else
-								keyvals = o.map{ |k,v| ["#{indent}#{opts[:indent]}#{k.to_s.inspect}",v] }
+								keyvals = o.map{ |k,v| ["#{indent}#{opts[:indent]}#{self.generate(k.to_s)}",v] }
 								if opts[:aligned]
 									longest = keyvals.map(&:first).map(&:length).max
 									formatk = "%-#{longest}s"

data/neatjson.gemspec

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

data/test/tests.js

@@ -34,6 +34,15 @@ exports.tests = [
 
 	{value:"foo",       tests:[{json:"\"foo\""}]},
 	{value:"foo\nbar",  tests:[{json:"\"foo\\nbar\""}]},
+	{value:"foo\tbar",  tests:[{json:"\"foo\\tbar\""}]},
+	{value:"foo\rbar",  tests:[{json:"\"foo\\rbar\""}]},
+	{value:"foo\bbar",  tests:[{json:"\"foo\\bbar\""}]},
+	{value:"foo\fbar",  tests:[{json:"\"foo\\fbar\""}]},
+
+	{value:"foo${no}bar",  tests:[{json:"\"foo${no}bar\""}]},
+	{value:"foo\#{no}bar",  tests:[{json:"\"foo\#{no}bar\""}]},
+	{value:"foo\\bar",  tests:[{json:"\"foo\\\\bar\""}]},
+	{value:"foo/bar",  tests:[{json:"\"foo/bar\""}]},
 
 	{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]]" },

data/test/tests.lua

@@ -31,9 +31,17 @@ return {
 	{value=1e-9,  tests={{json={'^1%.0+e%-0*9$', '^1e%-0*9$'}}}},
 	{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="foo",         tests={{json="\"foo\""}}},
+	{value="foo\nbar",    tests={{json="\"foo\\nbar\""}}},
+	{value="foo\tbar",    tests={{json="\"foo\\tbar\""}}},
+	{value="foo\rbar",    tests={{json="\"foo\\rbar\""}}},
+	{value="foo\bbar",    tests={{json="\"foo\\bbar\""}}},
+	{value="foo\fbar",    tests={{json="\"foo\\fbar\""}}},
+
+	{value="foo${no}bar", tests={{json="\"foo${no}bar\""}}},
+	{value="foo#{no}bar", tests={{json="\"foo#{no}bar\""}}},
+	{value="foo\\bar",    tests={{json="\"foo\\\\bar\""}}},
+	{value="foo/bar",     tests={{json="\"foo/bar\""}}},
 
 	{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]]" },

data/test/tests.rb

@@ -32,6 +32,15 @@ TESTS = [
 	{value:"foo",       tests:[{json:"\"foo\""}]},
 	{value: :foo,       tests:[{json:"\"foo\""}]},
 	{value:"foo\nbar",  tests:[{json:"\"foo\\nbar\""}]},
+	{value:"foo\tbar",  tests:[{json:"\"foo\\tbar\""}]},
+	{value:"foo\rbar",  tests:[{json:"\"foo\\rbar\""}]},
+	{value:"foo\bbar",  tests:[{json:"\"foo\\bbar\""}]},
+	{value:"foo\fbar",  tests:[{json:"\"foo\\fbar\""}]},
+
+	{value:"foo${no}bar",  tests:[{json:"\"foo${no}bar\""}]},
+	{value:"foo\#{no}bar",  tests:[{json:"\"foo\#{no}bar\""}]},
+	{value:"foo\\bar",  tests:[{json:"\"foo\\\\bar\""}]},
+	{value:"foo/bar",  tests:[{json:"\"foo/bar\""}]},
 
 	{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]]" },

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neatjson
 version: !ruby/object:Gem::Version
-  version: 0.10.4
+  version: 0.10.5
 platform: ruby
 authors:
 - Gavin Kistner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-17 00:00:00.000000000 Z
+date: 2022-11-18 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
@@ -50,7 +50,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Pretty, powerful, flexible JSON generation.