oj 3.0.3 → 3.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c5c4e44c052cf9e204ada5c41bc6b868b04ec56
-  data.tar.gz: d2a0352206bb10de6743c8be87d22120f122c7ca
+  metadata.gz: 77898b80dc0daaabff6e620f0d9ef0b6eb26eac1
+  data.tar.gz: 112de18472976923d86d57a62fa30f611e0c4bbc
 SHA512:
-  metadata.gz: f4e47a2c590b33dff4fd7057c9874d1ab95f9c0057cc7f22a30617604865d8999b2dab758c47d89ee6445de033eeb07ac3b32077db52080f08a62bf57af3b9e2
-  data.tar.gz: 56ea00a656fc87fbc072a240ddcb58223627f4a28874d8b9fe37d1044757bd6e2cab993cadfc711be04adfae11cd2557c084a66e80c853132b6ff40adbef8913
+  metadata.gz: f59fca5e3442fcf3d46e5f931ec36657e54f359924e60707ed4962c11f9b7f402e41e2166befb257a7bf6686a4552a6be8553b84552908ca503a30bdd4f94ec1
+  data.tar.gz: 9443804d9d931de71e5b9d3f2ba29d05141fb0dd86bd9700d285908d75e5566f50476b5887200c49dc3524637a076c3efb9f489adb4926bf4dd0403753eb5032

data/ext/oj/dump_object.c

@@ -624,7 +624,7 @@ dump_obj_attrs(VALUE obj, VALUE clas, slot_t id, int depth, Out out) {
 		oj_dump_cstr(buf, strlen(attr) + 1, 0, 0, out);
 	    }
 	    *out->cur++ = ':';
-	    oj_dump_obj_val(value, d2, out, true);
+	    oj_dump_obj_val(value, d2, out);
 	    assure_size(out, 2);
 	}
 #endif

data/ext/oj/mimic_json.c

