oj 2.13.0 → 2.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd957508587371c18e701b638fcf8191b3bc444d
-  data.tar.gz: aef52ecc143c4db76dfd1f9c64914a8a9021ad71
+  metadata.gz: 342383c1d1c0650dc81ad7a0f533e21b7ae67fa0
+  data.tar.gz: 7ba24a6ed5411eaef0c539076f0396cbed856489
 SHA512:
-  metadata.gz: 03d731a64121a180278f340025cb18e0644504ecb954a7a479a03f79fd6c46cd1ed00d48c850830433550ef968402f9f91a6903e888568075c3d38bb2626ed1d
-  data.tar.gz: 48f98ec630a2fe1f334de5eea37e952b549e7c97d98ab3f86e92a6608dd44e101da5fd853c3191ac76bf4e889609680ef5d97061330b67c7395e29a52cfae5d3
+  metadata.gz: 0a80309e5fc8cd37f2d76f99567012697f5776f212bac9ffe38ee4bf4740853f19653cd49b4d0b7238688e89a857d28f7010a3ac5eaee576638175f63c8a3507
+  data.tar.gz: 4a191f0f8294dde6558d24445b5f01eacf5276a68a823467caf32599ef6691c1523ed5253686372cee3e322dfdc845d2f88ccac471f9990605afa81a3f6edad7

data/README.md

