oj 3.10.0 → 3.10.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62a52be7754c5ef34c3006fb28fa918cb18f23c26ffa94e8daedf05396bbe0fb
-  data.tar.gz: 9cf9cfab00cf1e28f8b42c6d3e88ee6a2a785093cc024c558eeceb25eaf39cd1
+  metadata.gz: e6c2164398794345431cbf21fe2598c7a68498dc21a49868103f9227470c5cdc
+  data.tar.gz: 81ddcee2018723c2ca4a9c668d78043d60647a83ab99057cdce3bd92ebad56fd
 SHA512:
-  metadata.gz: 931cf30643fc1be050ec4f3c0c69f85b643b073e7bd5d16c5c8a5431c8d3701ae73fc5b68311246f2db993fa1c3e40b6169978f10b377a947cc937a7d26afd6e
-  data.tar.gz: 779d173d00513d830f825cc9e0f51a5a066beece8fe9289d1face779c34210d6f7506e8e8af380fc5f2d3c2dd727b46f14cc985d4a2867e3a71fb1de4217361a
+  metadata.gz: 546bcdf0ee93a8b170970ac0a9e26497ee4b903f606f1fc2640e77093765ea9d63d58501c4472fb742d810ac1adddbb31caaaa19b2cf984af1b0345b529a4aa3
+  data.tar.gz: 51745a18bc008d4ba5bac4a459ec2231997998efdf56de1e56b3bdd2b5e972733ed12a43be7ff10f54827825ae7e9a5c3532629c044f4c71ebe0934a05e2d334

data/ext/oj/compat.c