@@ -113,7 +113,7 @@ oj_parse_mimic_dump_options(VALUE ropts, Options copts) {
     if (Qnil != (v = rb_hash_lookup(ropts, oj_indent_sym))) {
 	rb_check_type(v, T_STRING);
 	if (sizeof(copts->dump_opts.indent_str) <= (len = RSTRING_LEN(v))) {
-	    rb_raise(rb_eArgError, "indent string is limited to %lu characters.", sizeof(copts->dump_opts.indent_str));
+	    rb_raise(rb_eArgError, "indent string is limited to %lu characters.", (unsigned long)sizeof(copts->dump_opts.indent_str));
 	}
 	strcpy(copts->dump_opts.indent_str, StringValuePtr(v));
 	copts->dump_opts.indent_size = (uint8_t)len;
@@ -122,7 +122,7 @@ oj_parse_mimic_dump_options(VALUE ropts, Options copts) {
     if (Qnil != (v = rb_hash_lookup(ropts, oj_space_sym))) {
 	rb_check_type(v, T_STRING);
 	if (sizeof(copts->dump_opts.after_sep) <= (len = RSTRING_LEN(v))) {
-	    rb_raise(rb_eArgError, "space string is limited to %lu characters.", sizeof(copts->dump_opts.after_sep));
+	    rb_raise(rb_eArgError, "space string is limited to %lu characters.", (unsigned long)sizeof(copts->dump_opts.after_sep));
 	}
 	strcpy(copts->dump_opts.after_sep, StringValuePtr(v));
 	copts->dump_opts.after_size = (uint8_t)len;
@@ -131,7 +131,7 @@ oj_parse_mimic_dump_options(VALUE ropts, Options copts) {
     if (Qnil != (v = rb_hash_lookup(ropts, oj_space_before_sym))) {
 	rb_check_type(v, T_STRING);
 	if (sizeof(copts->dump_opts.before_sep) <= (len = RSTRING_LEN(v))) {
-	    rb_raise(rb_eArgError, "space_before string is limited to %lu characters.", sizeof(copts->dump_opts.before_sep));
+	    rb_raise(rb_eArgError, "space_before string is limited to %lu characters.", (unsigned long)sizeof(copts->dump_opts.before_sep));
 	}
 	strcpy(copts->dump_opts.before_sep, StringValuePtr(v));
 	copts->dump_opts.before_size = (uint8_t)len;
@@ -140,7 +140,7 @@ oj_parse_mimic_dump_options(VALUE ropts, Options copts) {
     if (Qnil != (v = rb_hash_lookup(ropts, oj_object_nl_sym))) {
 	rb_check_type(v, T_STRING);
 	if (sizeof(copts->dump_opts.hash_nl) <= (len = RSTRING_LEN(v))) {
-	    rb_raise(rb_eArgError, "object_nl string is limited to %lu characters.", sizeof(copts->dump_opts.hash_nl));
+	    rb_raise(rb_eArgError, "object_nl string is limited to %lu characters.", (unsigned long)sizeof(copts->dump_opts.hash_nl));
 	}
 	strcpy(copts->dump_opts.hash_nl, StringValuePtr(v));
 	copts->dump_opts.hash_size = (uint8_t)len;
@@ -149,7 +149,7 @@ oj_parse_mimic_dump_options(VALUE ropts, Options copts) {
     if (Qnil != (v = rb_hash_lookup(ropts, oj_array_nl_sym))) {
 	rb_check_type(v, T_STRING);
 	if (sizeof(copts->dump_opts.array_nl) <= (len = RSTRING_LEN(v))) {
-	    rb_raise(rb_eArgError, "array_nl string is limited to %lu characters.", sizeof(copts->dump_opts.array_nl));
+	    rb_raise(rb_eArgError, "array_nl string is limited to %lu characters.", (unsigned long)sizeof(copts->dump_opts.array_nl));
 	}
 	strcpy(copts->dump_opts.array_nl, StringValuePtr(v));
 	copts->dump_opts.array_size = (uint8_t)len;

data/ext/oj/oj.c

@@ -407,7 +407,7 @@ oj_parse_options(VALUE ropts, Options copts) {
 	    break;
 	case T_STRING:
 	    if (sizeof(copts->dump_opts.indent_str) <= (len = RSTRING_LEN(v))) {
-		rb_raise(rb_eArgError, "indent string is limited to %lu characters.", sizeof(copts->dump_opts.indent_str));
+		rb_raise(rb_eArgError, "indent string is limited to %lu characters.", (unsigned long)sizeof(copts->dump_opts.indent_str));
 	    }
 	    strcpy(copts->dump_opts.indent_str, StringValuePtr(v));
 	    copts->dump_opts.indent_size = (uint8_t)len;
@@ -558,7 +558,7 @@ oj_parse_options(VALUE ropts, Options copts) {
 	} else {
 	    rb_check_type(v, T_STRING);
 	    if (sizeof(copts->dump_opts.after_sep) <= (len = RSTRING_LEN(v))) {
-		rb_raise(rb_eArgError, "space string is limited to %lu characters.", sizeof(copts->dump_opts.after_sep));
+		rb_raise(rb_eArgError, "space string is limited to %lu characters.", (unsigned long)sizeof(copts->dump_opts.after_sep));
 	    }
 	    strcpy(copts->dump_opts.after_sep, StringValuePtr(v));
 	    copts->dump_opts.after_size = (uint8_t)len;
@@ -571,7 +571,7 @@ oj_parse_options(VALUE ropts, Options copts) {
 	} else {
 	    rb_check_type(v, T_STRING);
 	    if (sizeof(copts->dump_opts.before_sep) <= (len = RSTRING_LEN(v))) {
-		rb_raise(rb_eArgError, "sapce_before string is limited to %lu characters.", sizeof(copts->dump_opts.before_sep));
+		rb_raise(rb_eArgError, "sapce_before string is limited to %lu characters.", (unsigned long)sizeof(copts->dump_opts.before_sep));
 	    }
 	    strcpy(copts->dump_opts.before_sep, StringValuePtr(v));
 	    copts->dump_opts.before_size = (uint8_t)len;
@@ -584,7 +584,7 @@ oj_parse_options(VALUE ropts, Options copts) {
 	} else {
 	    rb_check_type(v, T_STRING);
 	    if (sizeof(copts->dump_opts.hash_nl) <= (len = RSTRING_LEN(v))) {
-		rb_raise(rb_eArgError, "object_nl string is limited to %lu characters.", sizeof(copts->dump_opts.hash_nl));
+		rb_raise(rb_eArgError, "object_nl string is limited to %lu characters.", (unsigned long)sizeof(copts->dump_opts.hash_nl));
 	    }
 	    strcpy(copts->dump_opts.hash_nl, StringValuePtr(v));
 	    copts->dump_opts.hash_size = (uint8_t)len;
@@ -597,7 +597,7 @@ oj_parse_options(VALUE ropts, Options copts) {
 	} else {
 	    rb_check_type(v, T_STRING);
 	    if (sizeof(copts->dump_opts.array_nl) <= (len = RSTRING_LEN(v))) {
-		rb_raise(rb_eArgError, "array_nl string is limited to %lu characters.", sizeof(copts->dump_opts.array_nl));
+		rb_raise(rb_eArgError, "array_nl string is limited to %lu characters.", (unsigned long)sizeof(copts->dump_opts.array_nl));
 	    }
 	    strcpy(copts->dump_opts.array_nl, StringValuePtr(v));
 	    copts->dump_opts.array_size = (uint8_t)len;

data/ext/oj/rails.c

@@ -834,6 +834,7 @@ dump_as_json(VALUE obj, int depth, Out out, bool as_ok) {
     } else {
 	ja = rb_funcall(obj, oj_as_json_id, 0);
     }
+    out->argc = 0;
     if (ja == obj || !as_ok) {
 	// Once as_json is call it should never be called again on the same
 	// object with as_ok.
@@ -842,7 +843,7 @@ dump_as_json(VALUE obj, int depth, Out out, bool as_ok) {
 	int	type = rb_type(ja);
 
 	if (T_HASH == type || T_ARRAY == type) {
-	    dump_rails_val(ja, depth, out, false);
+	    dump_rails_val(ja, depth, out, true);
 	} else {
 	    dump_rails_val(ja, depth, out, true);
 	}
@@ -851,7 +852,7 @@ dump_as_json(VALUE obj, int depth, Out out, bool as_ok) {
 
 static void
 dump_to_hash(VALUE obj, int depth, Out out) {
-    dump_rails_val(rb_funcall(obj, oj_to_hash_id, 0), depth, out, false);
+    dump_rails_val(rb_funcall(obj, oj_to_hash_id, 0), depth, out, true);
 }
 
 static void
@@ -931,7 +932,7 @@ dump_array(VALUE a, int depth, Out out, bool as_ok) {
 	    } else {
 		fill_indent(out, d2);
 	    }
-	    dump_rails_val(rb_ary_entry(a, i), d2, out, as_ok);
+	    dump_rails_val(rb_ary_entry(a, i), d2, out, true);
 	    if (i < cnt) {
 		*out->cur++ = ',';
 	    }
@@ -1010,7 +1011,7 @@ hash_cb(VALUE key, VALUE value, Out out) {
 	    out->cur += out->opts->dump_opts.after_size;
 	}
     }
-    dump_rails_val(value, depth, out, false);
+    dump_rails_val(value, depth, out, true);
     out->depth = depth;
     *out->cur++ = ',';
 
@@ -1028,7 +1029,11 @@ dump_hash(VALUE obj, int depth, Out out, bool as_ok) {
 	    return;
 	}
     }
-    if (as_ok && !oj_rails_hash_opt && rb_respond_to(obj, oj_as_json_id)) {
+    // Nothing good can come from calling as_json on a hash which is supposed
+    // to be a primitive so if the type is a hash and the class is also a hash
+    // then do not call as_json.
+    //if (!oj_rails_hash_opt && as_ok && rb_cHash != rb_obj_class(obj) && rb_respond_to(obj, oj_as_json_id)) {
+    if (!oj_rails_hash_opt && as_ok && rb_respond_to(obj, oj_as_json_id)) {
 	dump_as_json(obj, depth, out, false);
 	return;
     }
@@ -1071,6 +1076,7 @@ dump_hash(VALUE obj, int depth, Out out, bool as_ok) {
 static void
 dump_obj(VALUE obj, int depth, Out out, bool as_ok) {
     if (oj_code_dump(oj_compat_codes, obj, depth, out)) {
+	out->argc = 0;
 	return;
     }
     if (as_ok) {
@@ -1096,6 +1102,7 @@ dump_obj(VALUE obj, int depth, Out out, bool as_ok) {
 static void
 dump_as_string(VALUE obj, int depth, Out out, bool as_ok) {
     if (oj_code_dump(oj_compat_codes, obj, depth, out)) {
+	out->argc = 0;
 	return;
     }
     oj_dump_obj_to_s(obj, out);

data/ext/oj/rxclass.c

@@ -6,16 +6,20 @@
 #include <sys/types.h>
 #include <stdlib.h>
 #include <errno.h>
-#include <regex.h>
 #include <string.h>
 #include <stdio.h>
+#if !IS_WINDOWS
+#include <regex.h>
+#endif
 
 #include "rxclass.h"
 
 typedef struct _RxC {
     struct _RxC	*next;
     VALUE	rrx;
+#if !IS_WINDOWS
     regex_t	rx;
+#endif
     VALUE	clas;
     char	src[256];
 } *RxC;
@@ -33,10 +37,12 @@ oj_rxclass_cleanup(RxClass rc) {
 
     while (NULL != (rxc = rc->head)) {
 	rc->head = rc->head->next;
+#if !IS_WINDOWS
 	if (Qnil == rxc->rrx) {
 	    regfree(&rxc->rx);
 	}
 	xfree(rxc);
+#endif
     }
 }
 
@@ -58,25 +64,29 @@ oj_rxclass_rappend(RxClass rc, VALUE rx, VALUE clas) {
 // Attempt to compile the expression. If it fails populate the error code..
 int
 oj_rxclass_append(RxClass rc, const char *expr, VALUE clas) {
-    // Use mallow and not ALLOC_N to avoid pulliing ruby.h which conflicts
-    // with regex_t.
     RxC	rxc;
+#if !IS_WINDOWS
     int	err;
     int	flags = 0;
-    
+#endif
     if (sizeof(rxc->src) <= strlen(expr)) {
-	snprintf(rc->err, sizeof(rc->err), "expressions must be less than %lu chracter", sizeof(rxc->src));
+	snprintf(rc->err, sizeof(rc->err), "expressions must be less than %lu characters", sizeof(rxc->src));
 	return EINVAL;
     }
     rxc = ALLOC_N(struct _RxC, 1);
     rxc->next = 0;
-    rxc->rrx = Qnil;
     rxc->clas = clas;
+
+#if IS_WINDOWS
+    rxc->rrx = rb_funcall(rb_cRegexp, rb_intern("new"), 1, rb_str_new2(expr));
+#else
+    rxc->rrx = Qnil;
     if (0 != (err = regcomp(&rxc->rx, expr, flags))) {
 	regerror(err, &rxc->rx, rc->err, sizeof(rc->err));
 	free(rxc);
 	return err;
     }
+#endif
     if (NULL == rc->tail) {
 	rc->head = rxc;
     } else {
@@ -102,12 +112,14 @@ oj_rxclass_match(RxClass rc, const char *str, int len) {
 		return rxc->clas;
 	    }
 	} else if (len < (int)sizeof(buf)) {
+#if !IS_WINDOWS
 	    // string is not \0 terminated so copy and atempt a match
 	    memcpy(buf, str, len);
 	    buf[len] = '\0';
 	    if (0 == regexec(&rxc->rx, buf, 0, NULL, 0)) { // match
 		return rxc->clas;
 	    }
+#endif
 	} else {
 	    // TBD allocate a larger buffer and attempt
 	}
@@ -126,7 +138,9 @@ oj_rxclass_copy(RxClass src, RxClass dest) {
 	    if (Qnil != rxc->rrx) {
 		oj_rxclass_rappend(dest, rxc->rrx, rxc->clas);
 	    } else {
+#if !IS_WINDOWS
 		oj_rxclass_append(dest, rxc->src, rxc->clas);
+#endif
 	    }
 	}
     }

data/lib/oj/version.rb

@@ -1,5 +1,5 @@
 
 module Oj
   # Current version of the module. 
-  VERSION = '3.0.3'
+  VERSION = '3.0.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.0.4
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-30 00:00:00.000000000 Z
+date: 2017-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler