oj 3.10.15 → 3.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80fcb3a59fb873da369d49ad3962960b159c0de18580de24da0cbc65935e7275
-  data.tar.gz: ddcd3f0b95a5a6cd9658c86fff9063bf6bbbc034091a894e8c3c8dcbd4a82e3a
+  metadata.gz: 698d68ef4c5a05318046700568e3d19c9d5e40644950c76cf02d31490a4bd738
+  data.tar.gz: 1cff670f6587f0080108980d339f9c8cff3097bb5e7cf67a2c583e8745385b7b
 SHA512:
-  metadata.gz: a59ab0a3872261dde24fb06612cbc90fbe6d8b06800d5304ba82ce789c0cdcff88c22477b268a8e1161595f97d8b09c0dcbc6b7b25ea7a9373590734618952c0
-  data.tar.gz: 7a547ff4e19e3ca256762fa5c75598e1aa5cb5bd1a15986a5258b9bdea24be6d4f77d34bfc0d142a061960d30d4b69238bb38b21ebd50095086a99e378eb37e5
+  metadata.gz: 3cfb98a97ead48a89f95af28dc364633199afb5cbe269ba07b90a26eabe77d9e59c1051731e07ff3821233bdf10d54896c2e9821786dfee2140beaac9dc8c0d2
+  data.tar.gz: 79173558b0cc6e4cb9852c32e7949d88396ffbb8f34cc7781f6144ade5c7ecf5cf8b24a374056ee50e8367d96ba79510cf8ba21a19acd8e52a61c8c731b44921

data/README.md

@@ -1,6 +1,6 @@
 # [![{}j](http://www.ohler.com/dev/images/oj_comet_64.svg)](http://www.ohler.com/oj) gem
 
