oj 3.9.2 → 3.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52a998aa9f2273e995d9ef52e26df3f8998aae1a98d7d088f6973cf8234a444f
-  data.tar.gz: 26647fb39df6d357074e5798bf263ca708a361cf910eba43c7c7a3d1ba905f51
+  metadata.gz: 62a52be7754c5ef34c3006fb28fa918cb18f23c26ffa94e8daedf05396bbe0fb
+  data.tar.gz: 9cf9cfab00cf1e28f8b42c6d3e88ee6a2a785093cc024c558eeceb25eaf39cd1
 SHA512:
-  metadata.gz: 9dffec2bd8c447ca172aa4a647a719c1cc62eeedab91ea30b79943fa212e4b78a10b3e3ddfd69e873e632c3bdddce2d955d34aa106dfa7e4f43618ea842aa829
-  data.tar.gz: 5dd30d0dcaf87e9b57c16ad13f0e7654ab8b8b02d8b3709f20614025283101bc44cedf4470bb2bb887b41a280d2e4b131f77a26a65a8e79447771a6bc5cca42d
+  metadata.gz: 931cf30643fc1be050ec4f3c0c69f85b643b073e7bd5d16c5c8a5431c8d3701ae73fc5b68311246f2db993fa1c3e40b6169978f10b377a947cc937a7d26afd6e
+  data.tar.gz: 779d173d00513d830f825cc9e0f51a5a066beece8fe9289d1face779c34210d6f7506e8e8af380fc5f2d3c2dd727b46f14cc985d4a2867e3a71fb1de4217361a

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)](http://travis-ci.org/ohler55/oj?branch=master) [![AppVeyor](https://img.shields.io/appveyor/ci/ohler55/oj/master.svg)](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) [![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)
 
 A *fast* JSON parser and Object marshaller as a Ruby gem.
 
@@ -42,7 +42,7 @@ gem 'oj'
 
 ## Support
 
-[Get supported Oj with a Tidelift Subscription.](https://tidelift.com/subscription/pkg/rubygems-oj?utm_source=rubygems-oj&utm_medium=referral&utm_campaign=readme)
+[Get supported Oj with a Tidelift Subscription.](https://tidelift.com/subscription/pkg/rubygems-oj?utm_source=rubygems-oj&utm_medium=referral&utm_campaign=readme) Security updates are [supported](https://tidelift.com/security).
 
 ## Further Reading
 

data/ext/oj/custom.c

@@ -609,6 +609,8 @@ dump_attr_cb(ID key, VALUE value, Out out) {
     // the key name is NULL. Not an empty string but NULL.
     if (NULL == attr) {
 	attr = "";
+    } else if (Yes == out->opts->ignore_under && '@' == *attr && '_' == attr[1]) {
+	return ST_CONTINUE;
     }
     if (0 == strcmp("bt", attr) || 0 == strcmp("mesg", attr)) {
 	return ST_CONTINUE;

data/ext/oj/dump.c

@@ -548,7 +548,7 @@ oj_dump_xml_time(VALUE obj, Out out) {
         tzhour = (int)(tzsecs / 3600);
         tzmin = (int)(tzsecs / 60) - (tzhour * 60);
     }
-    if (0 == nsec || 0 == out->opts->sec_prec) {
+    if ((0 == nsec && !out->opts->sec_prec_set) || 0 == out->opts->sec_prec) {
 	if (0 == tzsecs && rb_funcall2(obj, oj_utcq_id, 0, 0)) {
 	    sprintf(buf, "%04d-%02d-%02dT%02d:%02d:%02dZ", ti.year, ti.mon, ti.day, ti.hour, ti.min, ti.sec);
 	    oj_dump_cstr(buf, 20, 0, 0, out);
@@ -1023,8 +1023,8 @@ oj_dump_fixnum(VALUE obj, int depth, Out out, bool as_ok) {
     int		neg = 0;
     bool	dump_as_string = false;
 
-    if (out->opts->integer_range_max != 0 && out->opts->integer_range_min != 0 &&
-	(out->opts->integer_range_max < num || out->opts->integer_range_min > num)) {
+    if (out->opts->int_range_max != 0 && out->opts->int_range_min != 0 &&
+	(out->opts->int_range_max < num || out->opts->int_range_min > num)) {
 	dump_as_string = true;
     }
     if (0 > num) {
@@ -1062,23 +1062,20 @@ void
 oj_dump_bignum(VALUE obj, int depth, Out out, bool as_ok) {
     volatile VALUE	rs = rb_big2str(obj, 10);
     int			cnt = (int)RSTRING_LEN(rs);
-	bool		dump_as_string = false;
+    bool		dump_as_string = false;
 
-	if (out->opts->integer_range_max != 0 || out->opts->integer_range_min != 0) { // Bignum cannot be inside of Fixnum range
+    if (out->opts->int_range_max != 0 || out->opts->int_range_min != 0) { // Bignum cannot be inside of Fixnum range
 	dump_as_string = true;
 	assure_size(out, cnt + 2);
 	*out->cur++ = '"';
-	} else {
+    } else {
 	assure_size(out, cnt);
-	}
-
+    }
     memcpy(out->cur, rb_string_value_ptr((VALUE*)&rs), cnt);
     out->cur += cnt;
-
-	if(dump_as_string) {
+    if (dump_as_string) {
 	*out->cur++ = '"';
-	}
-
+    }
     *out->cur = '\0';
 }
 

data/ext/oj/dump_compat.c

@@ -870,7 +870,7 @@ dump_bignum(VALUE obj, int depth, Out out, bool as_ok) {
     // this must use to_s to pass the json gem unit tests.
     volatile VALUE	rs;
     int			cnt;
-	bool		dump_as_string = false;
+    bool		dump_as_string = false;
 
     if (use_bignum_alt) {
 	rs = rb_big2str(obj, 10);
@@ -880,21 +880,18 @@ dump_bignum(VALUE obj, int depth, Out out, bool as_ok) {
     rb_check_type(rs, T_STRING);
     cnt = (int)RSTRING_LEN(rs);
 
-	if (out->opts->integer_range_min != 0 || out->opts->integer_range_max != 0) {
+    if (out->opts->int_range_min != 0 || out->opts->int_range_max != 0) {
 	dump_as_string = true; // Bignum cannot be inside of Fixnum range
 	assure_size(out, cnt + 2);
 	*out->cur++ = '"';
-	} else {
+    } else {
 	assure_size(out, cnt);
-	}
-
+    }
     memcpy(out->cur, rb_string_value_ptr((VALUE*)&rs), cnt);
     out->cur += cnt;
-
-	if(dump_as_string) {
+    if (dump_as_string) {
 	*out->cur++ = '"';
-	}
-
+    }
     *out->cur = '\0';
 }
 

data/ext/oj/dump_object.c

@@ -56,7 +56,7 @@ dump_data(VALUE obj, int depth, Out out, bool as_ok) {
 	    }
 	} else {
 	    long	id = oj_check_circular(obj, out);
-	    
+
 	    if (0 <= id) {
 		dump_obj_attrs(obj, clas, id, depth, out);
 	    }
@@ -72,7 +72,7 @@ dump_obj(VALUE obj, int depth, Out out, bool as_ok) {
 	volatile VALUE	rstr = rb_funcall(obj, oj_to_s_id, 0);
 	const char	*str = rb_string_value_ptr((VALUE*)&rstr);
 	int		len = (int)RSTRING_LEN(rstr);
-	    
+
 	if (0 == strcasecmp("Infinity", str)) {
 	    str = oj_nan_str(obj, out->opts->dump_opts.nan_dump, out->opts->mode, true, &len);
 	    oj_dump_raw(str, len, out);
@@ -280,7 +280,7 @@ hash_cb(VALUE key, VALUE value, Out out) {
     }
     out->depth = depth;
     *out->cur++ = ',';
-    
+
     return ST_CONTINUE;
 }
 
@@ -363,6 +363,8 @@ dump_attr_cb(ID key, VALUE value, Out out) {
     // the key name is NULL. Not an empty string but NULL.
     if (NULL == attr) {
 	attr = "";
+    } else if (Yes == out->opts->ignore_under && '@' == *attr && '_' == attr[1]) {
+	return ST_CONTINUE;
     }
     if (0 == strcmp("bt", attr) || 0 == strcmp("mesg", attr)) {
 	return ST_CONTINUE;
@@ -384,7 +386,7 @@ dump_attr_cb(ID key, VALUE value, Out out) {
     oj_dump_obj_val(value, depth, out);
     out->depth = depth;
     *out->cur++ = ',';
-    
+
     return ST_CONTINUE;
 }
 #endif
@@ -424,7 +426,7 @@ dump_odd(VALUE obj, Odd odd, VALUE clas, int depth, Out out) {
 	v = rb_funcall(obj, *odd->attrs, 0);
 	if (Qundef == v || T_STRING != rb_type(v)) {
 	    rb_raise(rb_eEncodingError, "Invalid type for raw JSON.");
-	} else {	    
+	} else {
 	    const char	*s = rb_string_value_ptr((VALUE*)&v);
 	    int		len = (int)RSTRING_LEN(v);
 	    const char	*name = rb_id2name(*odd->attrs);
@@ -460,7 +462,7 @@ dump_odd(VALUE obj, Odd odd, VALUE clas, int depth, Out out) {
 		char	*n;
 		char	*end;
 		ID	i;
-	    
+
 		if (sizeof(nbuf) <= nlen) {
 		    if (NULL == (n2 = strdup(name))) {
 			rb_raise(rb_eNoMemError, "for attribute name.");
@@ -610,9 +612,12 @@ dump_obj_attrs(VALUE obj, VALUE clas, slot_t id, int depth, Out out) {
 	size = d2 * out->indent + 1;
 	for (i = cnt; 0 < i; i--, np++) {
 	    VALUE	value;
-	    
+
 	    vid = rb_to_id(*np);
 	    attr = rb_id2name(vid);
+	    if (Yes == out->opts->ignore_under && '@' == *attr && '_' == attr[1]) {
+		return ST_CONTINUE;
+	    }
 	    value = rb_ivar_get(obj, vid);
 
 	    if (oj_dump_ignore(out->opts, value)) {
@@ -739,7 +744,7 @@ dump_struct(VALUE obj, int depth, Out out, bool as_ok) {
 #else // RSTRUCT_LEN_RETURNS_INTEGER_OBJECT
 	cnt = (int)RSTRUCT_LEN(obj);
 #endif // RSTRUCT_LEN_RETURNS_INTEGER_OBJECT
-	
+
 	for (i = 0; i < cnt; i++) {
 	    v = RSTRUCT_GET(obj, i);
 	    if (oj_dump_ignore(out->opts, v)) {
@@ -812,7 +817,7 @@ static DumpFunc	obj_funcs[] = {
 void
 oj_dump_obj_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);
     }

data/ext/oj/mimic_json.c

@@ -690,8 +690,10 @@ static struct _options	mimic_object_to_json_options = {
     No,		// allow_nan
     No,		// trace
     No,		// safe
-    0,		// integer_range_min
-    0,		// integer_range_max
+    false,	// sec_prec_set
+    No,		// ignore_under
+    0,		// int_range_min
+    0,		// int_range_max
     oj_json_class,// create_id
     10,		// create_id_len
     3,		// sec_prec

data/ext/oj/oj.c

@@ -119,6 +119,7 @@ static VALUE	float_prec_sym;
 static VALUE	float_sym;
 static VALUE	huge_sym;
 static VALUE	ignore_sym;
+static VALUE	ignore_under_sym;
 static VALUE	json_sym;
 static VALUE	match_string_sym;
 static VALUE	mode_sym;
@@ -181,8 +182,10 @@ struct _options	oj_default_options = {
     Yes,	// allow_nan
     No,		// trace
     No,		// safe
-    0,		// integer_range_min
-    0,		// integer_range_max
+    false,	// sec_prec_set
+    No,		// ignore_under
+    0,		// int_range_min
+    0,		// int_range_max
     oj_json_class,	// create_id
     10,		// create_id_len
     9,		// sec_prec
@@ -251,6 +254,7 @@ struct _options	oj_default_options = {
  * - *:array_class* [_Class_|_nil_] Class to use instead of Array on load
  * - *:omit_nil* [_true_|_false_] if true Hash and Object attributes with nil values are omitted
  * - *:ignore* [_nil_|Array] either nil or an Array of classes to ignore when dumping
+ * - *:ignore_under* [Boolean] if true then attributes that start with _ are ignored when dumping in object or custom mode.
  * - *:integer_range* [_Range_] Dump integers outside range as strings.
  * - *:trace* [_true,_|_false_] Trace all load and dump calls, default is false (trace is off)
  * - *:safe* [_true,_|_false_] Safe mimic breaks JSON mimic to be safer, default is false (safe is off)
@@ -286,6 +290,7 @@ get_def_opts(VALUE self) {
     rb_hash_aset(opts, oj_trace_sym, (Yes == oj_default_options.trace) ? Qtrue : ((No == oj_default_options.trace) ? Qfalse : Qnil));
     rb_hash_aset(opts, oj_safe_sym, (Yes == oj_default_options.safe) ? Qtrue : ((No == oj_default_options.safe) ? Qfalse : Qnil));
     rb_hash_aset(opts, float_prec_sym, INT2FIX(oj_default_options.float_prec));
+    rb_hash_aset(opts, ignore_under_sym, (Yes == oj_default_options.ignore_under) ? Qtrue : ((No == oj_default_options.ignore_under) ? Qfalse : Qnil));
     switch (oj_default_options.mode) {
     case StrictMode:	rb_hash_aset(opts, mode_sym, strict_sym);	break;
     case CompatMode:	rb_hash_aset(opts, mode_sym, compat_sym);	break;
@@ -297,16 +302,16 @@ get_def_opts(VALUE self) {
     default:		rb_hash_aset(opts, mode_sym, object_sym);	break;
     }
 
-    if (oj_default_options.integer_range_max != 0 || oj_default_options.integer_range_min != 0) {
-    VALUE range = rb_obj_alloc(rb_cRange);
-    VALUE min = LONG2FIX(oj_default_options.integer_range_min);
-    VALUE max = LONG2FIX(oj_default_options.integer_range_max);
-    rb_ivar_set(range, oj_begin_id, min);
-    rb_ivar_set(range, oj_end_id, max);
-    rb_hash_aset(opts, integer_range_sym, range);
-    }
-    else {
-    rb_hash_aset(opts, integer_range_sym, Qnil);
+    if (oj_default_options.int_range_max != 0 || oj_default_options.int_range_min != 0) {
+	VALUE	range = rb_obj_alloc(rb_cRange);
+	VALUE	min = LONG2FIX(oj_default_options.int_range_min);
+	VALUE	max = LONG2FIX(oj_default_options.int_range_max);
+
+	rb_ivar_set(range, oj_begin_id, min);
+	rb_ivar_set(range, oj_end_id, max);
+	rb_hash_aset(opts, integer_range_sym, range);
+    } else {
+	rb_hash_aset(opts, integer_range_sym, Qnil);
     }
     switch (oj_default_options.escape_mode) {
     case NLEsc:		rb_hash_aset(opts, escape_mode_sym, newline_sym);	break;
@@ -398,6 +403,7 @@ get_def_opts(VALUE self) {
  *   - *:array_class* [_Class_|_nil_] Class to use instead of Array on load.
  *   - *:omit_nil* [_true_|_false_] if true Hash and Object attributes with nil values are omitted.
  *   - *:ignore* [_nil_|Array] either nil or an Array of classes to ignore when dumping
+ *   - *:ignore_under* [_Boolean_] if true then attributes that start with _ are ignored when dumping in object or custom mode.
  *   - *:integer_range* [_Range_] Dump integers outside range as strings.
  *   - *:trace* [_Boolean_] turn trace on or off.
  *   - *:safe* [_Boolean_] turn safe mimic on or off.
@@ -431,6 +437,7 @@ oj_parse_options(VALUE ropts, Options copts) {
 	{ oj_allow_nan_sym, &copts->allow_nan },
 	{ oj_trace_sym, &copts->trace },
 	{ oj_safe_sym, &copts->safe },
+	{ ignore_under_sym, &copts->ignore_under },
 	{ oj_create_additions_sym, &copts->create_ok },
 	{ Qnil, 0 }
     };
@@ -506,8 +513,12 @@ oj_parse_options(VALUE ropts, Options copts) {
 	n = NUM2INT(v);
 	if (0 > n) {
 	    n = 0;
+	    copts->sec_prec_set = false;
 	} else if (9 < n) {
 	    n = 9;
+	    copts->sec_prec_set = true;
+	} else {
+	    copts->sec_prec_set = true;
 	}
 	copts->sec_prec = n;
     }
@@ -738,19 +749,19 @@ oj_parse_options(VALUE ropts, Options copts) {
 	}
     }
     if (Qnil != (v = rb_hash_lookup(ropts, integer_range_sym))) {
-    if (TYPE(v) == T_STRUCT && rb_obj_class(v) == rb_cRange) {
-        VALUE min = rb_funcall(v, oj_begin_id, 0);
-        VALUE max = rb_funcall(v, oj_end_id, 0);
-
-        if (TYPE(min) != T_FIXNUM || TYPE(max) != T_FIXNUM) {
-            rb_raise(rb_eArgError, ":integer_range range bounds is not Fixnum.");
-        }
-
-        copts->integer_range_min = FIX2LONG(min);
-        copts->integer_range_max = FIX2LONG(max);
-    } else if (Qfalse != v) {
-        rb_raise(rb_eArgError, ":integer_range must be a range of Fixnum.");
-    }
+	if (TYPE(v) == T_STRUCT && rb_obj_class(v) == rb_cRange) {
+	    VALUE min = rb_funcall(v, oj_begin_id, 0);
+	    VALUE max = rb_funcall(v, oj_end_id, 0);
+
+	    if (TYPE(min) != T_FIXNUM || TYPE(max) != T_FIXNUM) {
+		rb_raise(rb_eArgError, ":integer_range range bounds is not Fixnum.");
+	    }
+
+	    copts->int_range_min = FIX2LONG(min);
+	    copts->int_range_max = FIX2LONG(max);
+	} else if (Qfalse != v) {
+	    rb_raise(rb_eArgError, ":integer_range must be a range of Fixnum.");
+	}
     }
 }
 
@@ -954,11 +965,13 @@ load_file(int argc, VALUE *argv, VALUE self) {
     }
     switch (mode) {
     case StrictMode:
+    case NullMode:
 	oj_set_strict_callbacks(&pi);
 	return oj_pi_sparse(argc, argv, &pi, fd);
-    case NullMode:
-    case CompatMode:
     case CustomMode:
+	oj_set_custom_callbacks(&pi);
+	return oj_pi_sparse(argc, argv, &pi, fd);
+    case CompatMode:
     case RailsMode:
 	oj_set_compat_callbacks(&pi);
 	return oj_pi_sparse(argc, argv, &pi, fd);
@@ -1052,6 +1065,9 @@ dump(int argc, VALUE *argv, VALUE self) {
     if (2 == argc) {
 	oj_parse_options(argv[1], &copts);
     }
+    if (CompatMode == copts.mode && copts.escape_mode != ASCIIEsc) {
+	copts.escape_mode = JSONEsc;
+    }
     out.buf = buf;
     out.end = buf + sizeof(buf) - 10;
     out.allocated = false;
@@ -1640,6 +1656,7 @@ Init_oj() {
     float_sym = ID2SYM(rb_intern("float"));			rb_gc_register_address(&float_sym);
     huge_sym = ID2SYM(rb_intern("huge"));			rb_gc_register_address(&huge_sym);
     ignore_sym = ID2SYM(rb_intern("ignore"));			rb_gc_register_address(&ignore_sym);
+    ignore_under_sym = ID2SYM(rb_intern("ignore_under"));	rb_gc_register_address(&ignore_under_sym);
     json_sym = ID2SYM(rb_intern("json"));			rb_gc_register_address(&json_sym);
     match_string_sym = ID2SYM(rb_intern("match_string"));	rb_gc_register_address(&match_string_sym);
     mode_sym = ID2SYM(rb_intern("mode"));			rb_gc_register_address(&mode_sym);

data/ext/oj/oj.h

@@ -149,8 +149,10 @@ typedef struct _options {
     char		allow_nan;	// YEsyNo for parsing only
     char		trace;		// YesNo
     char		safe;		// YesNo
-    int64_t		integer_range_min; // dump numbers outside range as string
-    int64_t		integer_range_max;
+    char		sec_prec_set;	// boolean (0 or 1)
+    char		ignore_under;	// YesNo - ignore attrs starting with _ if true in object and custom modes
+    int64_t		int_range_min;	// dump numbers below as string
+    int64_t		int_range_max;	// dump numbers above as string
     const char		*create_id;	// 0 or string
     size_t		create_id_len;	// length of create_id
     int			sec_prec;	// second precision when dumping time

data/ext/oj/parse.c

@@ -400,6 +400,10 @@ read_num(ParseInfo pi) {
 	pi->cur++;
 	ni.neg = 1;
     } else if ('+' == *pi->cur) {
+	if (StrictMode == pi->options.mode) {
+	    oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "not a number or other value");
+	    return;
+	}
 	pi->cur++;
     }
     if ('I' == *pi->cur) {
@@ -446,8 +450,13 @@ read_num(ParseInfo pi) {
 	if ('.' == *pi->cur) {
 	    pi->cur++;
 	    // A trailing . is not a valid decimal but if encountered allow it
-	    // except when mimicing the JSON gem.
-	    if (CompatMode == pi->options.mode) {
+	    // except when mimicing the JSON gem or in strict mode.
+	    if (StrictMode == pi->options.mode || CompatMode == pi->options.mode) {
+		int	pos = (int)(pi->cur - ni.str);
+		if (1 == pos || (2 == pos && ni.neg)) {
+		    oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "not a number");
+		    return;
+		}
 		if (*pi->cur < '0' || '9' < *pi->cur) {
 		    oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "not a number");
 		    return;
@@ -1050,7 +1059,7 @@ CLEANUP:
 	    }
 	    args[0] = msg;
 	    if (pi->err.clas == oj_parse_error_class) {
-		// The error was an Oj::ParseError so change to a JSON::ParseError.
+		// The error was an Oj::ParseError so change to a JSON::ParserError.
 		pi->err.clas = oj_json_parser_error_class;
 	    }
 	    rb_exc_raise(rb_class_new_instance(1, args, pi->err.clas));

data/ext/oj/parse.h

@@ -80,6 +80,7 @@ extern VALUE	oj_num_as_value(NumInfo ni);
 extern void	oj_set_strict_callbacks(ParseInfo pi);
 extern void	oj_set_object_callbacks(ParseInfo pi);
 extern void	oj_set_compat_callbacks(ParseInfo pi);
+extern void	oj_set_custom_callbacks(ParseInfo pi);
 extern void	oj_set_wab_callbacks(ParseInfo pi);
 
 extern void	oj_sparse2(ParseInfo pi);

data/ext/oj/rails.c

@@ -214,6 +214,8 @@ dump_bigdecimal(VALUE obj, int depth, Out out, bool as_ok) {
 
     if ('I' == *str || 'N' == *str || ('-' == *str && 'I' == str[1])) {
 	oj_dump_nil(Qnil, depth, out, false);
+    } else if (out->opts->int_range_max != 0 || out->opts->int_range_min != 0) {
+	oj_dump_cstr(str, (int)RSTRING_LEN(rstr), 0, 0, out);
     } else if (Yes == out->opts->bigdec_as_num) {
 	oj_dump_raw(str, (int)RSTRING_LEN(rstr), out);
     } else {
@@ -1035,6 +1037,7 @@ static VALUE
 rails_time_precision(VALUE self, VALUE prec) {
     rb_iv_set(self, "@time_precision", prec);
     oj_default_options.sec_prec = NUM2INT(prec);
+    oj_default_options.sec_prec_set = true;
 
     return prec;
 }
@@ -1078,6 +1081,7 @@ rails_set_encoder(VALUE self) {
 
     pv = rb_iv_get(encoding, "@time_precision");
     oj_default_options.sec_prec = NUM2INT(pv);
+    oj_default_options.sec_prec_set = true;
     rb_undef_method(encoding, "time_precision=");
     rb_define_module_function(encoding, "time_precision=", rails_time_precision, 1);
     rb_gv_set("$VERBOSE", verbose);
@@ -1438,8 +1442,9 @@ static DumpFunc	rails_funcs[] = {
     dump_array,		// RUBY_T_ARRAY    = 0x07,
     dump_hash,	 	// RUBY_T_HASH     = 0x08,
     dump_obj,		// RUBY_T_STRUCT   = 0x09,
-    oj_dump_bignum,	// RUBY_T_BIGNUM   = 0x0a,
-    NULL, 		// RUBY_T_FILE     = 0x0b,
+    dump_bigdecimal,	// 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,
     // Rails raises a stack error on Complex and Rational. It also corrupts