@@ -65,7 +65,7 @@ hash_set_cstr(ParseInfo pi, Val kval, const char *str, size_t len, const char *o
 static VALUE
 start_hash(ParseInfo pi) {
     volatile VALUE	h;
-    
+
     if (Qnil != pi->options.hash_class) {
 	h = rb_class_new_instance(0, NULL, pi->options.hash_class);
     } else {
@@ -87,7 +87,7 @@ end_hash(struct _parseInfo *pi) {
 	clas = oj_name2class(pi, parent->classname, parent->clen, 0, rb_eArgError);
 	if (Qundef != clas) { // else an error
 	    ID	creatable = rb_intern("json_creatable?");
-	    
+
 	    if (!rb_respond_to(clas, creatable) || Qtrue == rb_funcall(clas, creatable, 0)) {
 		parent->val = rb_funcall(clas, oj_json_create_id, 1, parent->val);
 	    }
@@ -146,7 +146,7 @@ add_num(ParseInfo pi, NumInfo ni) {
 static void
 hash_set_num(struct _parseInfo *pi, Val parent, NumInfo ni) {
     volatile VALUE	rval = oj_num_as_value(ni);
-    
+
     if (!oj_use_hash_alt && rb_cHash != rb_obj_class(parent->val)) {
 	// The rb_hash_set would still work but the unit tests for the
 	// json gem require the less efficient []= method be called to set
@@ -192,7 +192,7 @@ static void
 array_append_num(ParseInfo pi, NumInfo ni) {
     Val			parent = stack_peek(&pi->stack);
     volatile VALUE	rval = oj_num_as_value(ni);
-    
+
     if (!oj_use_array_alt && rb_cArray != rb_obj_class(parent->val)) {
 	// The rb_ary_push would still work but the unit tests for the json
 	// gem require the less efficient << method be called to push the
@@ -274,7 +274,7 @@ oj_compat_load(int argc, VALUE *argv, VALUE self) {
     pi.options.nilnil = Yes;
     pi.options.empty_string = Yes;
     oj_set_compat_callbacks(&pi);
-    
+
     if (T_STRING == rb_type(*argv)) {
 	return oj_pi_parse(argc, argv, &pi, 0, 0, false);
     } else {

data/ext/oj/custom.c

@@ -297,7 +297,8 @@ static struct _code	codes[] = {
 };
 
 static int
-hash_cb(VALUE key, VALUE value, Out out) {
+hash_cb(VALUE key, VALUE value, VALUE ov) {
+    Out	out = (Out)ov;
     int	depth = out->depth;
 
     if (oj_dump_ignore(out->opts, value)) {
@@ -592,7 +593,8 @@ dump_common(VALUE obj, int depth, Out out) {
 }
 
 static int
-dump_attr_cb(ID key, VALUE value, Out out) {
+dump_attr_cb(ID key, VALUE value, VALUE ov) {
+    Out		out = (Out)ov;
     int		depth = out->depth;
     size_t	size;
     const char	*attr;

data/ext/oj/dump.c

@@ -111,7 +111,7 @@ static char	rails_friendly_chars[256] = "\
 11111111111111111111111111111111\
 11111111111111111111111111111111\
 11111111111111111111111111111111\
-11611111111111111111111111111111";
+11111111111111111111111111111111";
 
 static void
 raise_strict(VALUE obj) {

data/ext/oj/dump_compat.c

@@ -648,7 +648,8 @@ dump_float(VALUE obj, int depth, Out out, bool as_ok) {
 }
 
 static int
-hash_cb(VALUE key, VALUE value, Out out) {
+hash_cb(VALUE key, VALUE value, VALUE ov) {
+    Out	out = (Out)ov;
     int	depth = out->depth;
 
     if (out->omit_nil && Qnil == value) {

data/ext/oj/dump_object.c

@@ -224,7 +224,8 @@ dump_sym(VALUE obj, int depth, Out out, bool as_ok) {
 }
 
 static int
-hash_cb(VALUE key, VALUE value, Out out) {
+hash_cb(VALUE key, VALUE value, VALUE ov) {
+    Out		out = (Out)ov;
     int		depth = out->depth;
     long	size = depth * out->indent + 1;
 
@@ -348,7 +349,8 @@ dump_hash_class(VALUE obj, VALUE clas, int depth, Out out) {
 
 #ifdef HAVE_RB_IVAR_FOREACH
 static int
-dump_attr_cb(ID key, VALUE value, Out out) {
+dump_attr_cb(ID key, VALUE value, VALUE ov) {
+    Out		out = (Out)ov;
     int		depth = out->depth;
     size_t	size = depth * out->indent + 1;
     const char	*attr = rb_id2name(key);
@@ -616,7 +618,7 @@ dump_obj_attrs(VALUE obj, VALUE clas, slot_t id, int depth, Out out) {
 	    vid = rb_to_id(*np);
 	    attr = rb_id2name(vid);
 	    if (Yes == out->opts->ignore_under && '@' == *attr && '_' == attr[1]) {
-		return ST_CONTINUE;
+		continue;
 	    }
 	    value = rb_ivar_get(obj, vid);
 

data/ext/oj/dump_strict.c

@@ -45,7 +45,7 @@ dump_float(VALUE obj, int depth, Out out, bool as_ok) {
 	cnt = 3;
     } else {
 	NanDump	nd = out->opts->dump_opts.nan_dump;
-	    
+
 	if (AutoNan == nd) {
 	    nd = RaiseNan;
 	}
@@ -195,11 +195,12 @@ dump_array(VALUE a, int depth, Out out, bool as_ok) {
 }
 
 static int
-hash_cb(VALUE key, VALUE value, Out out) {
+hash_cb(VALUE key, VALUE value, VALUE ov) {
+    Out		out = (Out)ov;
     int		depth = out->depth;
     long	size;
     int		rtype = rb_type(key);
-    
+
     if (rtype != T_STRING && rtype != T_SYMBOL) {
 	rb_raise(rb_eTypeError, "In :strict and :null mode all Hash keys must be Strings or Symbols, not %s.\n", rb_class2name(rb_obj_class(key)));
     }
@@ -359,7 +360,7 @@ static DumpFunc	strict_funcs[] = {
 void
 oj_dump_strict_val(VALUE obj, int depth, Out out) {
     int	type = rb_type(obj);
-    
+
     if (Yes == out->opts->trace) {
 	oj_trace("dump", obj, __FILE__, __LINE__, depth, TraceIn);
     }
@@ -408,7 +409,7 @@ static DumpFunc	null_funcs[] = {
 void
 oj_dump_null_val(VALUE obj, int depth, Out out) {
     int	type = rb_type(obj);
-    
+
     if (Yes == out->opts->trace) {
 	oj_trace("dump", obj, __FILE__, __LINE__, depth, TraceOut);
     }

data/ext/oj/extconf.rb

@@ -42,6 +42,11 @@ end
 
 $CPPFLAGS += ' -Wall'
 #puts "*** $CPPFLAGS: #{$CPPFLAGS}"
+# Adding the __attribute__ flag only works with gcc compilers and even then it
+# does not work to check args with varargs so just remove the check.
+CONFIG['warnflags'].slice!(/ -Wsuggest-attribute=format/)
+CONFIG['warnflags'].slice!(/ -Wdeclaration-after-statement/)
+CONFIG['warnflags'].slice!(/ -Wmissing-noreturn/)
 
 create_makefile(File.join(extension_name, extension_name))
 

data/ext/oj/mimic_json.c

@@ -199,6 +199,7 @@ mimic_dump(int argc, VALUE *argv, VALUE self) {
     struct _out		out;
     struct _options	copts = oj_default_options;
     VALUE		rstr;
+    VALUE		active_hack[1];
 
     copts.str_rx.head = NULL;
     copts.str_rx.tail = NULL;
@@ -216,6 +217,7 @@ mimic_dump(int argc, VALUE *argv, VALUE self) {
     */
     copts.dump_opts.max_depth = MAX_DEPTH; // when using dump there is no limit
     out.omit_nil = copts.dump_opts.omit_nil;
+
     if (2 <= argc) {
 	int	limit;
 
@@ -230,7 +232,15 @@ mimic_dump(int argc, VALUE *argv, VALUE self) {
 	    copts.dump_opts.max_depth = limit;
 	}
     }
-    oj_dump_obj_to_json(*argv, &copts, &out);
+    // ActiveSupport in active_support/core_ext/object/json.rb check the
+    // optional argument type to to_json and it the argument is a
+    // ::JSON::State it calls the JSON gem code otherwise it calls the active
+    // support encoder code. To make sure the desired branch is called a
+    // default ::JSON::State argument is passed in. Basically a hack to get
+    // around the active support hack so two wrongs make a right this time.
+    active_hack[0] = rb_funcall(state_class, oj_new_id, 0);
+    oj_dump_obj_to_json_using_params(*argv, &copts, &out, 1, active_hack);
+
     if (0 == out.buf) {
 	rb_raise(rb_eNoMemError, "Not enough memory.");
     }

data/ext/oj/object.c

@@ -669,7 +669,8 @@ static void
 array_append_cstr(ParseInfo pi, const char *str, size_t len, const char *orig) {
     volatile VALUE	rval = Qnil;
 
-    if (3 <= len && 0 != pi->circ_array) {
+    // orig lets us know whether the string was ^r1 or \u005er1
+    if (3 <= len && 0 != pi->circ_array && '^' == orig[0] && 0 == rb_array_len(stack_peek(&pi->stack)->val)) {
 	if ('i' == str[1]) {
 	    long	i = read_long(str + 2, len - 2);
 

data/ext/oj/oj.c

@@ -766,7 +766,9 @@ oj_parse_options(VALUE ropts, Options copts) {
 }
 
 static int
-match_string_cb(VALUE key, VALUE value, RxClass rc) {
+match_string_cb(VALUE key, VALUE value, VALUE rx) {
+    RxClass	rc = (RxClass)rx;
+
     if (T_CLASS != rb_type(value)) {
 	rb_raise(rb_eArgError, "for :match_string, the hash values must be a Class.");
     }
@@ -801,7 +803,7 @@ oj_parse_opt_match_string(RxClass rc, VALUE ropts) {
 }
 
 /* Document-method: load
- * call-seq: load(json, options) { _|_obj, start, len_|_ }
+ * call-seq: load(json, options={}) { _|_obj, start, len_|_ }
  *
  * Parses a JSON document String into a Object, Hash, Array, String, Fixnum,
  * Float, true, false, or nil according to the default mode or the mode
@@ -885,7 +887,7 @@ load(int argc, VALUE *argv, VALUE self) {
 }
 
 /* Document-method: load_file
- * call-seq: load_file(path, options) { _|_obj, start, len_|_ }
+ * call-seq: load_file(path, options={}) { _|_obj, start, len_|_ }
  *
  * Parses a JSON document String into a Object, Hash, Array, String, Fixnum,
  * Float, true, false, or nil according to the default mode or the mode
@@ -1043,7 +1045,7 @@ safe_load(VALUE self, VALUE doc) {
  */
 
 /* Document-method: dump
- * call-seq: dump(obj, options)
+ * call-seq: dump(obj, options={})
  *
  * Dumps an Object (obj) to a string.
  * - *obj* [_Object_] Object to serialize as an JSON document String
@@ -1141,7 +1143,7 @@ to_json(int argc, VALUE *argv, VALUE self) {
 }
 
 /* Document-method: to_file
- * call-seq: to_file(file_path, obj, options)
+ * call-seq: to_file(file_path, obj, options={})
  *
  * Dumps an Object to the specified file.
  * - *file* [_String_] _path file path to write the JSON document to
@@ -1164,7 +1166,7 @@ to_file(int argc, VALUE *argv, VALUE self) {
 }
 
 /* Document-method: to_stream
- * call-seq: to_stream(io, obj, options)
+ * call-seq: to_stream(io, obj, options={})
  *
  * Dumps an Object to the specified IO stream.
  * - *io* [_IO_] IO stream to write the JSON document to

data/ext/oj/parse.c

@@ -740,7 +740,7 @@ oj_parse2(ParseInfo pi) {
 }
 
 static VALUE
-rescue_big_decimal(VALUE str) {
+rescue_big_decimal(VALUE str, VALUE ignore) {
     rb_raise(oj_parse_error_class, "Invalid value for BigDecimal()");
     return Qnil;
 }
@@ -795,13 +795,13 @@ oj_num_as_value(NumInfo ni) {
 	    }
 	} else {
 	    // All these machinations are to get rounding to work better.
-	    long double	d = (long double)ni->i * (long double)ni->div + (long double)ni->num;
+	    long double	ld = (long double)ni->i * (long double)ni->div + (long double)ni->num;
 	    int		x = (int)((int64_t)ni->exp - ni->di);
 
 	    // Rounding sometimes cuts off the last digit even if there are only
 	    // 15 digits. This attempts to fix those few cases where this
 	    // occurs.
-	    if ((long double)INT64_MAX > d && (int64_t)d != (ni->i * ni->div + ni->num)) {
+	    if ((long double)INT64_MAX > ld && (int64_t)ld != (ni->i * ni->div + ni->num)) {
 		volatile VALUE	bd = rb_str_new(ni->str, ni->len);
 
 		rnum = rb_rescue2(parse_big_decimal, bd, rescue_big_decimal, bd, rb_eException, 0);
@@ -809,16 +809,23 @@ oj_num_as_value(NumInfo ni) {
 		    rnum = rb_funcall(rnum, rb_intern("to_f"), 0);
 		}
 	    } else {
-		d = roundl(d);
+		double	d;
+
+		ld = roundl(ld);
+		// You would expect that staying with a long double would be
+		// more accurate but it fails to match what Ruby generates so
+		// drop down to a double.
 		if (0 < x) {
-		    d *= powl(10.0L, x);
+		    d = (double)ld * pow(10.0, x);
 		} else if (0 > x) {
-		    d /= powl(10.0L, -x);
+		    d = (double)ld / pow(10.0, -x);
+		} else {
+		    d = (double)ld;
 		}
 		if (ni->neg) {
 		    d = -d;
 		}
-		rnum = rb_float_new((double)d);
+		rnum = rb_float_new(d);
 	    }
 	}
     }

data/ext/oj/rails.c

@@ -87,7 +87,8 @@ copy_opts(ROptTable src, ROptTable dest) {
 }
 
 static int
-dump_attr_cb(ID key, VALUE value, Out out) {
+dump_attr_cb(ID key, VALUE value, VALUE ov) {
+    Out		out = (Out)ov;
     int		depth = out->depth;
     size_t	size = depth * out->indent + 1;
     const char	*attr = rb_id2name(key);
@@ -1014,6 +1015,7 @@ rails_encode(int argc, VALUE *argv, VALUE self) {
 static VALUE
 rails_use_standard_json_time_format(VALUE self, VALUE state) {
     if (Qtrue == state || Qfalse == state) {
+	// no change needed
     } else if (Qnil == state) {
 	state = Qfalse;
     } else {
@@ -1025,6 +1027,11 @@ rails_use_standard_json_time_format(VALUE self, VALUE state) {
     return state;
 }
 
+static VALUE
+rails_use_standard_json_time_format_get(VALUE self) {
+    return xml_time ? Qtrue : Qfalse;
+}
+
 static VALUE
 rails_escape_html_entities_in_json(VALUE self, VALUE state) {
     rb_iv_set(self, "@escape_html_entities_in_json", state);
@@ -1033,6 +1040,11 @@ rails_escape_html_entities_in_json(VALUE self, VALUE state) {
     return state;
 }
 
+static VALUE
+rails_escape_html_entities_in_json_get(VALUE self) {
+    return escape_html ? Qtrue : Qfalse;
+}
+
 static VALUE
 rails_time_precision(VALUE self, VALUE prec) {
     rb_iv_set(self, "@time_precision", prec);
@@ -1056,7 +1068,12 @@ rails_set_encoder(VALUE self) {
     VALUE	encoding;
     VALUE	pv;
     VALUE	verbose;
+    VALUE	enc = resolve_classpath("ActiveSupport::JSON::Encoding");
 
+    if (Qnil != enc) {
+	escape_html = Qtrue == rb_iv_get(self, "@escape_html_entities_in_json");
+	xml_time = Qtrue == rb_iv_get(enc, "@use_standard_json_time_format");
+    }
     if (rb_const_defined_at(rb_cObject, rb_intern("ActiveSupport"))) {
 	active = rb_const_get_at(rb_cObject, rb_intern("ActiveSupport"));
     } else {
@@ -1073,11 +1090,15 @@ rails_set_encoder(VALUE self) {
     rb_gv_set("$VERBOSE", Qfalse);
     rb_undef_method(encoding, "use_standard_json_time_format=");
     rb_define_module_function(encoding, "use_standard_json_time_format=", rails_use_standard_json_time_format, 1);
+    rb_undef_method(encoding, "use_standard_json_time_format");
+    rb_define_module_function(encoding, "use_standard_json_time_format", rails_use_standard_json_time_format_get, 0);
 
     pv = rb_iv_get(encoding, "@escape_html_entities_in_json");
     escape_html = Qtrue == pv;
     rb_undef_method(encoding, "escape_html_entities_in_json=");
     rb_define_module_function(encoding, "escape_html_entities_in_json=", rails_escape_html_entities_in_json, 1);
+    rb_undef_method(encoding, "escape_html_entities_in_json");
+    rb_define_module_function(encoding, "escape_html_entities_in_json", rails_escape_html_entities_in_json_get, 0);
 
     pv = rb_iv_get(encoding, "@time_precision");
     oj_default_options.sec_prec = NUM2INT(pv);
@@ -1289,7 +1310,8 @@ dump_array(VALUE a, int depth, Out out, bool as_ok) {
 }
 
 static int
-hash_cb(VALUE key, VALUE value, Out out) {
+hash_cb(VALUE key, VALUE value, VALUE ov) {
+    Out		out = (Out)ov;
     int		depth = out->depth;
     long	size;
     int		rtype = rb_type(key);
@@ -1402,14 +1424,17 @@ dump_hash(VALUE obj, int depth, Out out, bool as_ok) {
 
 static void
 dump_obj(VALUE obj, int depth, Out out, bool as_ok) {
+    VALUE	clas;
+
     if (oj_code_dump(oj_compat_codes, obj, depth, out)) {
 	out->argc = 0;
 	return;
     }
+    clas = rb_obj_class(obj);
     if (as_ok) {
 	ROpt	ro;
 
-	if (NULL != (ro = oj_rails_get_opt(out->ropts, rb_obj_class(obj))) && ro->on) {
+	if (NULL != (ro = oj_rails_get_opt(out->ropts, clas)) && ro->on) {
 	    ro->dump(obj, depth, out, as_ok);
 	} else if (Yes == out->opts->raw_json && rb_respond_to(obj, oj_raw_json_id)) {
 	    oj_dump_raw_json(obj, depth, out);
@@ -1417,6 +1442,8 @@ dump_obj(VALUE obj, int depth, Out out, bool as_ok) {
 	    dump_as_json(obj, depth, out, true);
 	} else if (rb_respond_to(obj, oj_to_hash_id)) {
 	    dump_to_hash(obj, depth, out);
+	} else if (oj_bigdecimal_class == clas) {
+	    dump_bigdecimal(obj, depth, out, false);
 	} else {
 	    oj_dump_obj_to_s(obj, out);
 	}
@@ -1425,6 +1452,8 @@ dump_obj(VALUE obj, int depth, Out out, bool as_ok) {
     } else if (rb_respond_to(obj, oj_to_hash_id)) {
 	// Always attempt to_hash.
 	dump_to_hash(obj, depth, out);
+    } else if (oj_bigdecimal_class == clas) {
+	dump_bigdecimal(obj, depth, out, false);
     } else {
 	oj_dump_obj_to_s(obj, out);
     }
@@ -1442,8 +1471,7 @@ static DumpFunc	rails_funcs[] = {
     dump_array,		// RUBY_T_ARRAY    = 0x07,
     dump_hash,	 	// RUBY_T_HASH     = 0x08,
     dump_obj,		// RUBY_T_STRUCT   = 0x09,
-    dump_bigdecimal,	// RUBY_T_BIGNUM   = 0x0a,
-    //oj_dump_bignum,	// RUBY_T_BIGNUM   = 0x0a,
+    oj_dump_bignum,	// RUBY_T_BIGNUM   = 0x0a,
     dump_as_string,	// RUBY_T_FILE     = 0x0b,
     dump_obj,		// RUBY_T_DATA     = 0x0c,
     NULL, 		// RUBY_T_MATCH    = 0x0d,

data/ext/oj/sparse.c

@@ -773,6 +773,7 @@ oj_sparse2(ParseInfo pi) {
 		first = 0;
 	    }
 	    start = pi->rd.pos;
+	    // TBD break if option set to allow that
 	}
     }
 }

data/ext/oj/wab.c

@@ -148,11 +148,12 @@ dump_array(VALUE a, int depth, Out out, bool as_ok) {
 }
 
 static int
-hash_cb(VALUE key, VALUE value, Out out) {
+hash_cb(VALUE key, VALUE value, VALUE ov) {
+    Out		out = (Out)ov;
     int		depth = out->depth;
     long	size;
     int		rtype = rb_type(key);
-    
+
     if (rtype != T_SYMBOL) {
 	rb_raise(rb_eTypeError, "In :wab mode all Hash keys must be Symbols, not %s.\n", rb_class2name(rb_obj_class(key)));
     }
@@ -270,7 +271,7 @@ static DumpFunc	wab_funcs[] = {
 void
 oj_dump_wab_val(VALUE obj, int depth, Out out) {
     int	type = rb_type(obj);
-    
+
     if (Yes == out->opts->trace) {
 	oj_trace("dump", obj, __FILE__, __LINE__, depth, TraceIn);
     }
@@ -324,7 +325,7 @@ add_value(ParseInfo pi, VALUE val) {
 static bool
 uuid_check(const char *str, int len) {
     int		i;
-    
+
     for (i = 0; i < 8; i++, str++) {
 	if ('x' != hex_chars[*(uint8_t*)str]) {
 	    return false;
@@ -380,7 +381,7 @@ time_parse(const char *s, int len) {
     long	nsecs = 0;
     int		i;
     time_t	secs;
-    
+
     memset(&tm, 0, sizeof(tm));
     if ('-' == *s) {
 	s++;
@@ -444,7 +445,7 @@ protect_uri(VALUE rstr) {
 static VALUE
 cstr_to_rstr(const char *str, size_t len) {
     volatile VALUE	v = Qnil;
-    
+
     if (30 == len && '-' == str[4] && '-' == str[7] && 'T' == str[10] && ':' == str[13] && ':' == str[16]  && '.' == str[19] && 'Z' == str[29]) {
 	if (Qnil != (v = time_parse(str, (int)len))) {
 	    return v;
@@ -521,7 +522,7 @@ hash_set_cstr(ParseInfo pi, Val parent, const char *str, size_t len, const char
 static void
 hash_set_num(ParseInfo pi, Val parent, NumInfo ni) {
     volatile VALUE	rval = Qnil;
-    
+
     if (ni->infinity || ni->nan) {
 	oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "not a number or other value");
     }
@@ -551,7 +552,7 @@ start_array(ParseInfo pi) {
 static void
 array_append_cstr(ParseInfo pi, const char *str, size_t len, const char *orig) {
     volatile VALUE	rval = cstr_to_rstr(str, len);
-    
+
     rb_ary_push(stack_peek(&pi->stack)->val, rval);
     if (Yes == pi->options.trace) {
 	oj_trace_parse_call("set_value", pi, __FILE__, __LINE__, rval);
@@ -628,4 +629,3 @@ oj_wab_parse_cstr(int argc, VALUE *argv, char *json, size_t len) {
 
     return oj_pi_parse(argc, argv, &pi, json, len, true);
 }
-

data/lib/oj/version.rb

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

data/pages/Rails.md

@@ -80,6 +80,45 @@ The classes that can be put in optimized mode and are optimized when
 The ActiveSupport decoder is the `JSON.parse()` method. Calling the
 `Oj::Rails.set_decoder()` method replaces that method with the Oj equivalent.
 
+### Usage in Rails 3
+
+To support Rails 3 you can create a new module mixin to prepend to controllers:
+
+```ruby
+require 'oj'
+
+module OjJsonEncoder
+  def render(options = nil, extra_options = {}, &block)
+    if options && options.is_a?(Hash) && options[:json]
+      obj = options.delete(:json)
+      obj = Oj.dump(obj, :mode => :rails) unless obj.is_a?(String)
+      options[:text] = obj
+      response.content_type ||= Mime::JSON
+    end
+    super
+  end
+end
+```
+
+Usage:
+
+```ruby
+class MyController < ApplicationController
+  prepend OjJsonEncoder
+  def index
+    render :json => { :hello => 'world' }
+  end
+end
+```
+
+### Older Ruby Version Support (Pre 2.3.0)
+
+If you are using an older version of Ruby, you can pin `oj` to an earlier version in your Gemfile:
+
+```ruby
+gem 'oj', '3.7.12'
+```
+
 ### Notes:
 
 1. Optimized Floats set the significant digits to 16. This is different than

data/test/bar.rb

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-# encoding: UTF-8
 
 $: << File.dirname(__FILE__)
 $oj_dir = File.dirname(File.expand_path(File.dirname(__FILE__)))
@@ -7,16 +6,30 @@ $oj_dir = File.dirname(File.expand_path(File.dirname(__FILE__)))
   $: << File.join($oj_dir, dir)
 end
 
-require 'rails'
 require 'active_support'
-require 'active_support/json'
+require "active_support/json"
 
-require 'oj'
+$s = "\u2014 & \n \u{1F618}"
+
+=begin
+def check(label)
+  puts "\n--- #{label} --------------------"
+
+  ActiveSupport::JSON::Encoding.use_standard_json_time_format = true
+  puts "with standard_json == true: t.to_json - #{$t.to_json}"
+  ActiveSupport::JSON::Encoding.use_standard_json_time_format = false
+  puts "with standard_json == false: t.to_json - #{$t.to_json}"
+end
+
+check('Before Oj')
+=end
 
-puts Rails::VERSION::STRING
+require 'oj'
 
-#Oj.optimize_rails
+ActiveSupport::JSON::Encoding.escape_html_entities_in_json = false
+puts "ActiveSupport.encode(s) - #{ActiveSupport::JSON.encode($s)}"
 
-h = {foo: "bar"}
+Oj.optimize_rails
+Oj.default_options = { mode: :rails }
 
-puts Oj.dump(h, mode: :rails)
+puts "Oj.dump(s) - #{Oj.dump($s)}"

data/test/foo.rb

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-# encoding: UTF-8
 
 $: << File.dirname(__FILE__)
 $oj_dir = File.dirname(File.expand_path(File.dirname(__FILE__)))
@@ -7,161 +6,47 @@ $oj_dir = File.dirname(File.expand_path(File.dirname(__FILE__)))
   $: << File.join($oj_dir, dir)
 end
 
-#require 'json'
+require 'json'
+
+t = [Time.now.utc]
+
+puts "t.to_json - #{t.to_json}"
+
+puts "--- active support"
+
+require 'active_support'
+require "active_support/json"
+
+ActiveSupport::JSON::Encoding.use_standard_json_time_format = false
+
+puts "t.as_json - #{t.as_json}"
+puts "t.to_json - #{t.to_json}"
+
 require 'oj'
 
-Oj.mimic_JSON
-
-obj = {
-  ab: {
-    cbbb: {
-      tilbeb: [
-        {
-          coob: {
-            uijwts: [
-              {
-                prrrrr: {
-                  yakj: "pvebbx",
-                  lbhqy: {
-                    uhyw: {
-                      uijwts: [
-                        {
-                          jangi: {
-                            ubentg7haineued8atnr8w: {
-                              abc: "uejdncbncnamnasdasdasdasd",
-                              cde: "skfjskdfjskdfjsdkfjsdkfjs"
-                            }
-                          }
-                        }
-                      ]
-                    }
-                  }
-                }
-              },
-              {
-                kdncg: {
-                  lvbnt8b9ounv: {
-                    qk: 9
-                  }
-                }
-              }
-            ],
-            jenfjbhe: {}
-          }
-        }
-      ]
-    }
-  },
-  ijbh: {
-    jsnbrpbnunt: {
-      b88dibalbvp: {
-        mnbvd: "9uhbqlpiev"
-      }
-    },
-    ncnwkl: {
-      ksdfsf: {
-        mjln: "mnklkn"
-      },
-      kbrh: {
-        sdfn83nnalbmgnansdd: {
-          uijwts: {
-            ibha: {
-              uijwts: [
-                {
-                  lnrbf: {
-                    nbvtmqbhap9ebeb7btnnaw: {
-                      ksb: "sdfksdfjsdfsb39242dnasddd",
-                      mnm: "1293dsfnsdmfnsdfsd,fmnsd,"
-                    }
-                  }
-                }
-              ]
-            }
-          },
-          kbrh: {
-            bo8libts: {
-              nag40n: {
-                kyen: "sdfasnc92nsn"
-              },
-              kbrh: {
-                nbwyu26snfcbajsdkj8: {
-                  uijwts: {
-                    mdfnkjsdd: {}
-                  },
-                  kbrh: {
-                    kneahce: {
-                      uijwts: {
-                        kwnb: {
-                          uijwts: [
-                            {
-                              fhfd: {
-                                sfasdnfmasndfamsdnfajsmdf: false
-                              }
-                            }
-                          ],
-                          asdfsdff: [
-                            {
-                              cwdf: {
-                                sddlkfajsdkfjabskdfjalsdkfjansdkfjf: ""
-                              }
-                            },
-                            {
-                              bsdj: {
-                                sdfsjdlfkasy8kljsfsdf83jlkjfals: true
-                              }
-                            }
-                          ]
-                        }
-                      },
-                      kbrh: {
-                        sdfsdfsddfk: {
-                          uijwts: {
-                            sdfsd: {
-                              sdfsadf89mnlrrrqurqwvdnff: {
-                                "kj": 8
-                              }
-                            }
-                          },
-                          kbrh: {
-                            dkdjd: {
-                              dfeteu: {
-                                sdfd: "sdfasdfjlkjslrsdbb"
-                              },
-                              kbrh: {
-                                sdfskjdfldk: {
-                                  buqpen: {
-                                    kjlkj: {
-                                      sdflskdjfalsdkrjalwkjfsrlfjasdf: {
-                                        sd: 0
-                                      }
-                                    }
-                                  },
-                                  kbrh: {
-                                    sdfksljdlfksdfl: {
-                                      sdfsdkfjssd: {
-                                        ksdjf: "sdflsdkfjasdkaufs;ldkfjsdlf",
-                                        sdfsdfsl: [5]
-                                      }
-                                    }
-                                  }
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-#Oj.dump(obj)
-JSON.pretty_generate(obj)
-#JSON.generate(obj)
+t = [Time.now.utc]
+
+puts "-----------------------"
+
+#puts "t.as_json - #{t.as_json}"
+puts "t.to_json - #{t.to_json}"
+
+#Oj.mimic_JSON
+
+#puts "Oj - t.as_json - #{t.as_json}"
+
+puts "--- active support"
+
+require 'active_support'
+require "active_support/json"
+
+ActiveSupport::JSON::Encoding.use_standard_json_time_format = false
+
+puts "t.as_json - #{t.as_json}"
+puts "t.to_json - #{t.to_json}"
+
+puts "--- optimize"
+Oj.optimize_rails
+
+puts "t.as_json - #{t.as_json}"
+puts "t.to_json - #{t.to_json}"

data/test/json_gem/json_common_interface_test.rb

@@ -15,7 +15,7 @@ class JSONCommonInterfaceTest < Test::Unit::TestCase
   def setup
     @hash = {
       'a' => 2,
-      'b' => 3.141,
+      'b' => 5.23683071,
       'c' => 'c',
       'd' => [ 1, "b", 3.14 ],
       'e' => { 'foo' => 'bar' },
@@ -23,7 +23,7 @@ class JSONCommonInterfaceTest < Test::Unit::TestCase
       'h' => 1000.0,
       'i' => 0.001
     }
-    @json = '{"a":2,"b":3.141,"c":"c","d":[1,"b",3.14],"e":{"foo":"bar"},'\
+    @json = '{"a":2,"b":5.23683071,"c":"c","d":[1,"b",3.14],"e":{"foo":"bar"},'\
       '"g":"\\"\\u0000\\u001f","h":1000.0,"i":0.001}'
   end
 

data/test/test_custom.rb

@@ -470,10 +470,10 @@ class CustomJuice < Minitest::Test
 
   def test_time
     obj = Time.now()
-    dump_and_load(obj, false, :time_format => :unix, :create_id => "^o", :create_additions => true)
-    dump_and_load_inspect(obj, false, :time_format => :unix_zone, :create_id => "^o", :create_additions => true)
-    dump_and_load_inspect(obj, false, :time_format => :xmlschema, :create_id => "^o", :create_additions => true)
-    dump_and_load_inspect(obj, false, :time_format => :ruby, :create_id => "^o", :create_additions => true)
+    dump_load_dump(obj, false, :time_format => :unix, :create_id => "^o", :create_additions => true)
+    dump_load_dump(obj, false, :time_format => :unix_zone, :create_id => "^o", :create_additions => true)
+    dump_load_dump(obj, false, :time_format => :xmlschema, :create_id => "^o", :create_additions => true)
+    dump_load_dump(obj, false, :time_format => :ruby, :create_id => "^o", :create_additions => true)
   end
 
   def dump_and_load(obj, trace=false, options={})
@@ -504,4 +504,19 @@ class CustomJuice < Minitest::Test
     loaded
   end
 
+  def dump_load_dump(obj, trace=false, options={})
+    options = options.merge(:indent => 2, :mode => :custom)
+    json = Oj.dump(obj, options)
+    puts json if trace
+
+    loaded = Oj.load(json, options);
+    if obj.nil?
+      assert_nil(loaded)
+    else
+      json2 = Oj.dump(loaded, options)
+      assert_equal(json, json2)
+    end
+    loaded
+  end
+
 end

data/test/test_object.rb

@@ -869,6 +869,14 @@ class ObjectJuice < Minitest::Test
     assert_equal(a2[1].__id__, a2.__id__)
   end
 
+  def test_circular_array3
+    a = ['^r1']
+    json = Oj.dump(a, mode: :object, circular: true)
+    assert_equal(%{["^i1","\\u005er1"]}, json)
+    a2 = Oj.load(json, mode: :object, circular: true)
+    assert_equal(a, a2)
+  end
+
   def test_circular_hash2
     h = { 'a' => 7 }
     h['b'] = h

data/test/test_rails.rb

@@ -0,0 +1,26 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+$: << File.dirname(__FILE__)
+
+require 'helper'
+
+class RailsJuice < Minitest::Test
+
+  def test_bigdecimal_dump
+    orig = Oj.default_options
+    Oj.default_options = { mode: :rails, bigdecimal_as_decimal: true }
+    bd = BigDecimal('123')
+    json = Oj.dump(bd)
+    Oj.default_options = orig
+
+    assert_equal('0.123e3', json.downcase)
+
+    json = Oj.dump(bd, mode: :rails, bigdecimal_as_decimal: false)
+    assert_equal('"0.123e3"', json.downcase)
+
+    json = Oj.dump(bd, mode: :rails, bigdecimal_as_decimal: true)
+    assert_equal('0.123e3', json.downcase)
+  end
+
+end

data/test/tests.rb

@@ -19,6 +19,7 @@ require 'test_saj'
 require 'test_scp'
 require 'test_strict'
 require 'test_various'
+require 'test_rails'
 require 'test_wab'
 require 'test_writer'
 require 'test_integer_range'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 3.10.0
+  version: 3.10.6
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-28 00:00:00.000000000 Z
+date: 2020-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -243,6 +243,7 @@ files:
 - test/test_integer_range.rb
 - test/test_null.rb
 - test/test_object.rb
+- test/test_rails.rb
 - test/test_saj.rb
 - test/test_scp.rb
 - test/test_strict.rb
@@ -282,7 +283,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A fast JSON parser and serializer.
@@ -354,6 +355,7 @@ test_files:
 - test/baz.rb
 - test/tests_mimic_addition.rb
 - test/test_writer.rb
+- test/test_rails.rb
 - test/perf.rb
 - test/isolated/test_mimic_define.rb
 - test/isolated/test_mimic_after.rb