oj 2.1.4 → 2.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9c84fb3930bef0021b22138c0e4ee9b42785b1a
-  data.tar.gz: cba9e1d4cd91413a80b7ff6521ccb6b4c41927d9
+  metadata.gz: df465b98a85257f57cccf95bc93cb68de76fece4
+  data.tar.gz: 4092e954c5cb1bf3a1cf7a4d8729f4713bbee8bd
 SHA512:
-  metadata.gz: 8a6741639d1ba3a7bd3292980ac7819aa6497c8c14621beefc4a1b151c7b8735f787460a02fd0edc8d4fd8c884cf66a453ac5439be7ecb58bf73f85bea21fe7b
-  data.tar.gz: 7e822754689d760c7e35b648d601f641e33edc1922e747051046abf2f9785f69a6fd0643b24951de6f2fc0e1352689780d64aeb595375c6181d143080bf18075
+  metadata.gz: af5ae926a363a12681930df3dee6718f0ada11e43dbe54eef5916265efe65d99fa8d79ce8cdbb2158c2a6aa2111c236f61e6684dcd9699a680efc9c2be603231
+  data.tar.gz: 07fa5429999fbbce344b93d3c2afebbd275241ec0e8e733fa8a7ceb9d0da32b34b90effa57881ed68c99c8c0a8cd3ed25919c1747d2f5dc51625d1740ca7c3b8

data/README.md

@@ -20,9 +20,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.1.4
+### Current Release 2.1.6
 
