oj 2.13.1 → 2.14.0

data/ext/oj/oj.c

@@ -90,6 +90,8 @@ ID	oj_utc_offset_id;
 ID	oj_utcq_id;
 ID	oj_write_id;
 
+static ID	has_key_id;
+
 VALUE	oj_bag_class;
 VALUE	oj_bigdecimal_class;
 VALUE	oj_cstack_class;
@@ -160,26 +162,38 @@ VALUE oj_cache_mutex = Qnil;
 static const char	json_class[] = "json_class";
 
 struct _Options	oj_default_options = {
-    0,			// indent
-    No,			// circular
-    No,			// auto_define
-    No,			// sym_key
-    JSONEsc,		// escape_mode
-    ObjectMode,		// mode
-    Yes,		// class_cache
-    UnixZTime,		// time_format
-    Yes,		// bigdec_as_num
-    AutoDec,		// bigdec_load
-    Yes,		// to_json
-    No,			// nilnil
-    Yes,		// allow_gc
-    Yes,		// quirks_mode
-    json_class,		// create_id
-    10,			// create_id_len
-    9,			// sec_prec
-    0,			// dump_opts
-    15,			// float_prec
-    "%0.15g",		// float_fmt
+    0,		// indent
+    No,		// circular
+    No,		// auto_define
+    No,		// sym_key
+    JSONEsc,	// escape_mode
+    ObjectMode,	// mode
+    Yes,	// class_cache
+    UnixZTime,	// time_format
+    Yes,	// bigdec_as_num
+    AutoDec,	// bigdec_load
+    Yes,	// to_json
+    No,		// nilnil
+    Yes,	// allow_gc
+    Yes,	// quirks_mode
+    json_class,	// create_id
+    10,		// create_id_len
+    9,		// sec_prec
+    15,		// float_prec
+    "%0.15g",	// float_fmt
+    {		// dump_opts
+	false,	//use
+	"",	// indent
+	"",	// before_sep
+	"",	// after_sep
+	"",	// hash_nl
+	"",	// array_nl
+	0,	// indent_size
+	0,	// before_size
+	0,	// after_size
+	0,	// hash_size
+	0,	// array_size
+    }
 };
 
 static VALUE	define_mimic_json(int argc, VALUE *argv, VALUE self);
@@ -187,7 +201,7 @@ static VALUE	define_mimic_json(int argc, VALUE *argv, VALUE self);
 /* call-seq: default_options() => Hash
  *
  * Returns the default load and dump options as a Hash. The options are
- * - indent: [Fixnum] number of spaces to indent each element in an JSON document, zero is no newline between JSON elements, negative indicates no newline between top level JSON elements in a stream
+ * - 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: [true|false|nil] support circular references while dumping
  * - auto_define: [true|false|nil] automatically define classes if they do not exist
  * - symbol_keys: [true|false|nil] use symbols instead of strings for hash keys
@@ -204,13 +218,22 @@ static VALUE	define_mimic_json(int argc, VALUE *argv, VALUE self);
  * - nilnil: [true|false|nil] if true a nil input to load will return nil and not raise an Exception
  * - allow_gc: [true|false|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)
+ * - 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
  * @return [Hash] all current option settings.
  */
 static VALUE
 get_def_opts(VALUE self) {
     VALUE	opts = rb_hash_new();
-    
-    rb_hash_aset(opts, indent_sym, INT2FIX(oj_default_options.indent));
+
+    if (0 == oj_default_options.dump_opts.indent_size) {
+	rb_hash_aset(opts, indent_sym, INT2FIX(oj_default_options.indent));
+    } else {
+	rb_hash_aset(opts, indent_sym, rb_str_new2(oj_default_options.dump_opts.indent_str));
+    }
     rb_hash_aset(opts, sec_prec_sym, INT2FIX(oj_default_options.sec_prec));
     rb_hash_aset(opts, circular_sym, (Yes == oj_default_options.circular) ? Qtrue : ((No == oj_default_options.circular) ? Qfalse : Qnil));
     rb_hash_aset(opts, class_cache_sym, (Yes == oj_default_options.class_cache) ? Qtrue : ((No == oj_default_options.class_cache) ? Qfalse : Qnil));
@@ -250,6 +273,10 @@ get_def_opts(VALUE self) {
     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, 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, 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, object_nl_sym, (0 == oj_default_options.dump_opts.hash_size) ? Qnil : rb_str_new2(oj_default_options.dump_opts.hash_nl));
+    rb_hash_aset(opts, array_nl_sym, (0 == oj_default_options.dump_opts.array_size) ? Qnil : rb_str_new2(oj_default_options.dump_opts.array_nl));
 
     return opts;
 }
