oj 2.4.3 → 2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cdd58e56f91f91c1f5e3083766dd5aac66b9fa8b
-  data.tar.gz: 1c0c4cb8a0a39da1c7aac006bb83508c86308e9f
+  metadata.gz: a372edadce1968a9ad2d8f63e6a3ddb59f7452a9
+  data.tar.gz: 7fde017753c41e55117a5959d20ca5cb42bad830
 SHA512:
-  metadata.gz: 98ee0f6257164250f06e2c5be57d25c3f958985a0b31912c48f0391b8931d5c8e81f8159fd0061912dfd82e339a4584e3698de8395b2c112fbf0e9688ea69404
-  data.tar.gz: 583cdbe1a4d923dbd7815ac81e98636d545dcffed0a468d012b91c6ef1994ca84a68f9f29cce303c94bfc5a58a583320db770610ce5e72b1a73802f1b3791f9e
+  metadata.gz: 4024b5e1a5e33530cf5a714c62495bb06fc88225ae169ec429ac409b7f552637ffdcdfcb6f7d806a7fc4bc24d459ab8585d8f149044d7efb1eca23fc8320734b
+  data.tar.gz: 880b75ee95588c1da932492cdf0ae086f63061dc3ced0c87fe544a068e3b3f32de7b4c91c9c3a94da19b26843b629fe6a1757e2a10ad89b12c433dc326a8e601

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.0
+
+ - Added push_json() to the StringWriter and StreamWriter to allow raw JSON to be added to a JSON document being constructed.
+
 ### Current Release 2.4.3
 
  - Made include pthread.h conditional for Windows.

data/ext/oj/dump.c

@@ -2122,6 +2122,23 @@ oj_str_writer_push_value(StrWriter sw, VALUE val, const char *key) {
     dump_val(val, sw->depth, &sw->out);
 }
 
+void
+oj_str_writer_push_json(StrWriter sw, const char *json, const char *key) {
+    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 != key) {
+	dump_cstr(key, strlen(key), 0, 0, &sw->out);
+	*sw->out.cur++ = ':';
+    }
+    dump_raw(json, strlen(json), &sw->out);
+}
+
 void
 oj_str_writer_pop(StrWriter sw) {
     long	size;

data/ext/oj/oj.c

@@ -965,6 +965,36 @@ str_writer_push_value(int argc, VALUE *argv, VALUE self) {
     return Qnil;
 }
 
+/* call-seq: push_json(value, key=nil)
+ *
+ * Pushes a string onto the JSON document. The String must be a valid JSON
+ * encoded string. No additional checking is done to verify the validity of the
+ * string.
+ * @param [String] value JSON document to add to the JSON document
+ * @param [String] key the key if adding to an object in the JSON document
+ */
+static VALUE
+str_writer_push_json(int argc, VALUE *argv, VALUE self) {
+    rb_check_type(argv[0], T_STRING);
+    switch (argc) {
+    case 1:
+	oj_str_writer_push_json((StrWriter)DATA_PTR(self), StringValuePtr(*argv), 0);
+	break;
+    case 2:
+	if (Qnil == argv[1]) {
+	    oj_str_writer_push_json((StrWriter)DATA_PTR(self), StringValuePtr(*argv), 0);
+	} else {
+	    rb_check_type(argv[1], T_STRING);
+	    oj_str_writer_push_json((StrWriter)DATA_PTR(self), StringValuePtr(*argv), StringValuePtr(argv[1]));
+	}
+	break;
+    default:
+	rb_raise(rb_eArgError, "Wrong number of argument to 'push_json'.");
+	break;
+    }
+    return Qnil;
+}
+
 /* call-seq: pop()
  *
  * Pops up a level in the JSON document closing the array or object that is
@@ -1196,6 +1226,40 @@ stream_writer_push_value(int argc, VALUE *argv, VALUE self) {
     return Qnil;
 }
 
+/* call-seq: push_value(value, key=nil)
+ *
+ * Pushes a string onto the JSON document. The String must be a valid JSON
+ * encoded string. No additional checking is done to verify the validity of the
+ * string.
+ * @param [Object] value value to add to the JSON document
+ * @param [String] key the key if adding to an object in the JSON document
+ */
+static VALUE
+stream_writer_push_json(int argc, VALUE *argv, VALUE self) {
+    StreamWriter	sw = (StreamWriter)DATA_PTR(self);
+
+    rb_check_type(argv[0], T_STRING);
+    stream_writer_reset_buf(sw);
+    switch (argc) {
+    case 1:
+	oj_str_writer_push_json((StrWriter)DATA_PTR(self), StringValuePtr(*argv), 0);
+	break;
+    case 2:
+	if (Qnil == argv[0]) {
+	    oj_str_writer_push_json((StrWriter)DATA_PTR(self), StringValuePtr(*argv), 0);
+	} else {
+	    rb_check_type(argv[1], T_STRING);
+	    oj_str_writer_push_json((StrWriter)DATA_PTR(self), StringValuePtr(*argv), StringValuePtr(argv[1]));
+	}
+	break;
+    default:
+	rb_raise(rb_eArgError, "Wrong number of argument to 'push_json'.");
+	break;
+    }
+    stream_writer_write(sw);
+    return Qnil;
+}
+
 /* call-seq: pop()
  *
  * Pops up a level in the JSON document closing the array or object that is
@@ -1623,6 +1687,7 @@ void Init_oj() {
     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);
+    rb_define_method(oj_string_writer_class, "push_json", str_writer_push_json, -1);
     rb_define_method(oj_string_writer_class, "pop", str_writer_pop, 0);
     rb_define_method(oj_string_writer_class, "pop_all", str_writer_pop_all, 0);
     rb_define_method(oj_string_writer_class, "reset", str_writer_reset, 0);
@@ -1633,6 +1698,7 @@ void Init_oj() {
     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);
+    rb_define_method(oj_stream_writer_class, "push_json", stream_writer_push_json, -1);
     rb_define_method(oj_stream_writer_class, "pop", stream_writer_pop, 0);
     rb_define_method(oj_stream_writer_class, "pop_all", stream_writer_pop_all, 0);
 

data/ext/oj/oj.h

@@ -214,6 +214,7 @@ extern void	oj_write_leaf_to_file(Leaf leaf, const char *path, Options copts);
 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);
+extern void	oj_str_writer_push_json(StrWriter sw, const char *json, const char *key);
 extern void	oj_str_writer_pop(StrWriter sw);
 extern void	oj_str_writer_pop_all(StrWriter sw);
 

data/lib/oj/version.rb

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

data/test/test_writer.rb

@@ -76,6 +76,19 @@ class OjWriter < ::Test::Unit::TestCase
     assert_equal('[7,7.3,true,null,"a string",{"a":65},[1,2]]', w.to_s)
   end
 
+  def test_string_writer_json
+    w = Oj::StringWriter.new(:indent => 0)
+    w.push_array()
+    w.push_json('7')
+    w.push_json('true')
+    w.push_json(%|"a string"|)
+    w.push_object()
+    w.push_json('{"a":65}', 'x')
+    w.pop()
+    w.pop()
+    assert_equal('[7,true,"a string",{"x":{"a":65}}]', w.to_s)
+  end
+
   def test_string_writer_pop_excess
     w = Oj::StringWriter.new(:indent => 0)
     begin

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 2.4.3
+  version: 2.5.1
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-16 00:00:00.000000000 Z
+date: 2013-12-18 00:00:00.000000000 Z
 dependencies: []
 description: 'The fastest JSON parser and object serializer. '
 email: peter@ohler.com