oj 3.7.4 → 3.11.2

data/ext/oj/dump.h

@@ -1,10 +1,7 @@
-/* dump.h
- * Copyright (c) 2011, Peter Ohler
- * All rights reserved.
- */
+// Copyright (c) 2011 Peter Ohler. All rights reserved.
 
-#ifndef __OJ_DUMP_H__
-#define __OJ_DUMP_H__
+#ifndef OJ_DUMP_H
+#define OJ_DUMP_H
 
 #include <ruby.h>
 
@@ -45,6 +42,8 @@ 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 void	oj_dump_wab_val(VALUE obj, int depth, Out out);
 
+extern void	oj_dump_raw_json(VALUE obj, int depth, Out out);
+
 extern VALUE	oj_add_to_json(int argc, VALUE *argv, VALUE self);
 extern VALUE	oj_remove_to_json(int argc, VALUE *argv, VALUE self);
 
@@ -91,4 +90,4 @@ dump_ulong(unsigned long num, Out out) {
     *out->cur = '\0';
 }
 
-#endif /* __OJ_DUMP_H__ */
+#endif /* OJ_DUMP_H */

data/ext/oj/dump_compat.c

@@ -1,7 +1,4 @@
-/* dump_object.c
- * Copyright (c) 2012, 2017, Peter Ohler
- * All rights reserved.
- */
+// Copyright (c) 2012, 2017 Peter Ohler. All rights reserved.
 
 #include "code.h"
 #include "dump.h"
@@ -64,12 +61,10 @@ dump_values_array(VALUE *values, int depth, Out out) {
     } else {
 	if (out->opts->dump_opts.use) {
 	    size = d2 * out->opts->dump_opts.indent_size + out->opts->dump_opts.array_size + 2;
-	} else {
-	    size = d2 * out->indent + 3;
-	}
-	if (out->opts->dump_opts.use) {
 	    size += out->opts->dump_opts.array_size;
 	    size += out->opts->dump_opts.indent_size;
+	} else {
+	    size = d2 * out->indent + 3;
 	}
 	for (; Qundef != *values; values++) {
 	    assure_size(out, size);
@@ -80,6 +75,7 @@ dump_values_array(VALUE *values, int depth, Out out) {
 		}
 		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;
@@ -155,7 +151,7 @@ dump_array(VALUE a, int depth, Out out, bool as_ok) {
     if (as_ok && !oj_use_hash_alt && rb_obj_class(a) != rb_cArray && rb_respond_to(a, oj_to_json_id)) {
 	dump_to_json(a, out);
 	return;
-    }	
+    }
     cnt = (int)RARRAY_LEN(a);
     *out->cur++ = '[';
     assure_size(out, 2);
@@ -190,9 +186,9 @@ dump_array(VALUE a, int depth, Out out, bool as_ok) {
 		*out->cur++ = ',';
 	    }
 	}
-	size = depth * out->indent + 1;
-	assure_size(out, size);
 	if (out->opts->dump_opts.use) {
+	    size = out->opts->dump_opts.array_size + out->opts->dump_opts.indent_size * depth + 1;
+	    assure_size(out, size);
 	    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;
@@ -206,6 +202,8 @@ dump_array(VALUE a, int depth, Out out, bool as_ok) {
 		}
 	    }
 	} else {
+	    size = depth * out->indent + 1;
+	    assure_size(out, size);
 	    fill_indent(out, depth);
 	}
 	*out->cur++ = ']';
