oj 3.0.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4567e9da6a54d9e4867e415e0618c17e5108f90
-  data.tar.gz: 66813867faafbab6d5f2eb758abf5b757e73ef58
+  metadata.gz: 0c5c4e44c052cf9e204ada5c41bc6b868b04ec56
+  data.tar.gz: d2a0352206bb10de6743c8be87d22120f122c7ca
 SHA512:
-  metadata.gz: 16d1a220652f96d07f6a4fbaa589185d332b0d067eebdca3426f875e050d5d8307dd96c29e16093b2356f8ce45d7ca9e831c09a0454e5af2a54718bc25b8b8cb
-  data.tar.gz: 4cfd12ba09c4a035776f126e7d7ed719ab62bf515ae1716487a57b92ce919397b0074baade3aec6d66166e0c399ac760c11bf99fcd9b630d795db94f3c345fef
+  metadata.gz: f4e47a2c590b33dff4fd7057c9874d1ab95f9c0057cc7f22a30617604865d8999b2dab758c47d89ee6445de033eeb07ac3b32077db52080f08a62bf57af3b9e2
+  data.tar.gz: 56ea00a656fc87fbc072a240ddcb58223627f4a28874d8b9fe37d1044757bd6e2cab993cadfc711be04adfae11cd2557c084a66e80c853132b6ff40adbef8913

data/ext/oj/code.h

@@ -37,4 +37,6 @@ extern bool	oj_code_has(Code codes, VALUE clas, bool encode);
 
 extern void	oj_code_attrs(VALUE obj, Attr attrs, int depth, Out out);
 
+extern struct _Code	oj_compat_codes[];
+
 #endif /* __OJ_CODE_H__ */

data/ext/oj/dump.c

@@ -538,7 +538,7 @@ oj_dump_obj_to_json_using_params(VALUE obj, Options copts, Out out, int argc, VA
     case NullMode:	oj_dump_null_val(obj, 0, out);				break;
     case ObjectMode:	oj_dump_obj_val(obj, 0, out);				break;
     case CompatMode:	oj_dump_compat_val(obj, 0, out, Yes == copts->to_json);	break;
-    case RailsMode:	oj_dump_rails_val(obj, 0, out, true);			break;
+    case RailsMode:	oj_dump_rails_val(obj, 0, out);				break;
     case CustomMode:	oj_dump_custom_val(obj, 0, out, true);			break;
     default:		oj_dump_custom_val(obj, 0, out, true);			break;
     }

data/ext/oj/dump.h

@@ -41,7 +41,7 @@ extern void	oj_dump_strict_val(VALUE obj, int depth, Out out);
 extern void	oj_dump_null_val(VALUE obj, int depth, Out out);
 extern void	oj_dump_obj_val(VALUE obj, int depth, Out out);
 extern void	oj_dump_compat_val(VALUE obj, int depth, Out out, bool as_ok);
-extern void	oj_dump_rails_val(VALUE obj, int depth, Out out, bool as_ok);
+extern void	oj_dump_rails_val(VALUE obj, int depth, Out out);
 extern void	oj_dump_custom_val(VALUE obj, int depth, Out out, bool as_ok);
 
 extern VALUE	oj_add_to_json(int argc, VALUE *argv, VALUE self);

data/ext/oj/dump_compat.c

@@ -462,7 +462,7 @@ time_alt(VALUE obj, int depth, Out out) {
     oj_code_attrs(obj, attrs, depth, out);
 }
 
