oj 3.10.0 → 3.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62a52be7754c5ef34c3006fb28fa918cb18f23c26ffa94e8daedf05396bbe0fb
-  data.tar.gz: 9cf9cfab00cf1e28f8b42c6d3e88ee6a2a785093cc024c558eeceb25eaf39cd1
+  metadata.gz: 3dd1cae4ccf720f35b777913213b66466c7d9752055c60d828cdf681956731a3
+  data.tar.gz: e913c57a4619bfbea97144f6f4783219aca294e598c8c6449ddfc6cb997b46f7
 SHA512:
-  metadata.gz: 931cf30643fc1be050ec4f3c0c69f85b643b073e7bd5d16c5c8a5431c8d3701ae73fc5b68311246f2db993fa1c3e40b6169978f10b377a947cc937a7d26afd6e
-  data.tar.gz: 779d173d00513d830f825cc9e0f51a5a066beece8fe9289d1face779c34210d6f7506e8e8af380fc5f2d3c2dd727b46f14cc985d4a2867e3a71fb1de4217361a
+  metadata.gz: dc0b7bd0e9ea90e69eda6a6205c09540e2217f9ccdcb3c6e937fb82e4b979fada30a028b64559ac5dfddc22afb9d4302669de35315bb5c5392ad100a373bb472
+  data.tar.gz: 8d8ad9eeb68fb2d058c3f499ad51fc8c50d3349b36a237769f996a43de58449fbae36d3bff82c6be6a16828331f12aa19df6a1ef90b5bdff78ecdf732450a268

data/ext/oj/compat.c

