outstream-json 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb23d15ac017bb74a60f4d8b5d939ca4ea6a5220
-  data.tar.gz: 850a1a01ec27e3f663a106ffc420ed858bdeda03
+  metadata.gz: 734d7b472aa611644f4da6540a3e99ab8fd0485a
+  data.tar.gz: 5c24eb6f91c9962b7573c049c3826d2c5598aa15
 SHA512:
-  metadata.gz: 2ef5dc77093aa2024ac51a95da3729e5d3acc74bdb88585e633e5aeb9cf1d64fc9dc7fc64308e89adb4b0fdfe0f79729eeda92520d0baa2b178f6f508f69ee59
-  data.tar.gz: e482b9774860e128bc00aa10c397a5303013661378682cd837720ec7f52df1e82b4f2e342842a6b203323366ed012ded2b0d011da44de1f5570f45f4a229f600
+  metadata.gz: 734fffbc53a50f7f5de64eeb909d7473baa51e46883edbfb5106463ea2b24e1595e583544e9904fb03a374e194641572cc1ca82d96036f20673eea0add5f3f02
+  data.tar.gz: 6e30870b7ac6be1927f7a8db6d85cdf0405e5f48377b43a8d9c73df2b55fd597035a98773e728a4449c3f564a022467acbdf791f8dad51534cc199c512131717

data/lib/outstream/json.rb

@@ -99,21 +99,29 @@ module Outstream
         @count[@count.size-1] += 1
       end
       def add_object
-        write "{"
-        @count.push 0
-        result = yield
-        @count.pop
-        write "}"
-
-        result
+        begin
+          write "{"
+          @count.push 0
+          return yield
+        rescue
+          raise
+        ensure
+          @count.pop
+          write "}"
+        end
       end
       def add_array(a)
-        write "["
-        a.enum_for(:each).each_with_index {|v,i|
-          write "," if i > 0
-          add_value v
-        }
-        write "]"
+        begin
+          write "["
+          a.enum_for(:each).each_with_index {|v,i|
+            write "," if i > 0
+            add_value v
+          }
+        rescue
+          raise
+        ensure
+          write "]"
+        end
       end
       def add_value(value)
         if value.respond_to?:each_pair
@@ -121,7 +129,12 @@ module Outstream
         elsif value.respond_to?:each
           add_array value
         elsif value.respond_to?:call
-          add_value value.call
+          begin
+            add_value value.call
+          rescue
+            add_value nil
+            raise
+          end
         else
           write value.to_json
         end

data/test/test_json.rb

@@ -113,5 +113,24 @@ class TestJson < Test::Unit::TestCase
     }
     assert_equal '{"foo":{"bar":"wow"}}', out.to_s
   end
+
+  def testException
+    out = Outstream::Json.create {
+      add "foo" do
+        add "bar" => lambda { raise }
+      end
+    }
+    tokens = []
+    assert_raise { out.each {|str| tokens << str} }
+    assert_equal %w({ "foo" : { "bar" : null } }), tokens
+  end
+  def testExceptionInArray
+    out = Outstream::Json.create {
+      add "foo" => [lambda { raise }]
+    }
+    tokens = []
+    assert_raise { out.each {|str| tokens << str} }
+    assert_equal %w({ "foo" : [ null ] }), tokens
+  end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: outstream-json
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Ryan Calhoun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-15 00:00:00.000000000 Z
+date: 2016-02-16 00:00:00.000000000 Z
 dependencies: []
 description: A library which provides a means for writing a large number of object
   as json without building the entire set in memory first.