@@ -217,7 +215,7 @@ static ID	_dump_id = 0;
 
 static void
 bigdecimal_alt(VALUE obj, int depth, Out out) {
-    struct _Attr	attrs[] = {
+    struct _attr	attrs[] = {
 	{ "b", 1, Qnil },
 	{ NULL, 0, Qnil },
     };
@@ -235,7 +233,7 @@ static ID	imag_id = 0;
 
 static void
 complex_alt(VALUE obj, int depth, Out out) {
-    struct _Attr	attrs[] = {
+    struct _attr	attrs[] = {
 	{ "r", 1, Qnil },
 	{ "i", 1, Qnil },
 	{ NULL, 0, Qnil },
@@ -258,7 +256,7 @@ static ID	start_id = 0;
 
 static void
 date_alt(VALUE obj, int depth, Out out) {
-    struct _Attr	attrs[] = {
+    struct _attr	attrs[] = {
 	{ "y", 1, Qnil },
 	{ "m", 1, Qnil },
 	{ "d", 1, Qnil },
@@ -286,7 +284,7 @@ static ID	offset_id = 0;
 
 static void
 datetime_alt(VALUE obj, int depth, Out out) {
-    struct _Attr	attrs[] = {
+    struct _attr	attrs[] = {
 	{ "y", 1, Qnil },
 	{ "m", 1, Qnil },
 	{ "d", 1, Qnil },
@@ -375,7 +373,7 @@ static ID	table_id = 0;
 
 static void
 openstruct_alt(VALUE obj, int depth, Out out) {
-    struct _Attr	attrs[] = {
+    struct _attr	attrs[] = {
 	{ "t", 1, Qnil },
 	{ NULL, 0, Qnil },
     };
@@ -425,7 +423,7 @@ static ID	denominator_id = 0;
 
 static void
 rational_alt(VALUE obj, int depth, Out out) {
-    struct _Attr	attrs[] = {
+    struct _attr	attrs[] = {
 	{ "n", 1, Qnil },
 	{ "d", 1, Qnil },
 	{ NULL, 0, Qnil },
@@ -445,7 +443,7 @@ static ID	source_id = 0;
 
 static void
 regexp_alt(VALUE obj, int depth, Out out) {
-    struct _Attr	attrs[] = {
+    struct _attr	attrs[] = {
 	{ "o", 1, Qnil },
 	{ "s", 1, Qnil },
 	{ NULL, 0, Qnil },
@@ -462,7 +460,7 @@ regexp_alt(VALUE obj, int depth, Out out) {
 
 static void
 time_alt(VALUE obj, int depth, Out out) {
-    struct _Attr	attrs[] = {
+    struct _attr	attrs[] = {
 	{ "s", 1, Qundef, 0, Qundef },
 	{ "n", 1, Qundef, 0, Qundef },
 	{ NULL, 0, Qnil },
@@ -471,10 +469,14 @@ time_alt(VALUE obj, int depth, Out out) {
     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));
@@ -487,7 +489,7 @@ time_alt(VALUE obj, int depth, Out out) {
     oj_code_attrs(obj, attrs, depth, out, true);
 }
 
-struct _Code	oj_compat_codes[] = {
+struct _code	oj_compat_codes[] = {
     { "BigDecimal", Qnil, bigdecimal_alt, NULL, false },
     { "Complex", Qnil, complex_alt, NULL, false },
     { "Date", Qnil, date_alt, false },
@@ -643,7 +645,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) {
@@ -711,7 +714,7 @@ dump_hash(VALUE obj, int depth, Out out, bool as_ok) {
     if (as_ok && !oj_use_hash_alt && rb_obj_class(obj) != rb_cHash && rb_respond_to(obj, oj_to_json_id)) {
 	dump_to_json(obj, out);
 	return;
-    }	
+    }
     cnt = (int)RHASH_SIZE(obj);
     assure_size(out, 2);
     if (0 == cnt) {
@@ -758,9 +761,12 @@ dump_obj(VALUE obj, int depth, Out out, bool as_ok) {
 	exception_alt(obj, depth, out);
 	return;
     }
+    if (Yes == out->opts->raw_json && rb_respond_to(obj, oj_raw_json_id)) {
+	oj_dump_raw_json(obj, depth, out);
+	return;
+    }
     if (as_ok && rb_respond_to(obj, oj_to_json_id)) {
 	dump_to_json(obj, out);
-
 	return;
     }
     // Nothing else matched so encode as a JSON object with Ruby obj members
@@ -862,7 +868,7 @@ dump_bignum(VALUE obj, int depth, Out out, bool as_ok) {
     // this must use to_s to pass the json gem unit tests.
     volatile VALUE	rs;
     int			cnt;
-	bool		dump_as_string = false;
+    bool		dump_as_string = false;
 
     if (use_bignum_alt) {
 	rs = rb_big2str(obj, 10);
@@ -872,21 +878,18 @@ dump_bignum(VALUE obj, int depth, Out out, bool as_ok) {
     rb_check_type(rs, T_STRING);
     cnt = (int)RSTRING_LEN(rs);
 
-	if (out->opts->integer_range_min != 0 || out->opts->integer_range_max != 0) {
+    if (out->opts->int_range_min != 0 || out->opts->int_range_max != 0) {
 	dump_as_string = true; // Bignum cannot be inside of Fixnum range
 	assure_size(out, cnt + 2);
 	*out->cur++ = '"';
-	} else {
+    } else {
 	assure_size(out, cnt);
-	}
-
+    }
     memcpy(out->cur, rb_string_value_ptr((VALUE*)&rs), cnt);
     out->cur += cnt;
-
-	if(dump_as_string) {
+    if (dump_as_string) {
 	*out->cur++ = '"';
-	}
-
+    }
     *out->cur = '\0';
 }
 

data/ext/oj/dump_leaf.c

@@ -1,7 +1,4 @@
-/* dump_leaf.c
- * Copyright (c) 2012, 2017, Peter Ohler
- * All rights reserved.
- */
+// Copyright (c) 2012, 2017 Peter Ohler. All rights reserved.
 
 #include <errno.h>
 
@@ -15,7 +12,7 @@ grow(Out out, size_t len) {
     size_t  size = out->end - out->buf;
     long    pos = out->cur - out->buf;
     char    *buf;
-	
+
     size *= 2;
     if (size <= len * 2 + pos) {
 	size += len;
@@ -227,7 +224,7 @@ oj_dump_leaf_to_json(Leaf leaf, Options copts, Out out) {
 void
 oj_write_leaf_to_file(Leaf leaf, const char *path, Options copts) {
     char	buf[4096];
-    struct _Out out;
+    struct _out out;
     size_t	size;
     FILE	*f;
 

data/ext/oj/dump_object.c

@@ -1,7 +1,4 @@
-/* dump_object.c
- * Copyright (c) 2012, 2017, Peter Ohler
- * All rights reserved.
- */
+// Copyright (c) 2012, 2017 Peter Ohler. All rights reserved.
 
 #include "dump.h"
 #include "odd.h"
@@ -56,7 +53,7 @@ dump_data(VALUE obj, int depth, Out out, bool as_ok) {
 	    }
 	} else {
 	    long	id = oj_check_circular(obj, out);
-	    
+
 	    if (0 <= id) {
 		dump_obj_attrs(obj, clas, id, depth, out);
 	    }
@@ -72,7 +69,7 @@ dump_obj(VALUE obj, int depth, Out out, bool as_ok) {
 	volatile VALUE	rstr = rb_funcall(obj, oj_to_s_id, 0);
 	const char	*str = rb_string_value_ptr((VALUE*)&rstr);
 	int		len = (int)RSTRING_LEN(rstr);
-	    
+
 	if (0 == strcasecmp("Infinity", str)) {
 	    str = oj_nan_str(obj, out->opts->dump_opts.nan_dump, out->opts->mode, true, &len);
 	    oj_dump_raw(str, len, out);
@@ -224,7 +221,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;
 
@@ -280,7 +278,7 @@ hash_cb(VALUE key, VALUE value, Out out) {
     }
     out->depth = depth;
     *out->cur++ = ',';
-    
+
     return ST_CONTINUE;
 }
 
@@ -348,7 +346,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);
@@ -363,6 +362,8 @@ dump_attr_cb(ID key, VALUE value, Out out) {
     // the key name is NULL. Not an empty string but NULL.
     if (NULL == attr) {
 	attr = "";
+    } else if (Yes == out->opts->ignore_under && '@' == *attr && '_' == attr[1]) {
+	return ST_CONTINUE;
     }
     if (0 == strcmp("bt", attr) || 0 == strcmp("mesg", attr)) {
 	return ST_CONTINUE;
@@ -384,7 +385,7 @@ dump_attr_cb(ID key, VALUE value, Out out) {
     oj_dump_obj_val(value, depth, out);
     out->depth = depth;
     *out->cur++ = ',';
-    
+
     return ST_CONTINUE;
 }
 #endif
@@ -423,8 +424,8 @@ dump_odd(VALUE obj, Odd odd, VALUE clas, int depth, Out out) {
     if (odd->raw) {
 	v = rb_funcall(obj, *odd->attrs, 0);
 	if (Qundef == v || T_STRING != rb_type(v)) {
-	    rb_raise(rb_eEncodingError, "Invalid type for raw JSON.\n");
-	} else {	    
+	    rb_raise(rb_eEncodingError, "Invalid type for raw JSON.");
+	} else {
 	    const char	*s = rb_string_value_ptr((VALUE*)&v);
 	    int		len = (int)RSTRING_LEN(v);
 	    const char	*name = rb_id2name(*odd->attrs);
@@ -460,9 +461,11 @@ dump_odd(VALUE obj, Odd odd, VALUE clas, int depth, Out out) {
 		char	*n;
 		char	*end;
 		ID	i;
-	    
+
 		if (sizeof(nbuf) <= nlen) {
-		    n2 = strdup(name);
+		    if (NULL == (n2 = strdup(name))) {
+			rb_raise(rb_eNoMemError, "for attribute name.");
+		    }
 		} else {
 		    strcpy(n2, name);
 		}
@@ -608,9 +611,12 @@ dump_obj_attrs(VALUE obj, VALUE clas, slot_t id, int depth, Out out) {
 	size = d2 * out->indent + 1;
 	for (i = cnt; 0 < i; i--, np++) {
 	    VALUE	value;
-	    
+
 	    vid = rb_to_id(*np);
 	    attr = rb_id2name(vid);
+	    if (Yes == out->opts->ignore_under && '@' == *attr && '_' == attr[1]) {
+		continue;
+	    }
 	    value = rb_ivar_get(obj, vid);
 
 	    if (oj_dump_ignore(out->opts, value)) {
@@ -737,7 +743,7 @@ dump_struct(VALUE obj, int depth, Out out, bool as_ok) {
 #else // RSTRUCT_LEN_RETURNS_INTEGER_OBJECT
 	cnt = (int)RSTRUCT_LEN(obj);
 #endif // RSTRUCT_LEN_RETURNS_INTEGER_OBJECT
-	
+
 	for (i = 0; i < cnt; i++) {
 	    v = RSTRUCT_GET(obj, i);
 	    if (oj_dump_ignore(out->opts, v)) {
@@ -810,7 +816,7 @@ static DumpFunc	obj_funcs[] = {
 void
 oj_dump_obj_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);
     }

data/ext/oj/dump_strict.c

@@ -1,7 +1,4 @@
-/* dump_strict.c
- * Copyright (c) 2012, 2017, Peter Ohler
- * All rights reserved.
- */
+// Copyright (c) 2012, 2017 Peter Ohler. All rights reserved.
 
 #include <stdlib.h>
 #include <time.h>
@@ -45,7 +42,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 +192,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 +357,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 +406,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);
     }