oj 2.1.6 → 2.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df465b98a85257f57cccf95bc93cb68de76fece4
-  data.tar.gz: 4092e954c5cb1bf3a1cf7a4d8729f4713bbee8bd
+  metadata.gz: 70957d2247e339a9ad73f19ad36df9da6979848b
+  data.tar.gz: b2bdcf86cf0920e464560066b7054c997656b53c
 SHA512:
-  metadata.gz: af5ae926a363a12681930df3dee6718f0ada11e43dbe54eef5916265efe65d99fa8d79ce8cdbb2158c2a6aa2111c236f61e6684dcd9699a680efc9c2be603231
-  data.tar.gz: 07fa5429999fbbce344b93d3c2afebbd275241ec0e8e733fa8a7ceb9d0da32b34b90effa57881ed68c99c8c0a8cd3ed25919c1747d2f5dc51625d1740ca7c3b8
+  metadata.gz: d4ec5a8db9aa7fd4d9c3721ccbd09f7aa357583d4a8c75f071ee007356b9371164ab75dd2ea897117cb332cf9d6158f47e0c8338aacb3b77c389e0ca08c099a6
+  data.tar.gz: 5849f4c725ee2db364c41a034aead4e1c547ae53bb090db10e6bbb65013a19812cd024586fcba1f0d58285ded793a5f5c4675103f095cd57f184ba36beca6fe8

data/README.md

@@ -20,9 +20,13 @@ 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.6
+### Current Release 2.1.7
 