@@ -258,7 +285,7 @@ get_def_opts(VALUE self) {
  *
  * Sets the default options for load and dump.
  * @param [Hash] opts options to change
- * @param [Fixnum] :indent number of spaces to indent each element in an JSON document
+ * @param [Fixnum|String|nil] :indent number of spaces to indent each element in a JSON document or the String to use for identation.
  * @param [true|false|nil] :circular support circular references while dumping
  * @param [true|false|nil] :auto_define automatically define classes if they do not exist
  * @param [true|false|nil] :symbol_keys convert hash keys to symbols
@@ -289,314 +316,247 @@ get_def_opts(VALUE self) {
  * @param [true|false|nil] :nilnil if true a nil input to load will return nil and not raise an Exception
  * @param [true|false|nil] :allow_gc allow or prohibit GC during parsing, default is true (allow)
  * @param [true|false|nil] :quirks_mode allow single JSON values instead of documents, default is true (allow)
+ * @param [String|nil] :space String to use for the space after the colon in JSON object fields
+ * @param [String|nil] :space_before String to use before the colon separator in JSON object fields
+ * @param [String|nil] :object_nl String to use after a JSON object field value
+ * @param [String|nil] :array_nl String to use after a JSON array value
  * @return [nil]
  */
 static VALUE
 set_def_opts(VALUE self, VALUE opts) {
+    Check_Type(opts, T_HASH);
+    oj_parse_options(opts, &oj_default_options);
+
+    return Qnil;
+}
+
+void
+oj_parse_options(VALUE ropts, Options copts) {
     struct _YesNoOpt	ynos[] = {
-	{ circular_sym, &oj_default_options.circular },
-	{ auto_define_sym, &oj_default_options.auto_define },
-	{ symbol_keys_sym, &oj_default_options.sym_key },
-	{ class_cache_sym, &oj_default_options.class_cache },
-	{ bigdecimal_as_decimal_sym, &oj_default_options.bigdec_as_num },
-	{ use_to_json_sym, &oj_default_options.to_json },
-	{ nilnil_sym, &oj_default_options.nilnil },
-	{ allow_gc_sym, &oj_default_options.allow_gc },
-	{ quirks_mode_sym, &oj_default_options.quirks_mode },
+	{ circular_sym, &copts->circular },
+	{ auto_define_sym, &copts->auto_define },
+	{ symbol_keys_sym, &copts->sym_key },
+	{ class_cache_sym, &copts->class_cache },
+	{ bigdecimal_as_decimal_sym, &copts->bigdec_as_num },
+	{ use_to_json_sym, &copts->to_json },
+	{ nilnil_sym, &copts->nilnil },
+	{ allow_gc_sym, &copts->allow_gc },
+	{ quirks_mode_sym, &copts->quirks_mode },
 	{ Qnil, 0 }
     };
-    YesNoOpt	o;
-    VALUE	v;
+    YesNoOpt		o;
+    volatile VALUE	v;
+    size_t		len;
     
-    Check_Type(opts, T_HASH);
-    v = rb_hash_aref(opts, indent_sym);
-    if (Qnil != v) {
-	Check_Type(v, T_FIXNUM);
-	oj_default_options.indent = FIX2INT(v);
+    if (T_HASH != rb_type(ropts)) {
+	return;
     }
-    v = rb_hash_aref(opts, float_prec_sym);
-    if (Qnil != v) {
+    if (Qtrue == rb_funcall(ropts, has_key_id, 1, indent_sym)) {
+	v = rb_hash_lookup(ropts, indent_sym);
+	switch (rb_type(v)) {
+	case T_NIL:
+	    copts->dump_opts.indent_size = 0;
+	    *copts->dump_opts.indent_str = '\0';
+	    copts->indent = 0;
+	    break;
+	case T_FIXNUM:
+	    copts->dump_opts.indent_size = 0;
+	    *copts->dump_opts.indent_str = '\0';
+	    copts->indent = FIX2INT(v);
+	    break;
+	case T_STRING:
+	    if (sizeof(copts->dump_opts.indent_str) <= (len = RSTRING_LEN(v))) {
+		rb_raise(rb_eArgError, "indent string is limited to %lu characters.", sizeof(copts->dump_opts.indent_str));
+	    }
+	    strcpy(copts->dump_opts.indent_str, StringValuePtr(v));
+	    copts->dump_opts.indent_size = (uint8_t)len;
+	    copts->indent = 0;
+	    break;
+	default:
+	    rb_raise(rb_eTypeError, "indent must be a Fixnum, String, or nil.");
+	    break;
+	}
+    }
+    if (Qnil != (v = rb_hash_lookup(ropts, float_prec_sym))) {
 	int	n;
 
+	if (rb_cFixnum != rb_obj_class(v)) {
+	    rb_raise(rb_eArgError, ":float_precision must be a Fixnum.");
+	}
 	Check_Type(v, T_FIXNUM);
 	n = FIX2INT(v);
 	if (0 >= n) {
-	    *oj_default_options.float_fmt = '\0';
-	    oj_default_options.float_prec = 0;
+	    *copts->float_fmt = '\0';
+	    copts->float_prec = 0;
 	} else {
 	    if (20 < n) {
 		n = 20;
 	    }
-	    sprintf(oj_default_options.float_fmt, "%%0.%dg", n);
-	    oj_default_options.float_prec = n;
+	    sprintf(copts->float_fmt, "%%0.%dg", n);
+	    copts->float_prec = n;
 	}
     }
-    v = rb_hash_aref(opts, sec_prec_sym);
-    if (Qnil != v) {
+    if (Qnil != (v = rb_hash_lookup(ropts, sec_prec_sym))) {
 	int	n;
 
-	Check_Type(v, T_FIXNUM);
-	n = FIX2INT(v);
+	if (rb_cFixnum != rb_obj_class(v)) {
+	    rb_raise(rb_eArgError, ":second_precision must be a Fixnum.");
+	}
+	n = NUM2INT(v);
 	if (0 > n) {
 	    n = 0;
 	} else if (9 < n) {
 	    n = 9;
 	}
-	oj_default_options.sec_prec = n;
-    }
-
-    v = rb_hash_lookup(opts, mode_sym);
-    if (Qnil == v) {
-	// ignore
-    } else if (object_sym == v) {
-	oj_default_options.mode = ObjectMode;
-    } else if (strict_sym == v) {
-	oj_default_options.mode = StrictMode;
-    } else if (compat_sym == v) {
-	oj_default_options.mode = CompatMode;
-    } else if (null_sym == v) {
-	oj_default_options.mode = NullMode;
-    } else {
-	rb_raise(rb_eArgError, ":mode must be :object, :strict, :compat, or :null.");
-    }
-
-    v = rb_hash_lookup(opts, time_format_sym);
-    if (Qnil == v) {
-	// ignore
-    } else if (unix_sym == v) {
-	oj_default_options.time_format = UnixTime;
-    } else if (unix_zone_sym == v) {
-	oj_default_options.time_format = UnixZTime;
-    } else if (xmlschema_sym == v) {
-	oj_default_options.time_format = XmlTime;
-    } else if (ruby_sym == v) {
-	oj_default_options.time_format = RubyTime;
-    } else {
-	rb_raise(rb_eArgError, ":time_format must be :unix, :unix_zone, :xmlschema, or :ruby.");
-    }
-
-    v = rb_hash_lookup(opts, escape_mode_sym);
-    if (Qnil == v) {
-	// ignore
-    } else if (newline_sym == v) {
-	oj_default_options.escape_mode = NLEsc;
-    } else if (json_sym == v) {
-	oj_default_options.escape_mode = JSONEsc;
-    } else if (xss_safe_sym == v) {
-	oj_default_options.escape_mode = XSSEsc;
-    } else if (ascii_sym == v) {
-	oj_default_options.escape_mode = ASCIIEsc;
-    } else {
-	rb_raise(rb_eArgError, ":escape_mode must be :newline, :json, :xss_safe, or :ascii.");
-    }
-
-    v = rb_hash_lookup(opts, bigdecimal_load_sym);
-    if (Qnil == v) {
-	// ignore
-    } else if (bigdecimal_sym == v || Qtrue == v) {
-	oj_default_options.bigdec_load = BigDec;
-    } else if (float_sym == v) {
-	oj_default_options.bigdec_load = FloatDec;
-    } else if (auto_sym == v || Qfalse == v) {
-	oj_default_options.bigdec_load = AutoDec;
-    } else {
-	rb_raise(rb_eArgError, ":bigdecimal_load must be :bigdecimal, :float, or :auto.");
+	copts->sec_prec = n;
+    }
+    if (Qnil != (v = rb_hash_lookup(ropts, mode_sym))) {
+	if (object_sym == v) {
+	    copts->mode = ObjectMode;
+	} else if (strict_sym == v) {
+	    copts->mode = StrictMode;
+	} else if (compat_sym == v) {
+	    copts->mode = CompatMode;
+	} else if (null_sym == v) {
+	    copts->mode = NullMode;
+	} else {
+	    rb_raise(rb_eArgError, ":mode must be :object, :strict, :compat, or :null.");
+	}
     }
-
-    if (Qtrue == rb_funcall(opts, rb_intern("has_key?"), 1, create_id_sym)) {
-	if (0 != oj_default_options.create_id) {
+    if (Qnil != (v = rb_hash_lookup(ropts, time_format_sym))) {
+	if (unix_sym == v) {
+	    copts->time_format = UnixTime;
+	} else if (unix_zone_sym == v) {
+	    copts->time_format = UnixZTime;
+	} else if (xmlschema_sym == v) {
+	    copts->time_format = XmlTime;
+	} else if (ruby_sym == v) {
+	    copts->time_format = RubyTime;
+	} else {
+	    rb_raise(rb_eArgError, ":time_format must be :unix, :unix_zone, :xmlschema, or :ruby.");
+	}
+    }
+    if (Qnil != (v = rb_hash_lookup(ropts, escape_mode_sym))) {
+	if (newline_sym == v) {
+	    copts->escape_mode = NLEsc;
+	} else if (json_sym == v) {
+	    copts->escape_mode = JSONEsc;
+	} else if (xss_safe_sym == v) {
+	    copts->escape_mode = XSSEsc;
+	} else if (ascii_sym == v) {
+	    copts->escape_mode = ASCIIEsc;
+	} else {
+	    rb_raise(rb_eArgError, ":encoding must be :newline, :json, :xss_safe, or :ascii.");
+	}
+    }
+    if (Qnil != (v = rb_hash_lookup(ropts, bigdecimal_load_sym))) {
+	if (bigdecimal_sym == v || Qtrue == v) {
+	    copts->bigdec_load = BigDec;
+	} else if (float_sym == v) {
+	    copts->bigdec_load = FloatDec;
+	} 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 (Qtrue == rb_funcall(ropts, has_key_id, 1, create_id_sym)) {
+	v = rb_hash_lookup(ropts, create_id_sym);
+	if (Qnil == v) {
 	    if (json_class != oj_default_options.create_id) {
 		xfree((char*)oj_default_options.create_id);
 	    }
-	    oj_default_options.create_id = 0;
-	    oj_default_options.create_id_len = 0;
-	}
-	v = rb_hash_lookup(opts, create_id_sym);
-	if (Qnil != v) {
-	    size_t	len = RSTRING_LEN(v) + 1;
-
-	    oj_default_options.create_id = ALLOC_N(char, len);
-	    strcpy((char*)oj_default_options.create_id, StringValuePtr(v));
-	    oj_default_options.create_id_len = len - 1;
+	    copts->create_id = NULL;
+	    copts->create_id_len = 0;
+	} else if (T_STRING == rb_type(v)) {
+	    const char	*str = StringValuePtr(v);
+
+	    len = RSTRING_LEN(v);
+	    if (len != copts->create_id_len ||
+		0 != strcmp(copts->create_id, str)) {
+		copts->create_id = ALLOC_N(char, len + 1);
+		strcpy((char*)copts->create_id, str);
+		copts->create_id_len = len;
+	    }
+	} else {
+	    rb_raise(rb_eArgError, ":create_id must be string.");
 	}
     }
-
     for (o = ynos; 0 != o->attr; o++) {
-	if (Qtrue != rb_funcall(opts, rb_intern("has_key?"), 1, o->sym)) {
-	    continue;
-	}
-	if (Qnil != (v = rb_hash_lookup(opts, o->sym))) {
+	if (Qnil != (v = rb_hash_lookup(ropts, o->sym))) {
 	    if (Qtrue == v) {
 		*o->attr = Yes;
 	    } else if (Qfalse == v) {
 		*o->attr = No;
 	    } else {
-		rb_raise(rb_eArgError, "%s must be true, false, or nil.", rb_id2name(SYM2ID(o->sym)));
+		rb_raise(rb_eArgError, "%s must be true or false.", rb_id2name(SYM2ID(o->sym)));
 	    }
 	}
     }
-    // This is here only for backwards compatibility with the original Oj.
-    v = rb_hash_lookup(opts, ascii_only_sym);
-    if (Qtrue == v) {
-	oj_default_options.escape_mode = ASCIIEsc;
-    } else if (Qfalse == v) {
-	oj_default_options.escape_mode = JSONEsc;
-    }
-    return Qnil;
-}
-
-void
-oj_parse_options(VALUE ropts, Options copts) {
-    struct _YesNoOpt	ynos[] = {
-	{ circular_sym, &copts->circular },
-	{ auto_define_sym, &copts->auto_define },
-	{ symbol_keys_sym, &copts->sym_key },
-	{ class_cache_sym, &copts->class_cache },
-	{ bigdecimal_as_decimal_sym, &copts->bigdec_as_num },
-	{ use_to_json_sym, &copts->to_json },
-	{ nilnil_sym, &copts->nilnil },
-	{ allow_gc_sym, &copts->allow_gc },
-	{ quirks_mode_sym, &copts->quirks_mode },
-	{ Qnil, 0 }
-    };
-    YesNoOpt	o;
-    
-    if (rb_cHash == rb_obj_class(ropts)) {
-	VALUE	v;
-	
-	if (Qnil != (v = rb_hash_lookup(ropts, indent_sym))) {
-	    if (rb_cFixnum != rb_obj_class(v)) {
-		rb_raise(rb_eArgError, ":indent must be a Fixnum.");
-	    }
-	    copts->indent = NUM2INT(v);
-	}
-	if (Qnil != (v = rb_hash_lookup(ropts, float_prec_sym))) {
-	    int	n;
-
-	    if (rb_cFixnum != rb_obj_class(v)) {
-		rb_raise(rb_eArgError, ":float_precision must be a Fixnum.");
-	    }
-	    Check_Type(v, T_FIXNUM);
-	    n = FIX2INT(v);
-	    if (0 >= n) {
-		*copts->float_fmt = '\0';
-		copts->float_prec = 0;
-	    } else {
-		if (20 < n) {
-		    n = 20;
-		}
-		sprintf(copts->float_fmt, "%%0.%dg", n);
-		copts->float_prec = n;
-	    }
-	}
-	if (Qnil != (v = rb_hash_lookup(ropts, sec_prec_sym))) {
-	    int	n;
-
-	    if (rb_cFixnum != rb_obj_class(v)) {
-		rb_raise(rb_eArgError, ":second_precision must be a Fixnum.");
-	    }
-	    n = NUM2INT(v);
-	    if (0 > n) {
-		n = 0;
-	    } else if (9 < n) {
-		n = 9;
-	    }
-	    copts->sec_prec = n;
-	}
-	if (Qnil != (v = rb_hash_lookup(ropts, mode_sym))) {
-	    if (object_sym == v) {
-		copts->mode = ObjectMode;
-	    } else if (strict_sym == v) {
-		copts->mode = StrictMode;
-	    } else if (compat_sym == v) {
-		copts->mode = CompatMode;
-	    } else if (null_sym == v) {
-		copts->mode = NullMode;
-	    } else {
-		rb_raise(rb_eArgError, ":mode must be :object, :strict, :compat, or :null.");
-	    }
-	}
-	if (Qnil != (v = rb_hash_lookup(ropts, time_format_sym))) {
-	    if (unix_sym == v) {
-		copts->time_format = UnixTime;
-	    } else if (unix_zone_sym == v) {
-		copts->time_format = UnixZTime;
-	    } else if (xmlschema_sym == v) {
-		copts->time_format = XmlTime;
-	    } else if (ruby_sym == v) {
-		copts->time_format = RubyTime;
-	    } else {
-		rb_raise(rb_eArgError, ":time_format must be :unix, :unix_zone, :xmlschema, or :ruby.");
-	    }
-	}
-
-	if (Qnil != (v = rb_hash_lookup(ropts, escape_mode_sym))) {
-	    if (newline_sym == v) {
-		copts->escape_mode = NLEsc;
-	    } else if (json_sym == v) {
-		copts->escape_mode = JSONEsc;
-	    } else if (xss_safe_sym == v) {
-		copts->escape_mode = XSSEsc;
-	    } else if (ascii_sym == v) {
-		copts->escape_mode = ASCIIEsc;
-	    } else {
-		rb_raise(rb_eArgError, ":encoding must be :newline, :json, :xss_safe, or :ascii.");
+    if (Qtrue == rb_funcall(ropts, has_key_id, 1, space_sym)) {
+	if (Qnil == (v = rb_hash_lookup(ropts, space_sym))) {
+	    copts->dump_opts.after_size = 0;
+	    *copts->dump_opts.after_sep = '\0';
+	} else {
+	    rb_check_type(v, T_STRING);
+	    if (sizeof(copts->dump_opts.after_sep) <= (len = RSTRING_LEN(v))) {
+		rb_raise(rb_eArgError, "space string is limited to %lu characters.", sizeof(copts->dump_opts.after_sep));
 	    }
+	    strcpy(copts->dump_opts.after_sep, StringValuePtr(v));
+	    copts->dump_opts.after_size = (uint8_t)len;
 	}
-
-	if (Qnil != (v = rb_hash_lookup(ropts, bigdecimal_load_sym))) {
-	    if (bigdecimal_sym == v || Qtrue == v) {
-		copts->bigdec_load = BigDec;
-	    } else if (float_sym == v) {
-		copts->bigdec_load = FloatDec;
-	    } 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 (Qtrue == rb_funcall(ropts, has_key_id, 1, space_before_sym)) {
+	if (Qnil == (v = rb_hash_lookup(ropts, space_before_sym))) {
+	    copts->dump_opts.before_size = 0;
+	    *copts->dump_opts.before_sep = '\0';
+	} else {
+	    rb_check_type(v, T_STRING);
+	    if (sizeof(copts->dump_opts.before_sep) <= (len = RSTRING_LEN(v))) {
+		rb_raise(rb_eArgError, "sapce_before string is limited to %lu characters.", sizeof(copts->dump_opts.before_sep));
 	    }
+	    strcpy(copts->dump_opts.before_sep, StringValuePtr(v));
+	    copts->dump_opts.before_size = (uint8_t)len;
 	}
-
-	if (Qtrue == rb_funcall(ropts, rb_intern("has_key?"), 1, create_id_sym)) {
-	    v = rb_hash_lookup(ropts, create_id_sym);
-	    if (Qnil == v) {
-		if (json_class != oj_default_options.create_id) {
-		    xfree((char*)oj_default_options.create_id);
-		}
-		copts->create_id = 0;
-		copts->create_id_len = 0;
-	    } else if (T_STRING == rb_type(v)) {
-		size_t		len = RSTRING_LEN(v);
-		const char	*str = StringValuePtr(v);
-
-		if (len != copts->create_id_len ||
-		    0 != strcmp(copts->create_id, str)) {
-		    copts->create_id = ALLOC_N(char, len + 1);
-		    strcpy((char*)copts->create_id, str);
-		    copts->create_id_len = len;
-		}
-	    } else {
-		rb_raise(rb_eArgError, ":create_id must be string.");
+    }
+    if (Qtrue == rb_funcall(ropts, has_key_id, 1, object_nl_sym)) {
+	if (Qnil == (v = rb_hash_lookup(ropts, object_nl_sym))) {
+	    copts->dump_opts.hash_size = 0;
+	    *copts->dump_opts.hash_nl = '\0';
+	} else {
+	    rb_check_type(v, T_STRING);
+	    if (sizeof(copts->dump_opts.hash_nl) <= (len = RSTRING_LEN(v))) {
+		rb_raise(rb_eArgError, "object_nl string is limited to %lu characters.", sizeof(copts->dump_opts.hash_nl));
 	    }
+	    strcpy(copts->dump_opts.hash_nl, StringValuePtr(v));
+	    copts->dump_opts.hash_size = (uint8_t)len;
 	}
-	for (o = ynos; 0 != o->attr; o++) {
-	    if (Qnil != (v = rb_hash_lookup(ropts, o->sym))) {
-		if (Qtrue == v) {
-		    *o->attr = Yes;
-		} else if (Qfalse == v) {
-		    *o->attr = No;
-		} else {
-		    rb_raise(rb_eArgError, "%s must be true or false.", rb_id2name(SYM2ID(o->sym)));
-		}
+    }
+    if (Qtrue == rb_funcall(ropts, has_key_id, 1, array_nl_sym)) {
+	if (Qnil == (v = rb_hash_lookup(ropts, array_nl_sym))) {
+	    copts->dump_opts.array_size = 0;
+	    *copts->dump_opts.array_nl = '\0';
+	} else {
+	    rb_check_type(v, T_STRING);
+	    if (sizeof(copts->dump_opts.array_nl) <= (len = RSTRING_LEN(v))) {
+		rb_raise(rb_eArgError, "array_nl string is limited to %lu characters.", sizeof(copts->dump_opts.array_nl));
 	    }
-	}
-	// This is here only for backwards compatibility with the original Oj.
-	v = rb_hash_lookup(ropts, ascii_only_sym);
-	if (Qtrue == v) {
-	    copts->escape_mode = ASCIIEsc;
-	} else if (Qfalse == v) {
-	    copts->escape_mode = JSONEsc;
+	    strcpy(copts->dump_opts.array_nl, StringValuePtr(v));
+	    copts->dump_opts.array_size = (uint8_t)len;
 	}
     }
+    copts->dump_opts.use = (0 < copts->dump_opts.indent_size ||
+			    0 < copts->dump_opts.after_size ||
+			    0 < copts->dump_opts.before_size ||
+			    0 < copts->dump_opts.hash_size ||
+			    0 < copts->dump_opts.array_size);
+    // This is here only for backwards compatibility with the original Oj.
+    v = rb_hash_lookup(ropts, ascii_only_sym);
+    if (Qtrue == v) {
+	copts->escape_mode = ASCIIEsc;
+    } else if (Qfalse == v) {
+	copts->escape_mode = JSONEsc;
+    }
 }
 
 /* Document-method: strict_load
@@ -1665,53 +1625,57 @@ mimic_generate_core(int argc, VALUE *argv, Options copts) {
     out.end = buf + sizeof(buf) - 10;
     out.allocated = 0;
     if (2 == argc && Qnil != argv[1]) {
-	struct _DumpOpts	dump_opts;
-	VALUE			ropts = argv[1];
-	VALUE			v;
+	VALUE	ropts = argv[1];
+	VALUE	v;
+	size_t	len;
 
-	memset(&dump_opts, 0, sizeof(dump_opts)); // may not be needed
 	if (T_HASH != rb_type(ropts)) {
 	    rb_raise(rb_eArgError, "options must be a hash.");
 	}
-	if (Qnil != (v = rb_hash_lookup(ropts, indent_sym))) {
+	if (Qnil != (v = rb_hash_lookup(ropts, indent_sym))) { // TBD fixnum also ok
 	    rb_check_type(v, T_STRING);
-	    if (0 == copts->dump_opts) {
-		copts->dump_opts = &dump_opts;
+	    if (sizeof(copts->dump_opts.indent_str) <= (len = RSTRING_LEN(v))) {
+		rb_raise(rb_eArgError, "indent string is limited to %lu characters.", sizeof(copts->dump_opts.indent_str));
 	    }
-	    copts->dump_opts->indent = StringValuePtr(v);
-	    copts->dump_opts->indent_size = (uint8_t)strlen(copts->dump_opts->indent);
+	    strcpy(copts->dump_opts.indent_str, StringValuePtr(v));
+	    copts->dump_opts.indent_size = (uint8_t)len;
+	    copts->dump_opts.use = true;
 	}
 	if (Qnil != (v = rb_hash_lookup(ropts, space_sym))) {
 	    rb_check_type(v, T_STRING);
-	    if (0 == copts->dump_opts) {
-		copts->dump_opts = &dump_opts;
+	    if (sizeof(copts->dump_opts.after_sep) <= (len = RSTRING_LEN(v))) {
+		rb_raise(rb_eArgError, "space string is limited to %lu characters.", sizeof(copts->dump_opts.after_sep));
 	    }
-	    copts->dump_opts->after_sep = StringValuePtr(v);
-	    copts->dump_opts->after_size = (uint8_t)strlen(copts->dump_opts->after_sep);
+	    strcpy(copts->dump_opts.after_sep, StringValuePtr(v));
+	    copts->dump_opts.after_size = (uint8_t)len;
+	    copts->dump_opts.use = true;
 	}
 	if (Qnil != (v = rb_hash_lookup(ropts, space_before_sym))) {
 	    rb_check_type(v, T_STRING);
-	    if (0 == copts->dump_opts) {
-		copts->dump_opts = &dump_opts;
+	    if (sizeof(copts->dump_opts.before_sep) <= (len = RSTRING_LEN(v))) {
+		rb_raise(rb_eArgError, "space_before string is limited to %lu characters.", sizeof(copts->dump_opts.before_sep));
 	    }
-	    copts->dump_opts->before_sep = StringValuePtr(v);
-	    copts->dump_opts->before_size = (uint8_t)strlen(copts->dump_opts->before_sep);
+	    strcpy(copts->dump_opts.before_sep, StringValuePtr(v));
+	    copts->dump_opts.before_size = (uint8_t)len;
+	    copts->dump_opts.use = true;
 	}
 	if (Qnil != (v = rb_hash_lookup(ropts, object_nl_sym))) {
 	    rb_check_type(v, T_STRING);
-	    if (0 == copts->dump_opts) {
-		copts->dump_opts = &dump_opts;
+	    if (sizeof(copts->dump_opts.hash_nl) <= (len = RSTRING_LEN(v))) {
+		rb_raise(rb_eArgError, "object_nl string is limited to %lu characters.", sizeof(copts->dump_opts.hash_nl));
 	    }
-	    copts->dump_opts->hash_nl = StringValuePtr(v);
-	    copts->dump_opts->hash_size = (uint8_t)strlen(copts->dump_opts->hash_nl);
+	    strcpy(copts->dump_opts.hash_nl, StringValuePtr(v));
+	    copts->dump_opts.hash_size = (uint8_t)len;
+	    copts->dump_opts.use = true;
 	}
 	if (Qnil != (v = rb_hash_lookup(ropts, array_nl_sym))) {
 	    rb_check_type(v, T_STRING);
-	    if (0 == copts->dump_opts) {
-		copts->dump_opts = &dump_opts;
+	    if (sizeof(copts->dump_opts.array_nl) <= (len = RSTRING_LEN(v))) {
+		rb_raise(rb_eArgError, "array_nl string is limited to %lu characters.", sizeof(copts->dump_opts.array_nl));
 	    }
-	    copts->dump_opts->array_nl = StringValuePtr(v);
-	    copts->dump_opts->array_size = (uint8_t)strlen(copts->dump_opts->array_nl);
+	    strcpy(copts->dump_opts.array_nl, StringValuePtr(v));
+	    copts->dump_opts.array_size = (uint8_t)len;
+	    copts->dump_opts.use = true;
 	}
 	// :allow_nan is not supported as Oj always allows_nan
 	// :max_nesting is always set to 100
@@ -1738,19 +1702,18 @@ mimic_generate(int argc, VALUE *argv, VALUE self) {
 static VALUE
 mimic_pretty_generate(int argc, VALUE *argv, VALUE self) {
     struct _Options	copts = oj_default_options;
-    struct _DumpOpts	dump_opts;
-    
-    dump_opts.indent = "  ";
-    dump_opts.indent_size = (uint8_t)strlen(dump_opts.indent);
-    dump_opts.before_sep = " ";
-    dump_opts.before_size = (uint8_t)strlen(dump_opts.before_sep);
-    dump_opts.after_sep = " ";
-    dump_opts.after_size = (uint8_t)strlen(dump_opts.after_sep);
-    dump_opts.hash_nl = "\n";
-    dump_opts.hash_size = (uint8_t)strlen(dump_opts.hash_nl);
-    dump_opts.array_nl = "\n";
-    dump_opts.array_size = (uint8_t)strlen(dump_opts.array_nl);
-    copts.dump_opts = &dump_opts;
+
+    strcpy(copts.dump_opts.indent_str, "  ");
+    copts.dump_opts.indent_size = (uint8_t)strlen(copts.dump_opts.indent_str);
+    strcpy(copts.dump_opts.before_sep, " ");
+    copts.dump_opts.before_size = (uint8_t)strlen(copts.dump_opts.before_sep);
+    strcpy(copts.dump_opts.after_sep, " ");
+    copts.dump_opts.after_size = (uint8_t)strlen(copts.dump_opts.after_sep);
+    strcpy(copts.dump_opts.hash_nl, "\n");
+    copts.dump_opts.hash_size = (uint8_t)strlen(copts.dump_opts.hash_nl);
+    strcpy(copts.dump_opts.array_nl, "\n");
+    copts.dump_opts.array_size = (uint8_t)strlen(copts.dump_opts.array_nl);
+    copts.dump_opts.use = true;
 
     return mimic_generate_core(argc, argv, &copts);
 }
@@ -1833,26 +1796,38 @@ mimic_create_id(VALUE self, VALUE id) {
 }
 
 static struct _Options	mimic_object_to_json_options = {
-    0,			// indent
-    No,			// circular
-    No,			// auto_define
-    No,			// sym_key
-    JSONEsc,		// escape_mode
-    CompatMode,		// mode
-    No,			// class_cache
-    RubyTime,		// time_format
-    No,			// bigdec_as_num
-    FloatDec,		// bigdec_load
-    No,			// to_json
-    Yes,		// nilnil
-    Yes,		// allow_gc
-    Yes,		// quirks_mode
-    json_class,		// create_id
-    10,			// create_id_len
-    9,			// sec_prec
-    0,			// dump_opts
-    15,			// float_prec
-    "%0.15g",		// float_fmt
+    0,		// indent
+    No,		// circular
+    No,		// auto_define
+    No,		// sym_key
+    JSONEsc,	// escape_mode
+    CompatMode,	// mode
+    No,		// class_cache
+    RubyTime,	// time_format
+    No,		// bigdec_as_num
+    FloatDec,	// bigdec_load
+    No,		// to_json
+    Yes,	// nilnil
+    Yes,	// allow_gc
+    Yes,	// quirks_mode
+    json_class,	// create_id
+    10,		// create_id_len
+    9,		// sec_prec
+    15,		// float_prec
+    "%0.15g",	// float_fmt
+    {		// dump_opts
+	false,	//use
+	"",	// indent
+	"",	// before_sep
+	"",	// after_sep
+	"",	// hash_nl
+	"",	// array_nl
+	0,	// indent_size
+	0,	// before_size
+	0,	// after_size
+	0,	// hash_size
+	0,	// array_size
+    }
 };
 
 static VALUE
@@ -1961,11 +1936,7 @@ define_mimic_json(int argc, VALUE *argv, VALUE self) {
 
     rb_gv_set("$VERBOSE", dummy);
 
-    array_nl_sym = ID2SYM(rb_intern("array_nl"));			rb_gc_register_address(&array_nl_sym);
     create_additions_sym = ID2SYM(rb_intern("create_additions"));	rb_gc_register_address(&create_additions_sym);
-    object_nl_sym = ID2SYM(rb_intern("object_nl"));			rb_gc_register_address(&object_nl_sym);
-    space_before_sym = ID2SYM(rb_intern("space_before"));		rb_gc_register_address(&space_before_sym);
-    space_sym = ID2SYM(rb_intern("space"));				rb_gc_register_address(&space_sym);
     symbolize_names_sym = ID2SYM(rb_intern("symbolize_names"));		rb_gc_register_address(&symbolize_names_sym);
 
     if (rb_const_defined_at(mimic, rb_intern("ParserError"))) {
@@ -2121,6 +2092,7 @@ void Init_oj() {
     oj_utc_offset_id = rb_intern("utc_offset");
     oj_utcq_id = rb_intern("utc?");
     oj_write_id = rb_intern("write");
+    has_key_id = rb_intern("has_key?");
 
     rb_require("oj/bag");
     rb_require("oj/error");
@@ -2141,6 +2113,7 @@ void Init_oj() {
     ascii_sym = ID2SYM(rb_intern("ascii"));		rb_gc_register_address(&ascii_sym);
     auto_define_sym = ID2SYM(rb_intern("auto_define"));	rb_gc_register_address(&auto_define_sym);
     auto_sym = ID2SYM(rb_intern("auto"));		rb_gc_register_address(&auto_sym);
+    array_nl_sym = ID2SYM(rb_intern("array_nl"));	rb_gc_register_address(&array_nl_sym);
     bigdecimal_as_decimal_sym = ID2SYM(rb_intern("bigdecimal_as_decimal"));rb_gc_register_address(&bigdecimal_as_decimal_sym);
     bigdecimal_load_sym = ID2SYM(rb_intern("bigdecimal_load"));rb_gc_register_address(&bigdecimal_load_sym);
     bigdecimal_sym = ID2SYM(rb_intern("bigdecimal"));	rb_gc_register_address(&bigdecimal_sym);
@@ -2157,10 +2130,13 @@ void Init_oj() {
     newline_sym = ID2SYM(rb_intern("newline"));		rb_gc_register_address(&newline_sym);
     nilnil_sym = ID2SYM(rb_intern("nilnil"));		rb_gc_register_address(&nilnil_sym);
     null_sym = ID2SYM(rb_intern("null"));		rb_gc_register_address(&null_sym);
+    object_nl_sym = ID2SYM(rb_intern("object_nl"));	rb_gc_register_address(&object_nl_sym);
     object_sym = ID2SYM(rb_intern("object"));		rb_gc_register_address(&object_sym);
     quirks_mode_sym = ID2SYM(rb_intern("quirks_mode"));	rb_gc_register_address(&quirks_mode_sym);
     ruby_sym = ID2SYM(rb_intern("ruby"));		rb_gc_register_address(&ruby_sym);
     sec_prec_sym = ID2SYM(rb_intern("second_precision"));rb_gc_register_address(&sec_prec_sym);
+    space_before_sym = ID2SYM(rb_intern("space_before"));rb_gc_register_address(&space_before_sym);
+    space_sym = ID2SYM(rb_intern("space"));		rb_gc_register_address(&space_sym);
     strict_sym = ID2SYM(rb_intern("strict"));		rb_gc_register_address(&strict_sym);
     symbol_keys_sym = ID2SYM(rb_intern("symbol_keys"));	rb_gc_register_address(&symbol_keys_sym);
     time_format_sym = ID2SYM(rb_intern("time_format"));	rb_gc_register_address(&time_format_sym);