outstream-json 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f930b16d521d2755bfe9d6d7d2991f9462dc9966
-  data.tar.gz: 860c74f446317f9f211f1e5108446dec9f0dfe53
+  metadata.gz: bb23d15ac017bb74a60f4d8b5d939ca4ea6a5220
+  data.tar.gz: 850a1a01ec27e3f663a106ffc420ed858bdeda03
 SHA512:
-  metadata.gz: da4a08d92ab64858294421f6edef1a3250e5d0d4b4470c27c256506f36781d29861e036b3ff018d5a97d605739b897247e0030d6eba5585d922869b1e40c7bd6
-  data.tar.gz: 6d344e5dbac4cedd94abc099f6c3259db530bcd410eb5838954034e6e942901abf5a12039a985d4f287a20079c316a786db6bcc4ce7bc6e5930617f15ca0cfef
+  metadata.gz: 2ef5dc77093aa2024ac51a95da3729e5d3acc74bdb88585e633e5aeb9cf1d64fc9dc7fc64308e89adb4b0fdfe0f79729eeda92520d0baa2b178f6f508f69ee59
+  data.tar.gz: e482b9774860e128bc00aa10c397a5303013661378682cd837720ec7f52df1e82b4f2e342842a6b203323366ed012ded2b0d011da44de1f5570f45f4a229f600

data/README.md

@@ -25,7 +25,7 @@ The Json.create method defines a JSON object
 	out = Outstream::Json.create do
 	  ...
 	end
-	# use out.to_s or out.each to product result
+	# use out.to_s or out.each to produce result
 
 Use with basic ruby types
 
@@ -35,17 +35,22 @@ Use with basic ruby types
 	end
 	# {"string":"hello","number":42,"array":[1,2,3]}
 
+Use with hashes or blocks to create nested objects
+
 	Outstream::Json.create do
-	  add "nested_object" {
-		add "foo" => "bar"
+	  add "block_object" do
+	    add "foo" => "bar"
+	  end
+	  add "hash_object" => {
+	    "wow" => "cool"
 	  }
 	end
-	# {"nested_object":{"foo":"bar"}}
+	# {"block_object":{"foo":"bar"},"hash_object":{"wow":"cool"}}
 
 Use with transformed SQL result set
 
 	client = Mysql2::Client.new
-  	results = client.query("SELECT * FROM huge\_table", stream: true)	
+	results = client.query("SELECT * FROM hugetable", stream: true)
 	Outstream::Json.create do
 	  add results: results.lazy.map {|row| transform_row(row)}
 	end

data/lib/outstream/json.rb

@@ -23,13 +23,19 @@ module Outstream
     # and string values as quoted strings. If called without a block, returns an enumerator.
     #
     # Example:
-    #   json.each {|token| puts token}
+    #   json.each {|token| puts token} => nil
+    #   json.each => an_enumerator
     def each(&out_block)
       e = Enumerator.new {|yielder|
         Collector.new(yielder).collect &@body_block
       }
 
-      out_block ? e.each(&out_block) : e
+      if out_block
+        e.each(&out_block)
+        nil
+      else
+        e
+      end
     end
 
     # Produce a compact string of the JSON. The entire string is produced at once; this is not

data/test/test_json.rb

@@ -31,7 +31,7 @@ class TestJson < Test::Unit::TestCase
   end
   def testHash
     out = Outstream::Json.create {
-      add "foo" => {a: 1, b: 2}
+      add "foo" => { a: 1, b: 2 }
     }
     assert_equal '{"foo":{"a":1,"b":2}}', out.to_s
   end
@@ -76,6 +76,15 @@ class TestJson < Test::Unit::TestCase
     assert_equal '{"foo":"bar","wow":"cool"}', out.to_s
   end
 
+  def testEachBlock
+    out = Outstream::Json.create {
+      add "foo" => "bar"
+    }
+    tokens = []
+    assert_equal nil, out.each {|str| tokens << str}
+    assert_equal %w({ "foo" : "bar" }), tokens
+  end
+
   def testEnumerator
     x = "fun"
     out = Outstream::Json.create {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: outstream-json
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Ryan Calhoun