oj 2.6.1 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47818e1b552b974e400bd82db1723ecf930100ed
-  data.tar.gz: 48f46104df400dab9f9b1c838b7247d68b34c1c3
+  metadata.gz: 874c4d47513efdd1f1a64da2ddfe403009f683bc
+  data.tar.gz: 16969c09038d314da516230b5ed45787cc05f4cd
 SHA512:
-  metadata.gz: fa8d739990ecce865cf95bd363a6464b343cd29d6ab8af6a1bf19e3dd21029d8000f990084a03990822e3f7c88e3164476e7e2b9d8295b2d0e36a5b0dadf5194
-  data.tar.gz: a02d4f7b1b07caee178e7ec726dedaa481c5c429777dc4be0f2ba9ed361aab57e040ad4ce1abd2e71d79836bad57702f32b180703ffae46e4e0f939e30c397c9
+  metadata.gz: 5192373bff2623463ab580cf32b54a45ba380e66a16d342de37b79655c94d6e4ef61180e9332023d6601bc7243ba3f1a594d3a6ad427f0ceb79e2211d070e7b1
+  data.tar.gz: 6457b838b18ad5b580b096db8f2ed5c474cc7a7841dd6c2fcde90360a2ec861c7ef0b33a63580339c0735a0f6822a75bdc35d88ed1b8cdd99360f5d85d7e645a

data/README.md

@@ -26,11 +26,9 @@ 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.6.1
+### Current Release 2.7.0
 