- - Fixed Linux 32 bit rounding bug.
+ - Added Oj.to_stream() for dumping JSON to an IO object.
 
 [Older release notes](http://www.ohler.com/dev/oj_misc/release_notes.html).
 
@@ -35,7 +35,8 @@ than any other Ruby JSON parser and 3 or more times faster writing JSON.
 
 Oj has several dump or serialization modes which control how Objects are
 converted to JSON. These modes are set with the :mode option in either the
-default options or as one of the options to the dump() method.
+default options or as one of the options to the dump() method. The default mode
+is the :object mode.
 
 - :strict mode will only allow the 7 basic JSON types to be serialized. Any
   other Object will raise and Exception.

data/ext/oj/dump.c

@@ -37,6 +37,8 @@
 #include <stdio.h>
 #include <string.h>
 #include <math.h>
+#include <unistd.h>
+#include <errno.h>
 
 #include "oj.h"
 #include "cache8.h"
@@ -1138,7 +1140,7 @@ dump_data_comp(VALUE obj, int depth, Out out) {
 	    case RubyTime:	dump_ruby_time(obj, out);	break;
 	    case XmlTime:	dump_xml_time(obj, out);	break;
 	    case UnixTime:
-	    default:	dump_time(obj, out);		break;
+	    default:		dump_time(obj, out);		break;
 	    }
 	} else if (oj_bigdecimal_class == clas) {
 	    VALUE	rstr = rb_funcall(obj, oj_to_s_id, 0);
@@ -1671,6 +1673,7 @@ oj_write_obj_to_file(VALUE obj, const char *path, Options copts) {
     struct _Out out;
     size_t	size;
     FILE	*f;
+    int		ok;
 
     out.buf = buf;
     out.end = buf + sizeof(buf) - 10;
@@ -1678,17 +1681,62 @@ oj_write_obj_to_file(VALUE obj, const char *path, Options copts) {
     oj_dump_obj_to_json(obj, copts, &out);
     size = out.cur - out.buf;
     if (0 == (f = fopen(path, "w"))) {
+	if (out.allocated) {
+	    xfree(out.buf);
+	}
 	rb_raise(rb_eIOError, "%s\n", strerror(errno));
     }
-    if (size != fwrite(out.buf, 1, size, f)) {
+    ok = (size == fwrite(out.buf, 1, size, f));
+    if (out.allocated) {
+	xfree(out.buf);
+    }
+    fclose(f);
+    if (!ok) {
 	int	err = ferror(f);
 
 	rb_raise(rb_eIOError, "Write failed. [%d:%s]\n", err, strerror(err));
     }
+}
+
+void
+oj_write_obj_to_stream(VALUE obj, VALUE stream, Options copts) {
+    char	buf[4096];
+    struct _Out out;
+    size_t	size;
+    VALUE	clas = rb_obj_class(stream);
+    VALUE	s;
+
+    out.buf = buf;
+    out.end = buf + sizeof(buf) - 10;
+    out.allocated = 0;
+    oj_dump_obj_to_json(obj, copts, &out);
+    size = out.cur - out.buf;
+    if (oj_stringio_class == clas) {
+	rb_funcall(stream, oj_write_id, 1, rb_str_new(out.buf, size));
+#ifndef JRUBY_RUBY
+#if !IS_WINDOWS
+    } else if (rb_respond_to(stream, oj_fileno_id) && Qnil != (s = rb_funcall(stream, oj_fileno_id, 0))) {
+	    int		fd = FIX2INT(s);
+
+	    if (size != write(fd, out.buf, size)) {
+		if (out.allocated) {
+		    xfree(out.buf);
+		}
+		rb_raise(rb_eIOError, "Write failed. [%d:%s]\n", errno, strerror(errno));
+	    }
+#endif
+#endif
+    } else if (rb_respond_to(stream, oj_write_id)) {
+	s = rb_funcall(stream, oj_write_id, 1, rb_str_new(out.buf, size));
+    } else {
+	if (out.allocated) {
+	    xfree(out.buf);
+	}
+	rb_raise(rb_eArgError, "to_stream() expected an IO Object.");
+    }
     if (out.allocated) {
 	xfree(out.buf);
     }
-    fclose(f);
 }
 
 // dump leaf functions

data/ext/oj/extconf.rb

@@ -26,7 +26,7 @@ dflags = {
   'HAS_NANO_TIME' => ('ruby' == type && ('1' == version[0] && '9' == version[1]) || '2' <= version[0]) ? 1 : 0,
   'HAS_RSTRUCT' => ('ruby' == type || 'ree' == type || 'tcs-ruby' == type) ? 1 : 0,
   'HAS_IVAR_HELPERS' => ('ruby' == type && !is_windows && (('1' == version[0] && '9' == version[1]) || '2' <= version[0])) ? 1 : 0,
-  'HAS_EXCEPTION_MAGIC' => ('ruby' == type && !is_windows && ('1' == version[0] && '9' == version[1])) ? 0 : 1,
+  'HAS_EXCEPTION_MAGIC' => ('ruby' == type && ('1' == version[0] && '9' == version[1])) ? 0 : 1,
   'HAS_PROC_WITH_BLOCK' => ('ruby' == type && (('1' == version[0] && '9' == version[1]) || '2' <= version[0])) ? 1 : 0,
   'HAS_GC_GUARD' => ('jruby' != type && 'rubinius' != type) ? 1 : 0,
   'HAS_TOP_LEVEL_ST_H' => ('ree' == type || ('ruby' == type &&  '1' == version[0] && '8' == version[1])) ? 1 : 0,

data/ext/oj/oj.c

@@ -712,6 +712,27 @@ to_file(int argc, VALUE *argv, VALUE self) {
     return Qnil;
 }
 
+/* call-seq: to_stream(io, obj, options)
+ *
+ * Dumps an Object to the specified IO stream.
+ * @param [IO] io IO stream to write the JSON document to
+ * @param [Object] obj Object to serialize as an JSON document String
+ * @param [Hash] options formating options
+ * @param [Fixnum] :indent format expected
+ * @param [true|false] :circular allow circular references, default: false
+ */
+static VALUE
+to_stream(int argc, VALUE *argv, VALUE self) {
+    struct _Options	copts = oj_default_options;
+    
+    if (3 == argc) {
+	oj_parse_options(argv[2], &copts);
+    }
+    oj_write_obj_to_stream(argv[1], *argv, &copts);
+
+    return Qnil;
+}
+
 // Mimic JSON section
 
 static VALUE
@@ -1117,6 +1138,7 @@ void Init_oj() {
 
     rb_define_module_function(Oj, "dump", dump, -1);
     rb_define_module_function(Oj, "to_file", to_file, -1);
+    rb_define_module_function(Oj, "to_stream", to_stream, -1);
 
     rb_define_module_function(Oj, "saj_parse", oj_saj_parse, -1);
     rb_define_module_function(Oj, "sc_parse", oj_sc_parse, -1);

data/ext/oj/oj.h

@@ -165,6 +165,7 @@ extern void	oj_parse_options(VALUE ropts, Options copts);
 
 extern void	oj_dump_obj_to_json(VALUE obj, Options copts, Out out);
 extern void	oj_write_obj_to_file(VALUE obj, const char *path, Options copts);
+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);
 
@@ -214,6 +215,7 @@ extern ID	oj_tv_nsec_id;
 extern ID	oj_tv_sec_id;
 extern ID	oj_tv_usec_id;
 extern ID	oj_utc_offset_id;
+extern ID	oj_write_id;
 
 #if SAFE_CACHE
 extern pthread_mutex_t	oj_cache_mutex;

data/lib/oj/version.rb

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

data/test/perf_object.rb

@@ -78,7 +78,6 @@ if files.empty?
   File.open('sample.marshal', 'w') { |f| f.write($mars) }
 else
   puts "loading and parsing #{files}\n\n"
-  # TBD change to allow xml and json
   data = files.map do |f|
     $xml = File.read(f)
     $obj = Ox.load($xml);

data/test/tests.rb

@@ -933,29 +933,25 @@ class Juice < ::Test::Unit::TestCase
 
 # Stream IO
   def test_io_string
-    json = %{{
-  "x":true,
-  "y":58,
-  "z": [1,2,3]
-}
-}
-    input = StringIO.new(json)
+    src = { 'x' => true, 'y' => 58, 'z' => [1, 2, 3]}
+    output = StringIO.open("", "w+")
+    Oj.to_stream(output, src)
+
+    input = StringIO.new(output.string())
     obj = Oj.load(input, :mode => :strict)
-    assert_equal({ 'x' => true, 'y' => 58, 'z' => [1, 2, 3]}, obj)
+    assert_equal(src, obj)
   end
 
   def test_io_file
+    src = { 'x' => true, 'y' => 58, 'z' => [1, 2, 3]}
     filename = 'open_file_test.json'
-    File.open(filename, 'w') { |f| f.write(%{{
-  "x":true,
-  "y":58,
-  "z": [1,2,3]
-}
-}) }
+    File.open(filename, "w") { |f|
+      Oj.to_stream(f, src)
+    }
     f = File.new(filename)
     obj = Oj.load(f, :mode => :strict)
     f.close()
-    assert_equal({ 'x' => true, 'y' => 58, 'z' => [1, 2, 3]}, obj)
+    assert_equal(src, obj)
   end
 
 # symbol_keys option

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 2.1.4
+  version: 2.1.6
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-04 00:00:00.000000000 Z
+date: 2013-10-07 00:00:00.000000000 Z
 dependencies: []
 description: 'The fastest JSON parser and object serializer. '
 email: peter@ohler.com
@@ -118,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: oj
-rubygems_version: 2.0.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: A fast JSON parser and serializer.