-[![Build Status](https://img.shields.io/travis/ohler55/oj/master.svg?logo=travis)](http://travis-ci.org/ohler55/oj?branch=master) [![AppVeyor](https://img.shields.io/appveyor/ci/ohler55/oj/master.svg?logo=appveyor)](https://ci.appveyor.com/project/ohler55/oj) ![Gem](https://img.shields.io/gem/v/oj.svg) ![Gem](https://img.shields.io/gem/dt/oj.svg) [![SemVer compatibility](https://api.dependabot.com/badges/compatibility_score?dependency-name=oj&package-manager=bundler&version-scheme=semver)](https://dependabot.com/compatibility-score.html?dependency-name=oj&package-manager=bundler&version-scheme=semver) [![TideLift](https://tidelift.com/badges/github/ohler55/oj)](https://tidelift.com/subscription/pkg/rubygems-oj?utm_source=rubygems-oj&utm_medium=referral&utm_campaign=readme)
+[![Build Status](https://img.shields.io/travis/ohler55/oj/master.svg?logo=travis)](http://travis-ci.org/ohler55/oj?branch=master) ![Gem](https://img.shields.io/gem/v/oj.svg) ![Gem](https://img.shields.io/gem/dt/oj.svg) [![SemVer compatibility](https://api.dependabot.com/badges/compatibility_score?dependency-name=oj&package-manager=bundler&version-scheme=semver)](https://dependabot.com/compatibility-score.html?dependency-name=oj&package-manager=bundler&version-scheme=semver) [![TideLift](https://tidelift.com/badges/github/ohler55/oj)](https://tidelift.com/subscription/pkg/rubygems-oj?utm_source=rubygems-oj&utm_medium=referral&utm_campaign=readme)
 
 A *fast* JSON parser and Object marshaller as a Ruby gem.
 

data/ext/oj/dump.c

@@ -174,15 +174,20 @@ hixss_friendly_size(const uint8_t *str, size_t len) {
     return size - len * (size_t)'0' + check;
 }
 
-inline static size_t
+inline static long
 rails_xss_friendly_size(const uint8_t *str, size_t len) {
-    size_t	size = 0;
+    long	size = 0;
     size_t	i = len;
+    uint8_t	hi = 0;
 
     for (; 0 < i; str++, i--) {
 	size += rails_xss_friendly_chars[*str];
+	hi |= *str & 0x80;
     }
-    return size - len * (size_t)'0';
+    if (0 == hi) {
+	return size - len * (size_t)'0';
+    }
+    return -(size - len * (size_t)'0');
 }
 
 inline static size_t
@@ -249,7 +254,6 @@ dump_hex(uint8_t c, Out out) {
 
 static void
 raise_invalid_unicode(const char *str, int len, int pos) {
-    char	buf[len + 1];
     char	c;
     char	code[32];
     char	*cp = code;
@@ -268,8 +272,7 @@ raise_invalid_unicode(const char *str, int len, int pos) {
     cp--;
     *cp++ = ']';
     *cp = '\0';
-    strncpy(buf, str, len);
-    rb_raise(oj_json_generator_error_class, "Invalid Unicode %s at %d in '%s'", code, pos, buf);
+    rb_raise(oj_json_generator_error_class, "Invalid Unicode %s at %d", code, pos);
 }
 
 static const char*
@@ -767,6 +770,7 @@ oj_dump_cstr(const char *str, size_t cnt, bool is_sym, bool escape1, Out out) {
     size_t	size;
     char	*cmap;
     const char	*orig = str;
+    bool	has_hi = false;
 
     switch (out->opts->escape_mode) {
     case NLEsc:
@@ -785,10 +789,19 @@ oj_dump_cstr(const char *str, size_t cnt, bool is_sym, bool escape1, Out out) {
 	cmap = hixss_friendly_chars;
 	size = hixss_friendly_size((uint8_t*)str, cnt);
 	break;
-    case RailsXEsc:
+    case RailsXEsc: {
+	long	sz;
+
 	cmap = rails_xss_friendly_chars;
-	size = rails_xss_friendly_size((uint8_t*)str, cnt);
+	sz = rails_xss_friendly_size((uint8_t*)str, cnt);
+	if (sz < 0) {
+	    has_hi = true;
+	    size = (size_t)-sz;
+	} else {
+	    size = (size_t)sz;
+	}
 	break;
+    }
     case RailsEsc:
 	cmap = rails_friendly_chars;
 	size = rails_friendly_size((uint8_t*)str, cnt);
@@ -812,7 +825,7 @@ oj_dump_cstr(const char *str, size_t cnt, bool is_sym, bool escape1, Out out) {
 	str++;
 	is_sym = 0; // just to make sure
     }
-    if (cnt == size) {
+    if (cnt == size && !has_hi) {
 	if (is_sym) {
 	    *out->cur++ = ':';
 	}

data/ext/oj/mimic_json.c

@@ -364,7 +364,6 @@ mimic_generate_core(int argc, VALUE *argv, Options copts) {
     struct _out	out;
     VALUE	rstr;
 
-    // TBD
     memset(buf, 0, sizeof(buf));
 
     out.buf = buf;
@@ -510,7 +509,6 @@ mimic_parse_core(int argc, VALUE *argv, VALUE self, bool bang) {
     pi.options.create_ok = No;
     pi.options.allow_nan = (bang ? Yes : No);
     pi.options.nilnil = No;
-    //pi.options.bigdec_load = FloatDec;
     pi.options.bigdec_load = RubyDec;
     pi.options.mode = CompatMode;
     pi.max_depth = 100;
@@ -561,6 +559,9 @@ mimic_parse_core(int argc, VALUE *argv, VALUE self, bool bang) {
 		pi.options.array_class = v;
 	    }
 	}
+	if (Qtrue == rb_funcall(ropts, oj_has_key_id, 1, oj_decimal_class_sym)) {
+	    pi.options.compat_bigdec = (oj_bigdecimal_class == rb_hash_lookup(ropts, oj_decimal_class_sym));
+	}
 	v = rb_hash_lookup(ropts, oj_max_nesting_sym);
 	if (Qtrue == v) {
 	    pi.max_depth = 100;
@@ -685,6 +686,7 @@ static struct _options	mimic_object_to_json_options = {
     RubyTime,	// time_format
     No,		// bigdec_as_num
     RubyDec,	// bigdec_load
+    false,	// compat_bigdec
     No,		// to_hash
     No,		// to_json
     No,		// as_json
@@ -839,6 +841,7 @@ oj_mimic_json_methods(VALUE json) {
     }
     // Pull in the JSON::State mimic file.
     state_class = rb_const_get_at(generator, rb_intern("State"));
+    rb_gc_register_mark_object(state_class);
 
     symbolize_names_sym = ID2SYM(rb_intern("symbolize_names"));	rb_gc_register_address(&symbolize_names_sym);
 }

data/ext/oj/oj.c

@@ -88,6 +88,7 @@ VALUE	oj_slash_string;
 VALUE	oj_allow_nan_sym;
 VALUE	oj_array_class_sym;
 VALUE	oj_create_additions_sym;
+VALUE	oj_decimal_class_sym;
 VALUE	oj_hash_class_sym;
 VALUE	oj_indent_sym;
 VALUE	oj_object_class_sym;
@@ -106,6 +107,7 @@ static VALUE	bigdecimal_load_sym;
 static VALUE	bigdecimal_sym;
 static VALUE	circular_sym;
 static VALUE	class_cache_sym;
+static VALUE	compat_bigdecimal_sym;
 static VALUE	compat_sym;
 static VALUE	create_id_sym;
 static VALUE	custom_sym;
@@ -167,6 +169,7 @@ struct _options	oj_default_options = {
     UnixTime,	// time_format
     NotSet,	// bigdec_as_num
     AutoDec,	// bigdec_load
+    false,	// compat_bigdec
     No,		// to_hash
     No,		// to_json
     No,		// as_json
@@ -229,6 +232,7 @@ struct _options	oj_default_options = {
  * - *:time_format* [_:unix_|_:unix_zone_|_:xmlschema_|_:ruby_] time format when dumping
  * - *:bigdecimal_as_decimal* [_Boolean_|_nil_] dump BigDecimal as a decimal number or as a String
  * - *:bigdecimal_load* [_:bigdecimal_|_:float_|_:auto_|_:fast_] load decimals as BigDecimal instead of as a Float. :auto pick the most precise for the number of digits. :float should be the same as ruby. :fast may require rounding but is must faster.
+ * - *:compat_bigdecimal* [_true_|_false_] load decimals as BigDecimal instead of as a Float when in compat or rails mode.
  * - *:create_id* [_String_|_nil_] create id for json compatible object encoding, default is 'json_class'
  * - *:create_additions* [_Boolean_|_nil_] if true allow creation of instances using create_id on load.
  * - *:second_precision* [_Fixnum_|_nil_] number of digits after the decimal when dumping the seconds portion of time
@@ -333,6 +337,7 @@ get_def_opts(VALUE self) {
     case AutoDec:
     default:		rb_hash_aset(opts, bigdecimal_load_sym, auto_sym);	break;
     }
+    rb_hash_aset(opts, compat_bigdecimal_sym, oj_default_options.compat_bigdec ? Qtrue : Qfalse);
     rb_hash_aset(opts, create_id_sym, (NULL == oj_default_options.create_id) ? Qnil : rb_str_new2(oj_default_options.create_id));
     rb_hash_aset(opts, oj_space_sym, (0 == oj_default_options.dump_opts.after_size) ? Qnil : rb_str_new2(oj_default_options.dump_opts.after_sep));
     rb_hash_aset(opts, oj_space_before_sym, (0 == oj_default_options.dump_opts.before_size) ? Qnil : rb_str_new2(oj_default_options.dump_opts.before_sep));
@@ -378,6 +383,7 @@ get_def_opts(VALUE self) {
  *   - *:escape* [_:newline_|_:json_|_:xss_safe_|_:ascii_|_unicode_xss_|_nil_] mode encodes all high-bit characters as escaped sequences if :ascii, :json is standand UTF-8 JSON encoding, :newline is the same as :json but newlines are not escaped, :unicode_xss allows unicode but escapes &, <, and >, and any \u20xx characters along with some others, and :xss_safe escapes &, <, and >, and some others.
  *   - *:bigdecimal_as_decimal* [_Boolean_|_nil_] dump BigDecimal as a decimal number or as a String.
  *   - *:bigdecimal_load* [_:bigdecimal_|_:float_|_:auto_|_nil_] load decimals as BigDecimal instead of as a Float. :auto pick the most precise for the number of digits.
+ *   - *:compat_bigdecimal* [_true_|_false_] load decimals as BigDecimal instead of as a Float in compat mode.
  *   - *:mode* [_:object_|_:strict_|_:compat_|_:null_|_:custom_|_:rails_|_:wab_] load and dump mode to use for JSON :strict raises an exception when a non-supported Object is encountered. :compat attempts to extract variable values from an Object using to_json() or to_hash() then it walks the Object's variables if neither is found. The :object mode ignores to_hash() and to_json() methods and encodes variables using code internal to the Oj gem. The :null mode ignores non-supported Objects and replaces them with a null. The :custom mode honors all dump options. The :rails more mimics rails and Active behavior.
  *   - *:time_format* [_:unix_|_:xmlschema_|_:ruby_] time format when dumping in :compat mode :unix decimal number denoting the number of seconds since 1/1/1970, :unix_zone decimal number denoting the number of seconds since 1/1/1970 plus the utc_offset in the exponent, :xmlschema date-time format taken from XML Schema as a String, :ruby Time.to_s formatted String.
  *   - *:create_id* [_String_|_nil_] create id for json compatible object encoding
@@ -581,6 +587,21 @@ oj_parse_options(VALUE ropts, Options copts) {
 	    rb_raise(rb_eArgError, ":bigdecimal_load must be :bigdecimal, :float, or :auto.");
 	}
     }
+    if (Qnil != (v = rb_hash_lookup(ropts, compat_bigdecimal_sym))) {
+	copts->compat_bigdec = (Qtrue == v);
+    }
+    if (Qtrue == rb_funcall(ropts, oj_has_key_id, 1, oj_decimal_class_sym)) {
+	v = rb_hash_lookup(ropts, oj_decimal_class_sym);
+	if (rb_cFloat == v) {
+	    copts->compat_bigdec = FloatDec;
+	} else if (oj_bigdecimal_class == v) {
+ 	    copts->compat_bigdec = BigDec;
+	} else if (Qnil == v) {
+	    copts->compat_bigdec = AutoDec;
+	} else {
+	    rb_raise(rb_eArgError, ":decimal_class must be BigDecimal, Float, or nil.");
+	}
+   }
     if (Qtrue == rb_funcall(ropts, oj_has_key_id, 1, create_id_sym)) {
 	v = rb_hash_lookup(ropts, create_id_sym);
 	if (Qnil == v) {
@@ -1628,13 +1649,21 @@ Init_oj() {
     rb_require("oj/schandler");
 
     oj_bag_class = rb_const_get_at(Oj, rb_intern("Bag"));
+    rb_gc_register_mark_object(oj_bag_class);
     oj_bigdecimal_class = rb_const_get(rb_cObject, rb_intern("BigDecimal"));
+    rb_gc_register_mark_object(oj_bigdecimal_class);
     oj_date_class = rb_const_get(rb_cObject, rb_intern("Date"));
+    rb_gc_register_mark_object(oj_date_class);
     oj_datetime_class = rb_const_get(rb_cObject, rb_intern("DateTime"));
+    rb_gc_register_mark_object(oj_datetime_class);
     oj_enumerable_class = rb_const_get(rb_cObject, rb_intern("Enumerable"));
+    rb_gc_register_mark_object(oj_enumerable_class);
     oj_parse_error_class = rb_const_get_at(Oj, rb_intern("ParseError"));
+    rb_gc_register_mark_object(oj_parse_error_class);
     oj_stringio_class = rb_const_get(rb_cObject, rb_intern("StringIO"));
+    rb_gc_register_mark_object(oj_stringio_class);
     oj_struct_class = rb_const_get(rb_cObject, rb_intern("Struct"));
+    rb_gc_register_mark_object(oj_struct_class);
     oj_json_parser_error_class = rb_eEncodingError;    // replaced if mimic is called
     oj_json_generator_error_class = rb_eEncodingError; // replaced if mimic is called
 
@@ -1649,6 +1678,7 @@ Init_oj() {
     bigdecimal_sym = ID2SYM(rb_intern("bigdecimal"));		rb_gc_register_address(&bigdecimal_sym);
     circular_sym = ID2SYM(rb_intern("circular"));		rb_gc_register_address(&circular_sym);
     class_cache_sym = ID2SYM(rb_intern("class_cache"));		rb_gc_register_address(&class_cache_sym);
+    compat_bigdecimal_sym = ID2SYM(rb_intern("compat_bigdecimal"));rb_gc_register_address(&compat_bigdecimal_sym);
     compat_sym = ID2SYM(rb_intern("compat"));			rb_gc_register_address(&compat_sym);
     create_id_sym = ID2SYM(rb_intern("create_id"));		rb_gc_register_address(&create_id_sym);
     custom_sym = ID2SYM(rb_intern("custom"));			rb_gc_register_address(&custom_sym);
@@ -1674,6 +1704,7 @@ Init_oj() {
     oj_array_nl_sym = ID2SYM(rb_intern("array_nl"));		rb_gc_register_address(&oj_array_nl_sym);
     oj_ascii_only_sym = ID2SYM(rb_intern("ascii_only"));	rb_gc_register_address(&oj_ascii_only_sym);
     oj_create_additions_sym = ID2SYM(rb_intern("create_additions"));rb_gc_register_address(&oj_create_additions_sym);
+    oj_decimal_class_sym = ID2SYM(rb_intern("decimal_class"));	rb_gc_register_address(&oj_decimal_class_sym);
     oj_hash_class_sym = ID2SYM(rb_intern("hash_class"));	rb_gc_register_address(&oj_hash_class_sym);
     oj_indent_sym = ID2SYM(rb_intern("indent"));		rb_gc_register_address(&oj_indent_sym);
     oj_max_nesting_sym = ID2SYM(rb_intern("max_nesting"));	rb_gc_register_address(&oj_max_nesting_sym);

data/ext/oj/oj.h

@@ -135,6 +135,7 @@ typedef struct _options {
     char		time_format;	// TimeFormat
     char		bigdec_as_num;	// YesNo
     char		bigdec_load;	// BigLoad
+    char		compat_bigdec;	// boolean (0 or 1)
     char		to_hash;	// YesNo
     char		to_json;	// YesNo
     char		as_json;	// YesNo
@@ -310,6 +311,7 @@ extern VALUE	oj_array_class_sym;
 extern VALUE	oj_array_nl_sym;
 extern VALUE	oj_ascii_only_sym;
 extern VALUE	oj_create_additions_sym;
+extern VALUE	oj_decimal_class_sym;
 extern VALUE	oj_hash_class_sym;
 extern VALUE	oj_indent_sym;
 extern VALUE	oj_max_nesting_sym;

data/ext/oj/parse.c

@@ -212,18 +212,6 @@ read_escaped_str(ParseInfo pi, const char *start) {
 	    case '"':	buf_append(&buf, '"');	break;
 	    case '/':	buf_append(&buf, '/');	break;
 	    case '\\':	buf_append(&buf, '\\');	break;
-	    case '\'':
-		// The json gem claims this is not an error despite the
-		// ECMA-404 indicating it is not valid.
-		if (CompatMode == pi->options.mode) {
-		    buf_append(&buf, '\'');
-		} else {
-		    pi->cur = s;
-		    oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "invalid escaped character");
-		    buf_cleanup(&buf);
-		    return;
-		}
-		break;
 	    case 'u':
 		s++;
 		if (0 == (code = read_hex(pi, s)) && err_has(&pi->err)) {
@@ -263,6 +251,12 @@ read_escaped_str(ParseInfo pi, const char *start) {
 		}
 		break;
 	    default:
+		// The json gem claims this is not an error despite the
+		// ECMA-404 indicating it is not valid.
+		if (CompatMode == pi->options.mode) {
+		    buf_append(&buf, *s);
+		    break;
+		}
 		pi->cur = s;
 		oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "invalid escaped character");
 		buf_cleanup(&buf);
@@ -391,8 +385,13 @@ read_num(ParseInfo pi) {
     ni.nan = 0;
     ni.neg = 0;
     ni.has_exp = 0;
-    ni.no_big = (FloatDec == pi->options.bigdec_load || FastDec == pi->options.bigdec_load || RubyDec == pi->options.bigdec_load);
-    ni.bigdec_load = pi->options.bigdec_load;
+    if (CompatMode == pi->options.mode) {
+	ni.no_big = !pi->options.compat_bigdec;
+	ni.bigdec_load = pi->options.compat_bigdec;
+    } else {
+	ni.no_big = (FloatDec == pi->options.bigdec_load || FastDec == pi->options.bigdec_load || RubyDec == pi->options.bigdec_load);
+	ni.bigdec_load = pi->options.bigdec_load;
+    }
 
     if ('-' == *pi->cur) {
 	pi->cur++;
@@ -517,7 +516,11 @@ read_num(ParseInfo pi) {
 	    ni.nan = 1;
 	}
     }
-    if (BigDec == pi->options.bigdec_load) {
+    if (CompatMode == pi->options.mode) {
+	if (pi->options.compat_bigdec) {
+	    ni.big = 1;
+	}
+    } else if (BigDec == pi->options.bigdec_load) {
 	ni.big = 1;
     }
     if (0 == parent) {

data/ext/oj/sparse.c

@@ -225,17 +225,6 @@ read_escaped_str(ParseInfo pi) {
 	    case '"':	buf_append(&buf, '"');	break;
 	    case '/':	buf_append(&buf, '/');	break;
 	    case '\\':	buf_append(&buf, '\\');	break;
-	    case '\'':
-		// The json gem claims this is not an error despite the
-		// ECMA-404 indicating it is not valid.
-		if (CompatMode == pi->options.mode) {
-		    buf_append(&buf, '\'');
-		} else {
-		    oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "invalid escaped character");
-		    buf_cleanup(&buf);
-		    return;
-		}
-		break;
 	    case 'u':
 		if (0 == (code = read_hex(pi)) && err_has(&pi->err)) {
 		    buf_cleanup(&buf);
@@ -273,6 +262,12 @@ read_escaped_str(ParseInfo pi) {
 		}
 		break;
 	    default:
+		// The json gem claims this is not an error despite the
+		// ECMA-404 indicating it is not valid.
+		if (CompatMode == pi->options.mode) {
+		    buf_append(&buf, c);
+		    break;
+		}
 		oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "invalid escaped character");
 		buf_cleanup(&buf);
 		return;
@@ -405,8 +400,13 @@ read_num(ParseInfo pi) {
     ni.nan = 0;
     ni.neg = 0;
     ni.has_exp = 0;
-    ni.no_big = (FloatDec == pi->options.bigdec_load || FastDec == pi->options.bigdec_load || RubyDec == pi->options.bigdec_load);
-    ni.bigdec_load = pi->options.bigdec_load;
+    if (CompatMode == pi->options.mode) {
+	ni.no_big = !pi->options.compat_bigdec;
+	ni.bigdec_load = pi->options.compat_bigdec;
+    } else {
+	ni.no_big = (FloatDec == pi->options.bigdec_load || FastDec == pi->options.bigdec_load || RubyDec == pi->options.bigdec_load);
+	ni.bigdec_load = pi->options.bigdec_load;
+    }
 
     c = reader_get(&pi->rd);
     if ('-' == c) {
@@ -523,7 +523,11 @@ read_num(ParseInfo pi) {
 	    ni.nan = 1;
 	}
     }
-    if (BigDec == pi->options.bigdec_load) {
+    if (CompatMode == pi->options.mode) {
+	if (pi->options.compat_bigdec) {
+	    ni.big = 1;
+	}
+    } else if (BigDec == pi->options.bigdec_load) {
 	ni.big = 1;
     }
     add_num_value(pi, &ni);
@@ -546,15 +550,24 @@ read_nan(ParseInfo pi) {
     ni.infinity = 0;
     ni.nan = 1;
     ni.neg = 0;
-    ni.no_big = (FloatDec == pi->options.bigdec_load || FastDec == pi->options.bigdec_load || RubyDec == pi->options.bigdec_load);
-    ni.bigdec_load = pi->options.bigdec_load;
+    if (CompatMode == pi->options.mode) {
+	ni.no_big = !pi->options.compat_bigdec;
+	ni.bigdec_load = pi->options.compat_bigdec;
+    } else {
+	ni.no_big = (FloatDec == pi->options.bigdec_load || FastDec == pi->options.bigdec_load || RubyDec == pi->options.bigdec_load);
+	ni.bigdec_load = pi->options.bigdec_load;
+    }
 
     if ('a' != reader_get(&pi->rd) ||
 	('N' != (c = reader_get(&pi->rd)) && 'n' != c)) {
 	oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "not a number or other value");
 	return;
     }
-    if (BigDec == pi->options.bigdec_load) {
+    if (CompatMode == pi->options.mode) {
+	if (pi->options.compat_bigdec) {
+	    ni.big = 1;
+	}
+    } else if (BigDec == pi->options.bigdec_load) {
 	ni.big = 1;
     }
     add_num_value(pi, &ni);
@@ -744,8 +757,15 @@ oj_sparse2(ParseInfo pi) {
 		ni.infinity = 0;
 		ni.nan = 1;
 		ni.neg = 0;
-		ni.no_big = (FloatDec == pi->options.bigdec_load || RubyDec == pi->options.bigdec_load || FastDec == pi->options.bigdec_load);
-		ni.bigdec_load = pi->options.bigdec_load;
+		if (CompatMode == pi->options.mode) {
+		    ni.no_big = !pi->options.compat_bigdec;
+		    ni.bigdec_load = pi->options.compat_bigdec;
+		} else {
+		    ni.no_big = (FloatDec == pi->options.bigdec_load ||
+				 FastDec == pi->options.bigdec_load ||
+				 RubyDec == pi->options.bigdec_load);
+		    ni.bigdec_load = pi->options.bigdec_load;
+		}
 		add_num_value(pi, &ni);
 	    } else {
 		oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "invalid token");

data/lib/oj/mimic.rb

@@ -8,6 +8,50 @@ end
 
 module Oj
 
+  ##
+  # Custom mode can be used to emulate the compat mode with some minor
+  # differences. These are the options that setup the custom mode to be like
+  # the compat mode.
+  CUSTOM_MIMIC_JSON_OPTIONS = {
+    allow_gc: true,
+    allow_invalid_unicode: false,
+    allow_nan: false,
+    array_class: nil,
+    array_nl: nil,
+    auto_define: false,
+    bigdecimal_as_decimal: false,
+    bigdecimal_load: :auto,
+    circular: false,
+    class_cache: false,
+    create_additions: false,
+    create_id: "json_class",
+    empty_string: false,
+    escape_mode: :unicode_xss,
+    float_precision: 0,
+    hash_class: nil,
+    ignore: nil,
+    ignore_under: false,
+    indent: 0,
+    integer_range: nil,
+    mode: :custom,
+    nan: :raise,
+    nilnil: false,
+    object_nl: nil,
+    omit_nil: false,
+    quirks_mode: true,
+    safe: false,
+    second_precision: 3,
+    space: nil,
+    space_before: nil,
+    symbol_keys: false,
+    time_format: :ruby,
+    trace: false,
+    use_as_json: false,
+    use_raw_json: false,
+    use_to_hash: false,
+    use_to_json: true,
+  }
+
   # A bit hack-ish but does the trick. The JSON.dump_default_options is a Hash
   # but in mimic we use a C struct to store defaults. This class creates a view
   # onto that struct.
@@ -38,7 +82,7 @@ module Oj
 
       jfile = File.join(d, 'json.rb')
       $LOADED_FEATURES << jfile unless $LOADED_FEATURES.include?(jfile) if File.exist?(jfile)
-      
+
       Dir.glob(File.join(d, 'json', '**', '*.rb')).each do |file|
         # allow json/add/xxx to be loaded. User can override with Oj.add_to_json(xxx).
         $LOADED_FEATURES << file unless $LOADED_FEATURES.include?(file) unless file.include?('add')

data/lib/oj/version.rb

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

data/pages/Modes.md

@@ -96,6 +96,7 @@ information.
 | :auto_define           | Boolean |         |         |         |         |       x |       x |         |
 | :bigdecimal_as_decimal | Boolean |         |         |         |       3 |       x |       x |         |
 | :bigdecimal_load       | Boolean |         |         |         |         |         |       x |         |
+| :compat_bigdecimal     | Boolean |         |         |       x |         |         |       x |         |
 | :circular              | Boolean |       x |       x |       x |       x |       x |       x |         |
 | :class_cache           | Boolean |         |         |         |         |       x |       x |         |
 | :create_additions      | Boolean |         |         |       x |       x |         |       x |         |

data/pages/Options.md

@@ -66,6 +66,18 @@ Determines how to load decimals.
 
  - `:auto` the most precise for the number of digits is used.
 
+This can also be set with `:decimal_class` when used as a load or
+parse option to match the JSON gem. In that case either `Float`,
+`BigDecimal`, or `nil` can be provided.
+
+### :compat_bigdecimal [Boolean]
+
+Determines how to load decimals when in `:compat` mode.
+
+ - `true` convert all decimal numbers to BigDecimal.
+
+ - `false` convert all decimal numbers to Float.
+
 ### :circular [Boolean]
 
 Detect circular references while dumping. In :compat mode raise a

data/test/helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+#
 # Ubuntu does not accept arguments to ruby when called using env. To get warnings to show up the -w options is
 # required. That can be set in the RUBYOPT environment variable.
 # export RUBYOPT=-w
@@ -16,6 +18,14 @@ require 'bigdecimal'
 require 'pp'
 require 'oj'
 
+
+if defined?(GC.verify_compaction_references) == 'method'
+  # This method was added in Ruby 3.0.0. Calling it this way asks the GC to
+  # move objects around, helping to find object movement bugs.
+  GC.verify_compaction_references(double_heap: true, toward: :empty)
+end
+
+
 $ruby = RUBY_DESCRIPTION.split(' ')[0]
 $ruby = 'ree' if 'ruby' == $ruby && RUBY_DESCRIPTION.include?('Ruby Enterprise Edition')
 

data/test/json_gem/json_generator_test.rb

@@ -136,6 +136,10 @@ EOT
 
   def test_pretty_state
     state = JSON::PRETTY_STATE_PROTOTYPE.dup
+    # In come cases in Ruby 3.0 an :escape_slash is included in the state. It
+    # seems to occur on travis but not locally.
+    actual = state.to_h
+    actual.delete(:escape_slash)
     assert_equal({
       :allow_nan             => false,
       :array_nl              => "\n",
@@ -147,11 +151,15 @@ EOT
       :object_nl             => "\n",
       :space                 => " ",
       :space_before          => "",
-    }.sort_by { |n,| n.to_s }, state.to_h.sort_by { |n,| n.to_s })
+    }.sort_by { |n,| n.to_s }, actual.sort_by { |n,| n.to_s })
   end
 
   def test_safe_state
     state = JSON::SAFE_STATE_PROTOTYPE.dup
+    # In come cases in Ruby 3.0 an :escape_slash is included in the state. It
+    # seems to occur on travis but not locally.
+    actual = state.to_h
+    actual.delete(:escape_slash)
     assert_equal({
       :allow_nan             => false,
       :array_nl              => "",
@@ -163,11 +171,15 @@ EOT
       :object_nl             => "",
       :space                 => "",
       :space_before          => "",
-    }.sort_by { |n,| n.to_s }, state.to_h.sort_by { |n,| n.to_s })
+    }.sort_by { |n,| n.to_s }, actual.sort_by { |n,| n.to_s })
   end
 
   def test_fast_state
     state = JSON::FAST_STATE_PROTOTYPE.dup
+    # In come cases in Ruby 3.0 an :escape_slash is included in the state. It
+    # seems to occur on travis but not locally.
+    actual = state.to_h
+    actual.delete(:escape_slash)
     assert_equal({
       :allow_nan             => false,
       :array_nl              => "",
@@ -179,7 +191,7 @@ EOT
       :object_nl             => "",
       :space                 => "",
       :space_before          => "",
-    }.sort_by { |n,| n.to_s }, state.to_h.sort_by { |n,| n.to_s })
+    }.sort_by { |n,| n.to_s }, actual.sort_by { |n,| n.to_s })
   end
 
   def test_allow_nan

data/test/json_gem/test_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 $: << File.dirname(__FILE__)
 $oj_dir = File.dirname(File.dirname(File.expand_path(File.dirname(__FILE__))))
 %w(lib ext).each do |dir|
@@ -12,6 +14,12 @@ if ENV['REAL_JSON_GEM']
 else
   require 'oj'
   Oj.mimic_JSON
+
+  if defined?(GC.verify_compaction_references) == 'method'
+    # This method was added in Ruby 3.0.0. Calling it this way asks the GC to
+    # move objects around, helping to find object movement bugs.
+    GC.verify_compaction_references(double_heap: true, toward: :empty)
+  end
 end
 
 NaN = JSON::NaN if defined?(JSON::NaN)

data/test/test_compat.rb

@@ -178,7 +178,7 @@ class CompatJuice < Minitest::Test
     assert_equal('"abc"', json)
   end
 
-  def test_time
+  def test_time_xml_schema
     t = Time.xmlschema("2012-01-05T23:58:07.123456000+09:00")
     #t = Time.local(2012, 1, 5, 23, 58, 7, 123456)
     json = Oj.dump(t, :mode => :compat)
@@ -236,6 +236,12 @@ class CompatJuice < Minitest::Test
     assert_equal({"a\nb" => true, "c\td" => false}, obj)
   end
 
+  def test_invalid_escapes_handled
+    json = '{"subtext":"\"404er\” \w \k \3 \a"}'
+    obj = Oj.compat_load(json)
+    assert_equal({"subtext" => "\"404er” w k 3 a"}, obj)
+  end
+
   def test_hash_escaping
     json = Oj.to_json({'<>' => '<>'}, mode: :compat)
     assert_equal(json, '{"<>":"<>"}')
@@ -271,12 +277,19 @@ class CompatJuice < Minitest::Test
   # BigDecimal
   def test_bigdecimal
     # BigDecimals are dumped as strings and can not be restored to the
-    # original value.
+    # original value without using an undocumented feature of the JSON gem.
     json = Oj.dump(BigDecimal('3.14159265358979323846'))
     # 2.4.0 changes the exponent to lowercase
     assert_equal('"0.314159265358979323846e1"', json.downcase)
   end
 
+  def test_decimal_class
+    big = BigDecimal('3.14159265358979323846')
+    # :decimal_class is the undocumented feature.
+    json = Oj.load('3.14159265358979323846', mode: :compat, decimal_class: BigDecimal)
+    assert_equal(big, json)
+  end
+
   def test_infinity
     assert_raises(Oj::ParseError) { Oj.load('Infinity', :mode => :strict) }
     x = Oj.load('Infinity', :mode => :compat)
@@ -284,7 +297,7 @@ class CompatJuice < Minitest::Test
   end
 
   # Time
-  def test_time
+  def test_time_from_time_object
     t = Time.new(2015, 1, 5, 21, 37, 7.123456, -8 * 3600)
     expect = '"' + t.to_s + '"'
     json = Oj.dump(t)

data/test/test_rails.rb

@@ -23,4 +23,13 @@ class RailsJuice < Minitest::Test
     assert_equal('0.123e3', json.downcase)
   end
 
+  def test_invalid_encoding
+    assert_raises(EncodingError) {
+      Oj.dump("\"\xf3j", mode: :rails)
+    }
+    assert_raises(EncodingError) {
+      Oj.dump("\xf3j", mode: :rails)
+    }
+  end
+
 end

data/test/test_various.rb

@@ -120,6 +120,7 @@ class Juice < Minitest::Test
       escape_mode: :ascii,
       time_format: :unix_zone,
       bigdecimal_load: :float,
+      compat_bigdecimal: true,
       create_id: 'classy',
       create_additions: true,
       space: 'z',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 3.10.15
+  version: 3.11.1
 platform: ruby
 authors:
 - Peter Ohler
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-16 00:00:00.000000000 Z
+date: 2021-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -79,16 +79,16 @@ extensions:
 - ext/oj/extconf.rb
 extra_rdoc_files:
 - README.md
-- pages/Rails.md
-- pages/JsonGem.md
-- pages/Encoding.md
-- pages/WAB.md
-- pages/Custom.md
 - pages/Advanced.md
-- pages/Options.md
 - pages/Compatibility.md
+- pages/Custom.md
+- pages/Encoding.md
+- pages/JsonGem.md
 - pages/Modes.md
+- pages/Options.md
+- pages/Rails.md
 - pages/Security.md
+- pages/WAB.md
 files:
 - LICENSE
 - README.md
@@ -265,7 +265,7 @@ metadata:
   homepage_uri: http://www.ohler.com/oj/
   source_code_uri: https://github.com/ohler55/oj
   wiki_uri: https://github.com/ohler55/oj/wiki
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--title"
 - Oj
@@ -284,98 +284,98 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: A fast JSON parser and serializer.
 test_files:
+- test/_test_active.rb
+- test/_test_active_mimic.rb
+- test/_test_mimic_rails.rb
+- test/activerecord/result_test.rb
+- test/activesupport4/decoding_test.rb
+- test/activesupport4/encoding_test.rb
+- test/activesupport4/test_helper.rb
+- test/activesupport5/abstract_unit.rb
+- test/activesupport5/decoding_test.rb
+- test/activesupport5/encoding_test.rb
+- test/activesupport5/encoding_test_cases.rb
+- test/activesupport5/test_helper.rb
+- test/activesupport5/time_zone_test_helpers.rb
+- test/activesupport6/abstract_unit.rb
+- test/activesupport6/decoding_test.rb
+- test/activesupport6/encoding_test.rb
+- test/activesupport6/encoding_test_cases.rb
+- test/activesupport6/test_common.rb
+- test/activesupport6/test_helper.rb
+- test/activesupport6/time_zone_test_helpers.rb
+- test/bar.rb
+- test/baz.rb
+- test/files.rb
 - test/foo.rb
-- test/prec.rb
-- test/test_integer_range.rb
-- test/test_strict.rb
-- test/perf_strict.rb
-- test/tests.rb
-- test/perf_saj.rb
-- test/test_compat.rb
 - test/helper.rb
-- test/perf_file.rb
-- test/test_scp.rb
-- test/perf_compat.rb
-- test/json_gem/json_common_interface_test.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_redefine.rb
 - test/json_gem/json_addition_test.rb
-- test/json_gem/json_fixtures_test.rb
+- test/json_gem/json_common_interface_test.rb
+- test/json_gem/json_encoding_test.rb
 - test/json_gem/json_ext_parser_test.rb
-- test/json_gem/json_string_matching_test.rb
-- test/json_gem/json_generic_object_test.rb
+- test/json_gem/json_fixtures_test.rb
 - test/json_gem/json_generator_test.rb
-- test/json_gem/test_helper.rb
-- test/json_gem/json_encoding_test.rb
+- test/json_gem/json_generic_object_test.rb
 - test/json_gem/json_parser_test.rb
-- test/perf_wab.rb
-- test/test_file.rb
-- test/test_object.rb
-- test/sample.rb
+- test/json_gem/json_string_matching_test.rb
+- test/json_gem/test_helper.rb
+- test/perf.rb
+- test/perf_compat.rb
+- test/perf_fast.rb
+- test/perf_file.rb
 - test/perf_object.rb
-- test/test_hash.rb
-- test/test_custom.rb
-- test/bar.rb
-- test/activesupport4/encoding_test.rb
-- test/activesupport4/test_helper.rb
-- test/activesupport4/decoding_test.rb
-- test/sample_json.rb
-- test/activesupport5/encoding_test_cases.rb
-- test/activesupport5/encoding_test.rb
-- test/activesupport5/abstract_unit.rb
-- test/activesupport5/time_zone_test_helpers.rb
-- test/activesupport5/test_helper.rb
-- test/activesupport5/decoding_test.rb
-- test/test_saj.rb
+- test/perf_saj.rb
 - test/perf_scp.rb
-- test/test_wab.rb
-- test/test_null.rb
-- test/_test_active.rb
-- test/_test_mimic_rails.rb
-- test/test_fast.rb
-- test/perf_fast.rb
+- test/perf_simple.rb
+- test/perf_strict.rb
+- test/perf_wab.rb
+- test/prec.rb
 - test/sample/change.rb
-- test/sample/text.rb
+- test/sample/dir.rb
 - test/sample/doc.rb
-- test/sample/shape.rb
-- test/sample/layer.rb
-- test/sample/group.rb
 - test/sample/file.rb
-- test/sample/rect.rb
+- test/sample/group.rb
 - test/sample/hasprops.rb
+- test/sample/layer.rb
 - test/sample/line.rb
-- test/sample/dir.rb
 - test/sample/oval.rb
-- test/tests_mimic.rb
-- test/perf_simple.rb
-- test/zoo.rb
-- test/activerecord/result_test.rb
-- test/_test_active_mimic.rb
-- 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
-- test/isolated/test_mimic_rails_after.rb
-- test/isolated/test_mimic_before.rb
-- test/isolated/test_mimic_rails_before.rb
-- test/isolated/test_mimic_redefine.rb
-- test/isolated/shared.rb
-- test/isolated/test_mimic_alone.rb
-- test/isolated/test_mimic_as_json.rb
+- test/sample/rect.rb
+- test/sample/shape.rb
+- test/sample/text.rb
+- test/sample.rb
+- test/sample_json.rb
+- test/test_compat.rb
+- test/test_custom.rb
 - test/test_debian.rb
+- test/test_fast.rb
+- test/test_file.rb
 - test/test_gc.rb
-- test/files.rb
+- test/test_hash.rb
+- 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
 - test/test_various.rb
-- test/activesupport6/encoding_test_cases.rb
-- test/activesupport6/encoding_test.rb
-- test/activesupport6/abstract_unit.rb
-- test/activesupport6/time_zone_test_helpers.rb
-- test/activesupport6/test_helper.rb
-- test/activesupport6/test_common.rb
-- test/activesupport6/decoding_test.rb
+- test/test_wab.rb
+- test/test_writer.rb
+- test/tests.rb
+- test/tests_mimic.rb
+- test/tests_mimic_addition.rb
+- test/zoo.rb