wexpr 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5333a5ecc209d63d4618574c6677459ec5024b20a130cb24e68fe1319217bc87
-  data.tar.gz: 279c847e62ea270010a8fab80cfac9cb4aec0ab93dc0a5e2abba8aed4e82eabb
+  metadata.gz: 78348b4a80be320840f028bf01c5632ac52ecfc91cca05edd7421069bb9bc1ea
+  data.tar.gz: 32e59135983d7929c14b9c31d4bdb6e1cff0c85e2b7cf36bfb64812390b31b94
 SHA512:
-  metadata.gz: f3460b39058ae3af66ec6589e658c9e975f404a3118faa010831efc6f2c6a0ee4d1e93b0d6792e3100ad044d1d37f331bff8874af5e11d36464de4bf84239ac6
-  data.tar.gz: eb10da99634d721d84e2adbd0145be05b960803d9aaedfb677db8bb1144be5f6d685889f7bc88779deb40d095dd4f752d3dbaf5f86b998291e15d21d005e60ab
+  metadata.gz: 0c0477364d15c3181de3d2cec2c628f450e078e39dd2baead8a12676bbd8949363912c0829bcb95d86787fb74a3b16ef3a695e353f34c8a28cc3ecfa5041dfd6
+  data.tar.gz: d86ecd06f98cbf16e654c1c1e7a905fd5a4976b19f79c6f5b25e75601e99a7921c6f8d236c320de851b19ab0aad556116356d70f5f687b62ebcf780b40d514e9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    wexpr (0.1.0)
+    wexpr (0.1.4)
 
 GEM
   remote: https://rubygems.org/

data/lib/wexpr/expression.rb

@@ -1169,6 +1169,34 @@ module Wexpr
 			return ""
 		end
 		
+		##
+		# Will write the string escaped, and with quotes
+		# around it if needed.
+		#
+		def self.s_write_string_escaped(v, props)
+			buf = ''
+
+			if not props[:isbarewordsafe]
+				buf += '"'
+			end
+				
+			# do per character so we can escape as needed
+			for c in v.chars
+				if Expression.s_requires_escape(c)
+					buf += "\\"
+					buf += Expression.s_escape_for_value(c)
+				else
+					buf += c
+				end
+			end
+				
+			if not props[:isbarewordsafe]
+				buf += '"'
+			end
+
+			return buf
+		end
+
 		# NOTE THESE BUFFERS ARE ACTUALLY MUTABLE
 		#
 		# Human Readable notes:
@@ -1191,23 +1219,7 @@ module Wexpr
 				v = self.value
 				props = Expression.s_wexpr_value_string_properties(v)
 				
-				if not props[:isbarewordsafe]
-					newBuf += '"'
-				end
-				
-				# do per character so we can escape as needed
-				for c in v.chars
-					if Expression.s_requires_escape(c)
-						newBuf += "\\"
-						newBuf += Expression.s_escape_for_value(c)
-					else
-						newBuf += c
-					end
-				end
-				
-				if not props[:isbarewordsafe]
-					newBuf += '"'
-				end
+				newBuf += Expression.s_write_string_escaped(v, props)
 				
 				return newBuf
 				
@@ -1301,7 +1313,7 @@ module Wexpr
 					# if human readable, indent the line, output the key, space, object, newline
 					if writeHumanReadable
 						newBuf += Expression.s_indent(indent+1)
-						newBuf += key
+						newBuf += Expression.s_write_string_escaped(key, Expression.s_wexpr_value_string_properties(key))
 						newBuf += " "
 						
 						# add the value
@@ -1317,7 +1329,7 @@ module Wexpr
 						end
 						
 						# now key, space, value
-						newBuf += key
+						newBuf += Expression.s_write_string_escaped(key, Expression.s_wexpr_value_string_properties(key))
 						newBuf += " "
 						
 						newBuf = value.p_append_string_representation_to_buffer(flags, indent, newBuf)

data/lib/wexpr/version.rb

@@ -1,3 +1,3 @@
 module Wexpr
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wexpr
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Kenneth Perry (thothonegan)
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-17 00:00:00.000000000 Z
+date: 2020-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -99,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Wexpr parser and emitter for ruby