oj 2.7.0 → 2.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 874c4d47513efdd1f1a64da2ddfe403009f683bc
-  data.tar.gz: 16969c09038d314da516230b5ed45787cc05f4cd
+  metadata.gz: d543163764b5c7910fcbd77662a531acb56d8cff
+  data.tar.gz: f9c6554f24fc5ccf9ea95b755e009ddfbd603567
 SHA512:
-  metadata.gz: 5192373bff2623463ab580cf32b54a45ba380e66a16d342de37b79655c94d6e4ef61180e9332023d6601bc7243ba3f1a594d3a6ad427f0ceb79e2211d070e7b1
-  data.tar.gz: 6457b838b18ad5b580b096db8f2ed5c474cc7a7841dd6c2fcde90360a2ec861c7ef0b33a63580339c0735a0f6822a75bdc35d88ed1b8cdd99360f5d85d7e645a
+  metadata.gz: b4363a5dab53fe54977632c92caec3a77e304893a70230066dfc3332c81b570e82715140330e4affcb0e69f6094c108b563675873bdd1896a667fa757d6f8249
+  data.tar.gz: 4c7cdfcb15522a3ced05947997f31e30d2a55b2386456ea2279eb48852cbac08b8bd6378115b2f835beea264c0aea34d616c2d0ad2d7d5257506526d36fcb7ed

data/README.md

@@ -26,6 +26,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.7.1
+
+ - Fixed bug in new push_key which caused duplicate characters.
+
 ### Current Release 2.7.0
 
  - Added the push_key() method to the StringWriter and StreamWriter classes.

data/ext/oj/dump.c

@@ -2053,6 +2053,9 @@ oj_str_writer_push_key(StrWriter sw, const char *key) {
     DumpType	type = sw->types[sw->depth];
     long	size;
 
+    if (sw->keyWritten) {
+	rb_raise(rb_eStandardError, "Can not push more than one key before pushing a non-key.");
+    }
     if (ObjectNew != type && ObjectType != type) {
 	rb_raise(rb_eStandardError, "Can only push a key onto an Object.");
     }
@@ -2073,6 +2076,9 @@ void
 oj_str_writer_push_object(StrWriter sw, const char *key) {
     if (sw->keyWritten) {
 	sw->keyWritten = 0;
+	if (sw->out.end - sw->out.cur <= 1) {
+	    grow(&sw->out, 1);
+	}
     } else {
 	long	size;
 
@@ -2098,6 +2104,9 @@ void
 oj_str_writer_push_array(StrWriter sw, const char *key) {
     if (sw->keyWritten) {
 	sw->keyWritten = 0;
+	if (sw->out.end - sw->out.cur <= 1) {
+	    grow(&sw->out, 1);
+	}
     } else {
 	long	size;
 

data/ext/oj/oj.c

@@ -1187,6 +1187,7 @@ stream_writer_push_key(VALUE self, VALUE key) {
     StreamWriter	sw = (StreamWriter)DATA_PTR(self);
 
     rb_check_type(key, T_STRING);
+    stream_writer_reset_buf(sw);
     oj_str_writer_push_key(&sw->sw, StringValuePtr(key));
     stream_writer_write(sw);
     return Qnil;

data/lib/oj/version.rb

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

data/test/test_writer.rb

@@ -61,7 +61,7 @@ class OjWriter < ::Test::Unit::TestCase
     assert_equal('{"a1":{},"a2":{"b":{}},"a3":{}}', w.to_s)
   end
 
-  def test_string_writer_nested_key_object
+  def test_string_writer_nested_key
     w = Oj::StringWriter.new(:indent => 0)
     w.push_object()
     w.push_key('a1')
@@ -74,9 +74,11 @@ class OjWriter < ::Test::Unit::TestCase
     w.pop()
     w.push_key('a3')
     w.push_object()
+    w.push_key('a4')
+    w.push_value(37)
     w.pop()
     w.pop()
-    assert_equal('{"a1":{},"a2":{"b":{}},"a3":{}}', w.to_s)
+    assert_equal('{"a1":{},"a2":{"b":{}},"a3":{"a4":37}}', w.to_s)
   end
 
   def test_string_writer_value_array
@@ -268,4 +270,25 @@ class OjWriter < ::Test::Unit::TestCase
     assert_equal('{"a1":{},"a2":{"b":[7,true,"string"]},"a3":{}}', content)
   end
 
+  def test_stream_writer_nested_key_object
+    output = StringIO.open("", "w+")
+    w = Oj::StreamWriter.new(output, :indent => 0)
+    w.push_object()
+    w.push_key('a1')
+    w.push_object()
+    w.pop()
+    w.push_key('a2')
+    w.push_object('x')
+    w.push_object('b')
+    w.pop()
+    w.pop()
+    w.push_key('a3')
+    w.push_object()
+    w.push_key('a4')
+    w.push_value(37)
+    w.pop()
+    w.pop()
+    assert_equal('{"a1":{},"a2":{"b":{}},"a3":{"a4":37}}', output.string())
+  end
+
 end # OjWriter

metadata

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