- - Set a limit on the maximum nesting depth to 1000. An exception is raised
-   instead of a segfault unless a reduced stack is used which could trigger the
-   segfault due to an out of memory condition.
+ - Added the push_key() method to the StringWriter and StreamWriter classes.
 
 [Older release notes](http://www.ohler.com/dev/oj_misc/release_notes.html).
 

data/ext/oj/dump.c

@@ -2049,10 +2049,13 @@ maybe_comma(StrWriter sw) {
 }
 
 void
-oj_str_writer_push_object(StrWriter sw, const char *key) {
+oj_str_writer_push_key(StrWriter sw, const char *key) {
+    DumpType	type = sw->types[sw->depth];
     long	size;
 
-    key_check(sw, key);
+    if (ObjectNew != type && ObjectType != type) {
+	rb_raise(rb_eStandardError, "Can only push a key onto an Object.");
+    }
     size = sw->depth * sw->out.indent + 3;
     if (sw->out.end - sw->out.cur <= (long)size) {
 	grow(&sw->out, size);
@@ -2061,9 +2064,31 @@ oj_str_writer_push_object(StrWriter sw, const char *key) {
     if (0 < sw->depth) {
 	fill_indent(&sw->out, sw->depth);
     }
-    if (0 != key) {
-	dump_cstr(key, strlen(key), 0, 0, &sw->out);
-	*sw->out.cur++ = ':';
+    dump_cstr(key, strlen(key), 0, 0, &sw->out);
+    *sw->out.cur++ = ':';
+    sw->keyWritten = 1;
+}
+
+void
+oj_str_writer_push_object(StrWriter sw, const char *key) {
+    if (sw->keyWritten) {
+	sw->keyWritten = 0;
+    } else {
+	long	size;
+
+	key_check(sw, key);
+	size = sw->depth * sw->out.indent + 3;
+	if (sw->out.end - sw->out.cur <= (long)size) {
+	    grow(&sw->out, size);
+	}
+	maybe_comma(sw);
+	if (0 < sw->depth) {
+	    fill_indent(&sw->out, sw->depth);
+	}
+	if (0 != key) {
+	    dump_cstr(key, strlen(key), 0, 0, &sw->out);
+	    *sw->out.cur++ = ':';
+	}
     }
     *sw->out.cur++ = '{';
     push_type(sw, ObjectNew);
@@ -2071,20 +2096,24 @@ oj_str_writer_push_object(StrWriter sw, const char *key) {
 
 void
 oj_str_writer_push_array(StrWriter sw, const char *key) {
-    long	size;
+    if (sw->keyWritten) {
+	sw->keyWritten = 0;
+    } else {
+	long	size;
 
-    key_check(sw, key);
-    size = sw->depth * sw->out.indent + 3;
-    if (sw->out.end - sw->out.cur <= size) {
-	grow(&sw->out, size);
-    }
-    maybe_comma(sw);
-    if (0 < sw->depth) {
-	fill_indent(&sw->out, sw->depth);
-    }
-    if (0 != key) {
-	dump_cstr(key, strlen(key), 0, 0, &sw->out);
-	*sw->out.cur++ = ':';
+	key_check(sw, key);
+	size = sw->depth * sw->out.indent + 3;
+	if (sw->out.end - sw->out.cur <= size) {
+	    grow(&sw->out, size);
+	}
+	maybe_comma(sw);
+	if (0 < sw->depth) {
+	    fill_indent(&sw->out, sw->depth);
+	}
+	if (0 != key) {
+	    dump_cstr(key, strlen(key), 0, 0, &sw->out);
+	    *sw->out.cur++ = ':';
+	}
     }
     *sw->out.cur++ = '[';
     push_type(sw, ArrayNew);
@@ -2092,40 +2121,48 @@ oj_str_writer_push_array(StrWriter sw, const char *key) {
 
 void
 oj_str_writer_push_value(StrWriter sw, VALUE val, const char *key) {
-    long	size;
+    if (sw->keyWritten) {
+	sw->keyWritten = 0;
+    } else {
+	long	size;
 
-    key_check(sw, key);
-    size = sw->depth * sw->out.indent + 3;
-    if (sw->out.end - sw->out.cur <= size) {
-	grow(&sw->out, size);
-    }
-    maybe_comma(sw);
-    if (0 < sw->depth) {
-	fill_indent(&sw->out, sw->depth);
-    }
-    if (0 != key) {
-	dump_cstr(key, strlen(key), 0, 0, &sw->out);
-	*sw->out.cur++ = ':';
+	key_check(sw, key);
+	size = sw->depth * sw->out.indent + 3;
+	if (sw->out.end - sw->out.cur <= size) {
+	    grow(&sw->out, size);
+	}
+	maybe_comma(sw);
+	if (0 < sw->depth) {
+	    fill_indent(&sw->out, sw->depth);
+	}
+	if (0 != key) {
+	    dump_cstr(key, strlen(key), 0, 0, &sw->out);
+	    *sw->out.cur++ = ':';
+	}
     }
     dump_val(val, sw->depth, &sw->out);
 }
 
 void
 oj_str_writer_push_json(StrWriter sw, const char *json, const char *key) {
-    long	size;
+    if (sw->keyWritten) {
+	sw->keyWritten = 0;
+    } else {
+	long	size;
 
-    key_check(sw, key);
-    size = sw->depth * sw->out.indent + 3;
-    if (sw->out.end - sw->out.cur <= size) {
-	grow(&sw->out, size);
-    }
-    maybe_comma(sw);
-    if (0 < sw->depth) {
-	fill_indent(&sw->out, sw->depth);
-    }
-    if (0 != key) {
-	dump_cstr(key, strlen(key), 0, 0, &sw->out);
-	*sw->out.cur++ = ':';
+	key_check(sw, key);
+	size = sw->depth * sw->out.indent + 3;
+	if (sw->out.end - sw->out.cur <= size) {
+	    grow(&sw->out, size);
+	}
+	maybe_comma(sw);
+	if (0 < sw->depth) {
+	    fill_indent(&sw->out, sw->depth);
+	}
+	if (0 != key) {
+	    dump_cstr(key, strlen(key), 0, 0, &sw->out);
+	    *sw->out.cur++ = ':';
+	}
     }
     dump_raw(json, strlen(json), &sw->out);
 }
@@ -2135,6 +2172,10 @@ oj_str_writer_pop(StrWriter sw) {
     long	size;
     DumpType	type = sw->types[sw->depth];
 
+    if (sw->keyWritten) {
+	sw->keyWritten = 0;
+	rb_raise(rb_eStandardError, "Can not pop after writing a key but no value.");
+    }
     sw->depth--;
     if (0 > sw->depth) {
 	rb_raise(rb_eStandardError, "Can not pop with no open array or object.");

data/ext/oj/oj.c

@@ -864,6 +864,8 @@ str_writer_init(StrWriter sw) {
     sw->types = ALLOC_N(char, 256);
     sw->types_end = sw->types + 256;
     *sw->types = '\0';
+    sw->keyWritten = 0;
+
     sw->out.buf = ALLOC_N(char, 4096);
     sw->out.end = sw->out.buf + 4086;
     sw->out.allocated = 1;
@@ -894,6 +896,23 @@ str_writer_new(int argc, VALUE *argv, VALUE self) {
     return Data_Wrap_Struct(oj_string_writer_class, 0, str_writer_free, sw);
 }
 
+/* call-seq: push_key(key)
+ *
+ * Pushes a key onto the JSON document. The key will be used for the next push
+ * if currently in a JSON object and ignored otherwise. If a key is provided on
+ * the next push then that new key will be ignored.
+ * @param [String] key the key pending for the next push
+ */
+static VALUE
+str_writer_push_key(VALUE self, VALUE key) {
+    StrWriter	sw = (StrWriter)DATA_PTR(self);
+
+    rb_check_type(key, T_STRING);
+    oj_str_writer_push_key(sw, StringValuePtr(key));
+
+    return Qnil;
+}
+
 /* call-seq: push_object(key=nil)
  *
  * Pushes an object onto the JSON document. Future pushes will be to this object
@@ -1050,6 +1069,7 @@ str_writer_reset(VALUE self) {
 
     sw->depth = 0;
     *sw->types = '\0';
+    sw->keyWritten = 0;
     sw->out.cur = sw->out.buf;
     *sw->out.cur = '\0';
 
@@ -1155,6 +1175,23 @@ stream_writer_new(int argc, VALUE *argv, VALUE self) {
     return Data_Wrap_Struct(oj_stream_writer_class, 0, stream_writer_free, sw);
 }
 
+/* call-seq: push_key(key)
+ *
+ * Pushes a key onto the JSON document. The key will be used for the next push
+ * if currently in a JSON object and ignored otherwise. If a key is provided on
+ * the next push then that new key will be ignored.
+ * @param [String] key the key pending for the next push
+ */
+static VALUE
+stream_writer_push_key(VALUE self, VALUE key) {
+    StreamWriter	sw = (StreamWriter)DATA_PTR(self);
+
+    rb_check_type(key, T_STRING);
+    oj_str_writer_push_key(&sw->sw, StringValuePtr(key));
+    stream_writer_write(sw);
+    return Qnil;
+}
+
 /* call-seq: push_object(key=nil)
  *
  * Pushes an object onto the JSON document. Future pushes will be to this object
@@ -1706,6 +1743,7 @@ void Init_oj() {
 
     oj_string_writer_class = rb_define_class_under(Oj, "StringWriter", rb_cObject);
     rb_define_module_function(oj_string_writer_class, "new", str_writer_new, -1);
+    rb_define_method(oj_string_writer_class, "push_key", str_writer_push_key, 1);
     rb_define_method(oj_string_writer_class, "push_object", str_writer_push_object, -1);
     rb_define_method(oj_string_writer_class, "push_array", str_writer_push_array, -1);
     rb_define_method(oj_string_writer_class, "push_value", str_writer_push_value, -1);
@@ -1717,6 +1755,7 @@ void Init_oj() {
 
     oj_stream_writer_class = rb_define_class_under(Oj, "StreamWriter", rb_cObject);
     rb_define_module_function(oj_stream_writer_class, "new", stream_writer_new, -1);
+    rb_define_method(oj_stream_writer_class, "push_key", stream_writer_push_key, 1);
     rb_define_method(oj_stream_writer_class, "push_object", stream_writer_push_object, -1);
     rb_define_method(oj_stream_writer_class, "push_array", stream_writer_push_array, -1);
     rb_define_method(oj_stream_writer_class, "push_value", stream_writer_push_value, -1);

data/ext/oj/oj.h

@@ -162,6 +162,7 @@ typedef struct _StrWriter {
     int			depth;
     char		*types;	// DumpType
     char		*types_end;
+    int			keyWritten;
 } *StrWriter;
 
 typedef struct _StreamWriter {
@@ -212,6 +213,7 @@ extern void	oj_write_obj_to_stream(VALUE obj, VALUE stream, Options copts);
 extern void	oj_dump_leaf_to_json(Leaf leaf, Options copts, Out out);
 extern void	oj_write_leaf_to_file(Leaf leaf, const char *path, Options copts);
 
+extern void	oj_str_writer_push_key(StrWriter sw, const char *key);
 extern void	oj_str_writer_push_object(StrWriter sw, const char *key);
 extern void	oj_str_writer_push_array(StrWriter sw, const char *key);
 extern void	oj_str_writer_push_value(StrWriter sw, VALUE val, const char *key);

data/lib/oj/version.rb

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

data/test/test_writer.rb

@@ -61,6 +61,24 @@ class OjWriter < ::Test::Unit::TestCase
     assert_equal('{"a1":{},"a2":{"b":{}},"a3":{}}', w.to_s)
   end
 
+  def test_string_writer_nested_key_object
+    w = Oj::StringWriter.new(: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.pop()
+    w.pop()
+    assert_equal('{"a1":{},"a2":{"b":{}},"a3":{}}', w.to_s)
+  end
+
   def test_string_writer_value_array
     w = Oj::StringWriter.new(:indent => 2)
     w.push_array()
@@ -117,6 +135,33 @@ class OjWriter < ::Test::Unit::TestCase
   end
 
   def test_string_writer_pop_excess
+    w = Oj::StringWriter.new(:indent => 0)
+    begin
+      w.push_object() {
+        w.push_key('key')
+      }
+    rescue Exception
+      assert(true)
+      return
+    end
+    assert(false, "*** expected an exception")
+  end
+
+  def test_string_writer_array_key
+    w = Oj::StringWriter.new(:indent => 0)
+    begin
+      w.push_array() {
+        w.push_key('key')
+        w.push_value(7)
+      }
+    rescue Exception
+      assert(true)
+      return
+    end
+    assert(false, "*** expected an exception")
+  end
+
+  def test_string_writer_pop_with_key
     w = Oj::StringWriter.new(:indent => 0)
     begin
       w.pop()

metadata

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