oj 3.7.11 → 3.9.1

data/ext/oj/oj.h

@@ -21,7 +21,7 @@ extern "C" {
 #include <stdint.h>
 #include <stdbool.h>
 
-#if HAVE_LIBPTHREAD
+#ifdef HAVE_PTHREAD_MUTEX_INIT
 #include <pthread.h>
 #endif
 #include "cache8.h"
@@ -139,6 +139,7 @@ typedef struct _options {
     char		to_hash;	// YesNo
     char		to_json;	// YesNo
     char		as_json;	// YesNo
+    char		raw_json;	// YesNo
     char		nilnil;		// YesNo
     char		empty_string;	// YesNo
     char		allow_gc;	// allow GC during parse
@@ -147,6 +148,7 @@ typedef struct _options {
     char		create_ok;	// YesNo allow create_id
     char		allow_nan;	// YEsyNo for parsing only
     char		trace;		// YesNo
+    char		safe;		// YesNo
     int64_t		integer_range_min; // dump numbers outside range as string
     int64_t		integer_range_max;
     const char		*create_id;	// 0 or string
@@ -202,7 +204,7 @@ typedef struct _strWriter {
     char		*types;	// DumpType
     char		*types_end;
     int			keyWritten;
-    
+
 } *StrWriter;
 
 typedef struct _streamWriter {
@@ -219,7 +221,7 @@ enum {
     COL_VAL  = 0x02,
     RUBY_VAL = 0x03
 };
-    
+
 typedef struct _leaf {
     struct _leaf	*next;
     union {
@@ -349,6 +351,7 @@ extern ID	oj_readpartial_id;
 extern ID	oj_replace_id;
 extern ID	oj_stat_id;
 extern ID	oj_string_id;
+extern ID	oj_raw_json_id;
 extern ID	oj_to_h_id;
 extern ID	oj_to_hash_id;
 extern ID	oj_to_json_id;
@@ -365,8 +368,9 @@ extern ID	oj_write_id;
 
 extern bool	oj_use_hash_alt;
 extern bool	oj_use_array_alt;
+extern bool	string_writer_optimized;
 
-#if HAVE_LIBPTHREAD
+#ifdef HAVE_PTHREAD_MUTEX_INIT
 extern pthread_mutex_t	oj_cache_mutex;
 #else
 extern VALUE	oj_cache_mutex;

data/ext/oj/parse.c

@@ -8,6 +8,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <math.h>
+#include <ruby/util.h>
 
 #include "oj.h"
 #include "encode.h"
@@ -1036,7 +1037,7 @@ CLEANUP:
 	if (Qnil != pi->err_class) {
 	    pi->err.clas = pi->err_class;
 	}
-	if (CompatMode == pi->options.mode) {
+	if (CompatMode == pi->options.mode && Yes != pi->options.safe) {
 	    // The json gem requires the error message be UTF-8 encoded. In
 	    // additional the complete JSON source must be returned. There
 	    // does not seem to be a size limit.

data/ext/oj/rails.c

@@ -117,7 +117,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;
 }
 
@@ -230,7 +230,7 @@ dump_sec_nano(VALUE obj, int64_t sec, long nsec, Out out) {
     int			tzhour, tzmin;
     char		tzsign = '+';
     int			len;
-    
+
     if (out->end - out->cur <= 36) {
 	assure_size(out, 36);
     }
@@ -353,7 +353,7 @@ columns_array(VALUE rcols, int *ccnt) {
     StrLen		cols;
     int			i;
     int			cnt = (int)RARRAY_LEN(rcols);
-    
+
     *ccnt = cnt;
     cols = ALLOC_N(struct _strLen, cnt);
     for (i = 0, cp = cols; i < cnt; i++, cp++) {
@@ -372,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;
@@ -432,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");
@@ -597,7 +597,7 @@ 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));
@@ -672,7 +672,7 @@ encoder_new(int argc, VALUE *argv, VALUE self) {
     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;
@@ -727,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;
@@ -750,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;
@@ -759,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
@@ -780,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;
 }
@@ -806,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 {
@@ -820,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
@@ -836,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
@@ -844,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
@@ -868,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
@@ -966,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.
@@ -977,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);
@@ -985,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
  *
@@ -1037,7 +1041,7 @@ rails_time_precision(VALUE self, VALUE 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.
@@ -1049,7 +1053,7 @@ rails_set_encoder(VALUE self) {
     VALUE	encoding;
     VALUE	pv;
     VALUE	verbose;
-    
+
     if (rb_const_defined_at(rb_cObject, rb_intern("ActiveSupport"))) {
 	active = rb_const_get_at(rb_cObject, rb_intern("ActiveSupport"));
     } else {
@@ -1067,6 +1071,8 @@ rails_set_encoder(VALUE self) {
     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);
 
+    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);
 
@@ -1090,7 +1096,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 {
@@ -1113,7 +1119,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;
 }
 
@@ -1133,7 +1139,7 @@ oj_optimize_rails(VALUE self) {
 }
 
 /* Document-module: Oj::Rails
- * 
+ *
  * Module that provides rails and active support compatibility.
  */
 /* Document-class: Oj::Rails::Encoder
@@ -1143,7 +1149,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);
@@ -1283,7 +1289,10 @@ hash_cb(VALUE key, VALUE value, Out out) {
     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);
@@ -1398,6 +1407,8 @@ dump_obj(VALUE obj, int depth, Out out, bool as_ok) {
 
 	if (NULL != (ro = oj_rails_get_opt(out->ropts, rb_obj_class(obj))) && 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)) {
@@ -1405,6 +1416,8 @@ dump_obj(VALUE obj, int depth, Out out, bool as_ok) {
 	} 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);

data/ext/oj/resolve.c

@@ -6,7 +6,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#if HAVE_LIBPTHREAD
+#ifdef HAVE_PTHREAD_MUTEX_INIT
 #include <pthread.h>
 #endif
 
@@ -75,7 +75,7 @@ oj_name2class(ParseInfo pi, const char *name, size_t len, int auto_define, VALUE
     if (No == pi->options.class_cache) {
 	return resolve_classpath(pi, name, len, auto_define, error_class);
     }
-#if HAVE_LIBPTHREAD
+#ifdef HAVE_PTHREAD_MUTEX_INIT
     pthread_mutex_lock(&oj_cache_mutex);
 #else
     rb_mutex_lock(oj_cache_mutex);
@@ -85,7 +85,7 @@ oj_name2class(ParseInfo pi, const char *name, size_t len, int auto_define, VALUE
 	    *slot = clas;
 	}
     }
-#if HAVE_LIBPTHREAD
+#ifdef HAVE_PTHREAD_MUTEX_INIT
     pthread_mutex_unlock(&oj_cache_mutex);
 #else
     rb_mutex_unlock(oj_cache_mutex);

data/ext/oj/sparse.c

@@ -632,7 +632,7 @@ oj_sparse2(ParseInfo pi) {
     while (1) {
 	if (0 < pi->max_depth && pi->max_depth <= pi->stack.tail - pi->stack.head - 1) {
 	    VALUE	err_clas = oj_get_json_err_class("NestingError");
-	    
+
 	    oj_set_error_at(pi, err_clas, __FILE__, __LINE__, "Too deeply nested.");
 	    pi->err_class = err_clas;
 	    return;
@@ -890,7 +890,7 @@ CLEANUP:
 	if (Qnil != pi->err_class && 0 != pi->err_class) {
 	    pi->err.clas = pi->err_class;
 	}
-	if (CompatMode == pi->options.mode) {
+	if (CompatMode == pi->options.mode && Yes != pi->options.safe) {
 	    // The json gem requires the error message be UTF-8 encoded. In
 	    // additional the complete JSON source should be returned but that
 	    // is not possible without stored all the bytes read and reading

data/ext/oj/string_writer.c

@@ -8,6 +8,8 @@
 
 extern VALUE	Oj;
 
+bool	string_writer_optimized = false;
+
 static void
 key_check(StrWriter sw, const char *key) {
     DumpType	type = sw->types[sw->depth];
@@ -152,7 +154,7 @@ oj_str_writer_push_array(StrWriter sw, const char *key) {
 void
 oj_str_writer_push_value(StrWriter sw, VALUE val, const char *key) {
     Out	out = &sw->out;
-    
+
     if (sw->keyWritten) {
 	sw->keyWritten = 0;
     } else {
@@ -273,7 +275,7 @@ str_writer_free(void *ptr) {
 static VALUE
 str_writer_new(int argc, VALUE *argv, VALUE self) {
     StrWriter	sw = ALLOC(struct _strWriter);
-    
+
     oj_str_writer_init(sw, 0);
     if (1 == argc) {
 	oj_parse_options(argv[0], &sw->opts);
@@ -487,8 +489,26 @@ str_writer_to_s(VALUE self) {
     return oj_encode(rstr);
 }
 
+/* Document-method: as_json
+ * call-seq: as_json()
+ *
+ * Returns the contents of the writer as a JSON element. If called from inside
+ * an array or hash by Oj the raw buffer will be used othersize a more
+ * inefficient parse of the contents and a return of the result is
+ * completed. The parse uses the trict mode.
+ *
+ * *return* [_Hash_|_Array_|_String_|_Integer_|_Float_|_True_|_False_|_nil|)
+ */
+static VALUE
+str_writer_as_json(VALUE self) {
+    if (string_writer_optimized) {
+	return self;
+    }
+    return rb_hash_new();
+}
+
 /* Document-class: Oj::StringWriter
- * 
+ *
  * Supports building a JSON document one element at a time. Build the document
  * by pushing values into the document. Pushing an array or an object will
  * create that element in the JSON document and subsequent pushes will add the
@@ -509,4 +529,6 @@ oj_string_writer_init() {
     rb_define_method(oj_string_writer_class, "pop_all", str_writer_pop_all, 0);
     rb_define_method(oj_string_writer_class, "reset", str_writer_reset, 0);
     rb_define_method(oj_string_writer_class, "to_s", str_writer_to_s, 0);
+    rb_define_method(oj_string_writer_class, "raw_json", str_writer_to_s, 0);
+    rb_define_method(oj_string_writer_class, "as_json", str_writer_as_json, 0);
 }