oj 3.7.11 → 3.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d48227161f707ac83a49469686bfcdbe44376055ebdcd1a449f5e62a1089256
-  data.tar.gz: ef7636a3fecfa42d00246ebedab1784a2ee9c935e863694dba38aca471b477bc
+  metadata.gz: 4a9bfd0e254e8c30855238077fd24a8398fe6f51027d061865a4bae5b8843577
+  data.tar.gz: df12b305f11cae6ed49e002b64f02681df83b613674cec99baeaacc9e9308b27
 SHA512:
-  metadata.gz: c4dc96bbdff56dd250c03eca2576a502167470c077b8852eae1698636b8dad3f9c188d4a4f755766425de7f21ab4e363938352f80a3be76da36f6bfad3e57a42
-  data.tar.gz: 77e579b56103860a3364c0e33a91fd33e5fd55e15a2385b1a9993b6fb6c11f1ec31d3b7b4cd968e08b135a772d2d786f86503a113cb0c847049b332a4397b0a5
+  metadata.gz: 69db529090d8152e069fab0bb18327ba9cb823817e6282aafeb3caf073a723964e7daf9bf40ffe4921306d8b0caf0fa71e1912bfa6c9c411ee7b87ba8aa4be60
+  data.tar.gz: c438cdbc8e9ecb36a47b09d88a8e8170a76b1cb04ca966586b8096dbf176503aa9e88da3d4d429f1ad3bc0aef696f58d6367620a35c0f93fc5fda3ec43caa4f9

data/README.md

@@ -65,7 +65,7 @@ See [{file:CHANGELOG.md}](CHANGELOG.md)
 
 ## Links
 
- - *Documentation*: http://www.ohler.com/oj/doc, http://rubydoc.info/gems/oj
+- *Documentation*: http://www.ohler.com/oj/doc, http://rubydoc.info/gems/oj
 
 - *GitHub* *repo*: https://github.com/ohler55/oj
 
