json-write-stream 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b059dbe6cf700cf762a6f14734e097c17d90d76a
-  data.tar.gz: b48ccf8bc0205baf88a2b2a9181199873ef01da7
+  metadata.gz: 7445d1cf85a82a9414433ebbdb06008eac6ac4e2
+  data.tar.gz: a82b04356133b8b46c21906bab7d413aebeac855
 SHA512:
-  metadata.gz: 8f8247711d377344b4a4d8164e5dd1ecb357253bae33df1a6e97154da3ffbca1f26f5bca91cb3d5227f53334300e5ffa79f002b52ccbe13cb67a826950524cff
-  data.tar.gz: 10401cfc09651446c449e2c1f1e1bbd66b0db653022f58c669d49d06f512b403dde8383f42b8a96bd62a6201304a11a2bc3692537ba98b2db97579c06583081d
+  metadata.gz: 3818ce8ae032e722dbde636aaefa818975e91ab25a80e20045da648564051dffde7c12fb9e9291c9ecb2ad0bad48c2438665b672f2f773549f60339f6f4b163a
+  data.tar.gz: 3632c1b6c3b499f20f46e3577f60221a15aec7a10e523a3d39b84b9d6513a9ff83deb6ee8bed07cc4d3dad5fedd7ef6f9b3a1cc255ce7a00f397ee2835cbc27a

data/History.txt

@@ -13,3 +13,7 @@
 == 1.1.0
 
 * Add way of inserting text after commas.
+
+== 1.2.0
+
+* Add way of inserting text between key/value pairs.

data/lib/json-write-stream.rb

@@ -6,6 +6,7 @@ require 'json-write-stream/stateful'
 
 class JsonWriteStream
   DEFAULT_ENCODING = Encoding::UTF_8
+  DEFAULT_OPTIONS = { before: '', between: '' }.freeze
 
   class << self
     def from_stream(stream, encoding = DEFAULT_ENCODING)

data/lib/json-write-stream/stateful.rb

@@ -139,12 +139,14 @@ class JsonWriteStream
       stream.write(':')
     end
 
-    def write_key_value(key, value, before = '')
+    def write_key_value(key, value, options = DEFAULT_OPTIONS)
       write_comma
-      stream.write(before)
+      stream.write(options.fetch(:before, DEFAULT_OPTIONS[:before]))
       increment
       write_key(key)
-      stream.write(":#{escape(value)}")
+      stream.write(':')
+      stream.write(options.fetch(:between, DEFAULT_OPTIONS[:between]))
+      stream.write(escape(value))
     end
 
     def close
@@ -176,9 +178,9 @@ class JsonWriteStream
       stream.write('[')
     end
 
-    def write_element(element, before = '')
+    def write_element(element, options = DEFAULT_OPTIONS)
       write_comma
-      stream.write(before)
+      stream.write(options.fetch(:before, DEFAULT_OPTIONS[:before]))
       increment
       stream.write(escape(element))
     end

data/lib/json-write-stream/version.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
 
 class JsonWriteStream
-  VERSION = "1.1.0"
+  VERSION = '1.2.0'
 end

data/lib/json-write-stream/yielding.rb

@@ -60,30 +60,34 @@ class JsonWriteStream
       stream.write('{')
     end
 
-    def write_array(key, before = '')
+    def write_array(key, options = DEFAULT_OPTIONS)
       write_comma
-      stream.write(before)
+      stream.write(options.fetch(:before, DEFAULT_OPTIONS[:before]))
       increment
       write_key(key)
       stream.write(':')
+      stream.write(options.fetch(:between, DEFAULT_OPTIONS[:between]))
       super(true)
     end
 
-    def write_object(key, before = '')
+    def write_object(key, options = DEFAULT_OPTIONS)
       write_comma
-      stream.write(before)
+      stream.write(options.fetch(:before, DEFAULT_OPTIONS[:before]))
       increment
       write_key(key)
       stream.write(':')
+      stream.write(options.fetch(:between, DEFAULT_OPTIONS[:between]))
       super(true)
     end
 
-    def write_key_value(key, value, before = '')
+    def write_key_value(key, value, options = DEFAULT_OPTIONS)
       write_comma
-      stream.write(before)
+      stream.write(options.fetch(:before, DEFAULT_OPTIONS[:before]))
       increment
       write_key(key)
-      stream.write(":#{escape(value)}")
+      stream.write(':')
+      stream.write(options.fetch(:between, DEFAULT_OPTIONS[:between]))
+      stream.write(escape(value))
     end
 
     def close
@@ -102,9 +106,9 @@ class JsonWriteStream
       stream.write('[')
     end
 
-    def write_element(element, before = '')
+    def write_element(element, options = DEFAULT_OPTIONS)
       write_comma
-      stream.write(before)
+      stream.write(options.fetch(:before, DEFAULT_OPTIONS[:before]))
       increment
       stream.write(escape(element))
     end

data/spec/stateful_spec.rb

@@ -21,6 +21,22 @@ describe JsonWriteStream::YieldingWriter do
 
   it_behaves_like 'a json stream'
 
+  it 'respects the "before" option' do
+    stream_writer.write_object
+    stream_writer.write_key_value('foo', 'bar', before: "\n  ")
+    stream_writer.close
+
+    expect(stream.string).to eq("{\n  \"foo\":\"bar\"}")
+  end
+
+  it 'respects the "between" option' do
+    stream_writer.write_object
+    stream_writer.write_key_value('foo', 'bar', between: ' ')
+    stream_writer.close
+
+    expect(stream.string).to eq('{"foo": "bar"}')
+  end
+
   describe '#close' do
     it 'unwinds the stack, adds appropriate closing punctuation for each unclosed item, and closes the stream' do
       stream_writer.write_array

data/spec/yielding_spec.rb

@@ -21,6 +21,22 @@ describe JsonWriteStream::YieldingWriter do
 
   it_behaves_like 'a json stream'
 
+  it 'respects the "before" option' do
+    stream_writer.write_object do |object_writer|
+      object_writer.write_key_value('foo', 'bar', before: "\n  ")
+    end
+
+    expect(stream.string).to eq("{\n  \"foo\":\"bar\"}")
+  end
+
+  it 'respects the "between" option' do
+    stream_writer.write_object do |object_writer|
+      object_writer.write_key_value('foo', 'bar', between: ' ')
+    end
+
+    expect(stream.string).to eq('{"foo": "bar"}')
+  end
+
   describe '#write_key_value' do
     it 'converts all keys to strings' do
       stream_writer.write_object do |object_writer|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json-write-stream
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Cameron Dutro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-19 00:00:00.000000000 Z
+date: 2017-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_pure
@@ -64,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: An easy, streaming way to generate JSON.