oj 3.13.23 → 3.16.10

data/ext/oj/oj.c

@@ -14,6 +14,7 @@
 #include "dump.h"
 #include "encode.h"
 #include "intern.h"
+#include "mem.h"
 #include "odd.h"
 #include "parse.h"
 #include "rails.h"
@@ -21,7 +22,7 @@
 typedef struct _yesNoOpt {
     VALUE sym;
     char *attr;
-} * YesNoOpt;
+} *YesNoOpt;
 
 void Init_oj();
 
@@ -32,10 +33,10 @@ ID oj_array_append_id;
 ID oj_array_end_id;
 ID oj_array_start_id;
 ID oj_as_json_id;
-ID oj_at_id;
 ID oj_begin_id;
 ID oj_bigdecimal_id;
 ID oj_end_id;
+ID oj_eofq_id;
 ID oj_exclude_end_id;
 ID oj_error_id;
 ID oj_file_id;
@@ -50,6 +51,7 @@ ID oj_json_create_id;
 ID oj_length_id;
 ID oj_new_id;
 ID oj_parse_id;
+ID oj_plus_id;
 ID oj_pos_id;
 ID oj_raw_json_id;
 ID oj_read_id;
@@ -90,9 +92,7 @@ VALUE oj_array_class_sym;
 VALUE oj_create_additions_sym;
 VALUE oj_decimal_class_sym;
 VALUE oj_hash_class_sym;
-VALUE oj_in_sym;
 VALUE oj_indent_sym;
-VALUE oj_nanosecond_sym;
 VALUE oj_object_class_sym;
 VALUE oj_quirks_mode_sym;
 VALUE oj_safe_sym;
@@ -122,6 +122,7 @@ static VALUE escape_mode_sym;
 static VALUE integer_range_sym;
 static VALUE fast_sym;
 static VALUE float_prec_sym;
+static VALUE float_format_sym;
 static VALUE float_sym;
 static VALUE huge_sym;
 static VALUE ignore_sym;
@@ -134,6 +135,7 @@ static VALUE newline_sym;
 static VALUE nilnil_sym;
 static VALUE null_sym;
 static VALUE object_sym;
+static VALUE omit_null_byte_sym;
 static VALUE omit_nil_sym;
 static VALUE rails_sym;
 static VALUE raise_sym;
@@ -155,8 +157,8 @@ static VALUE word_sym;
 static VALUE xmlschema_sym;
 static VALUE xss_safe_sym;
 
-rb_encoding *oj_utf8_encoding = 0;
-int oj_utf8_encoding_index = 0;
+rb_encoding *oj_utf8_encoding       = 0;
+int          oj_utf8_encoding_index = 0;
 
 #ifdef HAVE_PTHREAD_MUTEX_INIT
 pthread_mutex_t oj_cache_mutex;