@@ -93,4 +93,12 @@ Follow [@peterohler on Twitter](http://twitter.com/peterohler) for announcements
 
  - *OjC, a C JSON parser*: https://www.ohler.com/ojc also at https://github.com/ohler55/ojc
 
- - *Piper Push Cache, push JSON to browsers*: http://www.piperpushcache.com
+ - *Agoo, a high performance Ruby web server supporting GraphQL on GitHub*: https://github.com/ohler55/agoo
+
+ - *Agoo-C, a high performance C web server supporting GraphQL on GitHub*: https://github.com/ohler55/agoo-c
+
+#### Contributing
+
++ Provide a Pull Request off the `develop` branch.
++ Report a bug
++ Suggest an idea

data/ext/oj/custom.c

@@ -32,6 +32,13 @@ dump_obj_str(VALUE obj, int depth, Out out) {
     oj_code_attrs(obj, attrs, depth, out, Yes == out->opts->create_ok);
 }
 
+static void
+dump_obj_as_str(VALUE obj, int depth, Out out) {
+    volatile VALUE	rstr = rb_funcall(obj, oj_to_s_id, 0);
+    const char		*str = rb_string_value_ptr((VALUE*)&rstr);
+
+    oj_dump_cstr(str, RSTRING_LEN(rstr), 0, 0, out);
+}
 
 static void
 bigdecimal_dump(VALUE obj, int depth, Out out) {
@@ -57,19 +64,23 @@ static ID	imag_id = 0;
 
 static void
 complex_dump(VALUE obj, int depth, Out out) {
-    struct _attr	attrs[] = {
-	{ "real", 4, Qnil },
-	{ "imag", 4, Qnil },
-	{ NULL, 0, Qnil },
-    };
-    if (0 == real_id) {
-	real_id = rb_intern("real");
-	imag_id = rb_intern("imag");
-    }
-    attrs[0].value = rb_funcall(obj, real_id, 0);
-    attrs[1].value = rb_funcall(obj, imag_id, 0);
+    if (NULL != out->opts->create_id) {
+	struct _attr	attrs[] = {
+	    { "real", 4, Qnil },
+	    { "imag", 4, Qnil },
+	    { NULL, 0, Qnil },
+	};
+	if (0 == real_id) {
+	    real_id = rb_intern("real");
+	    imag_id = rb_intern("imag");
+	}
+	attrs[0].value = rb_funcall(obj, real_id, 0);
+	attrs[1].value = rb_funcall(obj, imag_id, 0);
 
-    oj_code_attrs(obj, attrs, depth, out, Yes == out->opts->create_ok);
+	oj_code_attrs(obj, attrs, depth, out, Yes == out->opts->create_ok);
+    } else {
+	dump_obj_as_str(obj, depth, out);
+    }
 }
 
 static VALUE
@@ -115,7 +126,7 @@ date_dump(VALUE obj, int depth, Out out) {
     } else {
 	volatile VALUE	v;
 	volatile VALUE	ov;
-	
+
 	switch (out->opts->time_format) {
 	case RubyTime:
 	case XmlTime:
@@ -150,7 +161,7 @@ date_dump(VALUE obj, int depth, Out out) {
 static VALUE
 date_load(VALUE clas, VALUE args) {
     volatile VALUE	v;
-    
+
     if (Qnil != (v = rb_hash_aref(args, rb_str_new2("s")))) {
 	return rb_funcall(oj_date_class, rb_intern("parse"), 1, v);
     }
@@ -160,7 +171,7 @@ date_load(VALUE clas, VALUE args) {
 static VALUE
 datetime_load(VALUE clas, VALUE args) {
     volatile VALUE	v;
-    
+
     if (Qnil != (v = rb_hash_aref(args, rb_str_new2("s")))) {
 	return rb_funcall(oj_datetime_class, rb_intern("parse"), 1, v);
     }
@@ -193,23 +204,27 @@ openstruct_load(VALUE clas, VALUE args) {
 
 static void
 range_dump(VALUE obj, int depth, Out out) {
-    struct _attr	attrs[] = {
-	{ "begin", 5, Qnil },
-	{ "end", 3, Qnil },
-	{ "exclude", 7, Qnil },
-	{ NULL, 0, Qnil },
-    };
-    attrs[0].value = rb_funcall(obj, oj_begin_id, 0);
-    attrs[1].value = rb_funcall(obj, oj_end_id, 0);
-    attrs[2].value = rb_funcall(obj, oj_exclude_end_id, 0);
+    if (NULL != out->opts->create_id) {
+	struct _attr	attrs[] = {
+	    { "begin", 5, Qnil },
+	    { "end", 3, Qnil },
+	    { "exclude", 7, Qnil },
+	    { NULL, 0, Qnil },
+	};
+	attrs[0].value = rb_funcall(obj, oj_begin_id, 0);
+	attrs[1].value = rb_funcall(obj, oj_end_id, 0);
+	attrs[2].value = rb_funcall(obj, oj_exclude_end_id, 0);
 
-    oj_code_attrs(obj, attrs, depth, out, Yes == out->opts->create_ok);
+	oj_code_attrs(obj, attrs, depth, out, Yes == out->opts->create_ok);
+    } else {
+	dump_obj_as_str(obj, depth, out);
+    }
 }
 
 static VALUE
 range_load(VALUE clas, VALUE args) {
     VALUE	nargs[3];
-    
+
     nargs[0] = rb_hash_aref(args, rb_id2str(oj_begin_id));
     nargs[1] = rb_hash_aref(args, rb_id2str(oj_end_id));
     nargs[2] = rb_hash_aref(args, rb_id2str(oj_exclude_end_id));
@@ -222,19 +237,23 @@ static ID	denominator_id = 0;
 
 static void
 rational_dump(VALUE obj, int depth, Out out) {
-    struct _attr	attrs[] = {
-	{ "numerator", 9, Qnil },
-	{ "denominator", 11, Qnil },
-	{ NULL, 0, Qnil },
-    };
-    if (0 == numerator_id) {
-	numerator_id = rb_intern("numerator");
-	denominator_id = rb_intern("denominator");
-    }
-    attrs[0].value = rb_funcall(obj, numerator_id, 0);
-    attrs[1].value = rb_funcall(obj, denominator_id, 0);
+    if (NULL != out->opts->create_id) {
+	struct _attr	attrs[] = {
+	    { "numerator", 9, Qnil },
+	    { "denominator", 11, Qnil },
+	    { NULL, 0, Qnil },
+	};
+	if (0 == numerator_id) {
+	    numerator_id = rb_intern("numerator");
+	    denominator_id = rb_intern("denominator");
+	}
+	attrs[0].value = rb_funcall(obj, numerator_id, 0);
+	attrs[1].value = rb_funcall(obj, denominator_id, 0);
 
-    oj_code_attrs(obj, attrs, depth, out, Yes == out->opts->create_ok);
+	oj_code_attrs(obj, attrs, depth, out, Yes == out->opts->create_ok);
+    } else {
+	dump_obj_as_str(obj, depth, out);
+    }
 }
 
 static VALUE
@@ -250,7 +269,7 @@ rational_load(VALUE clas, VALUE args) {
 static VALUE
 regexp_load(VALUE clas, VALUE args) {
     volatile VALUE	v;
-    
+
     if (Qnil != (v = rb_hash_aref(args, rb_str_new2("s")))) {
 	return rb_funcall(rb_cRegexp, oj_new_id, 1, v);
     }
@@ -423,7 +442,7 @@ dump_odd(VALUE obj, Odd odd, VALUE clas, int depth, Out out) {
 	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 {	    
+	} else {
 	    const char	*s = rb_string_value_ptr((VALUE*)&v);
 	    int		len = (int)RSTRING_LEN(v);
 	    const char	*name = rb_id2name(*odd->attrs);
@@ -459,7 +478,7 @@ dump_odd(VALUE obj, Odd odd, VALUE clas, int depth, Out out) {
 		char	*n;
 		char	*end;
 		ID	i;
-	    
+
 		if (sizeof(nbuf) <= nlen) {
 		    if (NULL == (n2 = strdup(name))) {
 			rb_raise(rb_eNoMemError, "for attribute name.");
@@ -497,7 +516,10 @@ dump_odd(VALUE obj, Odd odd, VALUE clas, int depth, Out out) {
 // Return class if still needs dumping.
 static VALUE
 dump_common(VALUE obj, int depth, Out out) {
-    if (Yes == out->opts->to_json && rb_respond_to(obj, oj_to_json_id)) {
+
+    if (Yes == out->opts->raw_json && rb_respond_to(obj, oj_raw_json_id)) {
+	oj_dump_raw_json(obj, depth, out);
+    } else if (Yes == out->opts->to_json && rb_respond_to(obj, oj_to_json_id)) {
 	volatile VALUE	rs;
 	const char	*s;
 	int		len;
@@ -608,7 +630,7 @@ dump_attr_cb(ID key, VALUE value, Out out) {
     oj_dump_custom_val(value, depth, out, true);
     out->depth = depth;
     *out->cur++ = ',';
-    
+
     return ST_CONTINUE;
 }
 
@@ -780,7 +802,7 @@ static void
 dump_struct(VALUE obj, int depth, Out out, bool as_ok) {
     long	id = oj_check_circular(obj, out);
     VALUE	clas;
-    
+
     if (0 > id) {
 	oj_dump_nil(Qnil, depth, out, false);
     } else if (Qnil != (clas = dump_common(obj, depth, out))) {
@@ -793,7 +815,7 @@ dump_struct(VALUE obj, int depth, Out out, bool as_ok) {
 	size_t		size = d2 * out->indent + d3 * out->indent + 3;
 	const char	*name;
 	int		cnt;
-	size_t		len;	
+	size_t		len;
 
 	assure_size(out, size);
 	if (clas == rb_cRange) {
@@ -871,7 +893,11 @@ dump_data(VALUE obj, int depth, Out out, bool as_ok) {
 
 static void
 dump_regexp(VALUE obj, int depth, Out out, bool as_ok) {
-    dump_obj_str(obj, depth, out);
+    if (NULL != out->opts->create_id) {
+	dump_obj_str(obj, depth, out);
+    } else {
+	dump_obj_as_str(obj, depth, out);
+    }
 }
 
 static void
@@ -1043,7 +1069,7 @@ hash_set_num(struct _parseInfo *pi, Val kval, NumInfo ni) {
 	oj_set_obj_ivar(parent, kval, rval);
 	break;
     case T_HASH:
-	if (4 == parent->klen && NULL != parent->key && rb_cTime == parent->clas && 0 == strncmp("time", parent->key, 4)) {
+	if (4 == parent->klen && NULL != parent->key && rb_cTime == parent->clas && 0 != ni->div && 0 == strncmp("time", parent->key, 4)) {
 	    int64_t	nsec = ni->num * 1000000000LL / ni->div;
 
 	    if (ni->neg) {
@@ -1113,7 +1139,7 @@ static void
 array_append_num(ParseInfo pi, NumInfo ni) {
     Val			parent = stack_peek(&pi->stack);
     volatile VALUE	rval = oj_num_as_value(ni);
-    
+
     rb_ary_push(parent->val, rval);
     if (Yes == pi->options.trace) {
 	oj_trace_parse_call("append_number", pi, __FILE__, __LINE__, rval);

data/ext/oj/dump.c

@@ -15,6 +15,7 @@
 #include "cache8.h"
 #include "dump.h"
 #include "odd.h"
+#include "trace.h"
 #include "util.h"
 
 // Workaround in case INFINITY is not defined in math.h or if the OS is CentOS
@@ -166,7 +167,7 @@ hixss_friendly_size(const uint8_t *str, size_t len) {
     size_t	size = 0;
     size_t	i = len;
     bool	check = false;
-    
+
     for (; 0 < i; str++, i--) {
 	size += hixss_friendly_chars[*str];
 	if (0 != (0x80 & *str)) {
@@ -201,7 +202,7 @@ rails_friendly_size(const uint8_t *str, size_t len) {
 const char*
 oj_nan_str(VALUE obj, int opt, int mode, bool plus, int *lenp) {
     const char	*str = NULL;
-    
+
     if (AutoNan == opt) {
 	switch (mode) {
 	case CompatMode:	opt = WordNan;	break;
@@ -323,7 +324,7 @@ dump_unicode(const char *str, const char *end, Out out, const char *orig) {
     *out->cur++ = 'u';
     for (i = 3; 0 <= i; i--) {
 	*out->cur++ = hex_chars[(uint8_t)(code >> (i * 4)) & 0x0F];
-    }	
+    }
     return str - 1;
 }
 
@@ -331,7 +332,7 @@ static const char*
 check_unicode(const char *str, const char *end, const char *orig) {
     uint8_t	b = *(uint8_t*)str;
     int		cnt = 0;
-    
+
     if (0xC0 == (0xE0 & b)) {
 	cnt = 1;
     } else if (0xE0 == (0xF0 & b)) {
@@ -411,7 +412,7 @@ oj_dump_time(VALUE obj, Out out, int withZone) {
     sec = rb_num2ll(rb_funcall2(obj, oj_tv_sec_id, 0, 0));
     nsec = rb_num2ll(rb_funcall2(obj, oj_tv_nsec_id, 0, 0));
 #endif
-    
+
     *b-- = '\0';
     if (withZone) {
 	long	tzsecs = NUM2LONG(rb_funcall2(obj, oj_utc_offset_id, 0, 0));
@@ -740,6 +741,30 @@ debug_raise(const char *orig, size_t cnt, int line) {
     rb_raise(oj_json_generator_error_class, "Partial character in string. %s @ %d", buf, line);
 }
 
+void
+oj_dump_raw_json(VALUE obj, int depth, Out out) {
+    if (oj_string_writer_class == rb_obj_class(obj)) {
+	StrWriter	sw = (StrWriter)DATA_PTR(obj);
+	size_t		len = sw->out.cur - sw->out.buf;
+
+	if (0 < len) {
+	    len--;
+	}
+	oj_dump_raw(sw->out.buf, len, out);
+    } else {
+	volatile VALUE	jv;
+
+	if (Yes == out->opts->trace) {
+	    oj_trace("raw_json", obj, __FILE__, __LINE__, depth + 1, TraceRubyIn);
+	}
+	jv = rb_funcall(obj, oj_raw_json_id, 2, RB_INT2NUM(depth), RB_INT2NUM(out->indent));
+	if (Yes == out->opts->trace) {
+	    oj_trace("raw_json", obj, __FILE__, __LINE__, depth + 1, TraceRubyOut);
+	}
+	oj_dump_raw(rb_string_value_ptr((VALUE*)&jv), (size_t)RSTRING_LEN(jv), out);
+    }
+}
+
 void
 oj_dump_cstr(const char *str, size_t cnt, bool is_sym, bool escape1, Out out) {
     size_t	size;
@@ -801,7 +826,7 @@ oj_dump_cstr(const char *str, size_t cnt, bool is_sym, bool escape1, Out out) {
     } else {
 	const char	*end = str + cnt;
 	const char	*check_start = str;
-	
+
 	if (is_sym) {
 	    *out->cur++ = ':';
 	}
@@ -867,13 +892,13 @@ oj_dump_cstr(const char *str, size_t cnt, bool is_sym, bool escape1, Out out) {
 		break; // ignore, should never happen if the table is correct
 	    }
 	}
-	*out->cur++ = '"'; 
+	*out->cur++ = '"';
     }
     if ((JXEsc == out->opts->escape_mode || RailsXEsc == out->opts->escape_mode) && 0 < str - orig && 0 != (0x80 & *(str - 1))) {
 	uint8_t	c = (uint8_t)*(str - 1);
 	int	i;
 	int	scnt = (int)(str - orig);
-	
+
 	// Last utf-8 characters must be 0x10xxxxxx. The start must be
 	// 0x110xxxxx for 2 characters, 0x1110xxxx for 3, and 0x11110xxx for
 	// 4.
@@ -939,7 +964,7 @@ oj_grow_out(Out out, size_t len) {
     size_t  size = out->end - out->buf;
     long    pos = out->cur - out->buf;
     char    *buf = out->buf;
-	
+
     size *= 2;
     if (size <= len * 2 + pos) {
 	size += len;
@@ -996,24 +1021,21 @@ oj_dump_fixnum(VALUE obj, int depth, Out out, bool as_ok) {
     char	*b = buf + sizeof(buf) - 1;
     long long	num = rb_num2ll(obj);
     int		neg = 0;
-	bool	dump_as_string = false;
+    bool	dump_as_string = false;
 
-	if (out->opts->integer_range_max != 0 && out->opts->integer_range_min != 0 &&
-		(out->opts->integer_range_max < num || out->opts->integer_range_min > num)) {
+    if (out->opts->integer_range_max != 0 && out->opts->integer_range_min != 0 &&
+	(out->opts->integer_range_max < num || out->opts->integer_range_min > num)) {
 	dump_as_string = true;
-	}
-
+    }
     if (0 > num) {
 	neg = 1;
 	num = -num;
     }
-
     *b-- = '\0';
 
-	if (dump_as_string) {
+    if (dump_as_string) {
 	*b-- = '"';
-	}
-
+    }
     if (0 < num) {
 	for (; 0 < num; num /= 10, b--) {
 	    *b = (num % 10) + '0';
@@ -1026,11 +1048,9 @@ oj_dump_fixnum(VALUE obj, int depth, Out out, bool as_ok) {
     } else {
 	*b = '0';
     }
-
-	if (dump_as_string) {
+    if (dump_as_string) {
 	*--b = '"';
-	}
-
+    }
     assure_size(out, (sizeof(buf) - (b - buf)));
     for (; '\0' != *b; b++) {
 	*out->cur++ = *b;
@@ -1045,7 +1065,7 @@ oj_dump_bignum(VALUE obj, int depth, Out out, bool as_ok) {
 	bool		dump_as_string = false;
 
 	if (out->opts->integer_range_max != 0 || out->opts->integer_range_min != 0) { // Bignum cannot be inside of Fixnum range
-	dump_as_string = true; 
+	dump_as_string = true;
 	assure_size(out, cnt + 2);
 	*out->cur++ = '"';
 	} else {
@@ -1083,7 +1103,7 @@ oj_dump_float(VALUE obj, int depth, Out out, bool as_ok) {
 	    cnt = sizeof(inf_val) - 1;
 	} else {
 	    NanDump	nd = out->opts->dump_opts.nan_dump;
-	    
+
 	    if (AutoNan == nd) {
 		switch (out->opts->mode) {
 		case CompatMode:	nd = WordNan;	break;
@@ -1118,7 +1138,7 @@ oj_dump_float(VALUE obj, int depth, Out out, bool as_ok) {
 	    cnt = sizeof(ninf_val) - 1;
 	} else {
 	    NanDump	nd = out->opts->dump_opts.nan_dump;
-	    
+
 	    if (AutoNan == nd) {
 		switch (out->opts->mode) {
 		case CompatMode:	nd = WordNan;	break;
@@ -1152,7 +1172,7 @@ oj_dump_float(VALUE obj, int depth, Out out, bool as_ok) {
 	    cnt = sizeof(ninf_val) - 1;
 	} else {
 	    NanDump	nd = out->opts->dump_opts.nan_dump;
-	    
+
 	    if (AutoNan == nd) {
 		switch (out->opts->mode) {
 		case ObjectMode:	nd = HugeNan;	break;