oj 3.7.4 → 3.11.2

data/ext/oj/parse.h

@@ -1,10 +1,7 @@
-/* parse.h
- * Copyright (c) 2011, Peter Ohler
- * All rights reserved.
- */
+// Copyright (c) 2011 Peter Ohler. All rights reserved.
 
-#ifndef __OJ_PARSE_H__
-#define __OJ_PARSE_H__
+#ifndef OJ_PARSE_H
+#define OJ_PARSE_H
 
 #include <stdarg.h>
 #include <stdio.h>
@@ -17,9 +14,9 @@
 #include "reader.h"
 #include "rxclass.h"
 
-struct _RxClass;
+struct _rxClass;
 
-typedef struct _NumInfo {
+typedef struct _numInfo {
     int64_t	i;
     int64_t	num;
     int64_t	div;
@@ -31,43 +28,44 @@ typedef struct _NumInfo {
     int		infinity;
     int		nan;
     int		neg;
-    int		hasExp;
+    int		has_exp;
     int		no_big;
+    int		bigdec_load;
 } *NumInfo;
 
-typedef struct _ParseInfo {
+typedef struct _parseInfo {
     // used for the string parser
     const char		*json;
     const char		*cur;
     const char		*end;
     // used for the stream parser
-    struct _Reader	rd;
+    struct _reader	rd;
 
-    struct _Err		err;
-    struct _Options	options;
+    struct _err		err;
+    struct _options	options;
     VALUE		handler;
-    struct _ValStack	stack;
+    struct _valStack	stack;
     CircArray		circ_array;
-    struct _RxClass	str_rx;
+    struct _rxClass	str_rx;
     int			expect_value;
     int			max_depth; // just for the json gem
     VALUE		proc;
-    VALUE		(*start_hash)(struct _ParseInfo *pi);
-    void		(*end_hash)(struct _ParseInfo *pi);
-    VALUE		(*hash_key)(struct _ParseInfo *pi, const char *key, size_t klen);
-    void		(*hash_set_cstr)(struct _ParseInfo *pi, Val kval, const char *str, size_t len, const char *orig);
-    void		(*hash_set_num)(struct _ParseInfo *pi, Val kval, NumInfo ni);
-    void		(*hash_set_value)(struct _ParseInfo *pi, Val kval, VALUE value);
+    VALUE		(*start_hash)(struct _parseInfo *pi);
+    void		(*end_hash)(struct _parseInfo *pi);
+    VALUE		(*hash_key)(struct _parseInfo *pi, const char *key, size_t klen);
+    void		(*hash_set_cstr)(struct _parseInfo *pi, Val kval, const char *str, size_t len, const char *orig);
+    void		(*hash_set_num)(struct _parseInfo *pi, Val kval, NumInfo ni);
+    void		(*hash_set_value)(struct _parseInfo *pi, Val kval, VALUE value);
 
-    VALUE		(*start_array)(struct _ParseInfo *pi);
-    void		(*end_array)(struct _ParseInfo *pi);
-    void		(*array_append_cstr)(struct _ParseInfo *pi, const char *str, size_t len, const char *orig);
-    void		(*array_append_num)(struct _ParseInfo *pi, NumInfo ni);
-    void		(*array_append_value)(struct _ParseInfo *pi, VALUE value);
+    VALUE		(*start_array)(struct _parseInfo *pi);
+    void		(*end_array)(struct _parseInfo *pi);
+    void		(*array_append_cstr)(struct _parseInfo *pi, const char *str, size_t len, const char *orig);
+    void		(*array_append_num)(struct _parseInfo *pi, NumInfo ni);
+    void		(*array_append_value)(struct _parseInfo *pi, VALUE value);
 
-    void		(*add_cstr)(struct _ParseInfo *pi, const char *str, size_t len, const char *orig);
-    void		(*add_num)(struct _ParseInfo *pi, NumInfo ni);
-    void		(*add_value)(struct _ParseInfo *pi, VALUE val);
+    void		(*add_cstr)(struct _parseInfo *pi, const char *str, size_t len, const char *orig);
+    void		(*add_num)(struct _parseInfo *pi, NumInfo ni);
+    void		(*add_value)(struct _parseInfo *pi, VALUE val);
     VALUE		err_class;
     bool		has_callbacks;
 } *ParseInfo;
@@ -80,6 +78,7 @@ extern VALUE	oj_num_as_value(NumInfo ni);
 extern void	oj_set_strict_callbacks(ParseInfo pi);
 extern void	oj_set_object_callbacks(ParseInfo pi);
 extern void	oj_set_compat_callbacks(ParseInfo pi);
+extern void	oj_set_custom_callbacks(ParseInfo pi);
 extern void	oj_set_wab_callbacks(ParseInfo pi);
 
 extern void	oj_sparse2(ParseInfo pi);
@@ -87,7 +86,7 @@ extern VALUE	oj_pi_sparse(int argc, VALUE *argv, ParseInfo pi, int fd);
 
 static inline void
 parse_info_init(ParseInfo pi) {
-    memset(pi, 0, sizeof(struct _ParseInfo));
+    memset(pi, 0, sizeof(struct _parseInfo));
 }
 
 static inline bool
@@ -108,4 +107,4 @@ empty_ok(Options options) {
     return Yes == options->empty_string;
 }
 
-#endif /* __OJ_PARSE_H__ */
+#endif /* OJ_PARSE_H */

data/ext/oj/rails.c

@@ -1,20 +1,18 @@
-/* rails.c
- * Copyright (c) 2017, Peter Ohler
- * All rights reserved.
- */
+// Copyright (c) 2017 Peter Ohler. All rights reserved.
 
 #include "rails.h"
 #include "encode.h"
 #include "code.h"
 #include "encode.h"
 #include "trace.h"
+#include "util.h"
 
 #define OJ_INFINITY (1.0/0.0)
 
 // TBD keep static array of strings and functions to help with rails optimization
-typedef struct _Encoder {
-    struct _ROptTable	ropts;
-    struct _Options	opts;
+typedef struct _encoder {
+    struct _rOptTable	ropts;
+    struct _options	opts;
     VALUE		arg;
 } *Encoder;
 
@@ -28,7 +26,7 @@ static void	dump_rails_val(VALUE obj, int depth, Out out, bool as_ok);
 
 extern VALUE	Oj;
 
-static struct _ROptTable	ropts = { 0, 0, NULL };
+static struct _rOptTable	ropts = { 0, 0, NULL };
 
 static VALUE	encoder_class = Qnil;
 static bool	escape_html = true;
@@ -79,14 +77,15 @@ copy_opts(ROptTable src, ROptTable dest) {
     if (NULL == src->table) {
 	dest->table = NULL;
     } else {
-	dest->table = ALLOC_N(struct _ROpt, dest->alen);
-	memcpy(dest->table, src->table, sizeof(struct _ROpt) * dest->alen);
+	dest->table = ALLOC_N(struct _rOpt, dest->alen);
+	memcpy(dest->table, src->table, sizeof(struct _rOpt) * dest->alen);
     }
     return NULL;
 }
 
 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);
@@ -116,7 +115,7 @@ dump_attr_cb(ID key, VALUE value, Out out) {
     dump_rails_val(value, depth, out, true);
     out->depth = depth;
     *out->cur++ = ',';
-    
+
     return ST_CONTINUE;
 }
 
@@ -213,6 +212,8 @@ dump_bigdecimal(VALUE obj, int depth, Out out, bool as_ok) {
 
     if ('I' == *str || 'N' == *str || ('-' == *str && 'I' == str[1])) {
 	oj_dump_nil(Qnil, depth, out, false);
+    } else if (out->opts->int_range_max != 0 || out->opts->int_range_min != 0) {
+	oj_dump_cstr(str, (int)RSTRING_LEN(rstr), 0, 0, out);
     } else if (Yes == out->opts->bigdec_as_num) {
 	oj_dump_raw(str, (int)RSTRING_LEN(rstr), out);
     } else {
@@ -221,15 +222,15 @@ dump_bigdecimal(VALUE obj, int depth, Out out, bool as_ok) {
 }
 
 static void
-dump_sec_nano(VALUE obj, time_t sec, long nsec, Out out) {
+dump_sec_nano(VALUE obj, int64_t sec, long nsec, Out out) {
     char		buf[64];
-    struct tm		*tm;
+    struct _timeInfo	ti;
     long		one = 1000000000;
     long		tzsecs = NUM2LONG(rb_funcall2(obj, oj_utc_offset_id, 0, 0));
     int			tzhour, tzmin;
     char		tzsign = '+';
     int			len;
-    
+
     if (out->end - out->cur <= 36) {
 	assure_size(out, 36);
     }
@@ -248,7 +249,7 @@ dump_sec_nano(VALUE obj, time_t sec, long nsec, Out out) {
     }
     // 2012-01-05T23:58:07.123456000+09:00 or 2012/01/05 23:58:07 +0900
     sec += tzsecs;
-    tm = gmtime(&sec);
+    sec_as_time(sec, &ti);
     if (0 > tzsecs) {
         tzsign = '-';
         tzhour = (int)(tzsecs / -3600);
@@ -258,19 +259,12 @@ dump_sec_nano(VALUE obj, time_t sec, long nsec, Out out) {
         tzmin = (int)(tzsecs / 60) - (tzhour * 60);
     }
     if (!xml_time) {
-	len = sprintf(buf, "%04d/%02d/%02d %02d:%02d:%02d %c%02d%02d",
-		      tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday,
-		      tm->tm_hour, tm->tm_min, tm->tm_sec, tzsign, tzhour, tzmin);
+	len = sprintf(buf, "%04d/%02d/%02d %02d:%02d:%02d %c%02d%02d", ti.year, ti.mon, ti.day, ti.hour, ti.min, ti.sec, tzsign, tzhour, tzmin);
     } else if (0 == out->opts->sec_prec) {
 	if (0 == tzsecs && rb_funcall2(obj, oj_utcq_id, 0, 0)) {
-	    len = sprintf(buf, "%04d-%02d-%02dT%02d:%02d:%02dZ",
-			  tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday,
-			  tm->tm_hour, tm->tm_min, tm->tm_sec);
+	    len = sprintf(buf, "%04d-%02d-%02dT%02d:%02d:%02dZ", ti.year, ti.mon, ti.day, ti.hour, ti.min, ti.sec);
 	} else {
-	    len = sprintf(buf, "%04d-%02d-%02dT%02d:%02d:%02d%c%02d:%02d",
-			  tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday,
-			  tm->tm_hour, tm->tm_min, tm->tm_sec,
-			  tzsign, tzhour, tzmin);
+	    len = sprintf(buf, "%04d-%02d-%02dT%02d:%02d:%02d%c%02d:%02d", ti.year, ti.mon, ti.day, ti.hour, ti.min, ti.sec, tzsign, tzhour, tzmin);
 	}
     } else if (0 == tzsecs && rb_funcall2(obj, oj_utcq_id, 0, 0)) {
 	char	format[64] = "%04d-%02d-%02dT%02d:%02d:%02d.%09ldZ";
@@ -280,9 +274,7 @@ dump_sec_nano(VALUE obj, time_t sec, long nsec, Out out) {
 	    format[32] = '0' + out->opts->sec_prec;
 	    len -= 9 - out->opts->sec_prec;
 	}
-	len = sprintf(buf, format,
-		      tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday,
-		      tm->tm_hour, tm->tm_min, tm->tm_sec, nsec);
+	len = sprintf(buf, format, ti.year, ti.mon, ti.day, ti.hour, ti.min, ti.sec, nsec);
     } else {
 	char	format[64] = "%04d-%02d-%02dT%02d:%02d:%02d.%09ld%c%02d:%02d";
 
@@ -291,24 +283,25 @@ dump_sec_nano(VALUE obj, time_t sec, long nsec, Out out) {
 	    format[32] = '0' + out->opts->sec_prec;
 	    len -= 9 - out->opts->sec_prec;
 	}
-	len = sprintf(buf, format,
-		      tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday,
-		      tm->tm_hour, tm->tm_min, tm->tm_sec, nsec,
-		      tzsign, tzhour, tzmin);
+	len = sprintf(buf, format, ti.year, ti.mon, ti.day, ti.hour, ti.min, ti.sec, nsec, tzsign, tzhour, tzmin);
     }
     oj_dump_cstr(buf, len, 0, 0, out);
 }
 
 static void
 dump_time(VALUE obj, int depth, Out out, bool as_ok) {
-    time_t	sec;
+    long long	sec;
     long long	nsec;
 
 #ifdef HAVE_RB_TIME_TIMESPEC
-    {
+    if (16 <= sizeof(struct timespec)) {
 	struct timespec	ts = rb_time_timespec(obj);
-	sec = ts.tv_sec;
+
+	sec = (long long)ts.tv_sec;
 	nsec = ts.tv_nsec;
+    } else {
+	sec = rb_num2ll(rb_funcall2(obj, oj_tv_sec_id, 0, 0));
+	nsec = rb_num2ll(rb_funcall2(obj, oj_tv_nsec_id, 0, 0));
     }
 #else
     sec = rb_num2ll(rb_funcall2(obj, oj_tv_sec_id, 0, 0));
@@ -319,7 +312,7 @@ dump_time(VALUE obj, int depth, Out out, bool as_ok) {
 
 static void
 dump_timewithzone(VALUE obj, int depth, Out out, bool as_ok) {
-    time_t	sec = NUM2LONG(rb_funcall2(obj, oj_tv_sec_id, 0, 0));
+    int64_t	sec = NUM2LONG(rb_funcall2(obj, oj_tv_sec_id, 0, 0));
     long long	nsec = 0;
 
     if (rb_respond_to(obj, oj_tv_nsec_id)) {
@@ -339,7 +332,7 @@ dump_to_s(VALUE obj, int depth, Out out, bool as_ok) {
 
 static ID	parameters_id = 0;
 
-typedef struct _StrLen {
+typedef struct _strLen {
     const char	*str;
     int		len;
 } *StrLen;
@@ -360,9 +353,9 @@ columns_array(VALUE rcols, int *ccnt) {
     StrLen		cols;
     int			i;
     int			cnt = (int)RARRAY_LEN(rcols);
-    
+
     *ccnt = cnt;
-    cols = ALLOC_N(struct _StrLen, cnt);
+    cols = ALLOC_N(struct _strLen, cnt);
     for (i = 0, cp = cols; i < cnt; i++, cp++) {
 	v = rb_ary_entry(rcols, i);
 	if (T_STRING != rb_type(v)) {
@@ -379,7 +372,7 @@ dump_row(VALUE row, StrLen cols, int ccnt, int depth, Out out) {
     size_t	size;
     int		d2 = depth + 1;
     int		i;
-				   
+
     assure_size(out, 2);
     *out->cur++ = '{';
     size = depth * out->indent + 3;
@@ -439,7 +432,7 @@ dump_activerecord_result(VALUE obj, int depth, Out out, bool as_ok) {
     int			i, rcnt;
     size_t		size;
     int			d2 = depth + 1;
-    
+
     if (0 == rows_id) {
 	rows_id = rb_intern("@rows");
 	columns_id = rb_intern("@columns");
@@ -500,7 +493,7 @@ dump_activerecord_result(VALUE obj, int depth, Out out, bool as_ok) {
     *out->cur++ = ']';
 }
 
-typedef struct _NamedFunc {
+typedef struct _namedFunc {
     const char	*name;
     DumpFunc	func;
 } *NamedFunc;
@@ -557,7 +550,7 @@ dump_regexp(VALUE obj, int depth, Out out, bool as_ok) {
     dump_as_string(obj, depth, out, as_ok);
 }
 
-static struct _NamedFunc	dump_map[] = {
+static struct _namedFunc	dump_map[] = {
     { "ActionController::Parameters", dump_actioncontroller_parameters },
     { "ActiveRecord::Result", dump_activerecord_result },
     { "ActiveSupport::TimeWithZone", dump_timewithzone },
@@ -591,12 +584,12 @@ create_opt(ROptTable rot, VALUE clas) {
     rot->len++;
     if (NULL == rot->table) {
 	rot->alen = 256;
-	rot->table = ALLOC_N(struct _ROpt, rot->alen);
-	memset(rot->table, 0, sizeof(struct _ROpt) * rot->alen);
+	rot->table = ALLOC_N(struct _rOpt, rot->alen);
+	memset(rot->table, 0, sizeof(struct _rOpt) * rot->alen);
     } else if (rot->alen <= rot->len) {
 	rot->alen *= 2;
-	REALLOC_N(rot->table, struct _ROpt, rot->alen);
-	memset(rot->table + olen, 0, sizeof(struct _ROpt) * olen);
+	REALLOC_N(rot->table, struct _rOpt, rot->alen);
+	memset(rot->table + olen, 0, sizeof(struct _rOpt) * olen);
     }
     if (0 == olen) {
 	ro = rot->table;
@@ -604,10 +597,10 @@ create_opt(ROptTable rot, VALUE clas) {
 	ro = &rot->table[olen];
     } else {
 	int	i;
-	
+
 	for (i = 0, ro = rot->table; i < olen; i++, ro++) {
 	    if (clas < ro->clas) {
-		memmove(ro + 1, ro, sizeof(struct _ROpt) * (olen - i));
+		memmove(ro + 1, ro, sizeof(struct _rOpt) * (olen - i));
 		break;
 	    }
 	}
@@ -640,7 +633,7 @@ create_opt(ROptTable rot, VALUE clas) {
 	    ro->dump = dump_to_s;
 	}
     }
-    return NULL;
+    return ro;
 }
 
 static void
@@ -674,12 +667,12 @@ encoder_mark(void *ptr) {
  */
 static VALUE
 encoder_new(int argc, VALUE *argv, VALUE self) {
-    Encoder	e = ALLOC(struct _Encoder);
+    Encoder	e = ALLOC(struct _encoder);
 
     e->opts = oj_default_options;
     e->arg = Qnil;
     copy_opts(&ropts, &e->ropts);
-    
+
     if (1 <= argc && Qnil != *argv) {
 	oj_parse_options(*argv, &e->opts);
 	e->arg = *argv;
@@ -734,7 +727,7 @@ optimize(int argc, VALUE *argv, ROptTable rot, bool on) {
 	int		i;
 	NamedFunc	nf;
 	VALUE		clas;
-	
+
 	oj_rails_hash_opt = on;
 	oj_rails_array_opt = on;
 	oj_rails_float_opt = on;
@@ -757,6 +750,8 @@ optimize(int argc, VALUE *argv, ROptTable rot, bool on) {
 	    oj_rails_array_opt = on;
 	} else if (rb_cFloat == *argv) {
 	    oj_rails_float_opt = on;
+	} else if (oj_string_writer_class == *argv) {
+	    string_writer_optimized = on;
 	} else if (NULL != (ro = oj_rails_get_opt(rot, *argv)) ||
 		   NULL != (ro = create_opt(rot, *argv))) {
 	    ro->on = on;
@@ -766,14 +761,14 @@ optimize(int argc, VALUE *argv, ROptTable rot, bool on) {
 
 /* Document-method optimize
  *	call-seq: optimize(*classes)
- * 
+ *
  * Use Oj rails optimized routines to encode the specified classes. This
  * ignores the as_json() method on the class and uses an internal encoding
  * instead. Passing in no classes indicates all should use the optimized
  * version of encoding for all previously optimized classes. Passing in the
  * Object class set a global switch that will then use the optimized behavior
  * for all classes.
- * 
+ *
  * - *classes* [_Class_] a list of classes to optimize
  */
 static VALUE
@@ -787,19 +782,20 @@ encoder_optimize(int argc, VALUE *argv, VALUE self) {
 
 /* Document-method: optimize
  *	call-seq: optimize(*classes)
- * 
+ *
  * Use Oj rails optimized routines to encode the specified classes. This
  * ignores the as_json() method on the class and uses an internal encoding
  * instead. Passing in no classes indicates all should use the optimized
  * version of encoding for all previously optimized classes. Passing in the
  * Object class set a global switch that will then use the optimized behavior
  * for all classes.
- * 
+ *
  * - *classes* [_Class_] a list of classes to optimize
  */
 static VALUE
 rails_optimize(int argc, VALUE *argv, VALUE self) {
     optimize(argc, argv, &ropts, true);
+    string_writer_optimized = true;
 
     return Qnil;
 }
@@ -813,7 +809,7 @@ rails_optimize(int argc, VALUE *argv, VALUE self) {
 VALUE
 rails_mimic_json(VALUE self) {
     VALUE	json;
-    
+
     if (rb_const_defined_at(rb_cObject, rb_intern("JSON"))) {
 	json = rb_const_get_at(rb_cObject, rb_intern("JSON"));
     } else {
@@ -827,7 +823,7 @@ rails_mimic_json(VALUE self) {
 
 /* Document-method: deoptimize
  *	call-seq: deoptimize(*classes)
- * 
+ *
  * Turn off Oj rails optimization on the specified classes.
  *
  * - *classes* [_Class_] a list of classes to deoptimize
@@ -843,7 +839,7 @@ encoder_deoptimize(int argc, VALUE *argv, VALUE self) {
 
 /* Document-method: deoptimize
  *	call-seq: deoptimize(*classes)
- * 
+ *
  * Turn off Oj rails optimization on the specified classes.
  *
  * - *classes* [_Class_] a list of classes to deoptimize
@@ -851,13 +847,14 @@ encoder_deoptimize(int argc, VALUE *argv, VALUE self) {
 static VALUE
 rails_deoptimize(int argc, VALUE *argv, VALUE self) {
     optimize(argc, argv, &ropts, false);
+    string_writer_optimized = false;
 
     return Qnil;
 }
 
 /* Document-method:optimized?
  *	call-seq: optimized?(clas)
- * 
+ *
  * - *clas* [_Class_] Class to check
  *
  * @return true if the class is being optimized for rails and false otherwise
@@ -875,7 +872,7 @@ encoder_optimized(VALUE self, VALUE clas) {
 
 /* Document-method: optimized?
  *	call-seq: optimized?(clas)
- * 
+ *
  * Returns true if the specified Class is being optimized.
  */
 static VALUE
@@ -888,7 +885,7 @@ rails_optimized(VALUE self, VALUE clas) {
     return (ro->on) ? Qtrue : Qfalse;
 }
 
-typedef struct _OO {
+typedef struct _oo {
     Out		out;
     VALUE	obj;
 } *OO;
@@ -905,10 +902,10 @@ protect_dump(VALUE ov) {
 static VALUE
 encode(VALUE obj, ROptTable ropts, Options opts, int argc, VALUE *argv) {
     char		buf[4096];
-    struct _Out		out;
-    struct _Options	copts = *opts;
+    struct _out		out;
+    struct _options	copts = *opts;
     volatile VALUE	rstr = Qnil;
-    struct _OO		oo;
+    struct _oo		oo;
     int			line = 0;
 
     oo.out = &out;
@@ -917,7 +914,7 @@ encode(VALUE obj, ROptTable ropts, Options opts, int argc, VALUE *argv) {
     copts.str_rx.tail = NULL;
     copts.mode = RailsMode;
     if (escape_html) {
-	copts.escape_mode = JXEsc;
+	copts.escape_mode = RailsXEsc;
     } else {
 	copts.escape_mode = RailsEsc;
     }
@@ -973,7 +970,7 @@ encode(VALUE obj, ROptTable ropts, Options opts, int argc, VALUE *argv) {
 
 /* Document-method: encode
  *	call-seq: encode(obj)
- * 
+ *
  * - *obj* [_Object_] object to encode
  *
  * Returns encoded object as a JSON string.
@@ -984,7 +981,7 @@ encoder_encode(VALUE self, VALUE obj) {
 
     if (Qnil != e->arg) {
 	VALUE	argv[1] = { e->arg };
-	
+
 	return encode(obj, &e->ropts, &e->opts, 1, argv);
     }
     return encode(obj, &e->ropts, &e->opts, 0, NULL);
@@ -992,9 +989,9 @@ encoder_encode(VALUE self, VALUE obj) {
 
 /* Document-method: encode
  *	call-seq: encode(obj, opts=nil)
- * 
+ *
  * Encode obj as a JSON String.
- * 
+ *
  * - *obj* [_Object_|Hash|Array] object to convert to a JSON String
  * - *opts* [_Hash_] options
  *
@@ -1015,6 +1012,7 @@ rails_encode(int argc, VALUE *argv, VALUE self) {
 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 {
@@ -1026,6 +1024,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);
@@ -1034,17 +1037,23 @@ 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);
     oj_default_options.sec_prec = NUM2INT(prec);
+    oj_default_options.sec_prec_set = true;
 
     return prec;
 }
 
 /* Document-method: set_encoder
  *	call-seq: set_encoder()
- * 
+ *
  * Sets the ActiveSupport.encoder to Oj::Rails::Encoder and wraps some of the
  * formatting globals used by ActiveSupport to allow the use of those globals
  * in the Oj::Rails optimizations.
@@ -1056,7 +1065,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,12 +1087,19 @@ 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);
+    oj_default_options.sec_prec_set = true;
     rb_undef_method(encoding, "time_precision=");
     rb_define_module_function(encoding, "time_precision=", rails_time_precision, 1);
     rb_gv_set("$VERBOSE", verbose);
@@ -1097,7 +1118,7 @@ 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"));
     } else {
@@ -1120,7 +1141,7 @@ rails_set_decoder(VALUE self) {
     rb_undef_method(json, "parse");
     rb_define_module_function(json, "parse", oj_mimic_parse, -1);
     rb_gv_set("$VERBOSE", verbose);
-    
+
     return Qnil;
 }
 
@@ -1140,7 +1161,7 @@ oj_optimize_rails(VALUE self) {
 }
 
 /* Document-module: Oj::Rails
- * 
+ *
  * Module that provides rails and active support compatibility.
  */
 /* Document-class: Oj::Rails::Encoder
@@ -1150,7 +1171,7 @@ oj_optimize_rails(VALUE self) {
 void
 oj_mimic_rails_init() {
     VALUE	rails = rb_define_module_under(Oj, "Rails");
-    
+
     rb_define_module_function(rails, "encode", rails_encode, -1);
 
     encoder_class = rb_define_class_under(rails, "Encoder", rb_cObject);
@@ -1286,11 +1307,15 @@ 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 (out->omit_nil && Qnil == value) {
+	return ST_CONTINUE;
+    }
     if (rtype != T_STRING && rtype != T_SYMBOL) {
 	key = rb_funcall(key, oj_to_s_id, 0);
 	rtype = rb_type(key);
@@ -1396,25 +1421,36 @@ 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);
 	} 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 if (oj_bigdecimal_class == clas) {
+	    dump_bigdecimal(obj, depth, out, false);
 	} else {
 	    oj_dump_obj_to_s(obj, out);
 	}
+    } else if (Yes == out->opts->raw_json && rb_respond_to(obj, oj_raw_json_id)) {
+	oj_dump_raw_json(obj, depth, out);
     } 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);
     }
@@ -1433,7 +1469,7 @@ static DumpFunc	rails_funcs[] = {
     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_as_string,	// 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
@@ -1481,7 +1517,7 @@ 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;
+	out->opts->escape_mode = RailsXEsc;
     } else {
 	out->opts->escape_mode = RailsEsc;
     }