@@ -221,6 +223,7 @@ struct _options oj_default_options = {
         0,          // array_size
         AutoNan,    // nan_dump
         false,      // omit_nil
+        false,      // omit_null_byte
         MAX_DEPTH,  // max_depth
     },
     {
@@ -229,76 +232,89 @@ struct _options oj_default_options = {
         NULL,    // tail
         {'\0'},  // err
     },
-    NULL,  // ignore
+    NULL,
 };
 
 /* Document-method: default_options()
  *	call-seq: default_options()
  *
  * Returns the default load and dump options as a Hash. The options are
- * - *:indent* [_Fixnum_|_String_|_nil_] number of spaces to indent each element in an JSON
- *document, zero or nil is no newline between JSON elements, negative indicates no newline between
- *top level JSON elements in a stream, a String indicates the string should be used for indentation
- * - *:circular* [_Boolean_|_nil_] support circular references while dumping as well as shared
- *references
+ * - *:indent* [_Fixnum_|_String_|_nil_] number of spaces to indent each element
+ *   in an JSON document, zero or nil is no newline between JSON elements,
+ *   negative indicates no newline between top level JSON elements in a stream,
+ *   a String indicates the string should be used for indentation
+ * - *:circular* [_Boolean_|_nil_] support circular references while dumping as
+ *   well as shared references
  * - *:auto_define* [_Boolean_|_nil_] automatically define classes if they do not exist
  * - *:symbol_keys* [_Boolean_|_nil_] use symbols instead of strings for hash keys
- * - *:escape_mode* [_:newline_|_:json_|_:slash_|_:xss_safe_|_:ascii_|_:unicode_xss_|_nil_] determines the
- *characters to escape
- * - *:class_cache* [_Boolean_|_nil_] cache classes for faster parsing (if dynamically modifying
- *classes or reloading classes then don't use this)
- * - *:mode* [_:object_|_:strict_|_:compat_|_:null_|_:custom_|_:rails_|_:wab_] load and dump modes
- *to use for JSON
+ * - *:escape_mode* [_:newline_|_:json_|_:slash_|_:xss_safe_|_:ascii_|_:unicode_xss_|_nil_]
+ *   determines the characters to escape
+ * - *:class_cache* [_Boolean_|_nil_] cache classes for faster parsing (if dynamically
+ *   modifying classes or reloading classes then don't use this)
+ * - *: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_|_:fast_|_:ruby_] 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
+ * - *:bigdecimal_as_decimal* [_Boolean_|_nil_] dump BigDecimal as a decimal number or
+ *   as a String
+ * - *:bigdecimal_load* [_:bigdecimal_|_:float_|_:auto_|_:fast_|_:ruby_] 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
+ * - *:float_format* [_String_] the C printf format string for printing floats.
+ *   Default follows the float_precision and will be changed if float_precision is
+ *   changed. The string can be no more than 6 bytes.
  * - *: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
+ * - *: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)
- * - *:quirks_mode* [_true,_|_false_|_nil_] Allow single JSON values instead of documents, default
- *is true (allow)
- * - *:allow_invalid_unicode* [_true,_|_false_|_nil_] Allow invalid unicode, default is false (don't
- *allow)
- * - *:allow_nan* [_true,_|_false_|_nil_] Allow Nan, Infinity, and -Infinity to be parsed, default
- *is true (allow)
- * - *:indent_str* [_String_|_nil_] String to use for indentation, overriding the indent option is
- *not nil
- * - *:space* [_String_|_nil_] String to use for the space after the colon in JSON object fields
- * - *:space_before* [_String_|_nil_] String to use before the colon separator in JSON object fields
+ * - *:quirks_mode* [_true,_|_false_|_nil_] Allow single JSON values instead of
+ *   documents, default is true (allow)
+ * - *:allow_invalid_unicode* [_true,_|_false_|_nil_] Allow invalid unicode,
+ *   default is false (don't allow)
+ * - *:allow_nan* [_true,_|_false_|_nil_] Allow Nan, Infinity, and -Infinity to
+ *   be parsed, default is true (allow)
+ * - *:indent_str* [_String_|_nil_] String to use for indentation, overriding the
+ *   indent option is not nil
+ * - *:space* [_String_|_nil_] String to use for the space after the colon in JSON
+ *   object fields
+ * - *:space_before* [_String_|_nil_] String to use before the colon separator in
+ *   JSON object fields
  * - *:object_nl* [_String_|_nil_] String to use after a JSON object field value
  * - *:array_nl* [_String_|_nil_] String to use after a JSON array value
- * - *:nan* [_:null_|_:huge_|_:word_|_:raise_|_:auto_] how to dump Infinity and NaN. :null places a
- *null, :huge places a huge number, :word places Infinity or NaN, :raise raises and exception, :auto
- *uses default for each mode.
- * - *:hash_class* [_Class_|_nil_] Class to use instead of Hash on load, :object_class can also be
- *used
+ * - *:nan* [_:null_|_:huge_|_:word_|_:raise_|_:auto_] how to dump Infinity and
+ *   NaN. :null places a null, :huge places a huge number, :word places Infinity
+ *   or NaN, :raise raises and exception, :auto uses default for each mode.
+ * - *:hash_class* [_Class_|_nil_] Class to use instead of Hash on load,
+ *   :object_class can also be used
  * - *: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
+ * - *:omit_nil* [_true_|_false_] if true Hash and Object attributes with nil
+ *   values are omitted
+ * - *:omit_null_byte* [_true_|_false_] if true null bytes in strings will be
+ *   omitted when dumping
  * - *: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.
+ * - *:ignore_under* [_Boolean_] if true then attributes that start with _ are
+ *   ignored when dumping in object or custom mode.
  * - *:cache_keys* [_Boolean_] if true then hash keys are cached if less than 35 bytes.
- * - *:cache_str* [_Fixnum_] maximum string value length to cache (strings less than this are cached)
+ * - *:cache_str* [_Fixnum_] maximum string value length to cache (strings less
+ *   than this are cached)
  * - *: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)
+ * - *: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.
  */
