oj 2.4.0 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 873b6fade9db8e2c3e82c5a6329c4ceb09215d6d
-  data.tar.gz: 4f8074a9a5ac20d567c58d002323949fc08828ce
+  metadata.gz: 9262e646eacc8cec4f6eceb06d4f5c84370d62a1
+  data.tar.gz: 1de9d17fe6bcfa76e5da8d61d239853f7948421c
 SHA512:
-  metadata.gz: f82b5aedde38474ca0ddd6826f11ed4fa02bf17fbcf6a56ba14dca772c9e3000119d15d81c092f4dae9000a7dec6ca2c1a7c971a2b854a54d68a50586ab8f2d4
-  data.tar.gz: 8935ab29251ca82de0c9b770df24a0015bc6e46dc0f1cdfba6868ddc23b685306b8c4c4a1d182559ada38f654a8f9dbd199d4b68f9670a18d65fc7c45370eecf
+  metadata.gz: 95c811b68202c376bee344ad7c6aa10571cd4efec48a7b85f3e9057163643fc77e81c6780be85eaca0ad4f9eca1c1d2c66da6497e18235107bee6b133699eb09
+  data.tar.gz: 9c65680e52c0154dfeab3c712bbf29bd2f12f30bb720b084f7f4ddd5a6e75dad789fd4101a31d351a6613ff9258a545ff1aa8dcf2d77705244c29c0fdf5ec692

data/README.md

@@ -21,25 +21,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.4.0
+### Current Release 2.4.1
 
- - Merged in a PR to again allow strings with embedded nulls.
-
- - Implemented StreamWriter to compliment the StringWriter.
-
- - Fixed bug in the class cache hash function that showed up with the sparc compiler.
-
-### Current Release 2.3.0
-
- - JRuby is no longer supported.
-
- - Thanks to Stefan Kaes the support for structs has been optimized.
-
- - Better support for Rubinous
-
- - Added option to disable GG during parsing.
-
- - Added StringWriter that allows building a JSON document one element at a time.
+ - Fixed Windows version by removing class cache test.
 
 [Older release notes](http://www.ohler.com/dev/oj_misc/release_notes.html).
 

data/ext/oj/dump.c

@@ -1774,7 +1774,9 @@ oj_write_obj_to_stream(VALUE obj, VALUE stream, Options copts) {
     struct _Out out;
     ssize_t	size;
     VALUE	clas = rb_obj_class(stream);
+#if !IS_WINDOWS
     VALUE	s;
+#endif
 
     out.buf = buf;
     out.end = buf + sizeof(buf) - 10;
@@ -1783,7 +1785,6 @@ oj_write_obj_to_stream(VALUE obj, VALUE stream, Options copts) {
     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);
@@ -1794,7 +1795,6 @@ oj_write_obj_to_stream(VALUE obj, VALUE stream, Options copts) {
 	    }
 	    rb_raise(rb_eIOError, "Write failed. [%d:%s]\n", errno, strerror(errno));
 	}
-#endif
 #endif
     } else if (rb_respond_to(stream, oj_write_id)) {
 	rb_funcall(stream, oj_write_id, 1, rb_str_new(out.buf, size));
@@ -2067,11 +2067,11 @@ maybe_comma(StrWriter sw) {
 
 void
 oj_str_writer_push_object(StrWriter sw, const char *key) {
-    size_t	size;
+    long	size;
 
     key_check(sw, key);
     size = sw->depth * sw->out.indent + 3;
-    if (sw->out.end - sw->out.cur <= size) {
+    if (sw->out.end - sw->out.cur <= (long)size) {
 	grow(&sw->out, size);
     }
     maybe_comma(sw);
@@ -2086,7 +2086,7 @@ oj_str_writer_push_object(StrWriter sw, const char *key) {
 
 void
 oj_str_writer_push_array(StrWriter sw, const char *key) {
-    size_t	size;
+    long	size;
 
     key_check(sw, key);
     size = sw->depth * sw->out.indent + 3;
@@ -2104,7 +2104,7 @@ oj_str_writer_push_array(StrWriter sw, const char *key) {
 
 void
 oj_str_writer_push_value(StrWriter sw, VALUE val, const char *key) {
-    size_t	size;
+    long	size;
 
     key_check(sw, key);
     size = sw->depth * sw->out.indent + 3;
@@ -2121,7 +2121,7 @@ oj_str_writer_push_value(StrWriter sw, VALUE val, const char *key) {
 
 void
 oj_str_writer_pop(StrWriter sw) {
-    size_t	size;
+    long	size;
     DumpType	type = sw->types[sw->depth];
 
     sw->depth--;

data/ext/oj/oj.c

@@ -1074,17 +1074,17 @@ stream_writer_new(int argc, VALUE *argv, VALUE self) {
     int			fd = 0;
     VALUE		stream = argv[0];
     VALUE		clas = rb_obj_class(stream);
-    VALUE		s;
     StreamWriter	sw;
+#if !IS_WINDOWS
+    VALUE		s;
+#endif
     
     if (oj_stringio_class == clas) {
 	type = STRING_IO;
-#ifndef JRUBY_RUBY
 #if !IS_WINDOWS
     } else if (rb_respond_to(stream, oj_fileno_id) && Qnil != (s = rb_funcall(stream, oj_fileno_id, 0))) {
 	type = FILE_IO;
 	fd = FIX2INT(s);
-#endif
 #endif
     } else if (rb_respond_to(stream, oj_write_id)) {
 	type = STREAM_IO;
@@ -1578,6 +1578,7 @@ define_mimic_json(int argc, VALUE *argv, VALUE self) {
     return mimic;
 }
 
+/*
 extern void	oj_hash_test();
 
 static VALUE
@@ -1585,6 +1586,7 @@ hash_test(VALUE self) {
     oj_hash_test();
     return Qnil;
 }
+*/
 
 #if !HAS_ENCODING_SUPPORT
 static VALUE
@@ -1650,7 +1652,7 @@ void Init_oj() {
     oj_utf8_encoding = Qnil;
 #endif
 
-    rb_define_module_function(Oj, "hash_test", hash_test, 0);
+    //rb_define_module_function(Oj, "hash_test", hash_test, 0);
 
     rb_define_module_function(Oj, "default_options", get_def_opts, 0);
     rb_define_module_function(Oj, "default_options=", set_def_opts, 1);

data/lib/oj/version.rb

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

metadata

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