oj 3.7.12 → 3.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 596316b0a9a9e4fa7a82486f0589182f15a1c0c679d2d58f50357a291720cbfa
-  data.tar.gz: 3d58bd1344943d671222f1a7412c77731ecce70ddd3469a03ad15263374c243e
+  metadata.gz: a19be14b516dee300d722fd94e2ffc33415e046bec08a2e6bc62a2585967d616
+  data.tar.gz: 5c2d36263070e4ae9313657cdc0e56beb414bdd9c9025f5d7b2d5d3088ecab9f
 SHA512:
-  metadata.gz: 4273557f2d93c634e3a9ffc789a503f80ee5ca80a8031c1406a63a3e926648dd15294faa8820d6f6c63a625b9be4a34dd36bbde954ba8f68fe418f7182a84f55
-  data.tar.gz: ad6468ca75db3d8ebc792fcabbf417490c2cfe2927ab4859ef1c059fe36b8bad1c311fa03608a878350dd8324d3ab75887728a6ec4af1ffb1ea8739027642c69
+  metadata.gz: aef03660a2a58f825e7776b230627229fc8a22b92bf748146b67b3c505bb62f4ca1ab6376450786ae67a9c1e15cae2095e0cbde92787fdcd8f72b5a28ff63ee8
+  data.tar.gz: c17b96a8433a4115aeb2d5367ca05d6739cfc9ab4c8471fd0f5c69b103e5b67f534dfd579c08133dc94315ebfa17ef1f077b9cc5a12ecb4d42431d4df8a57f67

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

@@ -115,7 +115,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 +150,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 +160,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);
     }
@@ -209,7 +209,7 @@ range_dump(VALUE obj, int depth, Out 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));
@@ -250,7 +250,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 +423,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 +459,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 +497,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 +611,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 +783,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 +796,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) {
@@ -1113,7 +1116,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;

data/ext/oj/dump.h

@@ -45,6 +45,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);
 

data/ext/oj/dump_compat.c

@@ -64,12 +64,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 +78,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 +154,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 +189,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 +205,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++ = ']';
@@ -715,7 +716,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) {
@@ -762,9 +763,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

data/ext/oj/mimic_json.c

@@ -287,7 +287,7 @@ mimic_walk(VALUE key, VALUE obj, VALUE proc) {
  * call-seq: restore(source, proc=nil)
  *
  * Loads a Ruby Object from a JSON source that can be either a String or an
- * IO. If Proc is given or a block is providedit is called with each nested
+ * IO. If Proc is given or a block is provided it is called with each nested
  * element of the loaded Object.
  *
  * - *source* [_String_|IO] JSON source
@@ -300,7 +300,7 @@ mimic_walk(VALUE key, VALUE obj, VALUE proc) {
  * call-seq: load(source, proc=nil)
  *
  * Loads a Ruby Object from a JSON source that can be either a String or an
- * IO. If Proc is given or a block is providedit is called with each nested
+ * IO. If Proc is given or a block is provided it is called with each nested
  * element of the loaded Object.
  *
  * - *source* [_String_|IO] JSON source
@@ -357,6 +357,9 @@ mimic_generate_core(int argc, VALUE *argv, Options copts) {
     struct _out	out;
     VALUE	rstr;
 
+    // TBD
+    memset(buf, 0, sizeof(buf));
+
     out.buf = buf;
     out.end = buf + sizeof(buf) - 10;
     out.allocated = false;
@@ -677,6 +680,7 @@ static struct _options	mimic_object_to_json_options = {
     No,		// to_hash
     No,		// to_json
     No,		// as_json
+    No,		// raw_json
     No,		// nilnil
     No,		// empty_string
     Yes,	// allow_gc
@@ -685,6 +689,7 @@ static struct _options	mimic_object_to_json_options = {
     No,		// create_ok
     No,		// allow_nan
     No,		// trace
+    No,		// safe
     0,		// integer_range_min
     0,		// integer_range_max
     oj_json_class,// create_id