- - Added Oj.to_stream() for dumping JSON to an IO object.
+ - Added support for NaN and -NaN to address issue #102. This is not according to the JSON spec but seems to be expected.
+
+ - Added require for rational if the Ruby version is 1.8.7 to address issue #104.
+
+ - Added Rails re-call of Oj.dump in the to_json() method which caused loops with Rational objects to fix issue #108 and #105.
 
 [Older release notes](http://www.ohler.com/dev/oj_misc/release_notes.html).
 

data/ext/oj/dump.c

@@ -105,6 +105,10 @@ static void	dump_leaf_float(Leaf leaf, Out out);
 static void	dump_leaf_array(Leaf leaf, int depth, Out out);
 static void	dump_leaf_hash(Leaf leaf, int depth, Out out);
 
+// These are used to detect rails re-call of Oj.dump() inside the to_json()
+// method. It is not thread safe.
+static VALUE	last_obj = Qundef;
+static int	oj_rails_hack = -1;
 
 static const char	hex_chars[17] = "0123456789abcdef";
 
@@ -429,6 +433,9 @@ dump_float(VALUE obj, Out out) {
     } else if (-OJ_INFINITY == d) {
 	strcpy(buf, "-Infinity");
 	cnt = 9;
+    } else if (isnan(d)) {
+	strcpy(buf, "NaN");
+	cnt = 3;
     } else if (d == (double)(long long int)d) {
 	cnt = sprintf(buf, "%.1f", d); // used sprintf due to bug in snprintf
     } else {
@@ -585,6 +592,10 @@ dump_array(VALUE a, int depth, Out out) {
     if (id < 0) {
 	return;
     }
+
+#if HAS_GC_GUARD
+    RB_GC_GUARD(a);
+#endif
     np = RARRAY_PTR(a);
     cnt = (int)RARRAY_LEN(a);
     *out->cur++ = '[';
@@ -1121,10 +1132,16 @@ dump_data_comp(VALUE obj, int depth, Out out) {
 	dump_hash(h, depth, out->opts->mode, out);
     } else if (rb_respond_to(obj, oj_as_json_id) && obj != (o2 = rb_funcall(obj, oj_as_json_id, 0))) {
 	dump_val(o2, depth, out);
-    } else if (rb_respond_to(obj, oj_to_json_id)) {
-	VALUE		rs = rb_funcall(obj, oj_to_json_id, 0);
-	const char	*s = StringValuePtr(rs);
-	int		len = (int)RSTRING_LEN(rs);
+    } else if (rb_respond_to(obj, oj_to_json_id) && (!oj_rails_hack || last_obj != obj)) {
+	VALUE		rs;
+	const char	*s;
+	int		len;
+
+	last_obj = obj;
+	rs = rb_funcall(obj, oj_to_json_id, 0);
+	last_obj = Qundef;
+	s = StringValuePtr(rs);
+	len = (int)RSTRING_LEN(rs);
 
 	if (out->end - out->cur <= len + 1) {
 	    grow(out, len);
@@ -1199,6 +1216,9 @@ dump_data_obj(VALUE obj, int depth, Out out) {
 
 static void
 dump_obj_comp(VALUE obj, int depth, Out out) {
+#if HAS_GC_GUARD
+    RB_GC_GUARD(obj);
+#endif
     if (rb_respond_to(obj, oj_to_hash_id)) {
 	VALUE	h = rb_funcall(obj, oj_to_hash_id, 0);
  
@@ -1208,10 +1228,16 @@ dump_obj_comp(VALUE obj, int depth, Out out) {
 	dump_hash(h, depth, out->opts->mode, out);
     } else if (rb_respond_to(obj, oj_as_json_id)) {
 	dump_val(rb_funcall(obj, oj_as_json_id, 0), depth, out);
-    } else if (rb_respond_to(obj, oj_to_json_id)) {
-	VALUE		rs = rb_funcall(obj, oj_to_json_id, 0);
-	const char	*s = StringValuePtr(rs);
-	int		len = (int)RSTRING_LEN(rs);
+    } else if (rb_respond_to(obj, oj_to_json_id) && (!oj_rails_hack || last_obj != obj)) {
+	VALUE		rs;
+	const char	*s;
+	int		len;
+
+	last_obj = obj;
+	rs = rb_funcall(obj, oj_to_json_id, 0);
+	last_obj = Qundef;
+	s = StringValuePtr(rs);
+	len = (int)RSTRING_LEN(rs);
 
 	if (out->end - out->cur <= len + 1) {
 	    grow(out, len);
@@ -1661,6 +1687,9 @@ oj_dump_obj_to_json(VALUE obj, Options copts, Out out) {
 	oj_cache8_new(&out->circ_cache);
     }
     out->indent = copts->indent;
+    if (0 > oj_rails_hack) {
+	oj_rails_hack = (rb_const_defined_at(rb_cObject, rb_intern("ActiveSupport")));
+    }
     dump_val(obj, 0, out);
     if (Yes == copts->circular) {
 	oj_cache8_delete(out->circ_cache);
@@ -1702,7 +1731,7 @@ void
 oj_write_obj_to_stream(VALUE obj, VALUE stream, Options copts) {
     char	buf[4096];
     struct _Out out;
-    size_t	size;
+    ssize_t	size;
     VALUE	clas = rb_obj_class(stream);
     VALUE	s;
 

data/ext/oj/extconf.rb

@@ -30,6 +30,7 @@ dflags = {
   '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,
+  'NEEDS_RATIONAL' => ('ruby' == type &&  '1' == version[0] && '8' == version[1]) ? 1 : 0,
   'IS_WINDOWS' => is_windows ? 1 : 0,
   'SAFE_CACHE' => is_windows ? 0 : 1,
 }

data/ext/oj/object.c

@@ -199,7 +199,7 @@ hat_value(ParseInfo pi, Val parent, const char *key, size_t klen, VALUE value) {
 #if HAS_ENCODING_SUPPORT
 	s = rb_struct_alloc_noinit(sc);
 #else
-	s = rb_struct_new(sc);
+	s = rb_struct_new(sc, Qnil, Qnil, Qnil, Qnil, Qnil, Qnil, Qnil, Qnil, Qnil, Qnil, Qnil, Qnil, Qnil, Qnil, Qnil, Qnil, Qnil, Qnil, Qnil, Qnil);
 #endif
 	sv = RSTRUCT_PTR(s);
 	if (RSTRUCT_LEN(s) < len - 1) {

data/ext/oj/oj.c

@@ -1007,6 +1007,9 @@ mimic_create_id(VALUE self, VALUE id) {
  * raise an Exception but will not have any effect. The method can also be
  * called after the json gem is loaded. The necessary methods on the json gem
  * will be replaced with Oj methods.
+ *
+ * Note that this also sets the default options of :mode to :compat and
+ * :ascii_only to true.
  */
 static VALUE
 define_mimic_json(int argc, VALUE *argv, VALUE self) {
@@ -1114,6 +1117,9 @@ void Init_oj() {
     rb_require("time");
     rb_require("date");
     rb_require("bigdecimal");
+#if NEEDS_RATIONAL
+    rb_require("rational");
+#endif
     rb_require("stringio");
 #if HAS_ENCODING_SUPPORT
     oj_utf8_encoding = rb_enc_find("UTF-8");

data/ext/oj/parse.c

@@ -387,6 +387,7 @@ read_num(ParseInfo pi) {
     ni.dec_cnt = 0;
     ni.big = 0;
     ni.infinity = 0;
+    ni.nan = 0;
     ni.neg = 0;
 
     if ('-' == *pi->cur) {
@@ -402,66 +403,73 @@ read_num(ParseInfo pi) {
 	}
 	pi->cur += 8;
 	ni.infinity = 1;
-	return;
-    }
-    for (; '0' <= *pi->cur && *pi->cur <= '9'; pi->cur++) {
-	ni.dec_cnt++;
-	if (ni.big) {
-	    ni.big++;
-	} else {
-	    int	d = (*pi->cur - '0');
-
-	    if (0 == d) {
-		zero_cnt++;
-	    } else {
-		zero_cnt = 0;
-	    }
-	    ni.i = ni.i * 10 + d;
-	    if (LONG_MAX <= ni.i || DEC_MAX < ni.dec_cnt - zero_cnt) {
-		ni.big = 1;
-	    }
+    } else if ('N' == *pi->cur || 'n' == *pi->cur) {
+	if ('a' != pi->cur[1] || ('N' != pi->cur[2] && 'n' != pi->cur[2])) {
+	    oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "not a number or other value");
+	    return;
 	}
-    }
-    if ('.' == *pi->cur) {
-	pi->cur++;
+	pi->cur += 3;
+	ni.nan = 1;
+    } else {
 	for (; '0' <= *pi->cur && *pi->cur <= '9'; pi->cur++) {
-	    int	d = (*pi->cur - '0');
-
-	    if (0 == d) {
-		zero_cnt++;
+	    ni.dec_cnt++;
+	    if (ni.big) {
+		ni.big++;
 	    } else {
-		zero_cnt = 0;
+		int	d = (*pi->cur - '0');
+
+		if (0 == d) {
+		    zero_cnt++;
+		} else {
+		    zero_cnt = 0;
+		}
+		ni.i = ni.i * 10 + d;
+		if (LONG_MAX <= ni.i || DEC_MAX < ni.dec_cnt - zero_cnt) {
+		    ni.big = 1;
+		}
 	    }
-	    ni.dec_cnt++;
-	    ni.num = ni.num * 10 + d;
-	    ni.div *= 10;
-	    if (LONG_MAX <= ni.div || DEC_MAX < ni.dec_cnt - zero_cnt) {
-		ni.big = 1;
+	}
+	if ('.' == *pi->cur) {
+	    pi->cur++;
+	    for (; '0' <= *pi->cur && *pi->cur <= '9'; pi->cur++) {
+		int	d = (*pi->cur - '0');
+
+		if (0 == d) {
+		    zero_cnt++;
+		} else {
+		    zero_cnt = 0;
+		}
+		ni.dec_cnt++;
+		ni.num = ni.num * 10 + d;
+		ni.div *= 10;
+		if (LONG_MAX <= ni.div || DEC_MAX < ni.dec_cnt - zero_cnt) {
+		    ni.big = 1;
+		}
 	    }
 	}
-    }
-    if ('e' == *pi->cur || 'E' == *pi->cur) {
-	int	eneg = 0;
+	if ('e' == *pi->cur || 'E' == *pi->cur) {
+	    int	eneg = 0;
 
-	pi->cur++;
-	if ('-' == *pi->cur) {
-	    pi->cur++;
-	    eneg = 1;
-	} else if ('+' == *pi->cur) {
 	    pi->cur++;
-	}
-	for (; '0' <= *pi->cur && *pi->cur <= '9'; pi->cur++) {
-	    ni.exp = ni.exp * 10 + (*pi->cur - '0');
-	    if (EXP_MAX <= ni.exp) {
-		ni.big = 1;
+	    if ('-' == *pi->cur) {
+		pi->cur++;
+		eneg = 1;
+	    } else if ('+' == *pi->cur) {
+		pi->cur++;
+	    }
+	    for (; '0' <= *pi->cur && *pi->cur <= '9'; pi->cur++) {
+		ni.exp = ni.exp * 10 + (*pi->cur - '0');
+		if (EXP_MAX <= ni.exp) {
+		    ni.big = 1;
+		}
+	    }
+	    if (eneg) {
+		ni.exp = -ni.exp;
 	    }
 	}
-	if (eneg) {
-	    ni.exp = -ni.exp;
-	}
+	ni.dec_cnt -= zero_cnt;
+	ni.len = pi->cur - ni.str;
     }
-    ni.dec_cnt -= zero_cnt;
-    ni.len = pi->cur - ni.str;
     if (Yes == pi->options.bigdec_load) {
 	ni.big = 1;
     }
@@ -603,6 +611,7 @@ oj_parse2(ParseInfo pi) {
 	case '8':
 	case '9':
 	case 'I':
+	case 'N':
 	    pi->cur--;
 	    read_num(pi);
 	    break;
@@ -613,7 +622,12 @@ oj_parse2(ParseInfo pi) {
 	    read_false(pi);
 	    break;
 	case 'n':
-	    read_null(pi);
+	    if ('u' == *pi->cur) {
+		read_null(pi);
+	    } else {
+		pi->cur--;
+		read_num(pi);
+	    }
 	    break;
 	case '/':
 	    skip_comment(pi);
@@ -641,6 +655,8 @@ oj_num_as_value(NumInfo ni) {
 	} else {
 	    rnum = rb_float_new(OJ_INFINITY);
 	}
+    } else if (ni->nan) {
+	rnum = rb_float_new(NAN);
     } else if (1 == ni->div && 0 == ni->exp) { // fixnum
 	if (ni->big) {
 	    if (256 > ni->len) {

data/ext/oj/parse.h

@@ -48,6 +48,7 @@ typedef struct _NumInfo {
     int		dec_cnt;
     int		big;
     int		infinity;
+    int		nan;
     int		neg;
 } *NumInfo;
 

data/lib/oj/version.rb

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

data/test/test_scp.rb

@@ -217,7 +217,7 @@ class ScpTest < ::Test::Unit::TestCase
     begin
       Oj.sc_parse(handler, json)
     rescue Exception => e
-      assert_equal("unexpected character at line 1, column 6 [parse.c:625]", e.message)
+      assert_equal("unexpected character at line 1, column 6 [parse.c:639]", e.message)
     end
   end
 

data/test/tests.rb

@@ -105,6 +105,20 @@ class Range
   end
 end # Range
 
+# define the symbol
+class ActiveSupport
+end
+
+class RailsLike
+  attr_accessor :x
+  def initialize(x)
+    @x = x
+  end
+  def to_json(options = nil)
+    Oj.dump(self, :mode => :compat)
+  end
+end # RailsLike
+
 class Juice < ::Test::Unit::TestCase
 
   def test0_get_options
@@ -185,6 +199,12 @@ class Juice < ::Test::Unit::TestCase
     dump_and_load(2.48e16, false)
     dump_and_load(2.48e100 * 1.0e10, false)
     dump_and_load(-2.48e100 * 1.0e10, false)
+    dump_and_load(1/0.0, false)
+    # NaN does not always == NaN
+    json = Oj.dump(0/0.0)
+    assert_equal('NaN', json)
+    loaded = Oj.load(json);
+    assert_equal(true, loaded.nan?)
   end
 
   def test_string
@@ -1002,6 +1022,14 @@ class Juice < ::Test::Unit::TestCase
     assert_equal({ 'x' => true, 'y' => 58, 'z' => [1, 2, 3]}, obj)
   end
 
+# Rails re-call test. Active support recalls the json dumper when the to_json
+# method is called. This mimics that and verifies Oj detects it.
+  def test_rails_like
+    obj = RailsLike.new(3)
+    json = Oj.dump(obj, :mode => :compat)
+    assert_equal('{"x":3}', json)
+  end
+
   def dump_and_load(obj, trace=false)
     json = Oj.dump(obj, :indent => 2)
     puts json if trace

metadata

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