@@ -374,6 +390,7 @@ static VALUE get_def_opts(VALUE self) {
                  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, float_format_sym, rb_str_new_cstr(oj_default_options.float_fmt));
     rb_hash_aset(opts, cache_str_sym, INT2FIX(oj_default_options.cache_str));
     rb_hash_aset(
         opts,
@@ -383,6 +400,7 @@ static VALUE get_def_opts(VALUE self) {
         opts,
         cache_keys_sym,
         (Yes == oj_default_options.cache_keys) ? Qtrue : ((No == oj_default_options.cache_keys) ? 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;
@@ -458,13 +476,14 @@ static VALUE get_def_opts(VALUE self) {
     default: rb_hash_aset(opts, nan_sym, auto_sym); break;
     }
     rb_hash_aset(opts, omit_nil_sym, oj_default_options.dump_opts.omit_nil ? Qtrue : Qfalse);
+    rb_hash_aset(opts, omit_null_byte_sym, oj_default_options.dump_opts.omit_null_byte ? Qtrue : Qfalse);
     rb_hash_aset(opts, oj_hash_class_sym, oj_default_options.hash_class);
     rb_hash_aset(opts, oj_array_class_sym, oj_default_options.array_class);
 
     if (NULL == oj_default_options.ignore) {
         rb_hash_aset(opts, ignore_sym, Qnil);
     } else {
-        VALUE *        vp;
+        VALUE         *vp;
         volatile VALUE a = rb_ary_new();
 
         for (vp = oj_default_options.ignore; Qnil != *vp; vp++) {
@@ -480,68 +499,67 @@ static VALUE get_def_opts(VALUE self) {
  *
  * Sets the default options for load and dump.
  * - *opts* [_Hash_] options to change
- *   - *:indent* [_Fixnum_|_String_|_nil_] number of spaces to indent each element in a JSON
- *document or the String to use for indentation.
+ *   - *:indent* [_Fixnum_|_String_|_nil_] number of spaces to indent each element
+ *     in a JSON document or the String to use for indentation.
  *   - :circular [_Boolean_|_nil_] support circular references while dumping.
  *   - *:auto_define* [_Boolean_|_nil_] automatically define classes if they do not exist.
  *   - *:symbol_keys* [_Boolean_|_nil_] convert hash keys to symbols.
  *   - *:class_cache* [_Boolean_|_nil_] cache classes for faster parsing.
- *   - *: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.
+ *   - *: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
- *   - *: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.
+ *   - *: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_format* [_String_] the C printf format string for printing floats.
+ *     Default follows the float_precision and will be changed if float_precision
+ *     is changed. The string can be no more than 6 bytes.
+ *   - *: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_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.
+ *   - *: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).
- *   - *:allow_invalid_unicode* [_Boolean_|_nil_] allow invalid unicode, default is false (don't
- *allow).
+ *   - *:quirks_mode* [_Boolean_|_nil_] allow single JSON values instead of documents, default is true (allow).
+ *   - *:allow_invalid_unicode* [_Boolean_|_nil_] allow invalid unicode, default is false (don't allow).
  *   - *:allow_nan* [_Boolean_|_nil_] allow Nan, Infinity, and -Infinity, default is true (allow).
  *   - *:space* [_String_|_nil_] String to use for the space after the colon in JSON object fields.
- *   - *:space_before* [_String_|_nil_] String to use before the colon separator in JSON object
- *fields.
+ *   - *:space_before* [_String_|_nil_] String to use before the colon separator in JSON object fields.
  *   - *:object_nl* [_String_|_nil_] String to use after a JSON object field value.
  *   - *:array_nl* [_String_|_nil_] String to use after a JSON array value
- *   - *:nan* [_:null_|_:huge_|_:word_|_:raise_] how to dump Infinity and NaN in null, strict, and
- *compat mode. :null places a null, :huge places a huge number, :word places Infinity or NaN, :raise
- *raises and exception, :auto uses default for each mode.
- *   - *:hash_class* [_Class_|_nil_] Class to use instead of Hash on load, :object_class can also be
- *used.
+ *   - *:nan* [_:null_|_:huge_|_:word_|_:raise_] how to dump Infinity and NaN in null,
+ *     strict, and compat mode. :null places a null, :huge places a huge number, :word
+ *     places Infinity or NaN, :raise raises and exception, :auto uses default for each mode.
+ *   - *:hash_class* [_Class_|_nil_] Class to use instead of Hash on load, :object_class can also be used.
  *   - *: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.
+ *   - *:ignore_under* [_Boolean_] if true then attributes that start with _ are
+ *     ignored when dumping in object or custom mode.
  *   - *:cache_keys* [_Boolean_] if true then hash keys are cached
  *   - *:cache_str* [_Fixnum_] maximum string value length to cache (strings less than this are cached)
  *   - *:integer_range* [_Range_] Dump integers outside range as strings.
@@ -611,7 +629,6 @@ static int parse_options_cb(VALUE k, VALUE v, VALUE opts) {
     if (set_yesno_options(k, v, copts)) {
         return ST_CONTINUE;
     }
-
     if (oj_indent_sym == k) {
         switch (rb_type(v)) {
         case T_NIL:
@@ -639,15 +656,9 @@ static int parse_options_cb(VALUE k, VALUE v, VALUE opts) {
     } else if (float_prec_sym == k) {
         int n;
 
-#ifdef RUBY_INTEGER_UNIFICATION
         if (rb_cInteger != rb_obj_class(v)) {
             rb_raise(rb_eArgError, ":float_precision must be a Integer.");
         }
-#else
-        if (T_FIXNUM != rb_type(v)) {
-            rb_raise(rb_eArgError, ":float_precision must be a Fixnum.");
-        }
-#endif
         n = FIX2INT(v);
         if (0 >= n) {
             *copts->float_fmt = '\0';
@@ -662,15 +673,9 @@ static int parse_options_cb(VALUE k, VALUE v, VALUE opts) {
     } else if (cache_str_sym == k || cache_string_sym == k) {
         int n;
 
-#ifdef RUBY_INTEGER_UNIFICATION
         if (rb_cInteger != rb_obj_class(v)) {
             rb_raise(rb_eArgError, ":cache_str must be a Integer.");
         }
-#else
-        if (T_FIXNUM != rb_type(v)) {
-            rb_raise(rb_eArgError, ":cache_str must be a Fixnum.");
-        }
-#endif
         n = FIX2INT(v);
         if (0 >= n) {
             copts->cache_str = 0;
@@ -683,15 +688,9 @@ static int parse_options_cb(VALUE k, VALUE v, VALUE opts) {
     } else if (sec_prec_sym == k) {
         int n;
 
-#ifdef RUBY_INTEGER_UNIFICATION
         if (rb_cInteger != rb_obj_class(v)) {
             rb_raise(rb_eArgError, ":second_precision must be a Integer.");
         }
-#else
-        if (T_FIXNUM != rb_type(v)) {
-            rb_raise(rb_eArgError, ":second_precision must be a Fixnum.");
-        }
-#endif
         n = NUM2INT(v);
         if (0 > n) {
             n                   = 0;
@@ -769,7 +768,6 @@ static int parse_options_cb(VALUE k, VALUE v, VALUE opts) {
         if (Qnil == v) {
             return ST_CONTINUE;
         }
-
         copts->compat_bigdec = (Qtrue == v);
     } else if (oj_decimal_class_sym == k) {
         if (rb_cFloat == v) {
@@ -782,7 +780,7 @@ static int parse_options_cb(VALUE k, VALUE v, VALUE opts) {
     } else if (create_id_sym == k) {
         if (Qnil == v) {
             if (oj_json_class != oj_default_options.create_id && NULL != copts->create_id) {
-                xfree((char *)oj_default_options.create_id);
+                OJ_R_FREE((char *)oj_default_options.create_id);
             }
             copts->create_id     = NULL;
             copts->create_id_len = 0;
@@ -791,7 +789,7 @@ static int parse_options_cb(VALUE k, VALUE v, VALUE opts) {
 
             len = RSTRING_LEN(v);
             if (len != copts->create_id_len || 0 != strcmp(copts->create_id, str)) {
-                copts->create_id = ALLOC_N(char, len + 1);
+                copts->create_id = OJ_R_ALLOC_N(char, len + 1);
                 strcpy((char *)copts->create_id, str);
                 copts->create_id_len = len;
             }
@@ -882,6 +880,17 @@ static int parse_options_cb(VALUE k, VALUE v, VALUE opts) {
         } else {
             rb_raise(rb_eArgError, ":omit_nil must be true or false.");
         }
+    } else if (omit_null_byte_sym == k) {
+        if (Qnil == v) {
+            return ST_CONTINUE;
+        }
+        if (Qtrue == v) {
+            copts->dump_opts.omit_null_byte = true;
+        } else if (Qfalse == v) {
+            copts->dump_opts.omit_null_byte = false;
+        } else {
+            rb_raise(rb_eArgError, ":omit_null_byte must be true or false.");
+        }
     } else if (oj_ascii_only_sym == k) {
         // This is here only for backwards compatibility with the original Oj.
         if (Qtrue == v) {
@@ -911,7 +920,7 @@ static int parse_options_cb(VALUE k, VALUE v, VALUE opts) {
             copts->array_class = v;
         }
     } else if (ignore_sym == k) {
-        xfree(copts->ignore);
+        OJ_R_FREE(copts->ignore);
         copts->ignore = NULL;
         if (Qnil != v) {
             int cnt;
@@ -921,7 +930,7 @@ static int parse_options_cb(VALUE k, VALUE v, VALUE opts) {
             if (0 < cnt) {
                 int i;
 
-                copts->ignore = ALLOC_N(VALUE, cnt + 1);
+                copts->ignore = OJ_R_ALLOC_N(VALUE, cnt + 1);
                 for (i = 0; i < cnt; i++) {
                     copts->ignore[i] = RARRAY_AREF(v, i);
                 }
@@ -949,7 +958,26 @@ static int parse_options_cb(VALUE k, VALUE v, VALUE opts) {
         if (Qnil == v) {
             return ST_CONTINUE;
         }
-	copts->sym_key = (Qtrue == v) ? Yes : No;
+        copts->sym_key = (Qtrue == v) ? Yes : No;
+
+    } else if (oj_max_nesting_sym == k) {
+        if (Qtrue == v) {
+            copts->dump_opts.max_depth = 100;
+        } else if (Qfalse == v || Qnil == v) {
+            copts->dump_opts.max_depth = MAX_DEPTH;
+        } else if (T_FIXNUM == rb_type(v)) {
+            copts->dump_opts.max_depth = NUM2INT(v);
+            if (0 >= copts->dump_opts.max_depth) {
+                copts->dump_opts.max_depth = MAX_DEPTH;
+            }
+        }
+    } else if (float_format_sym == k) {
+        rb_check_type(v, T_STRING);
+        if (6 < (int)RSTRING_LEN(v)) {
+            rb_raise(rb_eArgError, ":float_format must be 6 bytes or less.");
+        }
+        strncpy(copts->float_fmt, RSTRING_PTR(v), (size_t)RSTRING_LEN(v));
+        copts->float_fmt[RSTRING_LEN(v)] = '\0';
     }
     return ST_CONTINUE;
 }
@@ -958,7 +986,6 @@ void oj_parse_options(VALUE ropts, Options copts) {
     if (T_HASH != rb_type(ropts)) {
         return;
     }
-
     rb_hash_foreach(ropts, parse_options_cb, (VALUE)copts);
     oj_parse_opt_match_string(&copts->str_rx, ropts);
 
@@ -1114,7 +1141,7 @@ static VALUE load(int argc, VALUE *argv, VALUE self) {
  * Returns [_Object_|_Hash_|_Array_|_String_|_Fixnum_|_Float_|_Boolean_|_nil_]
  */
 static VALUE load_file(int argc, VALUE *argv, VALUE self) {
-    char *            path;
+    char             *path;
     int               fd;
     Mode              mode = oj_default_options.mode;
     struct _parseInfo pi;
@@ -1122,7 +1149,7 @@ static VALUE load_file(int argc, VALUE *argv, VALUE self) {
     if (1 > argc) {
         rb_raise(rb_eArgError, "Wrong number of arguments to load().");
     }
-    Check_Type(*argv, T_STRING);
+    path = StringValuePtr(*argv);
     parse_info_init(&pi);
     pi.options   = oj_default_options;
     pi.handler   = Qnil;
@@ -1153,16 +1180,15 @@ static VALUE load_file(int argc, VALUE *argv, VALUE self) {
             }
         }
     }
-    path = StringValuePtr(*argv);
 #ifdef _WIN32
     {
         WCHAR *wide_path;
         wide_path = rb_w32_mbstr_to_wstr(CP_UTF8, path, -1, NULL);
-        fd = rb_w32_wopen(wide_path, O_RDONLY);
-        free(wide_path);
+        fd        = rb_w32_wopen(wide_path, O_RDONLY);
+        OJ_FREE(wide_path);
     }
 #else
-    fd = open(path, O_RDONLY);
+    fd             = open(path, O_RDONLY);
 #endif
     if (0 == fd) {
         rb_raise(rb_eIOError, "%s", strerror(errno));
@@ -1237,10 +1263,10 @@ static VALUE safe_load(VALUE self, VALUE doc) {
  */
 
 struct dump_arg {
-    struct _out *    out;
+    struct _out     *out;
     struct _options *copts;
     int              argc;
-    VALUE *          argv;
+    VALUE           *argv;
 };
 
 static VALUE dump_body(VALUE a) {
@@ -1251,8 +1277,7 @@ static VALUE dump_body(VALUE a) {
     if (0 == arg->out->buf) {
         rb_raise(rb_eNoMemError, "Not enough memory.");
     }
-    rstr = rb_str_new2(arg->out->buf);
-    rstr = oj_encode(rstr);
+    rstr = rb_utf8_str_new_cstr(arg->out->buf);
 
     return rstr;
 }
@@ -1296,8 +1321,8 @@ static VALUE dump(int argc, VALUE *argv, VALUE self) {
 
     oj_out_init(arg.out);
 
-    arg.out->omit_nil  = copts.dump_opts.omit_nil;
-    arg.out->caller    = CALLER_DUMP;
+    arg.out->omit_nil       = copts.dump_opts.omit_nil;
+    arg.out->omit_null_byte = copts.dump_opts.omit_null_byte;
 
     return rb_ensure(dump_body, (VALUE)&arg, dump_ensure, (VALUE)&arg);
 }
@@ -1309,17 +1334,16 @@ static VALUE dump(int argc, VALUE *argv, VALUE self) {
  * will be called. The mode is set to :compat.
  * - *obj* [_Object_] Object to serialize as an JSON document String
  * - *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).
- *   - *:indent* [_String_|_nil_] String to use for indentation, overriding the indent option if not
- * nil.
+ *   - *:max_nesting* [_Fixnum_|_boolean_] It true nesting is limited to 100.
+ *     If a Fixnum nesting is set to the provided value. The option to detect
+ *     circular references is available but is not compatible with the json gem.,
+ *     default is false or unlimited.
+ *   - *: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).
+ *   - *:indent* [_String_|_nil_] String to use for indentation, overriding the indent option if not nil.
  *   - *:space* [_String_|_nil_] String to use for the space after the colon in JSON object fields.
- *   - *:space_before* [_String_|_nil_] String to use before the colon separator in JSON object
- * fields.
+ *   - *:space_before* [_String_|_nil_] String to use before the colon separator in JSON object fields.
  *   - *:object_nl* [_String_|_nil_] String to use after a JSON object field value.
  *   - *:array_nl* [_String_|_nil_] String to use after a JSON array value.
  *   - *:trace* [_Boolean_] If true trace is turned on.
@@ -1344,7 +1368,8 @@ static VALUE to_json(int argc, VALUE *argv, VALUE self) {
 
     oj_out_init(&out);
 
-    out.omit_nil  = copts.dump_opts.omit_nil;
+    out.omit_nil       = copts.dump_opts.omit_nil;
+    out.omit_null_byte = copts.dump_opts.omit_null_byte;
     // For obj.to_json or generate nan is not allowed but if called from dump
     // it is.
     oj_dump_obj_to_json_using_params(*argv, &copts, &out, argc - 1, argv + 1);
@@ -1352,8 +1377,7 @@ static VALUE to_json(int argc, VALUE *argv, VALUE self) {
     if (0 == out.buf) {
         rb_raise(rb_eNoMemError, "Not enough memory.");
     }
-    rstr = rb_str_new2(out.buf);
-    rstr = oj_encode(rstr);
+    rstr = rb_utf8_str_new_cstr(out.buf);
 
     oj_out_free(&out);
 
@@ -1376,7 +1400,6 @@ static VALUE to_file(int argc, VALUE *argv, VALUE self) {
     if (3 == argc) {
         oj_parse_options(argv[2], &copts);
     }
-    Check_Type(*argv, T_STRING);
     oj_write_obj_to_file(argv[1], StringValuePtr(*argv), &copts);
 
     return Qnil;
@@ -1414,10 +1437,10 @@ static VALUE to_stream(int argc, VALUE *argv, VALUE self) {
  *
  * - *clas* [_Class__|_Module_] Class or Module to be made special
  * - *create_object* [_Object_]  object to call the create method on
- * - *create_method* [_Symbol_] method on the clas that will create a new instance of the clas when
- * given all the member values in the order specified.
- * - *members* [_Symbol__|_String_] methods used to get the member values from instances of the
- * clas.
+ * - *create_method* [_Symbol_] method on the clas that will create a new instance
+ *   of the clas when given all the member values in the order specified.
+ * - *members* [_Symbol__|_String_] methods used to get the member values from
+ *   instances of the clas.
  */
 static VALUE register_odd(int argc, VALUE *argv, VALUE self) {
     if (3 > argc) {
@@ -1450,10 +1473,10 @@ static VALUE register_odd(int argc, VALUE *argv, VALUE self) {
  *
  * - *clas* [_Class_|_Module_] Class or Module to be made special
  * - *create_object* [_Object_] object to call the create method on
- * - *create_method* [_Symbol_] method on the clas that will create a new instance of the clas when
- *given all the member values in the order specified.
- * - *dump_method* [_Symbol_|_String_] method to call on the object being serialized to generate the
- *raw JSON.
+ * - *create_method* [_Symbol_] method on the clas that will create a new instance
+ *   of the clas when given all the member values in the order specified.
+ * - *dump_method* [_Symbol_|_String_] method to call on the object being
+ *   serialized to generate the raw JSON.
  */
 static VALUE register_odd_raw(int argc, VALUE *argv, VALUE self) {
     if (3 > argc) {
@@ -1679,8 +1702,8 @@ extern VALUE oj_define_mimic_json(int argc, VALUE *argv, VALUE self);
  *   - *: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.
+ *   - *: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.
  *
  * Returns [_String_]generated JSON.
  */
@@ -1718,12 +1741,15 @@ static VALUE protect_require(VALUE x) {
 
 extern void print_all_odds(const char *label);
 
-static VALUE
-debug_odd(VALUE self, VALUE label) {
+static VALUE debug_odd(VALUE self, VALUE label) {
     print_all_odds(RSTRING_PTR(label));
     return Qnil;
 }
 
+static VALUE mem_report(VALUE self) {
+    oj_mem_report();
+    return Qnil;
+}
 
 /* Document-module: Oj
  *
@@ -1734,8 +1760,8 @@ debug_odd(VALUE self, VALUE label) {
  * global and options to methods allow additional behavior modifications. The
  * modes are:
  *
- * - *:strict* mode will only allow the 7 basic JSON types to be serialized. Any other Object
- *   will raise an Exception.
+ * - *:strict* mode will only allow the 7 basic JSON types to be serialized.
+ *   Any other Object 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.
@@ -1775,7 +1801,7 @@ void Init_oj(void) {
     rb_protect(protect_require, Qnil, &err);
     rb_require("stringio");
     oj_utf8_encoding_index = rb_enc_find_index("UTF-8");
-    oj_utf8_encoding = rb_enc_from_index(oj_utf8_encoding_index);
+    oj_utf8_encoding       = rb_enc_from_index(oj_utf8_encoding_index);
 
     // rb_define_module_function(Oj, "hash_test", hash_test, 0);
     rb_define_module_function(Oj, "debug_odd", debug_odd, 1);
@@ -1812,49 +1838,52 @@ void Init_oj(void) {
 
     rb_define_module_function(Oj, "optimize_rails", oj_optimize_rails, 0);
 
-    oj_add_value_id          = rb_intern("add_value");
-    oj_array_append_id       = rb_intern("array_append");
-    oj_array_end_id          = rb_intern("array_end");
-    oj_array_start_id        = rb_intern("array_start");
-    oj_as_json_id            = rb_intern("as_json");
-    oj_at_id                 = rb_intern("at");
-    oj_begin_id              = rb_intern("begin");
-    oj_bigdecimal_id         = rb_intern("BigDecimal");
-    oj_end_id                = rb_intern("end");
-    oj_error_id              = rb_intern("error");
-    oj_exclude_end_id        = rb_intern("exclude_end?");
-    oj_file_id               = rb_intern("file?");
-    oj_fileno_id             = rb_intern("fileno");
-    oj_ftype_id              = rb_intern("ftype");
-    oj_hash_end_id           = rb_intern("hash_end");
-    oj_hash_key_id           = rb_intern("hash_key");
-    oj_hash_set_id           = rb_intern("hash_set");
-    oj_hash_start_id         = rb_intern("hash_start");
-    oj_iconv_id              = rb_intern("iconv");
-    oj_json_create_id        = rb_intern("json_create");
-    oj_length_id             = rb_intern("length");
-    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");
-    oj_stat_id               = rb_intern("stat");
-    oj_string_id             = rb_intern("string");
-    oj_to_h_id               = rb_intern("to_h");
-    oj_to_hash_id            = rb_intern("to_hash");
-    oj_to_json_id            = rb_intern("to_json");
-    oj_to_s_id               = rb_intern("to_s");
-    oj_to_sym_id             = rb_intern("to_sym");
-    oj_to_time_id            = rb_intern("to_time");
-    oj_tv_nsec_id            = rb_intern("tv_nsec");
-    oj_tv_sec_id             = rb_intern("tv_sec");
-    oj_tv_usec_id            = rb_intern("tv_usec");
-    oj_utc_id                = rb_intern("utc");
-    oj_utc_offset_id         = rb_intern("utc_offset");
-    oj_utcq_id               = rb_intern("utc?");
-    oj_write_id              = rb_intern("write");
+    rb_define_module_function(Oj, "mem_report", mem_report, 0);
+
+    oj_add_value_id    = rb_intern("add_value");
+    oj_array_append_id = rb_intern("array_append");
+    oj_array_end_id    = rb_intern("array_end");
+    oj_array_start_id  = rb_intern("array_start");
+    oj_as_json_id      = rb_intern("as_json");
+    oj_begin_id        = rb_intern("begin");
+    oj_bigdecimal_id   = rb_intern("BigDecimal");
+    oj_end_id          = rb_intern("end");
+    oj_eofq_id         = rb_intern("eof?");
+    oj_error_id        = rb_intern("error");
+    oj_exclude_end_id  = rb_intern("exclude_end?");
+    oj_file_id         = rb_intern("file?");
+    oj_fileno_id       = rb_intern("fileno");
+    oj_ftype_id        = rb_intern("ftype");
+    oj_hash_end_id     = rb_intern("hash_end");
+    oj_hash_key_id     = rb_intern("hash_key");
+    oj_hash_set_id     = rb_intern("hash_set");
+    oj_hash_start_id   = rb_intern("hash_start");
+    oj_iconv_id        = rb_intern("iconv");
+    oj_json_create_id  = rb_intern("json_create");
+    oj_length_id       = rb_intern("length");
+    oj_new_id          = rb_intern("new");
+    oj_parse_id        = rb_intern("parse");
+    oj_plus_id         = rb_intern("+");
+    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");
+    oj_stat_id         = rb_intern("stat");
+    oj_string_id       = rb_intern("string");
+    oj_to_h_id         = rb_intern("to_h");
+    oj_to_hash_id      = rb_intern("to_hash");
+    oj_to_json_id      = rb_intern("to_json");
+    oj_to_s_id         = rb_intern("to_s");
+    oj_to_sym_id       = rb_intern("to_sym");
+    oj_to_time_id      = rb_intern("to_time");
+    oj_tv_nsec_id      = rb_intern("tv_nsec");
+    oj_tv_sec_id       = rb_intern("tv_sec");
+    oj_tv_usec_id      = rb_intern("tv_usec");
+    oj_utc_id          = rb_intern("utc");
+    oj_utc_offset_id   = rb_intern("utc_offset");
+    oj_utcq_id         = rb_intern("utc?");
+    oj_write_id        = rb_intern("write");
 
     rb_require("oj/bag");
     rb_require("oj/error");
@@ -1925,6 +1954,8 @@ void Init_oj(void) {
     rb_gc_register_address(&integer_range_sym);
     fast_sym = ID2SYM(rb_intern("fast"));
     rb_gc_register_address(&fast_sym);
+    float_format_sym = ID2SYM(rb_intern("float_format"));
+    rb_gc_register_address(&float_format_sym);
     float_prec_sym = ID2SYM(rb_intern("float_precision"));
     rb_gc_register_address(&float_prec_sym);
     float_sym = ID2SYM(rb_intern("float"));
@@ -1965,14 +1996,10 @@ void Init_oj(void) {
     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_in_sym = ID2SYM(rb_intern("in"));
-    rb_gc_register_address(&oj_in_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_nanosecond_sym = ID2SYM(rb_intern("nanosecond"));
-    rb_gc_register_address(&oj_nanosecond_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"));
@@ -1981,6 +2008,8 @@ void Init_oj(void) {
     rb_gc_register_address(&oj_quirks_mode_sym);
     oj_safe_sym = ID2SYM(rb_intern("safe"));
     rb_gc_register_address(&oj_safe_sym);
+    omit_null_byte_sym = ID2SYM(rb_intern("omit_null_byte"));
+    rb_gc_register_address(&omit_null_byte_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"));