oj 3.7.4 → 3.11.2

data/ext/oj/odd.c

@@ -1,14 +1,11 @@
-/* odd.c
- * Copyright (c) 2011, Peter Ohler
- * All rights reserved.
- */
+// Copyright (c) 2011 Peter Ohler. All rights reserved.
 
 #include <string.h>
 
 #include "odd.h"
 
-static struct _Odd	_odds[4]; // bump up if new initial Odd classes are added
-static struct _Odd	*odds = _odds;
+static struct _odd	_odds[4]; // bump up if new initial Odd classes are added
+static struct _odd	*odds = _odds;
 static long		odd_cnt = 0;
 static ID		sec_id;
 static ID		sec_fraction_id;
@@ -38,11 +35,11 @@ set_class(Odd odd, const char *classname) {
 
 static VALUE
 get_datetime_secs(VALUE obj) {
-    VALUE	rsecs = rb_funcall(obj, sec_id, 0);
-    VALUE	rfrac = rb_funcall(obj, sec_fraction_id, 0);
-    long	sec = NUM2LONG(rsecs);
-    long long	num = rb_num2ll(rb_funcall(rfrac, numerator_id, 0));
-    long long	den = rb_num2ll(rb_funcall(rfrac, denominator_id, 0));
+    volatile VALUE	rsecs = rb_funcall(obj, sec_id, 0);
+    volatile VALUE	rfrac = rb_funcall(obj, sec_fraction_id, 0);
+    long		sec = NUM2LONG(rsecs);
+    long long		num = rb_num2ll(rb_funcall(rfrac, numerator_id, 0));
+    long long		den = rb_num2ll(rb_funcall(rfrac, denominator_id, 0));
 
     num += sec * den;
 
@@ -152,7 +149,7 @@ oj_get_oddc(const char *classname, size_t len) {
 
 OddArgs
 oj_odd_alloc_args(Odd odd) {
-    OddArgs	oa = ALLOC_N(struct _OddArgs, 1);
+    OddArgs	oa = ALLOC_N(struct _oddArgs, 1);
     VALUE	*a;
     int		i;
 
@@ -191,15 +188,17 @@ oj_reg_odd(VALUE clas, VALUE create_object, VALUE create_method, int mcnt, VALUE
     AttrGetFunc	*fp;
 
     if (_odds == odds) {
-	odds = ALLOC_N(struct _Odd, odd_cnt + 1);
+	odds = ALLOC_N(struct _odd, odd_cnt + 1);
 
-	memcpy(odds, _odds, sizeof(struct _Odd) * odd_cnt);
+	memcpy(odds, _odds, sizeof(struct _odd) * odd_cnt);
     } else {
-	REALLOC_N(odds, struct _Odd, odd_cnt + 1);
+	REALLOC_N(odds, struct _odd, odd_cnt + 1);
     }
     odd = odds + odd_cnt;
     odd->clas = clas;
-    odd->classname = strdup(rb_class2name(clas));
+    if (NULL == (odd->classname = strdup(rb_class2name(clas)))) {
+	rb_raise(rb_eNoMemError, "for attribute name.");
+    }
     odd->clen = strlen(odd->classname);
     odd->create_obj = create_object;
     odd->create_op = SYM2ID(create_method);
@@ -210,7 +209,9 @@ oj_reg_odd(VALUE clas, VALUE create_object, VALUE create_method, int mcnt, VALUE
 	*fp = 0;
 	switch (rb_type(*members)) {
 	case T_STRING:
-	    *np = strdup(rb_string_value_ptr(members));
+	    if (NULL == (*np = strdup(rb_string_value_ptr(members)))) {
+		rb_raise(rb_eNoMemError, "for attribute name.");
+	    }
 	    break;
 	case T_SYMBOL:
 	    *np = rb_id2name(SYM2ID(*members));

data/ext/oj/odd.h

@@ -1,10 +1,7 @@
-/* odd.h
- * Copyright (c) 2011, Peter Ohler
- * All rights reserved.
- */
+// Copyright (c) 2011 Peter Ohler. All rights reserved.
 
-#ifndef __OJ_ODD_H__
-#define __OJ_ODD_H__
+#ifndef OJ_ODD_H
+#define OJ_ODD_H
 
 #include <stdbool.h>
 
@@ -14,7 +11,7 @@
 
 typedef VALUE	(*AttrGetFunc)(VALUE obj);
 
-typedef struct _Odd {
+typedef struct _odd {
     const char	*classname;
     size_t	clen;
     VALUE	clas;			// Ruby class or module
@@ -28,7 +25,7 @@ typedef struct _Odd {
     AttrGetFunc	attrFuncs[MAX_ODD_ARGS];
 } *Odd;
 
-typedef struct _OddArgs {
+typedef struct _oddArgs {
     Odd		odd;
     VALUE	args[MAX_ODD_ARGS];
 } *OddArgs;
@@ -41,4 +38,4 @@ extern void	oj_odd_free(OddArgs args);
 extern int	oj_odd_set_arg(OddArgs args, const char *key, size_t klen, VALUE value);
 extern void	oj_reg_odd(VALUE clas, VALUE create_object, VALUE create_method, int mcnt, VALUE *members, bool raw);
 
-#endif /* __OJ_ODD_H__ */
+#endif /* OJ_ODD_H */

data/ext/oj/oj.c

@@ -1,7 +1,4 @@
-/* oj.c
- * Copyright (c) 2012, Peter Ohler
- * All rights reserved.
- */
+// Copyright (c) 2012 Peter Ohler. All rights reserved.
 
 #include <stdlib.h>
 #include <errno.h>
@@ -19,7 +16,7 @@
 #include "rails.h"
 #include "encode.h"
 
-typedef struct _YesNoOpt {
+typedef struct _yesNoOpt {
     VALUE	sym;
     char	*attr;
 } *YesNoOpt;
@@ -53,6 +50,7 @@ ID	oj_length_id;
 ID	oj_new_id;
 ID	oj_parse_id;
 ID	oj_pos_id;
+ID	oj_raw_json_id;
 ID	oj_read_id;
 ID	oj_readpartial_id;
 ID	oj_replace_id;
@@ -90,10 +88,12 @@ 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;
 VALUE	oj_quirks_mode_sym;
+VALUE	oj_safe_sym;
 VALUE	oj_trace_sym;
 
 static VALUE	allow_blank_sym;
@@ -107,16 +107,19 @@ 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;
 static VALUE	empty_string_sym;
 static VALUE	escape_mode_sym;
 static VALUE	integer_range_sym;
+static VALUE	fast_sym;
 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;
@@ -137,6 +140,7 @@ static VALUE	unicode_xss_sym;
 static VALUE	unix_sym;
 static VALUE	unix_zone_sym;
 static VALUE	use_as_json_sym;
+static VALUE	use_raw_json_sym;
 static VALUE	use_to_hash_sym;
 static VALUE	use_to_json_sym;
 static VALUE	wab_sym;
@@ -146,7 +150,7 @@ static VALUE	xss_safe_sym;
 
 rb_encoding	*oj_utf8_encoding = 0;
 
-#if HAVE_LIBPTHREAD
+#ifdef HAVE_PTHREAD_MUTEX_INIT
 pthread_mutex_t	oj_cache_mutex;
 #else
 VALUE oj_cache_mutex = Qnil;
@@ -154,7 +158,7 @@ VALUE oj_cache_mutex = Qnil;
 
 const char	oj_json_class[] = "json_class";
 
-struct _Options	oj_default_options = {
+struct _options	oj_default_options = {
     0,		// indent
     No,		// circular
     No,		// auto_define
@@ -165,9 +169,11 @@ 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
+    No,		// raw_json
     No,		// nilnil
     Yes,	// empty_string
     Yes,	// allow_gc
@@ -176,8 +182,11 @@ struct _Options	oj_default_options = {
     No,		// create_ok
     Yes,	// allow_nan
     No,		// trace
-    0,		// integer_range_min
-    0,		// integer_range_max
+    No,		// safe
+    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
@@ -222,13 +231,15 @@ struct _Options	oj_default_options = {
  * - *:mode* [_:object_|_:strict_|_:compat_|_:null_|_:custom_|_:rails_|_:wab_] load and dump modes to use for JSON
  * - *: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_] load decimals as BigDecimal instead of as a Float. :auto pick the most precise for the number of digits.
+ * - *: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
  * - *:float_precision* [_Fixnum_|_nil_] number of digits of precision when dumping floats, 0 indicates use Ruby
  * - *:use_to_json* [_Boolean_|_nil_] call to_json() methods on dump, default is false
  * - *:use_as_json* [_Boolean_|_nil_] call as_json() methods on dump, default is false
+ * - *:use_raw_json* [_Boolean_|_nil_] call raw_json() methods on dump, default is false
  * - *:nilnil* [_Boolean_|_nil_] if true a nil input to load will return nil and not raise an Exception
  * - *:empty_string* [_Boolean_|_nil_] if true an empty input will not raise an Exception
  * - *:allow_gc* [_Boolean_|_nil_] allow or prohibit GC during parsing, default is true (allow)
@@ -245,8 +256,10 @@ 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
- * - *:integer_range* [_Range_] Dump integers outside range as strings. 
+ * - *: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)
  *
  * Return [_Hash_] all current option settings.
  */
@@ -269,6 +282,7 @@ get_def_opts(VALUE self) {
     rb_hash_aset(opts, use_to_json_sym, (Yes == oj_default_options.to_json) ? Qtrue : ((No == oj_default_options.to_json) ? Qfalse : Qnil));
     rb_hash_aset(opts, use_to_hash_sym, (Yes == oj_default_options.to_hash) ? Qtrue : ((No == oj_default_options.to_hash) ? Qfalse : Qnil));
     rb_hash_aset(opts, use_as_json_sym, (Yes == oj_default_options.as_json) ? Qtrue : ((No == oj_default_options.as_json) ? Qfalse : Qnil));
+    rb_hash_aset(opts, use_raw_json_sym, (Yes == oj_default_options.raw_json) ? Qtrue : ((No == oj_default_options.raw_json) ? Qfalse : Qnil));
     rb_hash_aset(opts, nilnil_sym, (Yes == oj_default_options.nilnil) ? Qtrue : ((No == oj_default_options.nilnil) ? Qfalse : Qnil));
     rb_hash_aset(opts, empty_string_sym, (Yes == oj_default_options.empty_string) ? Qtrue : ((No == oj_default_options.empty_string) ? Qfalse : Qnil));
     rb_hash_aset(opts, allow_gc_sym, (Yes == oj_default_options.allow_gc) ? Qtrue : ((No == oj_default_options.allow_gc) ? Qfalse : Qnil));
@@ -276,7 +290,9 @@ get_def_opts(VALUE self) {
     rb_hash_aset(opts, allow_invalid_unicode_sym, (Yes == oj_default_options.allow_invalid) ? Qtrue : ((No == oj_default_options.allow_invalid) ? Qfalse : Qnil));
     rb_hash_aset(opts, oj_allow_nan_sym, (Yes == oj_default_options.allow_nan) ? Qtrue : ((No == oj_default_options.allow_nan) ? Qfalse : Qnil));
     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;
@@ -287,17 +303,17 @@ get_def_opts(VALUE self) {
     case WabMode:	rb_hash_aset(opts, mode_sym, wab_sym);		break;
     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;
@@ -317,10 +333,12 @@ get_def_opts(VALUE self) {
     switch (oj_default_options.bigdec_load) {
     case BigDec:	rb_hash_aset(opts, bigdecimal_load_sym, bigdecimal_sym);break;
     case FloatDec:	rb_hash_aset(opts, bigdecimal_load_sym, float_sym);	break;
+    case FastDec:	rb_hash_aset(opts, bigdecimal_load_sym, fast_sym);	break;
     case AutoDec:
     default:		rb_hash_aset(opts, bigdecimal_load_sym, auto_sym);	break;
     }
-    rb_hash_aset(opts, create_id_sym, (0 == oj_default_options.create_id) ? Qnil : rb_str_new2(oj_default_options.create_id));
+    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));
     rb_hash_aset(opts, oj_object_nl_sym, (0 == oj_default_options.dump_opts.hash_size) ? Qnil : rb_str_new2(oj_default_options.dump_opts.hash_nl));
@@ -343,7 +361,7 @@ get_def_opts(VALUE self) {
     } else {
 	VALUE		*vp;
 	volatile VALUE	a = rb_ary_new();
-	
+
 	for (vp = oj_default_options.ignore; Qnil != *vp; vp++) {
 	    rb_ary_push(a, *vp);
 	}
@@ -365,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
@@ -374,6 +393,7 @@ get_def_opts(VALUE self) {
  *   - *:use_to_json* [_Boolean_|_nil_] call to_json() methods on dump, default is false.
  *   - *:use_as_json* [_Boolean_|_nil_] call as_json() methods on dump, default is false.
  *   - *:use_to_hash* [_Boolean_|_nil_] call to_hash() methods on dump, default is false.
+ *   - *:use_raw_json* [_Boolean_|_nil_] call raw_json() methods on dump, default is false.
  *   - *:nilnil* [_Boolean_|_nil_] if true a nil input to load will return nil and not raise an Exception.
  *   - *:allow_gc* [_Boolean_|_nil_] allow or prohibit GC during parsing, default is true (allow).
  *   - *:quirks_mode* [_Boolean_|_nil_] allow single JSON values instead of documents, default is true (allow).
@@ -388,8 +408,10 @@ 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
- *   - *:integer_range* [_Range_] Dump integers outside range as strings. 
+ *   - *: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.
  */
 static VALUE
 set_def_opts(VALUE self, VALUE opts) {
@@ -401,7 +423,7 @@ set_def_opts(VALUE self, VALUE opts) {
 
 void
 oj_parse_options(VALUE ropts, Options copts) {
-    struct _YesNoOpt	ynos[] = {
+    struct _yesNoOpt	ynos[] = {
 	{ circular_sym, &copts->circular },
 	{ auto_define_sym, &copts->auto_define },
 	{ symbol_keys_sym, &copts->sym_key },
@@ -410,6 +432,7 @@ oj_parse_options(VALUE ropts, Options copts) {
 	{ use_to_hash_sym, &copts->to_hash },
 	{ use_to_json_sym, &copts->to_json },
 	{ use_as_json_sym, &copts->as_json },
+	{ use_raw_json_sym, &copts->raw_json },
 	{ nilnil_sym, &copts->nilnil },
 	{ allow_blank_sym, &copts->nilnil }, // same as nilnil
 	{ empty_string_sym, &copts->empty_string },
@@ -418,13 +441,15 @@ oj_parse_options(VALUE ropts, Options copts) {
 	{ allow_invalid_unicode_sym, &copts->allow_invalid },
 	{ 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 }
     };
     YesNoOpt		o;
     volatile VALUE	v;
     size_t		len;
-    
+
     if (T_HASH != rb_type(ropts)) {
 	return;
     }
@@ -493,8 +518,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;
     }
@@ -550,12 +579,27 @@ oj_parse_options(VALUE ropts, Options copts) {
 	    copts->bigdec_load = BigDec;
 	} else if (float_sym == v) {
 	    copts->bigdec_load = FloatDec;
+	} else if (fast_sym == v) {
+	    copts->bigdec_load = FastDec;
 	} else if (auto_sym == v || Qfalse == v) {
 	    copts->bigdec_load = AutoDec;
 	} else {
 	    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 = false;
+	} else if (oj_bigdecimal_class == v) {
+ 	    copts->compat_bigdec = true;
+	} else {
+	    rb_raise(rb_eArgError, ":decimal_class must be BigDecimal or Float.");
+	}
+   }
     if (Qtrue == rb_funcall(ropts, oj_has_key_id, 1, create_id_sym)) {
 	v = rb_hash_lookup(ropts, create_id_sym);
 	if (Qnil == v) {
@@ -715,7 +759,7 @@ oj_parse_options(VALUE ropts, Options copts) {
 	    cnt = (int)RARRAY_LEN(v);
 	    if (0 < cnt) {
 		int	i;
-		
+
 		copts->ignore = ALLOC_N(VALUE, cnt + 1);
 		for (i = 0; i < cnt; i++) {
 		    copts->ignore[i] = rb_ary_entry(v, i);
@@ -725,24 +769,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.");
     }
@@ -777,7 +823,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
@@ -802,11 +848,10 @@ oj_parse_opt_match_string(RxClass rc, VALUE ropts) {
  *
  * - *json* [_String_|_IO_] JSON String or an Object that responds to read()
  * - *options* [_Hash_] load options (same as default_options)
- *   - -
  * - *obj* [_Hash_|_Array_|_String_|_Fixnum_|_Float_|_Boolean_|_nil_] parsed object.
  * - *start* [_optional, _Integer_] start position of parsed JSON for obj.
  * - *len* [_optional, _Integer_] length of parsed JSON for obj.
- * 
+ *
  * Returns [_Hash_|_Array_|_String_|_Fixnum_|_Float_|_Boolean_|_nil_]
  */
 static VALUE
@@ -862,7 +907,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
@@ -889,7 +934,6 @@ load(int argc, VALUE *argv, VALUE self) {
  *
  * - *path* [_String_] to a file containing a JSON document
  * - *options* [_Hash_] load options (same as default_options)
- *   - -
  * - *obj* [_Hash_|_Array_|_String_|_Fixnum_|_Float_|_Boolean_|_nil_] parsed object.
  * - *start* [_optional, _Integer_] start position of parsed JSON for obj.
  * - *len* [_optional, _Integer_] length of parsed JSON for obj.
@@ -901,7 +945,7 @@ load_file(int argc, VALUE *argv, VALUE self) {
     char		*path;
     int			fd;
     Mode		mode = oj_default_options.mode;
-    struct _ParseInfo	pi;
+    struct _parseInfo	pi;
 
     if (1 > argc) {
 	rb_raise(rb_eArgError, "Wrong number of arguments to load().");
@@ -943,11 +987,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);
@@ -976,7 +1022,7 @@ load_file(int argc, VALUE *argv, VALUE self) {
  */
 static VALUE
 safe_load(VALUE self, VALUE doc) {
-    struct _ParseInfo	pi;
+    struct _parseInfo	pi;
     VALUE		args[1];
 
     parse_info_init(&pi);
@@ -1019,7 +1065,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
@@ -1028,8 +1074,8 @@ safe_load(VALUE self, VALUE doc) {
 static VALUE
 dump(int argc, VALUE *argv, VALUE self) {
     char		buf[4096];
-    struct _Out		out;
-    struct _Options	copts = oj_default_options;
+    struct _out		out;
+    struct _options	copts = oj_default_options;
     VALUE		rstr;
 
     if (1 > argc) {
@@ -1041,6 +1087,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;
@@ -1064,7 +1113,7 @@ dump(int argc, VALUE *argv, VALUE self) {
  * Dumps an Object (obj) to a string. If the object has a to_json method that
  * will be called. The mode is set to :compat.
  * - *obj* [_Object_] Object to serialize as an JSON document String
- * - *options* [_Hash_] 
+ * - *options* [_Hash_]
  *   - *:max_nesting* [_boolean_] It true nesting is limited to 100. The option to detect circular references is available but is not compatible with the json gem., default is false
  *   - *:allow_nan* [_boolean_] If true non JSON compliant words such as Nan and Infinity will be used as appropriate, default is true.
  *   - *:quirks_mode* [_boolean_] Allow single JSON values instead of documents, default is true (allow).
@@ -1080,8 +1129,8 @@ dump(int argc, VALUE *argv, VALUE self) {
 static VALUE
 to_json(int argc, VALUE *argv, VALUE self) {
     char		buf[4096];
-    struct _Out		out;
-    struct _Options	copts = oj_default_options;
+    struct _out		out;
+    struct _options	copts = oj_default_options;
     VALUE		rstr;
 
     if (1 > argc) {
@@ -1114,7 +1163,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
@@ -1125,8 +1174,8 @@ to_json(int argc, VALUE *argv, VALUE self) {
  */
 static VALUE
 to_file(int argc, VALUE *argv, VALUE self) {
-    struct _Options	copts = oj_default_options;
-    
+    struct _options	copts = oj_default_options;
+
     if (3 == argc) {
 	oj_parse_options(argv[2], &copts);
     }
@@ -1137,7 +1186,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
@@ -1148,8 +1197,8 @@ to_file(int argc, VALUE *argv, VALUE self) {
  */
 static VALUE
 to_stream(int argc, VALUE *argv, VALUE self) {
-    struct _Options	copts = oj_default_options;
-    
+    struct _options	copts = oj_default_options;
+
     if (3 == argc) {
 	oj_parse_options(argv[2], &copts);
     }
@@ -1265,7 +1314,6 @@ register_odd_raw(int argc, VALUE *argv, VALUE self) {
  *
  * - *json* [_String_|_IO_] JSON String or an Object that responds to read().
  * - *options* [_Hash_] load options (same as default_options).
- *   - -
  * - *obj* [_Hash_|_Array_|_String_|_Fixnum_|_Float_|_Boolean_|_nil_] parsed object.
  * - *start* [_optional, _Integer_] start position of parsed JSON for obj.
  * - *len* [_optional, _Integer_] length of parsed JSON for obj.
@@ -1300,7 +1348,6 @@ extern VALUE	oj_strict_parse(int argc, VALUE *argv, VALUE self);
  *
  * - *json* [_String_|_IO_] JSON String or an Object that responds to read().
  * - *options* [_Hash_] load options (same as default_options).
- *   - -
  * - *obj* [_Hash_|_Array_|_String_|_Fixnum_|_Float_|_Boolean_|_nil_] parsed object.
  * - *start* [_optional, _Integer_] start position of parsed JSON for obj.
  * - *len* [_optional, _Integer_] length of parsed JSON for obj.
@@ -1322,22 +1369,6 @@ extern VALUE	oj_compat_parse(int argc, VALUE *argv, VALUE self);
  * valid. If the input is not a valid JSON document (an empty string is not a
  * valid JSON document) an exception is raised.
  *
- * Note: Oj is not able to automatically deserialize all classes that are a
- * subclass of a Ruby Exception. Only exception that take one required string
- * argument in the initialize() method are supported. This is an example of how
- * to write an Exception subclass that supports both a single string intializer
- * and an Exception as an argument. Additional optional arguments can be added
- * as well.
- *
- * The reason for this restriction has to do with a design decision on the part
- * of the Ruby developers. Exceptions are special Objects. They do not follow the
- * rules of other Objects. Exceptions have 'mesg' and a 'bt' attribute. Note that
- * these are not '@mesg' and '@bt'. They can not be set using the normal C or
- * Ruby calls. The only way I have found to set the 'mesg' attribute is through
- * the initializer. Unfortunately that means any subclass that provides a
- * different initializer can not be automatically decoded. A way around this is
- * to use a create function but this example shows an alternative.
- *
  * A block can be provided with a single argument. That argument will be the
  * parsed JSON document. This is useful when parsing a string that includes
  * multiple JSON documents. The block can take up to 3 arguments, the parsed
@@ -1347,7 +1378,6 @@ extern VALUE	oj_compat_parse(int argc, VALUE *argv, VALUE self);
  *
  * - *json* [_String_|_IO_] JSON String or an Object that responds to read().
  * - *options* [_Hash_] load options (same as default_options).
- *   - -
  * - *obj* [_Hash_|_Array_|_String_|_Fixnum_|_Float_|_Boolean_|_nil_] parsed object.
  * - *start* [_optional, _Integer_] start position of parsed JSON for obj.
  * - *len* [_optional, _Integer_] length of parsed JSON for obj.
@@ -1383,7 +1413,6 @@ extern VALUE	oj_object_parse(int argc, VALUE *argv, VALUE self);
  *
  * - *json* [_String_|_IO_] JSON String or an Object that responds to read().
  * - *options* [_Hash_] load options (same as default_options).
- *   - -
  * - *obj* [_Hash_|_Array_|_String_|_Fixnum_|_Float_|_Boolean_|_nil_] parsed object.
  * - *start* [_optional, _Integer_] start position of parsed JSON for obj.
  * - *len* [_optional, _Integer_] length of parsed JSON for obj.
@@ -1445,16 +1474,16 @@ extern VALUE	oj_define_mimic_json(int argc, VALUE *argv, VALUE self);
 
 /* Document-method: generate
  * call-seq: generate(obj, opts=nil)
- * 
+ *
  * Encode obj as a JSON String. The obj argument must be a Hash, Array, or
  * respond to to_h or to_json. Options other than those listed such as
  * +:allow_nan+ or +:max_nesting+ are ignored.
- * 
+ *
  * - *obj* [_Object__|_Hash_|_Array_] object to convert to a JSON String
  * - *opts* [_Hash_] options
- * - - *:indent* [_String_] String to use for indentation.
+ *   - *:indent* [_String_] String to use for indentation.
  *   - *:space* [_String_] String placed after a , or : delimiter
- *   - *:space * _before [_String_] String placed before a : delimiter
+ *   - *:space_before* [_String_] String placed before a : delimiter
  *   - *:object_nl* [_String_] String placed after a JSON object
  *   - *:array_nl* [_String_] String placed after a JSON array
  *   - *:ascii_only* [_Boolean_] if not nil or false then use only ascii characters in the output. Note JSON.generate does support this even if it is not documented.
@@ -1497,15 +1526,15 @@ protect_require(VALUE x) {
  * modes are:
  *
  * - *:strict* mode will only allow the 7 basic JSON types to be serialized. Any other Object
- *   will raise an Exception. 
- * 
+ *   will raise an Exception.
+ *
  * - *:null* mode is similar to the :strict mode except any Object that is not
  *   one of the JSON base types is replaced by a JSON null.
- * 
+ *
  * - *:object* mode will dump any Object as a JSON Object with keys that match
  *   the Ruby Object's variable names without the '@' character. This is the
  *   highest performance mode.
- * 
+ *
  * - *:compat* or *:json* mode is the compatible mode for the json gem. It mimics
  *   the json gem including the options, defaults, and restrictions.
  *
@@ -1591,6 +1620,7 @@ Init_oj() {
     oj_new_id = rb_intern("new");
     oj_parse_id = rb_intern("parse");
     oj_pos_id = rb_intern("pos");
+    oj_raw_json_id = rb_intern("raw_json");
     oj_read_id = rb_intern("read");
     oj_readpartial_id = rb_intern("readpartial");
     oj_replace_id = rb_intern("replace");
@@ -1617,13 +1647,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
 
@@ -1638,16 +1676,19 @@ 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);
     empty_string_sym = ID2SYM(rb_intern("empty_string"));	rb_gc_register_address(&empty_string_sym);
     escape_mode_sym = ID2SYM(rb_intern("escape_mode"));		rb_gc_register_address(&escape_mode_sym);
     integer_range_sym = ID2SYM(rb_intern("integer_range"));	rb_gc_register_address(&integer_range_sym);
+    fast_sym = ID2SYM(rb_intern("fast"));			rb_gc_register_address(&fast_sym);
     float_prec_sym = ID2SYM(rb_intern("float_precision"));	rb_gc_register_address(&float_prec_sym);
     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);
@@ -1661,12 +1702,14 @@ 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);
     oj_object_class_sym = ID2SYM(rb_intern("object_class"));	rb_gc_register_address(&oj_object_class_sym);
     oj_object_nl_sym = ID2SYM(rb_intern("object_nl"));		rb_gc_register_address(&oj_object_nl_sym);
     oj_quirks_mode_sym = ID2SYM(rb_intern("quirks_mode"));	rb_gc_register_address(&oj_quirks_mode_sym);
+    oj_safe_sym = ID2SYM(rb_intern("safe"));			rb_gc_register_address(&oj_safe_sym);
     oj_space_before_sym = ID2SYM(rb_intern("space_before"));	rb_gc_register_address(&oj_space_before_sym);
     oj_space_sym = ID2SYM(rb_intern("space"));			rb_gc_register_address(&oj_space_sym);
     oj_trace_sym = ID2SYM(rb_intern("trace"));			rb_gc_register_address(&oj_trace_sym);
@@ -1682,6 +1725,7 @@ Init_oj() {
     unix_sym = ID2SYM(rb_intern("unix"));			rb_gc_register_address(&unix_sym);
     unix_zone_sym = ID2SYM(rb_intern("unix_zone"));		rb_gc_register_address(&unix_zone_sym);
     use_as_json_sym = ID2SYM(rb_intern("use_as_json"));		rb_gc_register_address(&use_as_json_sym);
+    use_raw_json_sym = ID2SYM(rb_intern("use_raw_json"));	rb_gc_register_address(&use_raw_json_sym);
     use_to_hash_sym = ID2SYM(rb_intern("use_to_hash"));		rb_gc_register_address(&use_to_hash_sym);
     use_to_json_sym = ID2SYM(rb_intern("use_to_json"));		rb_gc_register_address(&use_to_json_sym);
     wab_sym = ID2SYM(rb_intern("wab"));				rb_gc_register_address(&wab_sym);
@@ -1698,8 +1742,10 @@ Init_oj() {
     oj_odd_init();
     oj_mimic_rails_init();
 
-#if HAVE_LIBPTHREAD
-    pthread_mutex_init(&oj_cache_mutex, 0);
+#ifdef HAVE_PTHREAD_MUTEX_INIT
+    if (0 != (err = pthread_mutex_init(&oj_cache_mutex, 0))) {
+	rb_raise(rb_eException, "failed to initialize a mutex. %s", strerror(err));
+    }
 #else
     oj_cache_mutex = rb_mutex_new();
     rb_gc_register_address(&oj_cache_mutex);