oj 3.9.0 → 3.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bda4706ea9e50aef4bdfcd1c9708566b573da4e4c9f000ddf12f3e403a821c88
-  data.tar.gz: 56dbfecea94b2c0e43aa4193aed7749e30d55e4c288770a193aac3c57850bea2
+  metadata.gz: '0569d0892b3b9d79f0edf0866d843adb9abc21046838be295164884edb930b61'
+  data.tar.gz: ff04edae94da97c911b19c93015035df9fb3ce89162c0afc1df036e0f675e65f
 SHA512:
-  metadata.gz: 73176c366166bb1b6fbe0a20501db677679ef7af8aaab547b9dadbba5856370d844f3595b06208a05c9efd9437d6f167298a0c73ef41fed905017a9aa5b2f764
-  data.tar.gz: 3c4731da851590f39cc71bd2cce9fb9e1e987ec22b54e2bfc948f8004d78dcb0b2bde464b784500958352f8dec045ba8e2ce3804769426821c7c03a11d95ce07
+  metadata.gz: 2d5a28e21b6c37bc5a11917512906c040cf8a0b038a07f23c0447a1705986fe98803191f6d2462e4f0ec67f7f3694cd9c61d0149d782f0a5e5f6b6d36a88d372
+  data.tar.gz: 789c0fdfe061476ee5e5c4bbe84519e7b1a6a015436e7fbe2cdb5f7922d6eef8de5914bd61488be4c297633e053f2a217630f7358796de9ba746aa6935466983

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/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;
@@ -609,6 +611,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;
@@ -1069,7 +1073,7 @@ hash_set_num(struct _parseInfo *pi, Val kval, NumInfo ni) {
 	oj_set_obj_ivar(parent, kval, rval);
 	break;
     case T_HASH:
-	if (4 == parent->klen && NULL != parent->key && rb_cTime == parent->clas && 0 == strncmp("time", parent->key, 4)) {
+	if (4 == parent->klen && NULL != parent->key && rb_cTime == parent->clas && 0 != ni->div && 0 == strncmp("time", parent->key, 4)) {
 	    int64_t	nsec = ni->num * 1000000000LL / ni->div;
 
 	    if (ni->neg) {

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

@@ -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) {
@@ -870,7 +871,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 +881,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);
@@ -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;
 
@@ -280,7 +281,7 @@ hash_cb(VALUE key, VALUE value, Out out) {
     }
     out->depth = depth;
     *out->cur++ = ',';
-    
+
     return ST_CONTINUE;
 }
 
@@ -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);
@@ -363,6 +365,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 +388,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 +428,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 +464,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 +614,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 +746,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 +819,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/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.");
     }
@@ -690,8 +700,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/object.c

@@ -276,7 +276,10 @@ hat_num(ParseInfo pi, Val parent, Val kval, NumInfo ni) {
     if (2 == kval->klen) {
 	switch (kval->key[1]) {
 	case 't': // time as a float
-	    {
+	    if (0 == ni->div || 9 < ni->di) {
+		rb_raise(rb_eArgError, "Invalid time decimal representation.");
+		//parent->val = rb_time_nano_new(0, 0);
+	    } else {
 		int64_t	nsec = ni->num * 1000000000LL / ni->div;
 
 		if (ni->neg) {
@@ -666,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

@@ -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,24 +749,26 @@ 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.");
+	}
     }
 }
 
 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.");
     }
@@ -954,11 +967,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 +1067,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 +1658,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);