oj 2.9.1 → 2.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89fa4d9b461087f8729149310d3ff78f6c93208f
-  data.tar.gz: ae041dd8632861dbb9a456fe28212ee33828b866
+  metadata.gz: b407855f298c79a1a5aa4533773acb82bfbf8506
+  data.tar.gz: 7f4c484232b2fd3af6c124e7e773b8a11ce91ea5
 SHA512:
-  metadata.gz: a4c73cfee1fad82bb875f6c0e57695ae5ed7c0de7ea573e46296624ae98d8cb4ea05d9b24c8847f0dd99b12ccbb98763a333f1c3a6e0e1b60b00f49d8ccb7c0c
-  data.tar.gz: 82419fd8c95688ede5884b41f37a67e04236eb666660407487076dad1f492cfef964ed819d4976eabd6d22b35eb0d3dd25fdc0b96a87d6a4d1b1ba71770c1068
+  metadata.gz: 939e9faafb18e2012621e4aad5fda45c2f2e832139c150d7d01f87fc2d891c0cc7df362d9b9aa1f9cf746efa4db7524aeea8626f91b6379eab0c07a374b27ff6
+  data.tar.gz: 68da1860ac19fc5304f0c4fd9ef3e9afe8677c3715765a3039f82d36c9678e02c41701bf2f27302e847cf9bff6adbdb64901318cbfa78bd7fd3132a5ef3a8ef3

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.9.2
+
+ - Fixed link error with Windows.
+
 ### Current Release 2.9.1
 
  - Fixed mimic load when given a block to evalate. It conflicted with the new

data/ext/oj/dump.c

@@ -1864,8 +1864,8 @@ oj_write_obj_to_stream(VALUE obj, VALUE stream, Options copts) {
     struct _Out out;
     ssize_t	size;
     VALUE	clas = rb_obj_class(stream);
-    int		fd;
 #if !IS_WINDOWS
+    int		fd;
     VALUE	s;
 #endif
 

data/ext/oj/oj.c

@@ -1483,13 +1483,13 @@ mimic_walk(VALUE key, VALUE obj, VALUE proc) {
 static VALUE
 mimic_load(int argc, VALUE *argv, VALUE self) {
     struct _ParseInfo	pi;
+    VALUE		obj;
+    VALUE		p = Qnil;
 
     pi.options = oj_default_options;
     oj_set_compat_callbacks(&pi);
 
-    VALUE	obj = oj_pi_parse(argc, argv, &pi, 0, 0, 0);
-    VALUE	p = Qnil;
-
+    obj = oj_pi_parse(argc, argv, &pi, 0, 0, 0);
     if (2 <= argc) {
 	p = argv[1];
     }

data/ext/oj/parse.c

@@ -770,7 +770,9 @@ oj_pi_parse(int argc, VALUE *argv, ParseInfo pi, char *json, size_t len, int yie
     } else {
 	VALUE		clas = rb_obj_class(input);
 	volatile VALUE	s;
+#if !IS_WINDOWS
 	int		fd;
+#endif
 
 	if (oj_stringio_class == clas) {
 	    s = rb_funcall2(input, oj_string_id, 0, 0);

data/ext/oj/saj.c

@@ -716,16 +716,16 @@ oj_saj_parse(int argc, VALUE *argv, VALUE self) {
     } else {
 	VALUE		clas = rb_obj_class(input);
 	volatile VALUE	s;
+#if !IS_WINDOWS
 	int		fd;
+#endif
 	
 	if (oj_stringio_class == clas) {
 	    s = rb_funcall2(input, oj_string_id, 0, 0);
 	    len = RSTRING_LEN(s) + 1;
 	    json = ALLOC_N(char, len);
 	    strcpy(json, rb_string_value_cstr((VALUE*)&s));
-#ifndef JRUBY_RUBY
 #if !IS_WINDOWS
-	    // JRuby gets confused with what is the real fileno.
 	} else if (rb_respond_to(input, oj_fileno_id) &&
 		   Qnil != (s = rb_funcall(input, oj_fileno_id, 0)) &&
 		   0 != (fd = FIX2INT(s))) {
@@ -738,7 +738,6 @@ oj_saj_parse(int argc, VALUE *argv, VALUE self) {
 		rb_raise(rb_eIOError, "failed to read from IO Object.");
 	    }
 	    json[len] = '\0';
-#endif
 #endif
 	} else if (rb_respond_to(input, oj_read_id)) {
 	    s = rb_funcall2(input, oj_read_id, 0, 0);

data/ext/oj/scp.c

@@ -260,12 +260,12 @@ oj_sc_parse(int argc, VALUE *argv, VALUE self) {
     } else {
 	VALUE		clas = rb_obj_class(input);
 	volatile VALUE	s;
+#if !IS_WINDOWS
 	int		fd;
-
+#endif
 	if (oj_stringio_class == clas) {
 	    s = rb_funcall2(input, oj_string_id, 0, 0);
 	    pi.json = StringValuePtr(input);
-#ifndef JRUBY_RUBY
 #if !IS_WINDOWS
 	    // JRuby gets confused with what is the real fileno.
 	} else if (rb_respond_to(input, oj_fileno_id) &&
@@ -284,7 +284,6 @@ oj_sc_parse(int argc, VALUE *argv, VALUE self) {
 		rb_raise(rb_eIOError, "failed to read from IO Object.");
 	    }
 	    ((char*)pi.json)[len] = '\0';
-#endif
 #endif
 	} else if (rb_respond_to(input, oj_read_id)) {
 	    s = rb_funcall2(input, oj_read_id, 0, 0);

data/ext/oj/sparse.c

@@ -37,6 +37,7 @@
 #include "oj.h"
 #include "parse.h"
 #include "buf.h"
+#include "hash.h" // for oj_strndup()
 #include "val_stack.h"
 
 // Workaround in case INFINITY is not defined in math.h or if the OS is CentOS
@@ -357,7 +358,7 @@ read_str(ParseInfo pi) {
 	case NEXT_HASH_KEY:
 	    parent->klen = pi->rd.tail - pi->rd.str - 1;
 	    if (sizeof(parent->karray) <= parent->klen) {
-		parent->key = strndup(pi->rd.str, parent->klen);
+		parent->key = oj_strndup(pi->rd.str, parent->klen);
 		parent->kalloc = 1;
 	    } else {
 		memcpy(parent->karray, pi->rd.str, parent->klen);

data/lib/oj/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 2.9.1
+  version: 2.9.2
 platform: ruby
 authors:
 - Peter Ohler