oj 3.3.7 → 3.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4d5410c27e25a4075040fce057dafda891377af
-  data.tar.gz: f06d843cbecfc3c54eac85685be54fb9d0a2cafa
+  metadata.gz: 28fc69ea25c02c80fd4d5d1622f05350e0fd6d5e
+  data.tar.gz: 143ef4198b371f30dbdd12d8e4f1ecd4b43cdb08
 SHA512:
-  metadata.gz: 5f5f28ef22ad9c2b60699458eb5a2e98c70a991989649b974b67c25109d31076a48244c4970aea3af4055d734f7e3c121ec9cdc1f73ed643d2a969c8895149f3
-  data.tar.gz: eee14c01cf62adabfcfe162997e74e7b31da61a5e2446495221446584e9bb39e8baaae20eff8a3245804c29a84812bb73f3a0f85d567deff9c6d90cc0f5f7e51
+  metadata.gz: b0478c6f09d46f53827b981ed947002c8b723884c83276384b1316f2d85db9dd29dba0095d4d6a8d618062c313954d5883e05b08e8ba016bb949aae43b797dad
+  data.tar.gz: 826fdefe54a411b7b92cc5563caeacccced2a7c0a25f869e1995fca3309cef7e4692e0ddb6e219317e788cc40daf3ddd4c0eb1c45bc932b4ab0e44a7c9d44bae

data/ext/oj/dump.c

@@ -1110,7 +1110,7 @@ oj_dump_float(VALUE obj, int depth, Out out, bool as_ok) {
 	strncpy(buf, rb_string_value_ptr((VALUE*)&rstr), cnt);
 	buf[cnt] = '\0';
     } else {
-	cnt = snprintf(buf, sizeof(buf), out->opts->float_fmt, d);
+	cnt = oj_dump_float_printf(buf, sizeof(buf), obj, d, out->opts->float_fmt);
     }
     assure_size(out, cnt);
     for (b = buf; '\0' != *b; b++) {
@@ -1118,3 +1118,18 @@ oj_dump_float(VALUE obj, int depth, Out out, bool as_ok) {
     }
     *out->cur = '\0';
 }
+
+int
+oj_dump_float_printf(char *buf, size_t blen, VALUE obj, double d, const char *format) {
+    int	cnt = snprintf(buf, blen, format, d);
+
+    // Round off issues at 16 significant digits so check for obvious ones of
+    // 0001 and 9999.
+    if (17 <= cnt && (0 == strcmp("0001", buf + cnt - 4) || 0 == strcmp("9999", buf + cnt - 4))) {
+	volatile VALUE	rstr = rb_funcall(obj, oj_to_s_id, 0);
+
+	strcpy(buf, rb_string_value_ptr((VALUE*)&rstr));
+	cnt = (int)RSTRING_LEN(rstr);
+    }
+    return cnt;
+}

data/ext/oj/dump.h

@@ -48,6 +48,8 @@ extern void	oj_dump_wab_val(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);
 
+extern int	oj_dump_float_printf(char *buf, size_t blen, VALUE obj, double d, const char *format);
+
 inline static void
 assure_size(Out out, size_t len) {
     if (out->end - out->cur <= (long)len) {

data/ext/oj/dump_compat.c

@@ -611,10 +611,9 @@ dump_float(VALUE obj, int depth, Out out, bool as_ok) {
 	    raise_json_err("NaN not allowed in JSON.", "GeneratorError");
 	}
     } else if (d == (double)(long long int)d) {
-	//cnt = snprintf(buf, sizeof(buf), "%.1Lf", (long double)d);
 	cnt = snprintf(buf, sizeof(buf), "%.1f", d);
     } else if (oj_rails_float_opt) {
-	cnt = snprintf(buf, sizeof(buf), "%0.16g", d);
+	cnt = oj_dump_float_printf(buf, sizeof(buf), obj, d, "%0.16g");
     } else {
 	volatile VALUE	rstr = rb_funcall(obj, oj_to_s_id, 0);
 

data/ext/oj/dump_strict.c

@@ -115,7 +115,7 @@ dump_float(VALUE obj, int depth, Out out, bool as_ok) {
 	    strncpy(buf, rb_string_value_ptr((VALUE*)&rstr), cnt);
 	    buf[cnt] = '\0';
 	} else {
-	    cnt = snprintf(buf, sizeof(buf), out->opts->float_fmt, d);
+	    cnt = oj_dump_float_printf(buf, sizeof(buf), obj, d, out->opts->float_fmt);
 	}
     }
     assure_size(out, cnt);

data/ext/oj/mimic_json.c

@@ -795,7 +795,6 @@ oj_mimic_json_methods(VALUE json) {
     } else {
     	oj_json_parser_error_class = rb_define_class_under(json, "ParserError", json_error);
     }
-    printf("*** setting parse error to %lx %s\n", oj_json_parser_error_class, rb_class2name(oj_json_parser_error_class));
     if (rb_const_defined_at(json, rb_intern("GeneratorError"))) {
         oj_json_generator_error_class = rb_const_get(json, rb_intern("GeneratorError"));
     } else {

data/ext/oj/rails.c

@@ -972,7 +972,7 @@ dump_float(VALUE obj, int depth, Out out, bool as_ok) {
 	} else if (d == (double)(long long int)d) {
 	    cnt = snprintf(buf, sizeof(buf), "%.1f", d);
 	} else if (oj_rails_float_opt) {
-	    cnt = snprintf(buf, sizeof(buf), "%0.16g", d);
+	    cnt = oj_dump_float_printf(buf, sizeof(buf), obj, d, "%0.16g");
 	} else {
 	    volatile VALUE	rstr = rb_funcall(obj, oj_to_s_id, 0);
 

data/lib/oj/version.rb

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

metadata

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