oj 2.5.2 → 2.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 220d1012a368e139d601519ae2bde0835b574a44
-  data.tar.gz: e792b43ad00c9d8c592221e136b433d2ac1525cf
+  metadata.gz: c4165ecef265108d14800378477125c41841e728
+  data.tar.gz: 6ba913e644eba9a2aad1661b325bfab916eb5538
 SHA512:
-  metadata.gz: 105d031b3ed97c598a828537304adbd344c43aafaf1a79793cdabe51823a6a1d3a1bb7aafce6022ffa732f355141a4061ca6f8bc33dc00b9be584ad5baf51270
-  data.tar.gz: 3ff635338d57dd897511bbabe746fcde5db77629f8ffd10d4441f1e81e5a24a22ff64f386cd6da0e8410d3c25fc504b4fffb29f57a313339eb9daa6397abcf9a
+  metadata.gz: 822357deaa522c3fcbf1971c6c5f791904d9b083afe8b8bea4c96a7f6bf7b2101bd0114c614e291943a9a8f48571824c49133f94a7dc1279c9e342e8a6d7f1e4
+  data.tar.gz: 5727942d444faa502f69bf3875e1c3c9b3176ea4fa2d6caaa26ed74cab3fea32d49780cf6e83687946d7d43bae91c3969efee2e3add96d77c011d78ed15c8869

data/README.md

@@ -20,6 +20,10 @@ Follow [@peterohler on Twitter](http://twitter.com/#!/peterohler) for announceme
 
 [![Build Status](https://secure.travis-ci.org/ohler55/oj.png?branch=master)](http://travis-ci.org/ohler55/oj)
 
+### Current Release 2.5.3
+
+ - Added support for blocks with StringWriter
+
 ### Current Release 2.5.2
 
  - Fixed indent problem with StringWriter so it now indents properly

data/ext/oj/oj.c

@@ -895,22 +895,28 @@ str_writer_new(int argc, VALUE *argv, VALUE self) {
  */
 static VALUE
 str_writer_push_object(int argc, VALUE *argv, VALUE self) {
+    StrWriter	sw = (StrWriter)DATA_PTR(self);
+
     switch (argc) {
     case 0:
-	oj_str_writer_push_object((StrWriter)DATA_PTR(self), 0);
+	oj_str_writer_push_object(sw, 0);
 	break;
     case 1:
 	if (Qnil == argv[0]) {
-	    oj_str_writer_push_object((StrWriter)DATA_PTR(self), 0);
+	    oj_str_writer_push_object(sw, 0);
 	} else {
 	    rb_check_type(argv[0], T_STRING);
-	    oj_str_writer_push_object((StrWriter)DATA_PTR(self), StringValuePtr(argv[0]));
+	    oj_str_writer_push_object(sw, StringValuePtr(argv[0]));
 	}
 	break;
     default:
 	rb_raise(rb_eArgError, "Wrong number of argument to 'push_object'.");
 	break;
     }
+    if (rb_block_given_p()) {
+	rb_yield(Qnil);
+	oj_str_writer_pop(sw);
+    }
     return Qnil;
 }
 
@@ -922,22 +928,28 @@ str_writer_push_object(int argc, VALUE *argv, VALUE self) {
  */
 static VALUE
 str_writer_push_array(int argc, VALUE *argv, VALUE self) {
+    StrWriter	sw = (StrWriter)DATA_PTR(self);
+
     switch (argc) {
     case 0:
-	oj_str_writer_push_array((StrWriter)DATA_PTR(self), 0);
+	oj_str_writer_push_array(sw, 0);
 	break;
     case 1:
 	if (Qnil == argv[0]) {
-	    oj_str_writer_push_array((StrWriter)DATA_PTR(self), 0);
+	    oj_str_writer_push_array(sw, 0);
 	} else {
 	    rb_check_type(argv[0], T_STRING);
-	    oj_str_writer_push_array((StrWriter)DATA_PTR(self), StringValuePtr(argv[0]));
+	    oj_str_writer_push_array(sw, StringValuePtr(argv[0]));
 	}
 	break;
     default:
 	rb_raise(rb_eArgError, "Wrong number of argument to 'push_object'.");
 	break;
     }
+    if (rb_block_given_p()) {
+	rb_yield(Qnil);
+	oj_str_writer_pop(sw);
+    }
     return Qnil;
 }
 

data/lib/oj/version.rb

@@ -1,5 +1,5 @@
 
 module Oj
   # Current version of the module. 
-  VERSION = '2.5.2'
+  VERSION = '2.5.3'
 end

data/test/test_writer.rb

@@ -90,6 +90,20 @@ class OjWriter < ::Test::Unit::TestCase
 |, w.to_s)
   end
 
+  def test_string_writer_block
+    w = Oj::StringWriter.new(:indent => 0)
+    w.push_object() {
+      w.push_object("a1") {
+        w.push_value(7, 'a7')
+      }
+      w.push_array("a2") {
+        w.push_value('x')
+        w.push_value(3)
+      }
+    }
+    assert_equal('{"a1":{"a7":7},"a2":["x",3]}', w.to_s)
+  end
+
   def test_string_writer_json
     w = Oj::StringWriter.new(:indent => 0)
     w.push_array()

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 2.5.2
+  version: 2.5.3
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-02 00:00:00.000000000 Z
+date: 2014-01-03 00:00:00.000000000 Z
 dependencies: []
 description: 'The fastest JSON parser and object serializer. '
 email: peter@ohler.com