-static struct _Code	codes[] = {
+struct _Code	oj_compat_codes[] = {
     { "BigDecimal", Qnil, bigdecimal_alt, NULL, false },
     { "Complex", Qnil, complex_alt, NULL, false },
     { "Date", Qnil, date_alt, false },
@@ -481,7 +481,7 @@ oj_add_to_json(int argc, VALUE *argv, VALUE self) {
     Code	a;
 
     if (0 == argc) {
-	for (a = codes; NULL != a->name; a++) {
+	for (a = oj_compat_codes; NULL != a->name; a++) {
 	    if (Qnil == a->clas || Qundef == a->clas) {
 		a->clas = rb_const_get_at(rb_cObject, rb_intern(a->name));
 	    }
@@ -514,7 +514,7 @@ oj_add_to_json(int argc, VALUE *argv, VALUE self) {
 		oj_use_array_alt = true;
 		continue;
 	    }
-	    for (a = codes; NULL != a->name; a++) {
+	    for (a = oj_compat_codes; NULL != a->name; a++) {
 		if (Qnil == a->clas || Qundef == a->clas) {
 		    a->clas = rb_const_get_at(rb_cObject, rb_intern(a->name));
 		}
@@ -531,7 +531,7 @@ oj_add_to_json(int argc, VALUE *argv, VALUE self) {
 VALUE
 oj_remove_to_json(int argc, VALUE *argv, VALUE self) {
     if (0 == argc) {
-	oj_code_set_active(codes, Qnil, false);
+	oj_code_set_active(oj_compat_codes, Qnil, false);
 	use_struct_alt = false;
 	use_exception_alt = false;
 	use_bignum_alt = false;
@@ -559,7 +559,7 @@ oj_remove_to_json(int argc, VALUE *argv, VALUE self) {
 		oj_use_array_alt = false;
 		continue;
 	    }
-	    oj_code_set_active(codes, *argv, false);
+	    oj_code_set_active(oj_compat_codes, *argv, false);
 	}
     }
     return Qnil;
@@ -723,7 +723,7 @@ dump_hash(VALUE obj, int depth, Out out, bool as_ok) {
 // called.
 static void
 dump_obj(VALUE obj, int depth, Out out, bool as_ok) {
-    if (oj_code_dump(codes, obj, depth, out)) {
+    if (oj_code_dump(oj_compat_codes, obj, depth, out)) {
 	return;
     }
     if (use_exception_alt && rb_obj_is_kind_of(obj, rb_eException)) {
@@ -754,7 +754,7 @@ static void
 dump_struct(VALUE obj, int depth, Out out, bool as_ok) {
     VALUE	clas = rb_obj_class(obj);
 
-    if (oj_code_dump(codes, obj, depth, out)) {
+    if (oj_code_dump(oj_compat_codes, obj, depth, out)) {
 	return;
     }
     if (rb_cRange == clas) {
@@ -866,7 +866,6 @@ dump_bignum(VALUE obj, int depth, Out out, bool as_ok) {
     *out->cur = '\0';
 }
 
-
 static DumpFunc	compat_funcs[] = {
     NULL,	 	// RUBY_T_NONE   = 0x00,
     dump_obj,		// RUBY_T_OBJECT = 0x01,

data/ext/oj/dump_object.c

@@ -624,7 +624,7 @@ dump_obj_attrs(VALUE obj, VALUE clas, slot_t id, int depth, Out out) {
 		oj_dump_cstr(buf, strlen(attr) + 1, 0, 0, out);
 	    }
 	    *out->cur++ = ':';
-	    oj_dump_obj_val(value, d2, out, 0, 0, true);
+	    oj_dump_obj_val(value, d2, out, true);
 	    assure_size(out, 2);
 	}
 #endif

data/ext/oj/oj.c

@@ -16,7 +16,7 @@
 #include "hash.h"
 #include "odd.h"
 #include "dump.h"
-#include "mimic_rails.h"
+#include "rails.h"
 #include "encode.h"
 
 #if !HAS_ENCODING_SUPPORT || defined(RUBINIUS_RUBY)

data/ext/oj/{mimic_rails.c → rails.c}

@@ -1,11 +1,14 @@
-/* mimic_rails.c
+/* rails.c
  * Copyright (c) 2017, Peter Ohler
  * All rights reserved.
  */
 
-#include "dump.h"
-#include "mimic_rails.h"
+#include "rails.h"
 #include "encode.h"
+#include "code.h"
+#include "encode.h"
+
+#define OJ_INFINITY (1.0/0.0)
 
 // TBD keep static array of strings and functions to help with rails optimization
 typedef struct _Encoder {
@@ -14,6 +17,11 @@ typedef struct _Encoder {
     VALUE		arg;
 } *Encoder;
 
+bool	oj_rails_hash_opt = false;
+bool	oj_rails_array_opt = false;
+
+static void	dump_rails_val(VALUE obj, int depth, Out out, bool as_ok);
+
 extern VALUE	Oj;
 
 static struct _ROptTable	ropts = { 0, 0, NULL };
@@ -98,7 +106,7 @@ dump_attr_cb(ID key, VALUE value, Out out) {
 	oj_dump_cstr(buf, strlen(buf), 0, 0, out);
     }
     *out->cur++ = ':';
-    oj_dump_rails_val(value, depth, out, true);
+    dump_rails_val(value, depth, out, true);
     out->depth = depth;
     *out->cur++ = ',';
     
@@ -172,7 +180,7 @@ dump_struct(VALUE obj, int depth, Out out, bool as_ok) {
 #else
 	v = rb_struct_aref(obj, INT2FIX(i));
 #endif
-	oj_dump_rails_val(v, d3, out, true);
+	dump_rails_val(v, d3, out, true);
     }
     fill_indent(out, depth);
     *out->cur++ = '}';
@@ -187,7 +195,7 @@ dump_enumerable(VALUE obj, int depth, Out out, bool as_ok) {
     if (0 == to_a_id) {
 	to_a_id = rb_intern("to_a");
     }
-    oj_dump_rails_val(rb_funcall(obj, to_a_id, 0), depth, out, false);
+    dump_rails_val(rb_funcall(obj, to_a_id, 0), depth, out, false);
 }
 
 static void
@@ -556,7 +564,7 @@ static VALUE
 protect_dump(VALUE ov) {
     OO	oo = (OO)ov;
 
-    oj_dump_rails_val(oo->obj, 0, oo->out, true);
+    dump_rails_val(oo->obj, 0, oo->out, true);
 
     return Qnil;
 }
@@ -596,7 +604,7 @@ encode(VALUE obj, ROptTable ropts, Options opts, int argc, VALUE *argv) {
     if (Yes == copts.circular) {
 	oj_cache8_new(&out.circ_cache);
     }
-    //oj_dump_rails_val(*argv, 0, &out, true);
+    //dump_rails_val(*argv, 0, &out, true);
     rb_protect(protect_dump, (VALUE)&oo, &line);
 
     if (0 == line) {
@@ -719,6 +727,7 @@ rails_set_encoder(VALUE self) {
     VALUE	json;
     VALUE	encoding;
     VALUE	pv;
+    VALUE	verbose;
     
     if (rb_const_defined_at(rb_cObject, rb_intern("ActiveSupport"))) {
 	active = rb_const_get_at(rb_cObject, rb_intern("ActiveSupport"));
@@ -730,7 +739,11 @@ rails_set_encoder(VALUE self) {
     json = rb_const_get_at(active, rb_intern("JSON"));
     encoding = rb_const_get_at(json, rb_intern("Encoding"));
 
-    rb_undef_method(active, "use_standard_json_time_format=");
+    // rb_undef_method doesn't work for modules or maybe sometimes
+    // doesn't. Anyway setting verbose should hide the warning.
+    verbose = rb_gv_get("$VERBOSE");
+    rb_gv_set("$VERBOSE", Qfalse);
+    rb_undef_method(encoding, "use_standard_json_time_format=");
     rb_define_module_function(encoding, "use_standard_json_time_format=", rails_use_standard_json_time_format, 1);
 
     rb_undef_method(encoding, "escape_html_entities_in_json=");
@@ -740,6 +753,7 @@ rails_set_encoder(VALUE self) {
     oj_default_options.sec_prec = NUM2INT(pv);
     rb_undef_method(encoding, "time_precision=");
     rb_define_module_function(encoding, "time_precision=", rails_time_precision, 1);
+    rb_gv_set("$VERBOSE", verbose);
 
     return Qnil;
 }
@@ -754,6 +768,7 @@ static VALUE
 rails_set_decoder(VALUE self) {
     VALUE	json;
     VALUE	json_error;
+    VALUE	verbose;
     
     if (rb_const_defined_at(rb_cObject, rb_intern("JSON"))) {
 	json = rb_const_get_at(rb_cObject, rb_intern("JSON"));
@@ -770,8 +785,13 @@ rails_set_decoder(VALUE self) {
     } else {
     	oj_json_parser_error_class = rb_define_class_under(json, "ParserError", json_error);
     }
+    // rb_undef_method doesn't work for modules or maybe sometimes
+    // doesn't. Anyway setting verbose should hide the warning.
+    verbose = rb_gv_get("$VERBOSE");
+    rb_gv_set("$VERBOSE", Qfalse);
     rb_undef_method(json, "parse");
     rb_define_module_function(json, "parse", oj_mimic_parse, -1);
+    rb_gv_set("$VERBOSE", verbose);
     
     return Qnil;
 }
@@ -804,3 +824,337 @@ oj_mimic_rails_init() {
     rb_define_method(encoder_class, "deoptimize", encoder_deoptimize, -1);
     rb_define_method(encoder_class, "optimized?", encoder_optimized, 1);
 }
+
+static void
+dump_as_json(VALUE obj, int depth, Out out, bool as_ok) {
+    volatile VALUE	ja;
+
+    if (0 < out->argc) {
+	ja = rb_funcall2(obj, oj_as_json_id, out->argc, out->argv);
+    } else {
+	ja = rb_funcall(obj, oj_as_json_id, 0);
+    }
+    if (ja == obj || !as_ok) {
+	// Once as_json is call it should never be called again on the same
+	// object with as_ok.
+	dump_rails_val(ja, depth, out, false);
+    } else {
+	int	type = rb_type(ja);
+
+	if (T_HASH == type || T_ARRAY == type) {
+	    dump_rails_val(ja, depth, out, false);
+	} else {
+	    dump_rails_val(ja, depth, out, true);
+	}
+    }
+}
+
+static void
+dump_to_hash(VALUE obj, int depth, Out out) {
+    dump_rails_val(rb_funcall(obj, oj_to_hash_id, 0), depth, out, false);
+}
+
+static void
+dump_float(VALUE obj, int depth, Out out, bool as_ok) {
+    char	buf[64];
+    char	*b;
+    double	d = rb_num2dbl(obj);
+    int		cnt = 0;
+
+    if (0.0 == d) {
+	b = buf;
+	*b++ = '0';
+	*b++ = '.';
+	*b++ = '0';
+	*b++ = '\0';
+	cnt = 3;
+    } else {
+	if (isnan(d) || OJ_INFINITY == d || -OJ_INFINITY == d) {
+	    strcpy(buf, "null");
+	    cnt = 4;
+	} else if (d == (double)(long long int)d) {
+	    cnt = snprintf(buf, sizeof(buf), "%.1f", d);
+	} else {
+	    cnt = snprintf(buf, sizeof(buf), "%0.16g", d);
+	}
+    }
+    assure_size(out, cnt);
+    for (b = buf; '\0' != *b; b++) {
+	*out->cur++ = *b;
+    }
+    *out->cur = '\0';
+}
+
+static void
+dump_array(VALUE a, int depth, Out out, bool as_ok) {
+    size_t	size;
+    int		i, cnt;
+    int		d2 = depth + 1;
+
+    if (Yes == out->opts->circular) {
+	if (0 > oj_check_circular(a, out)) {
+	    oj_dump_nil(Qnil, 0, out, false);
+	    return;
+	}
+    }
+    if (as_ok && !oj_rails_array_opt && rb_respond_to(a, oj_as_json_id)) {
+	dump_as_json(a, depth, out, false);
+	return;
+    }
+    cnt = (int)RARRAY_LEN(a);
+    *out->cur++ = '[';
+    size = 2;
+    assure_size(out, size);
+    if (0 == cnt) {
+	*out->cur++ = ']';
+    } else {
+	if (out->opts->dump_opts.use) {
+	    size = d2 * out->opts->dump_opts.indent_size + out->opts->dump_opts.array_size + 1;
+	} else {
+	    size = d2 * out->indent + 2;
+	}
+	cnt--;
+	for (i = 0; i <= cnt; i++) {
+	    assure_size(out, size);
+	    if (out->opts->dump_opts.use) {
+		if (0 < out->opts->dump_opts.array_size) {
+		    strcpy(out->cur, out->opts->dump_opts.array_nl);
+		    out->cur += out->opts->dump_opts.array_size;
+		}
+		if (0 < out->opts->dump_opts.indent_size) {
+		    int	i;
+		    for (i = d2; 0 < i; i--) {
+			strcpy(out->cur, out->opts->dump_opts.indent_str);
+			out->cur += out->opts->dump_opts.indent_size;
+		    }
+		}
+	    } else {
+		fill_indent(out, d2);
+	    }
+	    dump_rails_val(rb_ary_entry(a, i), d2, out, as_ok);
+	    if (i < cnt) {
+		*out->cur++ = ',';
+	    }
+	}
+	size = depth * out->indent + 1;
+	assure_size(out, size);
+	if (out->opts->dump_opts.use) {
+	    if (0 < out->opts->dump_opts.array_size) {
+		strcpy(out->cur, out->opts->dump_opts.array_nl);
+		out->cur += out->opts->dump_opts.array_size;
+	    }
+	    if (0 < out->opts->dump_opts.indent_size) {
+		int	i;
+
+		for (i = depth; 0 < i; i--) {
+		    strcpy(out->cur, out->opts->dump_opts.indent_str);
+		    out->cur += out->opts->dump_opts.indent_size;
+		}
+	    }
+	} else {
+	    fill_indent(out, depth);
+	}
+	*out->cur++ = ']';
+    }
+    *out->cur = '\0';
+}
+
+static int
+hash_cb(VALUE key, VALUE value, Out out) {
+    int		depth = out->depth;
+    long	size;
+    int		rtype = rb_type(key);
+    
+    if (rtype != T_STRING && rtype != T_SYMBOL) {
+	key = rb_funcall(key, oj_to_s_id, 0);
+	rtype = rb_type(key);
+    }
+    if (!out->opts->dump_opts.use) {
+	size = depth * out->indent + 1;
+	assure_size(out, size);
+	fill_indent(out, depth);
+	if (rtype == T_STRING) {
+	    oj_dump_str(key, 0, out, false);
+	} else {
+	    oj_dump_sym(key, 0, out, false);
+	}
+	*out->cur++ = ':';
+    } else {
+	size = depth * out->opts->dump_opts.indent_size + out->opts->dump_opts.hash_size + 1;
+	assure_size(out, size);
+	if (0 < out->opts->dump_opts.hash_size) {
+	    strcpy(out->cur, out->opts->dump_opts.hash_nl);
+	    out->cur += out->opts->dump_opts.hash_size;
+	}
+	if (0 < out->opts->dump_opts.indent_size) {
+	    int	i;
+	    for (i = depth; 0 < i; i--) {
+		strcpy(out->cur, out->opts->dump_opts.indent_str);
+		out->cur += out->opts->dump_opts.indent_size;
+	    }
+	}
+	if (rtype == T_STRING) {
+	    oj_dump_str(key, 0, out, false);
+	} else {
+	    oj_dump_sym(key, 0, out, false);
+	}
+	size = out->opts->dump_opts.before_size + out->opts->dump_opts.after_size + 2;
+	assure_size(out, size);
+	if (0 < out->opts->dump_opts.before_size) {
+	    strcpy(out->cur, out->opts->dump_opts.before_sep);
+	    out->cur += out->opts->dump_opts.before_size;
+	}
+	*out->cur++ = ':';
+	if (0 < out->opts->dump_opts.after_size) {
+	    strcpy(out->cur, out->opts->dump_opts.after_sep);
+	    out->cur += out->opts->dump_opts.after_size;
+	}
+    }
+    dump_rails_val(value, depth, out, false);
+    out->depth = depth;
+    *out->cur++ = ',';
+
+    return ST_CONTINUE;
+}
+
+static void
+dump_hash(VALUE obj, int depth, Out out, bool as_ok) {
+    int		cnt;
+    size_t	size;
+
+    if (Yes == out->opts->circular) {
+	if (0 > oj_check_circular(obj, out)) {
+	    oj_dump_nil(Qnil, 0, out, false);
+	    return;
+	}
+    }
+    if (as_ok && !oj_rails_hash_opt && rb_respond_to(obj, oj_as_json_id)) {
+	dump_as_json(obj, depth, out, false);
+	return;
+    }
+    cnt = (int)RHASH_SIZE(obj);
+    size = depth * out->indent + 2;
+    assure_size(out, 2);
+    *out->cur++ = '{';
+    if (0 == cnt) {
+	*out->cur++ = '}';
+    } else {
+	out->depth = depth + 1;
+	rb_hash_foreach(obj, hash_cb, (VALUE)out);
+	if (',' == *(out->cur - 1)) {
+	    out->cur--; // backup to overwrite last comma
+	}
+	if (!out->opts->dump_opts.use) {
+	    assure_size(out, size);
+	    fill_indent(out, depth);
+	} else {
+	    size = depth * out->opts->dump_opts.indent_size + out->opts->dump_opts.hash_size + 1;
+	    assure_size(out, size);
+	    if (0 < out->opts->dump_opts.hash_size) {
+		strcpy(out->cur, out->opts->dump_opts.hash_nl);
+		out->cur += out->opts->dump_opts.hash_size;
+	    }
+	    if (0 < out->opts->dump_opts.indent_size) {
+		int	i;
+
+		for (i = depth; 0 < i; i--) {
+		    strcpy(out->cur, out->opts->dump_opts.indent_str);
+		    out->cur += out->opts->dump_opts.indent_size;
+		}
+	    }
+	}
+	*out->cur++ = '}';
+    }
+    *out->cur = '\0';
+}
+
+static void
+dump_obj(VALUE obj, int depth, Out out, bool as_ok) {
+    if (oj_code_dump(oj_compat_codes, obj, depth, out)) {
+	return;
+    }
+    if (as_ok) {
+	ROpt	ro;
+	
+	if (NULL != (ro = oj_rails_get_opt(out->ropts, rb_obj_class(obj))) && ro->on) {
+	    ro->dump(obj, depth, out, as_ok);
+	} else if (rb_respond_to(obj, oj_as_json_id)) {
+	    dump_as_json(obj, depth, out, true);
+	} else if (rb_respond_to(obj, oj_to_hash_id)) {
+	    dump_to_hash(obj, depth, out);
+	} else {
+	    oj_dump_obj_to_s(obj, out);
+	}
+    } else if (rb_respond_to(obj, oj_to_hash_id)) {
+	// Always attempt to_hash.
+	dump_to_hash(obj, depth, out);
+    } else {
+	oj_dump_obj_to_s(obj, out);
+    }
+}
+
+static void
+dump_as_string(VALUE obj, int depth, Out out, bool as_ok) {
+    if (oj_code_dump(oj_compat_codes, obj, depth, out)) {
+	return;
+    }
+    oj_dump_obj_to_s(obj, out);
+}
+
+static DumpFunc	rails_funcs[] = {
+    NULL,	 	// RUBY_T_NONE     = 0x00,
+    dump_obj,		// RUBY_T_OBJECT   = 0x01,
+    oj_dump_class, 	// RUBY_T_CLASS    = 0x02,
+    oj_dump_class,	// RUBY_T_MODULE   = 0x03,
+    dump_float, 	// RUBY_T_FLOAT    = 0x04,
+    oj_dump_str, 	// RUBY_T_STRING   = 0x05,
+    dump_as_string,	// RUBY_T_REGEXP   = 0x06,
+    dump_array,		// RUBY_T_ARRAY    = 0x07,
+    dump_hash,	 	// RUBY_T_HASH     = 0x08,
+    dump_obj,		// RUBY_T_STRUCT   = 0x09,
+    oj_dump_bignum,	// RUBY_T_BIGNUM   = 0x0a,
+    NULL, 		// RUBY_T_FILE     = 0x0b,
+    dump_obj,		// RUBY_T_DATA     = 0x0c,
+    NULL, 		// RUBY_T_MATCH    = 0x0d,
+    // Rails raises a stack error on Complex and Rational. It also corrupts
+    // something whic causes a segfault on the next call. Oj will not mimic
+    // that behavior.
+    dump_as_string, 	// RUBY_T_COMPLEX  = 0x0e,
+    dump_as_string, 	// RUBY_T_RATIONAL = 0x0f,
+    NULL, 		// 0x10
+    oj_dump_nil, 	// RUBY_T_NIL      = 0x11,
+    oj_dump_true, 	// RUBY_T_TRUE     = 0x12,
+    oj_dump_false,	// RUBY_T_FALSE    = 0x13,
+    oj_dump_sym,	// RUBY_T_SYMBOL   = 0x14,
+    oj_dump_fixnum,	// RUBY_T_FIXNUM   = 0x15,
+};
+
+static void
+dump_rails_val(VALUE obj, int depth, Out out, bool as_ok) {
+    int	type = rb_type(obj);
+
+    if (MAX_DEPTH < depth) {
+	rb_raise(rb_eNoMemError, "Too deeply nested.\n");
+    }
+    if (0 < type && type <= RUBY_T_FIXNUM) {
+	DumpFunc	f = rails_funcs[type];
+
+	if (NULL != f) {
+	    f(obj, depth, out, as_ok);
+	    return;
+	}
+    }
+    oj_dump_nil(Qnil, depth, out, false);
+}
+
+void
+oj_dump_rails_val(VALUE obj, int depth, Out out) {
+    out->opts->str_rx.head = NULL;
+    out->opts->str_rx.tail = NULL;
+    if (escape_html) {
+	out->opts->escape_mode = JXEsc;
+    } else {
+	out->opts->escape_mode = RailsEsc;
+    }
+    dump_rails_val(obj, depth, out, true);
+}

data/ext/oj/{mimic_rails.h → rails.h}

@@ -1,10 +1,10 @@
-/* mimic_rails.h
+/* rails.h
  * Copyright (c) 2017, Peter Ohler
  * All rights reserved.
  */
 
-#ifndef __OJ_MIMIC_RAILS_H__
-#define __OJ_MIMIC_RAILS_H__
+#ifndef __OJ_RAILS_H__
+#define __OJ_RAILS_H__
 
 #include "dump.h"
 
@@ -14,4 +14,4 @@ extern ROpt	oj_rails_get_opt(ROptTable rot, VALUE clas);
 extern bool	oj_rails_hash_opt;
 extern bool	oj_rails_array_opt;
 
-#endif /* __OJ_MIMIC_RAILS_H__ */
+#endif /* __OJ_RAILS_H__ */

data/lib/oj/version.rb

@@ -1,5 +1,5 @@
 
 module Oj
   # Current version of the module. 
-  VERSION = '3.0.2'
+  VERSION = '3.0.3'
 end

data/pages/Rails.md

@@ -40,12 +40,15 @@ specific to Oj such as the :circular option which it used to detect circular
 references while encoding.
 
 By default Oj acts like the ActiveSupport encoder and honors any changes in
-the as_json() methods. There are also optimized encoders for some
+the as_json() methods. There are some optimized Oj encoders for some
 classes. When the optimized encoder it toggled the as_json() methods will not
 be called for that class but instead the optimized version will be called. The
 optimized version is the same as the ActiveSupport default encoding for a
 given class. The optimized versions are toggled with the optimize() and
-deoptimize() methods.
+deoptimize() methods. There is a default optimized version for every class
+that takes the visible attributes and encodes them but that may not be the
+same as what Rails uses. Trial an error is the best approach for classes not
+listed here.
 
 The classes that can be put in optimized mode are:
 

data/test/activesupport4/decoding_test.rb

@@ -76,8 +76,11 @@ class TestJSONDecoding < ActiveSupport::TestCase
       prev = ActiveSupport.parse_json_times
       ActiveSupport.parse_json_times = true
       silence_warnings do
-        assert_equal expected, ActiveSupport::JSON.decode(json), "JSON decoding \
-        failed for #{json}"
+        if expected.nil?
+          assert_nil ActiveSupport::JSON.decode(json), "JSON decoding failed for #{json}"
+        else
+          assert_equal expected, ActiveSupport::JSON.decode(json), "JSON decoding failed for #{json}"
+        end
       end
       ActiveSupport.parse_json_times = prev
     end

data/test/activesupport4/encoding_test.rb

@@ -421,7 +421,7 @@ class TestJSONEncoding < ActiveSupport::TestCase
   end
 
   def test_nil_true_and_false_represented_as_themselves
-    assert_equal nil,   nil.as_json
+    assert_nil(nil.as_json)
     assert_equal true,  true.as_json
     assert_equal false, false.as_json
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-27 00:00:00.000000000 Z
+date: 2017-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -85,7 +85,6 @@ files:
 - ext/oj/dump_compat.c
 - ext/oj/dump_leaf.c
 - ext/oj/dump_object.c
-- ext/oj/dump_rails.c
 - ext/oj/dump_strict.c
 - ext/oj/encode.h
 - ext/oj/err.c
@@ -96,8 +95,6 @@ files:
 - ext/oj/hash.h
 - ext/oj/hash_test.c
 - ext/oj/mimic_json.c
-- ext/oj/mimic_rails.c
-- ext/oj/mimic_rails.h
 - ext/oj/object.c
 - ext/oj/odd.c
 - ext/oj/odd.h
@@ -105,6 +102,8 @@ files:
 - ext/oj/oj.h
 - ext/oj/parse.c
 - ext/oj/parse.h
+- ext/oj/rails.c
+- ext/oj/rails.h
 - ext/oj/reader.c
 - ext/oj/reader.h
 - ext/oj/resolve.c

data/ext/oj/dump_rails.c

@@ -1,329 +0,0 @@
-/* dump_object.c
- * Copyright (c) 2012, 2017, Peter Ohler
- * All rights reserved.
- */
-
-#include "dump.h"
-#include "encode.h"
-#include "mimic_rails.h"
-
-#define OJ_INFINITY (1.0/0.0)
-
-bool	oj_rails_hash_opt = false;
-bool	oj_rails_array_opt = false;
-
-static void
-dump_as_json(VALUE obj, int depth, Out out, bool as_ok) {
-    volatile VALUE	ja;
-
-    if (0 < out->argc) {
-	ja = rb_funcall2(obj, oj_as_json_id, out->argc, out->argv);
-    } else {
-	ja = rb_funcall(obj, oj_as_json_id, 0);
-    }
-    if (ja == obj || !as_ok) {
-	// Once as_json is call it should never be called again on the same
-	// object with as_ok.
-	oj_dump_rails_val(ja, depth, out, false);
-    } else {
-	int	type = rb_type(ja);
-
-	if (T_HASH == type || T_ARRAY == type) {
-	    oj_dump_rails_val(ja, depth, out, false);
-	} else {
-	    oj_dump_rails_val(ja, depth, out, true);
-	}
-    }
-}
-
-static void
-dump_to_hash(VALUE obj, int depth, Out out) {
-    oj_dump_rails_val(rb_funcall(obj, oj_to_hash_id, 0), depth, out, false);
-}
-
-static void
-dump_float(VALUE obj, int depth, Out out, bool as_ok) {
-    char	buf[64];
-    char	*b;
-    double	d = rb_num2dbl(obj);
-    int		cnt = 0;
-
-    if (0.0 == d) {
-	b = buf;
-	*b++ = '0';
-	*b++ = '.';
-	*b++ = '0';
-	*b++ = '\0';
-	cnt = 3;
-    } else {
-	if (isnan(d) || OJ_INFINITY == d || -OJ_INFINITY == d) {
-	    strcpy(buf, "null");
-	    cnt = 4;
-	} else if (d == (double)(long long int)d) {
-	    cnt = snprintf(buf, sizeof(buf), "%.1f", d);
-	} else {
-	    cnt = snprintf(buf, sizeof(buf), "%0.16g", d);
-	}
-    }
-    assure_size(out, cnt);
-    for (b = buf; '\0' != *b; b++) {
-	*out->cur++ = *b;
-    }
-    *out->cur = '\0';
-}
-
-static void
-dump_array(VALUE a, int depth, Out out, bool as_ok) {
-    size_t	size;
-    int		i, cnt;
-    int		d2 = depth + 1;
-
-    if (Yes == out->opts->circular) {
-	if (0 > oj_check_circular(a, out)) {
-	    oj_dump_nil(Qnil, 0, out, false);
-	    return;
-	}
-    }
-    if (as_ok && !oj_rails_array_opt && rb_respond_to(a, oj_as_json_id)) {
-	dump_as_json(a, depth, out, false);
-	return;
-    }
-    cnt = (int)RARRAY_LEN(a);
-    *out->cur++ = '[';
-    size = 2;
-    assure_size(out, size);
-    if (0 == cnt) {
-	*out->cur++ = ']';
-    } else {
-	if (out->opts->dump_opts.use) {
-	    size = d2 * out->opts->dump_opts.indent_size + out->opts->dump_opts.array_size + 1;
-	} else {
-	    size = d2 * out->indent + 2;
-	}
-	cnt--;
-	for (i = 0; i <= cnt; i++) {
-	    assure_size(out, size);
-	    if (out->opts->dump_opts.use) {
-		if (0 < out->opts->dump_opts.array_size) {
-		    strcpy(out->cur, out->opts->dump_opts.array_nl);
-		    out->cur += out->opts->dump_opts.array_size;
-		}
-		if (0 < out->opts->dump_opts.indent_size) {
-		    int	i;
-		    for (i = d2; 0 < i; i--) {
-			strcpy(out->cur, out->opts->dump_opts.indent_str);
-			out->cur += out->opts->dump_opts.indent_size;
-		    }
-		}
-	    } else {
-		fill_indent(out, d2);
-	    }
-	    oj_dump_rails_val(rb_ary_entry(a, i), d2, out, as_ok);
-	    if (i < cnt) {
-		*out->cur++ = ',';
-	    }
-	}
-	size = depth * out->indent + 1;
-	assure_size(out, size);
-	if (out->opts->dump_opts.use) {
-	    if (0 < out->opts->dump_opts.array_size) {
-		strcpy(out->cur, out->opts->dump_opts.array_nl);
-		out->cur += out->opts->dump_opts.array_size;
-	    }
-	    if (0 < out->opts->dump_opts.indent_size) {
-		int	i;
-
-		for (i = depth; 0 < i; i--) {
-		    strcpy(out->cur, out->opts->dump_opts.indent_str);
-		    out->cur += out->opts->dump_opts.indent_size;
-		}
-	    }
-	} else {
-	    fill_indent(out, depth);
-	}
-	*out->cur++ = ']';
-    }
-    *out->cur = '\0';
-}
-
-static int
-hash_cb(VALUE key, VALUE value, Out out) {
-    int		depth = out->depth;
-    long	size;
-    int		rtype = rb_type(key);
-    
-    if (rtype != T_STRING && rtype != T_SYMBOL) {
-	key = rb_funcall(key, oj_to_s_id, 0);
-	rtype = rb_type(key);
-    }
-    if (!out->opts->dump_opts.use) {
-	size = depth * out->indent + 1;
-	assure_size(out, size);
-	fill_indent(out, depth);
-	if (rtype == T_STRING) {
-	    oj_dump_str(key, 0, out, false);
-	} else {
-	    oj_dump_sym(key, 0, out, false);
-	}
-	*out->cur++ = ':';
-    } else {
-	size = depth * out->opts->dump_opts.indent_size + out->opts->dump_opts.hash_size + 1;
-	assure_size(out, size);
-	if (0 < out->opts->dump_opts.hash_size) {
-	    strcpy(out->cur, out->opts->dump_opts.hash_nl);
-	    out->cur += out->opts->dump_opts.hash_size;
-	}
-	if (0 < out->opts->dump_opts.indent_size) {
-	    int	i;
-	    for (i = depth; 0 < i; i--) {
-		strcpy(out->cur, out->opts->dump_opts.indent_str);
-		out->cur += out->opts->dump_opts.indent_size;
-	    }
-	}
-	if (rtype == T_STRING) {
-	    oj_dump_str(key, 0, out, false);
-	} else {
-	    oj_dump_sym(key, 0, out, false);
-	}
-	size = out->opts->dump_opts.before_size + out->opts->dump_opts.after_size + 2;
-	assure_size(out, size);
-	if (0 < out->opts->dump_opts.before_size) {
-	    strcpy(out->cur, out->opts->dump_opts.before_sep);
-	    out->cur += out->opts->dump_opts.before_size;
-	}
-	*out->cur++ = ':';
-	if (0 < out->opts->dump_opts.after_size) {
-	    strcpy(out->cur, out->opts->dump_opts.after_sep);
-	    out->cur += out->opts->dump_opts.after_size;
-	}
-    }
-    oj_dump_rails_val(value, depth, out, false);
-    out->depth = depth;
-    *out->cur++ = ',';
-
-    return ST_CONTINUE;
-}
-
-static void
-dump_hash(VALUE obj, int depth, Out out, bool as_ok) {
-    int		cnt;
-    size_t	size;
-
-    if (Yes == out->opts->circular) {
-	if (0 > oj_check_circular(obj, out)) {
-	    oj_dump_nil(Qnil, 0, out, false);
-	    return;
-	}
-    }
-    if (as_ok && !oj_rails_hash_opt && rb_respond_to(obj, oj_as_json_id)) {
-	dump_as_json(obj, depth, out, false);
-	return;
-    }
-    cnt = (int)RHASH_SIZE(obj);
-    size = depth * out->indent + 2;
-    assure_size(out, 2);
-    *out->cur++ = '{';
-    if (0 == cnt) {
-	*out->cur++ = '}';
-    } else {
-	out->depth = depth + 1;
-	rb_hash_foreach(obj, hash_cb, (VALUE)out);
-	if (',' == *(out->cur - 1)) {
-	    out->cur--; // backup to overwrite last comma
-	}
-	if (!out->opts->dump_opts.use) {
-	    assure_size(out, size);
-	    fill_indent(out, depth);
-	} else {
-	    size = depth * out->opts->dump_opts.indent_size + out->opts->dump_opts.hash_size + 1;
-	    assure_size(out, size);
-	    if (0 < out->opts->dump_opts.hash_size) {
-		strcpy(out->cur, out->opts->dump_opts.hash_nl);
-		out->cur += out->opts->dump_opts.hash_size;
-	    }
-	    if (0 < out->opts->dump_opts.indent_size) {
-		int	i;
-
-		for (i = depth; 0 < i; i--) {
-		    strcpy(out->cur, out->opts->dump_opts.indent_str);
-		    out->cur += out->opts->dump_opts.indent_size;
-		}
-	    }
-	}
-	*out->cur++ = '}';
-    }
-    *out->cur = '\0';
-}
-
-static void
-dump_obj(VALUE obj, int depth, Out out, bool as_ok) {
-    if (as_ok) {
-	ROpt	ro;
-	
-	if (NULL != (ro = oj_rails_get_opt(out->ropts, rb_obj_class(obj))) && ro->on) {
-	    ro->dump(obj, depth, out, as_ok);
-	} else if (rb_respond_to(obj, oj_as_json_id)) {
-	    dump_as_json(obj, depth, out, true);
-	} else if (rb_respond_to(obj, oj_to_hash_id)) {
-	    dump_to_hash(obj, depth, out);
-	} else {
-	    oj_dump_obj_to_s(obj, out);
-	}
-    } else if (rb_respond_to(obj, oj_to_hash_id)) {
-	// Always attempt to_hash.
-	dump_to_hash(obj, depth, out);
-    } else {
-	oj_dump_obj_to_s(obj, out);
-    }
-}
-
-static void
-dump_as_string(VALUE obj, int depth, Out out, bool as_ok) {
-    oj_dump_obj_to_s(obj, out);
-}
-
-static DumpFunc	rails_funcs[] = {
-    NULL,	 	// RUBY_T_NONE     = 0x00,
-    dump_obj,		// RUBY_T_OBJECT   = 0x01,
-    oj_dump_class, 	// RUBY_T_CLASS    = 0x02,
-    oj_dump_class,	// RUBY_T_MODULE   = 0x03,
-    dump_float, 	// RUBY_T_FLOAT    = 0x04,
-    oj_dump_str, 	// RUBY_T_STRING   = 0x05,
-    dump_as_string,	// RUBY_T_REGEXP   = 0x06,
-    dump_array,		// RUBY_T_ARRAY    = 0x07,
-    dump_hash,	 	// RUBY_T_HASH     = 0x08,
-    dump_obj,		// RUBY_T_STRUCT   = 0x09,
-    oj_dump_bignum,	// RUBY_T_BIGNUM   = 0x0a,
-    NULL, 		// RUBY_T_FILE     = 0x0b,
-    dump_obj,		// RUBY_T_DATA     = 0x0c,
-    NULL, 		// RUBY_T_MATCH    = 0x0d,
-    // Rails raises a stack error on Complex and Rational. It also corrupts
-    // something whic causes a segfault on the next call. Oj will not mimic
-    // that behavior.
-    dump_as_string, 	// RUBY_T_COMPLEX  = 0x0e,
-    dump_as_string, 	// RUBY_T_RATIONAL = 0x0f,
-    NULL, 		// 0x10
-    oj_dump_nil, 	// RUBY_T_NIL      = 0x11,
-    oj_dump_true, 	// RUBY_T_TRUE     = 0x12,
-    oj_dump_false,	// RUBY_T_FALSE    = 0x13,
-    oj_dump_sym,	// RUBY_T_SYMBOL   = 0x14,
-    oj_dump_fixnum,	// RUBY_T_FIXNUM   = 0x15,
-};
-
-void
-oj_dump_rails_val(VALUE obj, int depth, Out out, bool as_ok) {
-    int	type = rb_type(obj);
-
-    if (MAX_DEPTH < depth) {
-	rb_raise(rb_eNoMemError, "Too deeply nested.\n");
-    }
-    if (0 < type && type <= RUBY_T_FIXNUM) {
-	DumpFunc	f = rails_funcs[type];
-
-	if (NULL != f) {
-	    f(obj, depth, out, as_ok);
-	    return;
-	}
-    }
-    oj_dump_nil(Qnil, depth, out, false);
-}