turbostreamer 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e135edfd638899e0bb26aab00a6cc7f63d702c53757b0f3f7aeb1500762fd6b2
-  data.tar.gz: 7a77931cabed9f76dec5925e5309fd8af550c2f5d829ed4472bf158e4e4555c4
+  metadata.gz: 81c2119468be8e96eb8e02da3fe72df9996aaa16fc610d4b0bf2b5f902663004
+  data.tar.gz: 21fc7309b4f17ae08e76b73f70bdc6c9d6a456a37d354aa53c45313b4c5e017d
 SHA512:
-  metadata.gz: 48b0c24c3e052f91ad2f82455698f3640b6fb0048c5d5a58da8f2332e4f7af79f26ba72e65073fd48f64049e3cd36ecd1674cd357c9030c4e849d3865cf567d3
-  data.tar.gz: 9c90fe729ce30b82f15919ded942519cef4436b2b5675711c549972e527210f1d7df173dfc92a45bea060273c2e92c7790a148314d2f78bfdb75c9cc2bb54ebc
+  metadata.gz: 5353499e01978fa2b6036f2bd26bd4f76a3da28cd07a242aec9be06d67afb9125b49ba179e8d13748945f36c9cfecb276118d88952c600854f88ce4c65e0fb41
+  data.tar.gz: 907614df89e2f67d3a087570eda988f55b498b85d65d4e2756eccafb2acfdcd7911ff4de726edadb3bec02b4428812b68d58ca86fcb8d884dbf1f4beaf304e2b

data/README.md

@@ -93,6 +93,18 @@ end
 # => { "author": { "name": "David" } }
 ```
 
+To merge existing hash or array to current context:
+
+``` ruby
+hash = { author: { name: "David" } }
+json.post do
+  json.title "Merge HOWTO"
+  json.merge! hash
+end
+
+# => "post": { "title": "Merge HOWTO", "author": { "name": "David" } }
+```
+
 Top level arrays can be handled directly.  Useful for index and other collection
 actions.
 

data/lib/turbostreamer/encoders/oj.rb

@@ -4,7 +4,7 @@ class TurboStreamer
   class OjEncoder
 
     attr_reader :output
-    
+
     def initialize(io, options={})
       @stack = []
       @indexes = []
@@ -42,8 +42,6 @@ class TurboStreamer
       @stack << :map
       @indexes << 0
       if @write_comma_on_next_push
-        @stream_writer.flush
-        @output.write(",".freeze)
         @write_comma_on_next_push = false
       end
       @stream_writer.push_object
@@ -59,8 +57,6 @@ class TurboStreamer
       @stack << :array
       @indexes << 0
       if @write_comma_on_next_push
-        @stream_writer.flush
-        @output.write(",".freeze)
         @write_comma_on_next_push = false
       end
       @stream_writer.push_array
@@ -75,21 +71,26 @@ class TurboStreamer
     def inject(string)
       @stream_writer.flush
 
+      # It's possible to have
+      # `@write_comma_on_next_push == true` and `@indexes.last > 0`
+      # So there might be double comma written without this flag
+      comma_written = false
       if @write_comma_on_next_push
         @output.write(",".freeze)
         @write_comma_on_next_push = false
+        comma_written = true
       end
 
       if @stack.last == :array && !string.empty?
         if @indexes.last > 0
-          self.output.write(",")
+          self.output.write(",") unless comma_written
         else
           @write_comma_on_next_push = true
         end
         @indexes[-1] += 1
       elsif @stack.last == :map && !string.empty?
         if @indexes.last > 0
-          self.output.write(",")
+          self.output.write(",") unless comma_written
         else
           @write_comma_on_next_push = true
         end
@@ -130,7 +131,10 @@ class TurboStreamer
         result = result.sub(/\A\[/, ''.freeze).chomp("]".freeze)
       end
 
-      result
+      # Possible for `output.string` to have value like
+      # `[,{"key":"value"}]\n`
+      # Thus the comma must be removed here
+      result.sub(/\A,/, ''.freeze)
     ensure
       @indexes.pop
       @stream_writer = old_writer

data/lib/turbostreamer/version.rb

@@ -1,3 +1,3 @@
 class TurboStreamer
-  VERSION = '1.2.0'
+  VERSION = '1.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: turbostreamer
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Jon Bracy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-27 00:00:00.000000000 Z
+date: 2019-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -72,20 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.11.2
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.11.2
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -184,6 +178,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rabl
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - jonbracy@gmail.com
@@ -226,8 +234,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Stream JSON via a Builder-style DSL