@@ -65,7 +65,7 @@ hash_set_cstr(ParseInfo pi, Val kval, const char *str, size_t len, const char *o
 static VALUE
 start_hash(ParseInfo pi) {
     volatile VALUE	h;
-    
+
     if (Qnil != pi->options.hash_class) {
 	h = rb_class_new_instance(0, NULL, pi->options.hash_class);
     } else {
@@ -87,7 +87,7 @@ end_hash(struct _parseInfo *pi) {
 	clas = oj_name2class(pi, parent->classname, parent->clen, 0, rb_eArgError);
 	if (Qundef != clas) { // else an error
 	    ID	creatable = rb_intern("json_creatable?");
-	    
+
 	    if (!rb_respond_to(clas, creatable) || Qtrue == rb_funcall(clas, creatable, 0)) {
 		parent->val = rb_funcall(clas, oj_json_create_id, 1, parent->val);
 	    }
@@ -146,7 +146,7 @@ add_num(ParseInfo pi, NumInfo ni) {
 static void
 hash_set_num(struct _parseInfo *pi, Val parent, NumInfo ni) {
     volatile VALUE	rval = oj_num_as_value(ni);
-    
+
     if (!oj_use_hash_alt && rb_cHash != rb_obj_class(parent->val)) {
 	// The rb_hash_set would still work but the unit tests for the
 	// json gem require the less efficient []= method be called to set
@@ -192,7 +192,7 @@ static void
 array_append_num(ParseInfo pi, NumInfo ni) {
     Val			parent = stack_peek(&pi->stack);
     volatile VALUE	rval = oj_num_as_value(ni);
-    
+
     if (!oj_use_array_alt && rb_cArray != rb_obj_class(parent->val)) {
 	// The rb_ary_push would still work but the unit tests for the json
 	// gem require the less efficient << method be called to push the
@@ -274,7 +274,7 @@ oj_compat_load(int argc, VALUE *argv, VALUE self) {
     pi.options.nilnil = Yes;
     pi.options.empty_string = Yes;
     oj_set_compat_callbacks(&pi);
-    
+
     if (T_STRING == rb_type(*argv)) {
 	return oj_pi_parse(argc, argv, &pi, 0, 0, false);
     } else {

data/ext/oj/custom.c

@@ -297,7 +297,8 @@ static struct _code	codes[] = {
 };
 
 static int
-hash_cb(VALUE key, VALUE value, Out out) {
+hash_cb(VALUE key, VALUE value, VALUE ov) {
+    Out	out = (Out)ov;
     int	depth = out->depth;
 
     if (oj_dump_ignore(out->opts, value)) {
@@ -592,7 +593,8 @@ dump_common(VALUE obj, int depth, Out out) {
 }
 
 static int
-dump_attr_cb(ID key, VALUE value, Out out) {
+dump_attr_cb(ID key, VALUE value, VALUE ov) {
+    Out		out = (Out)ov;
     int		depth = out->depth;
     size_t	size;
     const char	*attr;

data/ext/oj/dump_compat.c

@@ -648,7 +648,8 @@ dump_float(VALUE obj, int depth, Out out, bool as_ok) {
 }
 
 static int
-hash_cb(VALUE key, VALUE value, Out out) {
+hash_cb(VALUE key, VALUE value, VALUE ov) {
+    Out	out = (Out)ov;
     int	depth = out->depth;
 
     if (out->omit_nil && Qnil == value) {

data/ext/oj/dump_object.c

@@ -224,7 +224,8 @@ dump_sym(VALUE obj, int depth, Out out, bool as_ok) {
 }
 
 static int
-hash_cb(VALUE key, VALUE value, Out out) {
+hash_cb(VALUE key, VALUE value, VALUE ov) {
+    Out		out = (Out)ov;
     int		depth = out->depth;
     long	size = depth * out->indent + 1;
 
@@ -348,7 +349,8 @@ dump_hash_class(VALUE obj, VALUE clas, int depth, Out out) {
 
 #ifdef HAVE_RB_IVAR_FOREACH
 static int
-dump_attr_cb(ID key, VALUE value, Out out) {
+dump_attr_cb(ID key, VALUE value, VALUE ov) {
+    Out		out = (Out)ov;
     int		depth = out->depth;
     size_t	size = depth * out->indent + 1;
     const char	*attr = rb_id2name(key);

data/ext/oj/dump_strict.c

@@ -45,7 +45,7 @@ dump_float(VALUE obj, int depth, Out out, bool as_ok) {
 	cnt = 3;
     } else {
 	NanDump	nd = out->opts->dump_opts.nan_dump;
-	    
+
 	if (AutoNan == nd) {
 	    nd = RaiseNan;
 	}
@@ -195,11 +195,12 @@ dump_array(VALUE a, int depth, Out out, bool as_ok) {
 }
 
 static int
-hash_cb(VALUE key, VALUE value, Out out) {
+hash_cb(VALUE key, VALUE value, VALUE ov) {
+    Out		out = (Out)ov;
     int		depth = out->depth;
     long	size;
     int		rtype = rb_type(key);
-    
+
     if (rtype != T_STRING && rtype != T_SYMBOL) {
 	rb_raise(rb_eTypeError, "In :strict and :null mode all Hash keys must be Strings or Symbols, not %s.\n", rb_class2name(rb_obj_class(key)));
     }
@@ -359,7 +360,7 @@ static DumpFunc	strict_funcs[] = {
 void
 oj_dump_strict_val(VALUE obj, int depth, Out out) {
     int	type = rb_type(obj);
-    
+
     if (Yes == out->opts->trace) {
 	oj_trace("dump", obj, __FILE__, __LINE__, depth, TraceIn);
     }
@@ -408,7 +409,7 @@ static DumpFunc	null_funcs[] = {
 void
 oj_dump_null_val(VALUE obj, int depth, Out out) {
     int	type = rb_type(obj);
-    
+
     if (Yes == out->opts->trace) {
 	oj_trace("dump", obj, __FILE__, __LINE__, depth, TraceOut);
     }

data/ext/oj/extconf.rb

@@ -42,6 +42,11 @@ end
 
 $CPPFLAGS += ' -Wall'
 #puts "*** $CPPFLAGS: #{$CPPFLAGS}"
+# Adding the __attribute__ flag only works with gcc compilers and even then it
+# does not work to check args with varargs so just remove the check.
+CONFIG['warnflags'].slice!(/ -Wsuggest-attribute=format/)
+CONFIG['warnflags'].slice!(/ -Wdeclaration-after-statement/)
+CONFIG['warnflags'].slice!(/ -Wmissing-noreturn/)
 
 create_makefile(File.join(extension_name, extension_name))
 

data/ext/oj/mimic_json.c

@@ -199,6 +199,7 @@ mimic_dump(int argc, VALUE *argv, VALUE self) {
     struct _out		out;
     struct _options	copts = oj_default_options;
     VALUE		rstr;
+    VALUE		active_hack[1];
 
     copts.str_rx.head = NULL;
     copts.str_rx.tail = NULL;
@@ -216,6 +217,7 @@ mimic_dump(int argc, VALUE *argv, VALUE self) {
     */
     copts.dump_opts.max_depth = MAX_DEPTH; // when using dump there is no limit
     out.omit_nil = copts.dump_opts.omit_nil;
+
     if (2 <= argc) {
 	int	limit;
 
@@ -230,7 +232,15 @@ mimic_dump(int argc, VALUE *argv, VALUE self) {
 	    copts.dump_opts.max_depth = limit;
 	}
     }
-    oj_dump_obj_to_json(*argv, &copts, &out);
+    // ActiveSupport in active_support/core_ext/object/json.rb check the
+    // optional argument type to to_json and it the argument is a
+    // ::JSON::State it calls the JSON gem code otherwise it calls the active
+    // support encoder code. To make sure the desired branch is called a
+    // default ::JSON::State argument is passed in. Basically a hack to get
+    // around the active support hack so two wrongs make a right this time.
+    active_hack[0] = rb_funcall(state_class, oj_new_id, 0);
+    oj_dump_obj_to_json_using_params(*argv, &copts, &out, 1, active_hack);
+
     if (0 == out.buf) {
 	rb_raise(rb_eNoMemError, "Not enough memory.");
     }

data/ext/oj/oj.c

@@ -766,7 +766,9 @@ oj_parse_options(VALUE ropts, Options copts) {
 }
 
 static int
-match_string_cb(VALUE key, VALUE value, RxClass rc) {
+match_string_cb(VALUE key, VALUE value, VALUE rx) {
+    RxClass	rc = (RxClass)rx;
+
     if (T_CLASS != rb_type(value)) {
 	rb_raise(rb_eArgError, "for :match_string, the hash values must be a Class.");
     }

data/ext/oj/parse.c

@@ -740,7 +740,7 @@ oj_parse2(ParseInfo pi) {
 }
 
 static VALUE
-rescue_big_decimal(VALUE str) {
+rescue_big_decimal(VALUE str, VALUE ignore) {
     rb_raise(oj_parse_error_class, "Invalid value for BigDecimal()");
     return Qnil;
 }

data/ext/oj/rails.c

@@ -87,7 +87,8 @@ copy_opts(ROptTable src, ROptTable dest) {
 }
 
 static int
-dump_attr_cb(ID key, VALUE value, Out out) {
+dump_attr_cb(ID key, VALUE value, VALUE ov) {
+    Out		out = (Out)ov;
     int		depth = out->depth;
     size_t	size = depth * out->indent + 1;
     const char	*attr = rb_id2name(key);
@@ -1011,9 +1012,11 @@ rails_encode(int argc, VALUE *argv, VALUE self) {
     }
 }
 
+// TBD provide a get function as well
 static VALUE
 rails_use_standard_json_time_format(VALUE self, VALUE state) {
     if (Qtrue == state || Qfalse == state) {
+	// no change needed
     } else if (Qnil == state) {
 	state = Qfalse;
     } else {
@@ -1025,6 +1028,11 @@ rails_use_standard_json_time_format(VALUE self, VALUE state) {
     return state;
 }
 
+static VALUE
+rails_use_standard_json_time_format_get(VALUE self) {
+    return xml_time ? Qtrue : Qfalse;
+}
+
 static VALUE
 rails_escape_html_entities_in_json(VALUE self, VALUE state) {
     rb_iv_set(self, "@escape_html_entities_in_json", state);
@@ -1033,6 +1041,11 @@ rails_escape_html_entities_in_json(VALUE self, VALUE state) {
     return state;
 }
 
+static VALUE
+rails_escape_html_entities_in_json_get(VALUE self) {
+    return escape_html ? Qtrue : Qfalse;
+}
+
 static VALUE
 rails_time_precision(VALUE self, VALUE prec) {
     rb_iv_set(self, "@time_precision", prec);
@@ -1056,7 +1069,12 @@ rails_set_encoder(VALUE self) {
     VALUE	encoding;
     VALUE	pv;
     VALUE	verbose;
+    VALUE	enc = resolve_classpath("ActiveSupport::JSON::Encoding");
 
+    if (Qnil != enc) {
+	escape_html = Qtrue == rb_iv_get(self, "@escape_html_entities_in_json");
+	xml_time = Qtrue == rb_iv_get(enc, "@use_standard_json_time_format");
+    }
     if (rb_const_defined_at(rb_cObject, rb_intern("ActiveSupport"))) {
 	active = rb_const_get_at(rb_cObject, rb_intern("ActiveSupport"));
     } else {
@@ -1073,11 +1091,15 @@ rails_set_encoder(VALUE self) {
     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, "use_standard_json_time_format");
+    rb_define_module_function(encoding, "use_standard_json_time_format", rails_use_standard_json_time_format_get, 0);
 
     pv = rb_iv_get(encoding, "@escape_html_entities_in_json");
     escape_html = Qtrue == pv;
     rb_undef_method(encoding, "escape_html_entities_in_json=");
     rb_define_module_function(encoding, "escape_html_entities_in_json=", rails_escape_html_entities_in_json, 1);
+    rb_undef_method(encoding, "escape_html_entities_in_json");
+    rb_define_module_function(encoding, "escape_html_entities_in_json", rails_escape_html_entities_in_json_get, 0);
 
     pv = rb_iv_get(encoding, "@time_precision");
     oj_default_options.sec_prec = NUM2INT(pv);
@@ -1289,7 +1311,8 @@ dump_array(VALUE a, int depth, Out out, bool as_ok) {
 }
 
 static int
-hash_cb(VALUE key, VALUE value, Out out) {
+hash_cb(VALUE key, VALUE value, VALUE ov) {
+    Out		out = (Out)ov;
     int		depth = out->depth;
     long	size;
     int		rtype = rb_type(key);
@@ -1402,14 +1425,17 @@ dump_hash(VALUE obj, int depth, Out out, bool as_ok) {
 
 static void
 dump_obj(VALUE obj, int depth, Out out, bool as_ok) {
+    VALUE	clas;
+
     if (oj_code_dump(oj_compat_codes, obj, depth, out)) {
 	out->argc = 0;
 	return;
     }
+    clas = rb_obj_class(obj);
     if (as_ok) {
 	ROpt	ro;
 
-	if (NULL != (ro = oj_rails_get_opt(out->ropts, rb_obj_class(obj))) && ro->on) {
+	if (NULL != (ro = oj_rails_get_opt(out->ropts, clas)) && ro->on) {
 	    ro->dump(obj, depth, out, as_ok);
 	} else if (Yes == out->opts->raw_json && rb_respond_to(obj, oj_raw_json_id)) {
 	    oj_dump_raw_json(obj, depth, out);
@@ -1417,6 +1443,8 @@ dump_obj(VALUE obj, int depth, Out out, bool as_ok) {
 	    dump_as_json(obj, depth, out, true);
 	} else if (rb_respond_to(obj, oj_to_hash_id)) {
 	    dump_to_hash(obj, depth, out);
+	} else if (oj_bigdecimal_class == clas) {
+	    dump_bigdecimal(obj, depth, out, false);
 	} else {
 	    oj_dump_obj_to_s(obj, out);
 	}
@@ -1425,6 +1453,8 @@ dump_obj(VALUE obj, int depth, Out out, bool as_ok) {
     } else if (rb_respond_to(obj, oj_to_hash_id)) {
 	// Always attempt to_hash.
 	dump_to_hash(obj, depth, out);
+    } else if (oj_bigdecimal_class == clas) {
+	dump_bigdecimal(obj, depth, out, false);
     } else {
 	oj_dump_obj_to_s(obj, out);
     }
@@ -1442,8 +1472,7 @@ static DumpFunc	rails_funcs[] = {
     dump_array,		// RUBY_T_ARRAY    = 0x07,
     dump_hash,	 	// RUBY_T_HASH     = 0x08,
     dump_obj,		// RUBY_T_STRUCT   = 0x09,
-    dump_bigdecimal,	// RUBY_T_BIGNUM   = 0x0a,
-    //oj_dump_bignum,	// RUBY_T_BIGNUM   = 0x0a,
+    oj_dump_bignum,	// RUBY_T_BIGNUM   = 0x0a,
     dump_as_string,	// RUBY_T_FILE     = 0x0b,
     dump_obj,		// RUBY_T_DATA     = 0x0c,
     NULL, 		// RUBY_T_MATCH    = 0x0d,

data/ext/oj/sparse.c

@@ -773,6 +773,7 @@ oj_sparse2(ParseInfo pi) {
 		first = 0;
 	    }
 	    start = pi->rd.pos;
+	    // TBD break if option set to allow that
 	}
     }
 }

data/ext/oj/wab.c

@@ -148,11 +148,12 @@ dump_array(VALUE a, int depth, Out out, bool as_ok) {
 }
 
 static int
-hash_cb(VALUE key, VALUE value, Out out) {
+hash_cb(VALUE key, VALUE value, VALUE ov) {
+    Out		out = (Out)ov;
     int		depth = out->depth;
     long	size;
     int		rtype = rb_type(key);
-    
+
     if (rtype != T_SYMBOL) {
 	rb_raise(rb_eTypeError, "In :wab mode all Hash keys must be Symbols, not %s.\n", rb_class2name(rb_obj_class(key)));
     }
@@ -270,7 +271,7 @@ static DumpFunc	wab_funcs[] = {
 void
 oj_dump_wab_val(VALUE obj, int depth, Out out) {
     int	type = rb_type(obj);
-    
+
     if (Yes == out->opts->trace) {
 	oj_trace("dump", obj, __FILE__, __LINE__, depth, TraceIn);
     }
@@ -324,7 +325,7 @@ add_value(ParseInfo pi, VALUE val) {
 static bool
 uuid_check(const char *str, int len) {
     int		i;
-    
+
     for (i = 0; i < 8; i++, str++) {
 	if ('x' != hex_chars[*(uint8_t*)str]) {
 	    return false;
@@ -380,7 +381,7 @@ time_parse(const char *s, int len) {
     long	nsecs = 0;
     int		i;
     time_t	secs;
-    
+
     memset(&tm, 0, sizeof(tm));
     if ('-' == *s) {
 	s++;
@@ -444,7 +445,7 @@ protect_uri(VALUE rstr) {
 static VALUE
 cstr_to_rstr(const char *str, size_t len) {
     volatile VALUE	v = Qnil;
-    
+
     if (30 == len && '-' == str[4] && '-' == str[7] && 'T' == str[10] && ':' == str[13] && ':' == str[16]  && '.' == str[19] && 'Z' == str[29]) {
 	if (Qnil != (v = time_parse(str, (int)len))) {
 	    return v;
@@ -521,7 +522,7 @@ hash_set_cstr(ParseInfo pi, Val parent, const char *str, size_t len, const char
 static void
 hash_set_num(ParseInfo pi, Val parent, NumInfo ni) {
     volatile VALUE	rval = Qnil;
-    
+
     if (ni->infinity || ni->nan) {
 	oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "not a number or other value");
     }
@@ -551,7 +552,7 @@ start_array(ParseInfo pi) {
 static void
 array_append_cstr(ParseInfo pi, const char *str, size_t len, const char *orig) {
     volatile VALUE	rval = cstr_to_rstr(str, len);
-    
+
     rb_ary_push(stack_peek(&pi->stack)->val, rval);
     if (Yes == pi->options.trace) {
 	oj_trace_parse_call("set_value", pi, __FILE__, __LINE__, rval);
@@ -628,4 +629,3 @@ oj_wab_parse_cstr(int argc, VALUE *argv, char *json, size_t len) {
 
     return oj_pi_parse(argc, argv, &pi, json, len, true);
 }
-

data/lib/oj/version.rb

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

data/test/foo.rb

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-# encoding: UTF-8
 
 $: << File.dirname(__FILE__)
 $oj_dir = File.dirname(File.expand_path(File.dirname(__FILE__)))
@@ -7,161 +6,47 @@ $oj_dir = File.dirname(File.expand_path(File.dirname(__FILE__)))
   $: << File.join($oj_dir, dir)
 end
 
-#require 'json'
+require 'json'
+
+t = [Time.now.utc]
+
+puts "t.to_json - #{t.to_json}"
+
+puts "--- active support"
+
+require 'active_support'
+require "active_support/json"
+
+ActiveSupport::JSON::Encoding.use_standard_json_time_format = false
+
+puts "t.as_json - #{t.as_json}"
+puts "t.to_json - #{t.to_json}"
+
 require 'oj'
 
-Oj.mimic_JSON
-
-obj = {
-  ab: {
-    cbbb: {
-      tilbeb: [
-        {
-          coob: {
-            uijwts: [
-              {
-                prrrrr: {
-                  yakj: "pvebbx",
-                  lbhqy: {
-                    uhyw: {
-                      uijwts: [
-                        {
-                          jangi: {
-                            ubentg7haineued8atnr8w: {
-                              abc: "uejdncbncnamnasdasdasdasd",
-                              cde: "skfjskdfjskdfjsdkfjsdkfjs"
-                            }
-                          }
-                        }
-                      ]
-                    }
-                  }
-                }
-              },
-              {
-                kdncg: {
-                  lvbnt8b9ounv: {
-                    qk: 9
-                  }
-                }
-              }
-            ],
-            jenfjbhe: {}
-          }
-        }
-      ]
-    }
-  },
-  ijbh: {
-    jsnbrpbnunt: {
-      b88dibalbvp: {
-        mnbvd: "9uhbqlpiev"
-      }
-    },
-    ncnwkl: {
-      ksdfsf: {
-        mjln: "mnklkn"
-      },
-      kbrh: {
-        sdfn83nnalbmgnansdd: {
-          uijwts: {
-            ibha: {
-              uijwts: [
-                {
-                  lnrbf: {
-                    nbvtmqbhap9ebeb7btnnaw: {
-                      ksb: "sdfksdfjsdfsb39242dnasddd",
-                      mnm: "1293dsfnsdmfnsdfsd,fmnsd,"
-                    }
-                  }
-                }
-              ]
-            }
-          },
-          kbrh: {
-            bo8libts: {
-              nag40n: {
-                kyen: "sdfasnc92nsn"
-              },
-              kbrh: {
-                nbwyu26snfcbajsdkj8: {
-                  uijwts: {
-                    mdfnkjsdd: {}
-                  },
-                  kbrh: {
-                    kneahce: {
-                      uijwts: {
-                        kwnb: {
-                          uijwts: [
-                            {
-                              fhfd: {
-                                sfasdnfmasndfamsdnfajsmdf: false
-                              }
-                            }
-                          ],
-                          asdfsdff: [
-                            {
-                              cwdf: {
-                                sddlkfajsdkfjabskdfjalsdkfjansdkfjf: ""
-                              }
-                            },
-                            {
-                              bsdj: {
-                                sdfsjdlfkasy8kljsfsdf83jlkjfals: true
-                              }
-                            }
-                          ]
-                        }
-                      },
-                      kbrh: {
-                        sdfsdfsddfk: {
-                          uijwts: {
-                            sdfsd: {
-                              sdfsadf89mnlrrrqurqwvdnff: {
-                                "kj": 8
-                              }
-                            }
-                          },
-                          kbrh: {
-                            dkdjd: {
-                              dfeteu: {
-                                sdfd: "sdfasdfjlkjslrsdbb"
-                              },
-                              kbrh: {
-                                sdfskjdfldk: {
-                                  buqpen: {
-                                    kjlkj: {
-                                      sdflskdjfalsdkrjalwkjfsrlfjasdf: {
-                                        sd: 0
-                                      }
-                                    }
-                                  },
-                                  kbrh: {
-                                    sdfksljdlfksdfl: {
-                                      sdfsdkfjssd: {
-                                        ksdjf: "sdflsdkfjasdkaufs;ldkfjsdlf",
-                                        sdfsdfsl: [5]
-                                      }
-                                    }
-                                  }
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-#Oj.dump(obj)
-JSON.pretty_generate(obj)
-#JSON.generate(obj)
+t = [Time.now.utc]
+
+puts "-----------------------"
+
+#puts "t.as_json - #{t.as_json}"
+puts "t.to_json - #{t.to_json}"
+
+#Oj.mimic_JSON
+
+#puts "Oj - t.as_json - #{t.as_json}"
+
+puts "--- active support"
+
+require 'active_support'
+require "active_support/json"
+
+ActiveSupport::JSON::Encoding.use_standard_json_time_format = false
+
+puts "t.as_json - #{t.as_json}"
+puts "t.to_json - #{t.to_json}"
+
+puts "--- optimize"
+Oj.optimize_rails
+
+puts "t.as_json - #{t.as_json}"
+puts "t.to_json - #{t.to_json}"

data/test/test_custom.rb

@@ -470,10 +470,10 @@ class CustomJuice < Minitest::Test
 
   def test_time
     obj = Time.now()
-    dump_and_load(obj, false, :time_format => :unix, :create_id => "^o", :create_additions => true)
-    dump_and_load_inspect(obj, false, :time_format => :unix_zone, :create_id => "^o", :create_additions => true)
-    dump_and_load_inspect(obj, false, :time_format => :xmlschema, :create_id => "^o", :create_additions => true)
-    dump_and_load_inspect(obj, false, :time_format => :ruby, :create_id => "^o", :create_additions => true)
+    dump_load_dump(obj, false, :time_format => :unix, :create_id => "^o", :create_additions => true)
+    dump_load_dump(obj, false, :time_format => :unix_zone, :create_id => "^o", :create_additions => true)
+    dump_load_dump(obj, false, :time_format => :xmlschema, :create_id => "^o", :create_additions => true)
+    dump_load_dump(obj, false, :time_format => :ruby, :create_id => "^o", :create_additions => true)
   end
 
   def dump_and_load(obj, trace=false, options={})
@@ -504,4 +504,19 @@ class CustomJuice < Minitest::Test
     loaded
   end
 
+  def dump_load_dump(obj, trace=false, options={})
+    options = options.merge(:indent => 2, :mode => :custom)
+    json = Oj.dump(obj, options)
+    puts json if trace
+
+    loaded = Oj.load(json, options);
+    if obj.nil?
+      assert_nil(loaded)
+    else
+      json2 = Oj.dump(loaded, options)
+      assert_equal(json, json2)
+    end
+    loaded
+  end
+
 end

data/test/test_rails.rb

@@ -0,0 +1,26 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+$: << File.dirname(__FILE__)
+
+require 'helper'
+
+class RailsJuice < Minitest::Test
+
+  def test_bigdecimal_dump
+    orig = Oj.default_options
+    Oj.default_options = { mode: :rails, bigdecimal_as_decimal: true }
+    bd = BigDecimal('123')
+    json = Oj.dump(bd)
+    Oj.default_options = orig
+
+    assert_equal('0.123e3', json.downcase)
+
+    json = Oj.dump(bd, mode: :rails, bigdecimal_as_decimal: false)
+    assert_equal('"0.123e3"', json.downcase)
+
+    json = Oj.dump(bd, mode: :rails, bigdecimal_as_decimal: true)
+    assert_equal('0.123e3', json.downcase)
+  end
+
+end

data/test/tests.rb

@@ -19,6 +19,7 @@ require 'test_saj'
 require 'test_scp'
 require 'test_strict'
 require 'test_various'
+require 'test_rails'
 require 'test_wab'
 require 'test_writer'
 require 'test_integer_range'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 3.10.0
+  version: 3.10.1
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-28 00:00:00.000000000 Z
+date: 2020-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -243,6 +243,7 @@ files:
 - test/test_integer_range.rb
 - test/test_null.rb
 - test/test_object.rb
+- test/test_rails.rb
 - test/test_saj.rb
 - test/test_scp.rb
 - test/test_strict.rb
@@ -354,6 +355,7 @@ test_files:
 - test/baz.rb
 - test/tests_mimic_addition.rb
 - test/test_writer.rb
+- test/test_rails.rb
 - test/perf.rb
 - test/isolated/test_mimic_define.rb
 - test/isolated/test_mimic_after.rb