@@ -26,6 +26,10 @@ Follow [@peterohler on Twitter](http://twitter.com/#!/peterohler) for announceme
 
 [![Build Status](https://secure.travis-ci.org/ohler55/oj.png?branch=master)](http://travis-ci.org/ohler55/oj)
 
+## Release 2.13.1
+
+ - Thanks to Comboy for the fix to a large number rounding bug.
+ 
 ## Release 2.13.0
 
  - Oj no longer raises an exception if the to_hash method of an object does not

data/ext/oj/dump.c

@@ -1786,9 +1786,12 @@ dump_struct_obj(VALUE obj, int depth, Out out) {
     size = d3 * out->indent + 2;
 #ifdef RSTRUCT_LEN
     {
-	VALUE	*vp;
+	const VALUE	*vp;
 
-	for (i = (int)RSTRUCT_LEN(obj), vp = RSTRUCT_PTR(obj); 0 < i; i--, vp++) {
+#ifndef RSTRUCT_CONST_PTR
+# define RSTRUCT_CONST_PTR(st) (const VALUE *)RSTRUCT_PTR(st)
+#endif
+	for (i = (int)RSTRUCT_LEN(obj), vp = RSTRUCT_CONST_PTR(obj); 0 < i; i--, vp++) {
 	    if (out->end - out->cur <= (long)size) {
 		grow(out, size);
 	    }

data/ext/oj/parse.c

@@ -389,7 +389,6 @@ static void
 read_num(ParseInfo pi) {
     struct _NumInfo	ni;
     Val			parent = stack_peek(&pi->stack);
-    int			zero_cnt = 0;
 
     ni.str = pi->cur;
     ni.i = 0;
@@ -398,7 +397,6 @@ read_num(ParseInfo pi) {
     ni.di = 0;
     ni.len = 0;
     ni.exp = 0;
-    ni.dec_cnt = 0;
     ni.big = 0;
     ni.infinity = 0;
     ni.nan = 0;
@@ -427,41 +425,32 @@ read_num(ParseInfo pi) {
 	pi->cur += 3;
 	ni.nan = 1;
     } else {
+	int	dec_cnt = 0;
+
 	for (; '0' <= *pi->cur && *pi->cur <= '9'; pi->cur++) {
-	    ni.dec_cnt++;
+	    dec_cnt++;
 	    if (ni.big) {
 		ni.big++;
 	    } else {
 		int	d = (*pi->cur - '0');
 
-		if (0 == d) {
-		    zero_cnt++;
-		} else {
-		    zero_cnt = 0;
-		}
-		// TBD move size check here
 		ni.i = ni.i * 10 + d;
-		if (LONG_MAX <= ni.i || DEC_MAX < ni.dec_cnt - zero_cnt) {
+		if (LONG_MAX <= ni.i || DEC_MAX < dec_cnt) {
 		    ni.big = 1;
 		}
 	    }
 	}
 	if ('.' == *pi->cur) {
+	    dec_cnt = 0;
 	    pi->cur++;
 	    for (; '0' <= *pi->cur && *pi->cur <= '9'; pi->cur++) {
 		int	d = (*pi->cur - '0');
 
-		if (0 == d) {
-		    zero_cnt++;
-		} else {
-		    zero_cnt = 0;
-		}
-		ni.dec_cnt++;
-		// TBD move size check here
+		dec_cnt++;
 		ni.num = ni.num * 10 + d;
 		ni.div *= 10;
 		ni.di++;
-		if (LONG_MAX <= ni.div || DEC_MAX < ni.dec_cnt - zero_cnt) {
+		if (LONG_MAX <= ni.div || DEC_MAX < dec_cnt) {
 		    ni.big = 1;
 		}
 	    }
@@ -487,7 +476,6 @@ read_num(ParseInfo pi) {
 		ni.exp = -ni.exp;
 	    }
 	}
-	ni.dec_cnt -= zero_cnt;
 	ni.len = pi->cur - ni.str;
     }
     if (BigDec == pi->options.bigdec_load) {

data/ext/oj/parse.h

@@ -48,7 +48,7 @@ typedef struct _NumInfo {
     const char	*str;
     size_t	len;
     long	exp;
-    int		dec_cnt;
+    //int		dec_cnt;
     int		big;
     int		infinity;
     int		nan;

data/ext/oj/sparse.c

@@ -399,7 +399,6 @@ read_str(ParseInfo pi) {
 static void
 read_num(ParseInfo pi) {
     struct _NumInfo	ni;
-    int			zero_cnt = 0;
     char		c;
 
     reader_protect(&pi->rd);
@@ -409,7 +408,6 @@ read_num(ParseInfo pi) {
     ni.di = 0;
     ni.len = 0;
     ni.exp = 0;
-    ni.dec_cnt = 0;
     ni.big = 0;
     ni.infinity = 0;
     ni.nan = 0;
@@ -430,39 +428,32 @@ read_num(ParseInfo pi) {
 	}
 	ni.infinity = 1;
     } else {
+	int	dec_cnt = 0;
+
 	for (; '0' <= c && c <= '9'; c = reader_get(&pi->rd)) {
-	    ni.dec_cnt++;
+	    dec_cnt++;
 	    if (ni.big) {
 		ni.big++;
 	    } else {
 		int	d = (c - '0');
 
-		if (0 == d) {
-		    zero_cnt++;
-		} else {
-		    zero_cnt = 0;
-		}
 		ni.i = ni.i * 10 + d;
-		if (LONG_MAX <= ni.i || DEC_MAX < ni.dec_cnt - zero_cnt) {
+		if (LONG_MAX <= ni.i || DEC_MAX < dec_cnt) {
 		    ni.big = 1;
 		}
 	    }
 	}
 	if ('.' == c) {
+	    dec_cnt = 0;
 	    c = reader_get(&pi->rd);
 	    for (; '0' <= c && c <= '9'; c = reader_get(&pi->rd)) {
 		int	d = (c - '0');
 
-		if (0 == d) {
-		    zero_cnt++;
-		} else {
-		    zero_cnt = 0;
-		}
-		ni.dec_cnt++;
+		dec_cnt++;
 		ni.num = ni.num * 10 + d;
 		ni.div *= 10;
 		ni.di++;
-		if (LONG_MAX <= ni.div || DEC_MAX < ni.dec_cnt - zero_cnt) {
+		if (LONG_MAX <= ni.div || DEC_MAX < dec_cnt) {
 		    ni.big = 1;
 		}
 	    }
@@ -488,7 +479,6 @@ read_num(ParseInfo pi) {
 		ni.exp = -ni.exp;
 	    }
 	}
-	ni.dec_cnt -= zero_cnt;
 	ni.len = pi->rd.tail - pi->rd.str;
 	if (0 != c) {
 	    reader_backup(&pi->rd);
@@ -515,7 +505,6 @@ read_nan(ParseInfo pi) {
     ni.di = 0;
     ni.len = 0;
     ni.exp = 0;
-    ni.dec_cnt = 0;
     ni.big = 0;
     ni.infinity = 0;
     ni.nan = 1;
@@ -685,7 +674,6 @@ oj_sparse2(ParseInfo pi) {
 		ni.di = 0;
 		ni.len = 0;
 		ni.exp = 0;
-		ni.dec_cnt = 0;
 		ni.big = 0;
 		ni.infinity = 0;
 		ni.nan = 1;

data/lib/oj/version.rb

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

data/test/test_various.rb

@@ -109,12 +109,11 @@ class Juice < Minitest::Test
                    :float_precision=>15,
                    :mode=>:object,
                    :escape_mode=>:json,
-                   :time_format=>:unix,
+                   :time_format=>:unix_zone,
                    :bigdecimal_load=>:auto,
                    :create_id=>'json_class'}, opts)
   end
 =end
-
   def test_set_options
     orig ={
       :indent=>0,
@@ -901,8 +900,10 @@ class Juice < Minitest::Test
     b = Oj.load(json, :mode => :strict)
     assert_equal(30226801971775055948247051683954096612865741943, b)
   end
+
   def test_bignum_object
     dump_and_load(7 ** 55, false)
+    dump_and_load(10 ** 19, false)
   end
 
   # BigDecimal

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 2.13.0
+  version: 2.13.1
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-19 00:00:00.000000000 Z
+date: 2015-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler