oj 2.17.5 → 2.18.0

checksums.yaml

@@ -1,7 +1,7 @@
----
-SHA1:
-  metadata.gz: f9904f1f35cca59ff6e3e9f9f3a2e391cdc29404
-  data.tar.gz: 77f647f9b93058861cbe1f2fe84e1063169fc5b1
-SHA512:
-  metadata.gz: eb5d9a18cc205da2c52035750f274ea4c9a41fbe71b383eff0e032c4006c37c87c8b3a3fb238239e4e4e4f8ee9920007666fe3daa9de1b001e2cc118d1ebcf22
-  data.tar.gz: 8e414158909fcdf69bb16fc1465b6d710ec36f1845849f716c021629162873026d6fa38cf19330e92a65911804df69eaea6e982b84b7b153853e0e09df303651
+--- 
+SHA1: 
+  metadata.gz: 49295a5c6be0e45972d2cf83173fabb2db55fcc3
+  data.tar.gz: 645d5ec2b8214eeb596fd98cb5a9c0e1e2a9836e
+SHA512: 
+  metadata.gz: 0731c01c050cc7aff03be4510be0ad026ed0a320f1fee34fb6318bcdcb5888455c13e9dfb6ec2e7b4d6436e5c04cf43a6d43ff257bb076cc1ec5b8ee5c224cc4
+  data.tar.gz: ce82256a18f92155498d0ee6b74c06704eb51782cd3411a3c7c2308af252386e668c43216831b32999a349cea83ff5804515314ec1ef9dfc1df36fac388c56dc

data/README.md

@@ -170,9 +170,16 @@ Oj.default_options = {:mode => :compat }
 
 ## Releases
 
-**Future Release 2.17.5**
+** Release 2.18.0**
 
-- Added additional code to check for as_json arguments and recursive calls.
+- Rubinius compilation fixes.
+
+- Added a separate option for as_json instead of piggy backing on the
+  use_to_json. This changes the API slightly.
+
+- Ready for Ruby 2.4.
+
+- Thanks to faucct for fixing mimic to not redefine JSON::ParseError.
 
 [Older release notes](http://www.ohler.com/dev/oj_misc/release_notes.html).
 

data/ext/oj/dump.c

@@ -1118,7 +1118,7 @@ dump_time(VALUE obj, Out out, int withZone) {
 	long	tzsecs = NUM2LONG(rb_funcall2(obj, oj_utc_offset_id, 0, 0));
 	int	zneg = (0 > tzsecs);
 
-	if (0 == tzsecs && Qtrue == rb_funcall2(obj, oj_utcq_id, 0, 0)) {
+	if (0 == tzsecs && rb_funcall2(obj, oj_utcq_id, 0, 0)) {
 	    tzsecs = 86400;
 	}
 	if (zneg) {
@@ -1251,7 +1251,7 @@ dump_xml_time(VALUE obj, Out out) {
     }
 #endif
     if (0 == nsec || 0 == out->opts->sec_prec) {
-	if (0 == tzsecs && Qtrue == rb_funcall2(obj, oj_utcq_id, 0, 0)) {
+	if (0 == tzsecs && rb_funcall2(obj, oj_utcq_id, 0, 0)) {
 	    sprintf(buf, "%04d-%02d-%02dT%02d:%02d:%02dZ",
 		    tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday,
 		    tm->tm_hour, tm->tm_min, tm->tm_sec);
@@ -1263,7 +1263,7 @@ dump_xml_time(VALUE obj, Out out) {
 		    tzsign, tzhour, tzmin);
 	    dump_cstr(buf, 25, 0, 0, out);
 	}
-    } else if (0 == tzsecs && Qtrue == rb_funcall2(obj, oj_utcq_id, 0, 0)) {
+    } else if (0 == tzsecs && rb_funcall2(obj, oj_utcq_id, 0, 0)) {
 	char	format[64] = "%04d-%02d-%02dT%02d:%02d:%02d.%09ldZ";
 	int	len = 30;
 
@@ -1321,7 +1321,7 @@ static void
 dump_data_comp(VALUE obj, int depth, Out out, int argc, VALUE *argv, bool as_ok) {
     VALUE	clas = rb_obj_class(obj);
 
-    if (as_ok && rb_respond_to(obj, oj_to_hash_id)) {
+    if (as_ok && Yes == out->opts->to_json && rb_respond_to(obj, oj_to_hash_id)) {
 	volatile VALUE	h = rb_funcall(obj, oj_to_hash_id, 0);
  
 	if (T_HASH != rb_type(h)) {
@@ -1333,14 +1333,14 @@ dump_data_comp(VALUE obj, int depth, Out out, int argc, VALUE *argv, bool as_ok)
 	    dump_val(h, depth, out, 0, 0, false);
 	}
 	dump_hash(h, Qundef, depth, out->opts->mode, out);
-
     } else if (Yes == out->opts->bigdec_as_num && oj_bigdecimal_class == clas) {
 	volatile VALUE	rstr = rb_funcall(obj, oj_to_s_id, 0);
 
 	dump_raw(rb_string_value_ptr((VALUE*)&rstr), RSTRING_LEN(rstr), out);
-    } else if (as_ok && rb_respond_to(obj, oj_as_json_id)) {
+    } else if (as_ok && Yes == out->opts->as_json && rb_respond_to(obj, oj_as_json_id)) {
 	volatile VALUE	aj;
 
+#if HAS_METHOD_ARITY
 	// Some classes elect to not take an options argument so check the arity
 	// of as_json.
 	switch (rb_obj_method_arity(obj, oj_as_json_id)) {
@@ -1361,6 +1361,9 @@ dump_data_comp(VALUE obj, int depth, Out out, int argc, VALUE *argv, bool as_ok)
 	    aj = rb_funcall2(obj, oj_as_json_id, argc, argv);
 	    break;
 	}
+#else
+	aj = rb_funcall2(obj, oj_as_json_id, argc, argv);
+#endif
 	// Catch the obvious brain damaged recursive dumping.
 	if (aj == obj) {
 	    volatile VALUE	rstr = rb_funcall(obj, oj_to_s_id, 0);
@@ -1451,7 +1454,7 @@ dump_data_obj(VALUE obj, int depth, Out out) {
 
 static void
 dump_obj_comp(VALUE obj, int depth, Out out, int argc, VALUE *argv, bool as_ok) {
-    if (as_ok && rb_respond_to(obj, oj_to_hash_id)) {
+    if (as_ok && Yes == out->opts->to_json && rb_respond_to(obj, oj_to_hash_id)) {
 	volatile VALUE	h = rb_funcall(obj, oj_to_hash_id, 0);
 
 	if (T_HASH != rb_type(h)) {
@@ -1464,9 +1467,10 @@ dump_obj_comp(VALUE obj, int depth, Out out, int argc, VALUE *argv, bool as_ok)
 	} else {
 	    dump_hash(h, Qundef, depth, out->opts->mode, out);
 	}
-    } else if (as_ok && rb_respond_to(obj, oj_as_json_id)) {
+    } else if (as_ok && Yes == out->opts->as_json && rb_respond_to(obj, oj_as_json_id)) {
 	volatile VALUE	aj;
 
+#if HAS_METHOD_ARITY
 	// Some classes elect to not take an options argument so check the arity
 	// of as_json.
 	switch (rb_obj_method_arity(obj, oj_as_json_id)) {
@@ -1487,6 +1491,9 @@ dump_obj_comp(VALUE obj, int depth, Out out, int argc, VALUE *argv, bool as_ok)
 	    aj = rb_funcall2(obj, oj_as_json_id, argc, argv);
 	    break;
 	}
+#else
+	aj = rb_funcall2(obj, oj_as_json_id, argc, argv);
+#endif
 	// Catch the obvious brain damaged recursive dumping.
 	if (aj == obj) {
 	    volatile VALUE	rstr = rb_funcall(obj, oj_to_s_id, 0);
@@ -1774,7 +1781,7 @@ dump_obj_attrs(VALUE obj, VALUE clas, slot_t id, int depth, Out out) {
 	}
 #endif
 #if HAS_EXCEPTION_MAGIC
-	if (Qtrue == rb_obj_is_kind_of(obj, rb_eException)) {
+	if (rb_obj_is_kind_of(obj, rb_eException)) {
 	    volatile VALUE	rv;
 
 	    if (',' != *(out->cur - 1)) {
@@ -1816,7 +1823,7 @@ dump_obj_attrs(VALUE obj, VALUE clas, slot_t id, int depth, Out out) {
 
 static void
 dump_struct_comp(VALUE obj, int depth, Out out, int argc, VALUE *argv, bool as_ok) {
-    if (as_ok && rb_respond_to(obj, oj_to_hash_id)) {
+    if (as_ok && Yes == out->opts->to_json && rb_respond_to(obj, oj_to_hash_id)) {
 	volatile VALUE	h = rb_funcall(obj, oj_to_hash_id, 0);
  
 	if (T_HASH != rb_type(h)) {
@@ -1828,9 +1835,10 @@ dump_struct_comp(VALUE obj, int depth, Out out, int argc, VALUE *argv, bool as_o
 	    dump_val(h, depth, out, 0, 0, false);
 	}
 	dump_hash(h, Qundef, depth, out->opts->mode, out);
-    } else if (as_ok && rb_respond_to(obj, oj_as_json_id)) {
+    } else if (as_ok && Yes == out->opts->as_json && rb_respond_to(obj, oj_as_json_id)) {
 	volatile VALUE	aj;
 
+#if HAS_METHOD_ARITY
 	// Some classes elect to not take an options argument so check the arity
 	// of as_json.
 	switch (rb_obj_method_arity(obj, oj_as_json_id)) {
@@ -1851,6 +1859,9 @@ dump_struct_comp(VALUE obj, int depth, Out out, int argc, VALUE *argv, bool as_o
 	    aj = rb_funcall2(obj, oj_as_json_id, argc, argv);
 	    break;
 	}
+#else
+	aj = rb_funcall2(obj, oj_as_json_id, argc, argv);
+#endif
 	// Catch the obvious brain damaged recursive dumping.
 	if (aj == obj) {
 	    volatile VALUE	rstr = rb_funcall(obj, oj_to_s_id, 0);
@@ -1899,6 +1910,7 @@ dump_struct_obj(VALUE obj, int depth, Out out) {
     *out->cur++ = '"';
     *out->cur++ = ':';
     *out->cur++ = '[';
+#if HAS_STRUCT_MEMBERS
     if ('#' == *class_name) {
 	VALUE		ma = rb_struct_s_members(clas);
 	const char	*name;
@@ -1922,6 +1934,9 @@ dump_struct_obj(VALUE obj, int depth, Out out) {
 	}
 	*out->cur++ = ']';
     } else {
+#else
+    if (true) {
+#endif
 	fill_indent(out, d3);
 	*out->cur++ = '"';
 	memcpy(out->cur, class_name, len);
@@ -1932,17 +1947,21 @@ dump_struct_obj(VALUE obj, int depth, Out out) {
     size = d3 * out->indent + 2;
 #ifdef RSTRUCT_LEN
     {
-	const VALUE	*vp;
-
-#ifndef RSTRUCT_CONST_PTR
-# define RSTRUCT_CONST_PTR(st) (const VALUE *)RSTRUCT_PTR(st)
-#endif
-	for (i = (int)RSTRUCT_LEN(obj), vp = RSTRUCT_CONST_PTR(obj); 0 < i; i--, vp++) {
+	VALUE	v;
+	int	cnt;
+#if UNIFY_FIXNUM_AND_BIGNUM
+	cnt = (int)NUM2LONG(RSTRUCT_LEN(obj));
+#else // UNIFY_FIXNUM_AND_INTEGER
+	cnt = (int)RSTRUCT_LEN(obj);
+#endif // UNIFY_FIXNUM_AND_INTEGER
+	
+	for (i = 0; i < cnt; i++) {
+	    v = RSTRUCT_GET(obj, i);
 	    if (out->end - out->cur <= (long)size) {
 		grow(out, size);
 	    }
 	    fill_indent(out, d3);
-	    dump_val(*vp, d3, out, 0, 0, true);
+	    dump_val(v, d3, out, 0, 0, true);
 	    *out->cur++ = ',';
 	}
     }
@@ -1957,7 +1976,7 @@ dump_struct_obj(VALUE obj, int depth, Out out) {
 		grow(out, size);
 	    }
 	    fill_indent(out, d3);
-	    dump_val(rb_struct_aref(obj, INT2FIX(i)), d3, out, 0, 0);
+	    dump_val(rb_struct_aref(obj, INT2FIX(i)), d3, out, 0, 0, true);
 	    *out->cur++ = ',';
 	}
     }

data/ext/oj/extconf.rb

@@ -35,6 +35,9 @@ dflags = {
   'DATETIME_1_8' => ('ruby' == type && ('1' == version[0] && '8' == version[1])) ? 1 : 0,
   'NO_TIME_ROUND_PAD' => ('rubinius' == type) ? 1 : 0,
   'HAS_DATA_OBJECT_WRAP' => ('ruby' == type && '2' == version[0] && '3' <= version[1]) ? 1 : 0,
+  'HAS_METHOD_ARITY' =>  ('rubinius' == type) ? 0 : 1,
+  'HAS_STRUCT_MEMBERS' =>  ('rubinius' == type) ? 0 : 1,
+  'UNIFY_FIXNUM_AND_BIGNUM' => ('ruby' == type && '2' == version[0] && '4' <= version[1]) ? 1 : 0,
 }
 # This is a monster hack to get around issues with 1.9.3-p0 on CentOS 5.4. SO
 # some reason math.h and string.h contents are not processed. Might be a

data/ext/oj/object.c

@@ -390,7 +390,8 @@ hat_value(ParseInfo pi, Val parent, const char *key, size_t klen, volatile VALUE
 	if (2 == klen && 'u' == key[1]) {
             volatile VALUE	sc;
 	    volatile VALUE	e1;
-
+	    int			slen;
+	    
 	    if (0 == len) {
 		oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "Invalid struct data");
 		return 1;
@@ -415,27 +416,24 @@ hat_value(ParseInfo pi, Val parent, const char *key, size_t klen, volatile VALUE
             parent->val = rb_obj_alloc(sc);
             // If the JSON array has more entries than the struct class allows, we record an error.
 #ifdef RSTRUCT_LEN
+#if UNIFY_FIXNUM_AND_BIGNUM
+	    slen = (int)NUM2LONG(RSTRUCT_LEN(parent->val));
+#else // UNIFY_FIXNUM_AND_INTEGER
+	    slen = (int)RSTRUCT_LEN(parent->val);
+#endif // UNIFY_FIXNUM_AND_INTEGER
+#else
+	    slen = FIX2INT(rb_funcall2(parent->val, oj_length_id, 0, 0));
+#endif
             // MRI >= 1.9
-            if (len - 1 > RSTRUCT_LEN(parent->val)) {
+            if (len - 1 > slen) {
 		oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "Invalid struct data");
             } else {
-                MEMCPY(RSTRUCT_PTR(parent->val), RARRAY_PTR(value) + 1, VALUE, len - 1);
-            }
-#else
-            {
-		// MRI < 1.9 or Rubinius
-		int	slen = FIX2INT(rb_funcall2(parent->val, oj_length_id, 0, 0));
 		int	i;
 
-		if (len - 1 > slen) {
-		    oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "Invalid struct data");
-		} else {
-		    for (i = 0; i < slen; i++) {
-			rb_struct_aset(parent->val, INT2FIX(i), RARRAY_PTR(value)[i + 1]);
-		    }
+		for (i = 0; i < slen; i++) {
+		    rb_struct_aset(parent->val, INT2FIX(i), RARRAY_PTR(value)[i + 1]);
 		}
             }
-#endif
 	    return 1;
 	} else if (3 <= klen && '#' == key[1]) {
 	    volatile VALUE	*a;

data/ext/oj/oj.c

@@ -142,6 +142,7 @@ static VALUE	symbol_keys_sym;
 static VALUE	time_format_sym;
 static VALUE	unix_sym;
 static VALUE	unix_zone_sym;
+static VALUE	use_as_json_sym;
 static VALUE	use_to_json_sym;
 static VALUE	word_sym;
 static VALUE	xmlschema_sym;
@@ -180,7 +181,8 @@ struct _Options	oj_default_options = {
     UnixZTime,	// time_format
     Yes,	// bigdec_as_num
     AutoDec,	// bigdec_load
-    Yes,	// to_json
+    No,		// to_json
+    No,		// as_json
     No,		// nilnil
     Yes,	// allow_gc
     Yes,	// quirks_mode
@@ -227,6 +229,7 @@ static VALUE	define_mimic_json(int argc, VALUE *argv, VALUE self);
  * - second_precision: [Fixnum|nil] number of digits after the decimal when dumping the seconds portion of time
  * - float_precision: [Fixnum|nil] number of digits of precision when dumping floats, 0 indicates use Ruby
  * - use_to_json: [true|false|nil] call to_json() methods on dump, default is false
+ * - use_as_json: [true|false|nil] call as_json() methods on dump, default is false
  * - nilnil: [true|false|nil] if true a nil input to load will return nil and not raise an Exception
  * - allow_gc: [true|false|nil] allow or prohibit GC during parsing, default is true (allow)
  * - quirks_mode: [true,|false|nil] Allow single JSON values instead of documents, default is true (allow)
@@ -257,6 +260,7 @@ get_def_opts(VALUE self) {
     rb_hash_aset(opts, symbol_keys_sym, (Yes == oj_default_options.sym_key) ? Qtrue : ((No == oj_default_options.sym_key) ? Qfalse : Qnil));
     rb_hash_aset(opts, bigdecimal_as_decimal_sym, (Yes == oj_default_options.bigdec_as_num) ? Qtrue : ((No == oj_default_options.bigdec_as_num) ? Qfalse : Qnil));
     rb_hash_aset(opts, use_to_json_sym, (Yes == oj_default_options.to_json) ? Qtrue : ((No == oj_default_options.to_json) ? Qfalse : Qnil));
+    rb_hash_aset(opts, use_as_json_sym, (Yes == oj_default_options.as_json) ? Qtrue : ((No == oj_default_options.as_json) ? Qfalse : Qnil));
     rb_hash_aset(opts, nilnil_sym, (Yes == oj_default_options.nilnil) ? Qtrue : ((No == oj_default_options.nilnil) ? Qfalse : Qnil));
     rb_hash_aset(opts, allow_gc_sym, (Yes == oj_default_options.allow_gc) ? Qtrue : ((No == oj_default_options.allow_gc) ? Qfalse : Qnil));
     rb_hash_aset(opts, quirks_mode_sym, (Yes == oj_default_options.quirks_mode) ? Qtrue : ((No == oj_default_options.quirks_mode) ? Qfalse : Qnil));
@@ -341,6 +345,7 @@ get_def_opts(VALUE self) {
  * @param [Fixnum|nil] :second_precision number of digits after the decimal when dumping the seconds portion of time
  * @param [Fixnum|nil] :float_precision number of digits of precision when dumping floats, 0 indicates use Ruby
  * @param [true|false|nil] :use_to_json call to_json() methods on dump, default is false
+ * @param [true|false|nil] :use_as_json call as_json() methods on dump, default is false
  * @param [true|false|nil] :nilnil if true a nil input to load will return nil and not raise an Exception
  * @param [true|false|nil] :allow_gc allow or prohibit GC during parsing, default is true (allow)
  * @param [true|false|nil] :quirks_mode allow single JSON values instead of documents, default is true (allow)
@@ -371,6 +376,7 @@ oj_parse_options(VALUE ropts, Options copts) {
 	{ class_cache_sym, &copts->class_cache },
 	{ bigdecimal_as_decimal_sym, &copts->bigdec_as_num },
 	{ use_to_json_sym, &copts->to_json },
+	{ use_as_json_sym, &copts->as_json },
 	{ nilnil_sym, &copts->nilnil },
 	{ allow_gc_sym, &copts->allow_gc },
 	{ quirks_mode_sym, &copts->quirks_mode },
@@ -1908,6 +1914,7 @@ static struct _Options	mimic_object_to_json_options = {
     No,		// bigdec_as_num
     FloatDec,	// bigdec_load
     No,		// to_json
+    Yes,	// as_json
     Yes,	// nilnil
     Yes,	// allow_gc
     Yes,	// quirks_mode
@@ -2049,13 +2056,15 @@ define_mimic_json(int argc, VALUE *argv, VALUE self) {
     symbolize_names_sym = ID2SYM(rb_intern("symbolize_names"));		rb_gc_register_address(&symbolize_names_sym);
 
     if (rb_const_defined_at(mimic, rb_intern("JSONError"))) {
-	rb_funcall(mimic, rb_intern("remove_const"), 1, ID2SYM(rb_intern("JSONError")));
+        json_error = rb_const_get(mimic, rb_intern("JSONError"));
+    } else {
+        json_error = rb_define_class_under(mimic, "JSONError", rb_eStandardError);
     }
-    json_error = rb_define_class_under(mimic, "JSONError", rb_eStandardError);
     if (rb_const_defined_at(mimic, rb_intern("ParserError"))) {
-	rb_funcall(mimic, rb_intern("remove_const"), 1, ID2SYM(rb_intern("ParserError")));
+        json_parser_error_class = rb_const_get(mimic, rb_intern("ParserError"));
+    } else {
+    	json_parser_error_class = rb_define_class_under(mimic, "ParserError", json_error);
     }
-    json_parser_error_class = rb_define_class_under(mimic, "ParserError", json_error);
 
     if (!rb_const_defined_at(mimic, rb_intern("State"))) {
         rb_define_class_under(mimic, "State", rb_cObject);
@@ -2262,6 +2271,7 @@ void Init_oj() {
     time_format_sym = ID2SYM(rb_intern("time_format"));	rb_gc_register_address(&time_format_sym);
     unix_sym = ID2SYM(rb_intern("unix"));		rb_gc_register_address(&unix_sym);
     unix_zone_sym = ID2SYM(rb_intern("unix_zone"));	rb_gc_register_address(&unix_zone_sym);
+    use_as_json_sym = ID2SYM(rb_intern("use_as_json"));	rb_gc_register_address(&use_as_json_sym);
     use_to_json_sym = ID2SYM(rb_intern("use_to_json"));	rb_gc_register_address(&use_to_json_sym);
     word_sym = ID2SYM(rb_intern("word"));		rb_gc_register_address(&word_sym);
     xmlschema_sym = ID2SYM(rb_intern("xmlschema"));	rb_gc_register_address(&xmlschema_sym);

data/ext/oj/oj.h

@@ -154,6 +154,7 @@ typedef struct _Options {
     char		bigdec_as_num;	// YesNo
     char		bigdec_load;	// BigLoad
     char		to_json;	// YesNo
+    char		as_json;	// YesNo
     char		nilnil;		// YesNo
     char		allow_gc;	// allow GC during parse
     char		quirks_mode;	// allow single JSON values instead of documents

data/lib/oj/version.rb

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

data/test/isolated/test_mimic_redefine.rb

@@ -0,0 +1,15 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+$: << File.join(File.dirname(__FILE__), '..')
+
+require 'helper'
+
+class MimicRedefine < Minitest::Test
+  def test_mimic_redefine
+    require 'json'
+    parser_error = JSON::ParserError
+    Oj.mimic_JSON
+    assert_equal(parser_error, JSON::ParserError)
+  end
+end # MimicSingle

data/test/test_compat.rb

@@ -331,18 +331,20 @@ class CompatJuice < Minitest::Test
 
   def test_json_object_compat
     obj = Jeez.new(true, 58)
-    Oj.default_options = { :mode => :compat, :use_to_json => true }
+    Oj.default_options = { :mode => :compat, :use_as_json => true, :use_to_json => true }
     dump_and_load(obj, false)
   end
 
   def test_json_module_object
+    Oj.default_options = { :mode => :compat, :use_as_json => true, :use_to_json => true }
     obj = One::Two::Three::Deep.new()
     dump_and_load(obj, false)
   end
 
   def test_json_object_create_id
+    Oj.default_options = { :mode => :compat, :use_as_json => false, :use_to_json => false }
     expected = Jeez.new(true, 58)
-    json = Oj.dump(expected, :indent => 2, :mode => :compat, :use_to_json => true)
+    json = Oj.dump(expected, :indent => 2, :mode => :compat, :use_to_json => true, :use_as_json => true)
     obj = Oj.compat_load(json)
     assert_equal(expected, obj)
   end
@@ -359,6 +361,7 @@ class CompatJuice < Minitest::Test
   end
 
   def test_json_object_create_cache
+    Oj.default_options = { :mode => :compat, :use_as_json => true, :use_to_json => true }
     expected = Jeez.new(true, 58)
     json = Oj.dump(expected, :indent => 2, :mode => :compat, :use_to_json => true)
     obj = Oj.compat_load(json, :class_cache => true)
@@ -368,14 +371,16 @@ class CompatJuice < Minitest::Test
   end
 
   def test_json_object_create_id_other
+    Oj.default_options = { :mode => :compat, :use_as_json => false, :use_to_json => false }
     expected = Jeez.new(true, 58)
-    json = Oj.dump(expected, :indent => 2, :mode => :compat, :use_to_json => true)
+    json = Oj.dump(expected, :indent => 2, :mode => :compat, :use_as_json => true)
     json.gsub!('json_class', '_class_')
     obj = Oj.compat_load(json, :create_id => "_class_")
     assert_equal(expected, obj)
   end
 
   def test_json_object_create_deep
+    Oj.default_options = { :mode => :compat, :use_as_json => true, :use_to_json => true }
     expected = One::Two::Three::Deep.new()
     json = Oj.dump(expected, :indent => 2, :mode => :compat)
     obj = Oj.compat_load(json)

data/test/test_debian.rb

@@ -36,7 +36,7 @@ class DebJuice < Minitest::Test
   end
 
   def test_as_json_object_compat_hash_cached
-    Oj.default_options = { :mode => :compat, :class_cache => true, :use_to_json => true }
+    Oj.default_options = { :mode => :compat, :class_cache => true, :use_as_json => true }
     obj = Orange.new(true, 58)
     json = Oj.dump(obj, :indent => 2)
     assert(!json.nil?)

data/test/test_file.rb

@@ -157,7 +157,7 @@ class FileJuice < Minitest::Test
   end
 
   def test_as_json_object_compat_hash
-    Oj.default_options = { :mode => :compat, :use_to_json => true }
+    Oj.default_options = { :mode => :compat, :use_as_json => true }
     obj = Orange.new(true, 58)
     json = Oj.dump(obj, :indent => 2)
     assert(!json.nil?)

data/test/test_various.rb

@@ -126,6 +126,7 @@ class Juice < Minitest::Test
       :symbol_keys=>true,
       :bigdecimal_as_decimal=>false,
       :use_to_json=>false,
+      :use_as_json=>false,
       :nilnil=>true,
       :allow_gc=>false,
       :quirks_mode=>false,
@@ -759,6 +760,7 @@ class Juice < Minitest::Test
     assert_equal('null', json)
   end
   def test_to_hash_object_compat
+    Oj.default_options = { :use_to_json => true }
     obj = Jazz.new(true, 58)
     json = Oj.dump(obj, :mode => :compat, :indent => 2)
     h = Oj.load(json, :mode => :strict)
@@ -802,7 +804,7 @@ class Juice < Minitest::Test
   end
 
   def test_as_json_object_compat_hash
-    Oj.default_options = { :mode => :compat, :use_to_json => true }
+    Oj.default_options = { :mode => :compat, :use_as_json => true }
     obj = Orange.new(true, 58)
     json = Oj.dump(obj, :indent => 2)
     assert(!json.nil?)
@@ -810,7 +812,7 @@ class Juice < Minitest::Test
   end
 
   def test_as_json_object_compat_non_hash
-    Oj.default_options = { :mode => :compat, :use_to_json => true }
+    Oj.default_options = { :mode => :compat, :use_as_json => true }
     obj = Melon.new(true, 58)
     json = Oj.dump(obj, :indent => 2)
     assert_equal(%{"true 58"}, json)
@@ -942,6 +944,7 @@ class Juice < Minitest::Test
     assert_equal('null', json)
   end
   def test_range_compat
+    Oj.default_options = { :use_to_json => true }
     json = Oj.dump(1..7, :mode => :compat)
     h = Oj.load(json, :mode => :strict)
     assert_equal({'begin' => 1, 'end' => 7, 'exclude_end' => false}, h)
@@ -1022,6 +1025,7 @@ class Juice < Minitest::Test
     assert_equal(orig.to_f, bg)
   end
   def test_bigdecimal_compat_as_json
+    Oj.default_options = { :use_as_json => true }
     orig = BigDecimal.new('80.51')
     BigDecimal.send(:define_method, :as_json) do
       %{this is big}

metadata

@@ -1,65 +1,55 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: oj
-version: !ruby/object:Gem::Version
-  version: 2.17.5
+version: !ruby/object:Gem::Version 
+  version: 2.18.0
 platform: ruby
-authors:
+authors: 
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-19 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2016-11-26 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rake-compiler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5'
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "0.9"
   type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: minitest
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5'
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4'
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "5"
   type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rails
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4'
-description: 'The fastest JSON parser and object serializer. '
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "4"
+  type: :development
+  version_requirements: *id003
+description: "The fastest JSON parser and object serializer. "
 email: peter@ohler.com
 executables: []
-extensions:
+
+extensions: 
 - ext/oj/extconf.rb
-extra_rdoc_files:
+extra_rdoc_files: 
 - README.md
-files:
+files: 
 - LICENSE
 - README.md
 - ext/oj/buf.h
@@ -127,6 +117,7 @@ files:
 - test/isolated/test_mimic_rails_after.rb
 - test/isolated/test_mimic_rails_before.rb
 - test/isolated/test_mimic_rails_datetime.rb
+- test/isolated/test_mimic_redefine.rb
 - test/mod.rb
 - test/perf.rb
 - test/perf_compat.rb
@@ -169,32 +160,33 @@ files:
 - test/test_writer.rb
 - test/write_timebars.rb
 homepage: http://www.ohler.com/oj
-licenses:
+licenses: 
 - MIT
 metadata: {}
+
 post_install_message: 
-rdoc_options:
-- "--main"
+rdoc_options: 
+- --main
 - README.md
-require_paths:
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - &id004 
+    - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - *id004
 requirements: []
+
 rubyforge_project: oj
-rubygems_version: 2.5.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A fast JSON parser and serializer.
-test_files:
+test_files: 
 - test/_test_active.rb
 - test/_test_active_mimic.rb
 - test/_test_mimic_rails.rb
@@ -210,15 +202,6 @@ test_files:
 - test/foo.rb
 - test/helper.rb
 - test/io.rb
-- test/isolated/shared.rb
-- test/isolated/test_mimic_after.rb
-- test/isolated/test_mimic_alone.rb
-- test/isolated/test_mimic_as_json.rb
-- test/isolated/test_mimic_before.rb
-- test/isolated/test_mimic_define.rb
-- test/isolated/test_mimic_rails_after.rb
-- test/isolated/test_mimic_rails_before.rb
-- test/isolated/test_mimic_rails_datetime.rb
 - test/mod.rb
 - test/perf.rb
 - test/perf_compat.rb
@@ -231,18 +214,6 @@ test_files:
 - test/perf_strict.rb
 - test/rails.rb
 - test/russian.rb
-- test/sample/change.rb
-- test/sample/dir.rb
-- test/sample/doc.rb
-- test/sample/file.rb
-- test/sample/group.rb
-- test/sample/hasprops.rb
-- test/sample/layer.rb
-- test/sample/line.rb
-- test/sample/oval.rb
-- test/sample/rect.rb
-- test/sample/shape.rb
-- test/sample/text.rb
 - test/sample.rb
 - test/sample_json.rb
 - test/struct.rb
@@ -260,4 +231,25 @@ test_files:
 - test/test_various.rb
 - test/test_writer.rb
 - test/write_timebars.rb
-has_rdoc: true
+- test/isolated/shared.rb
+- test/isolated/test_mimic_after.rb
+- test/isolated/test_mimic_alone.rb
+- test/isolated/test_mimic_as_json.rb
+- test/isolated/test_mimic_before.rb
+- test/isolated/test_mimic_define.rb
+- test/isolated/test_mimic_rails_after.rb
+- test/isolated/test_mimic_rails_before.rb
+- test/isolated/test_mimic_rails_datetime.rb
+- test/isolated/test_mimic_redefine.rb
+- test/sample/change.rb
+- test/sample/dir.rb
+- test/sample/doc.rb
+- test/sample/file.rb
+- test/sample/group.rb
+- test/sample/hasprops.rb
+- test/sample/layer.rb
+- test/sample/line.rb
+- test/sample/oval.rb
+- test/sample/rect.rb
+- test/sample/shape.rb
+- test/sample/text.rb