oj 2.14.0 → 2.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c5b4c3cba3688cc740907e024a5c586dc87ee8e
-  data.tar.gz: 779f5f0c8ca3485a69099c63bb7e9048f7c3b1cd
+  metadata.gz: 8e5d3a7192d7fefd4923450eb9ca27fa3e480f53
+  data.tar.gz: 96278a7d936f76e660b8ae89ccfe25550cd75a77
 SHA512:
-  metadata.gz: 35a08d84c9b2e4cef975627ab66cb92ae5db9f1f9baf45cb2a9a10ecb21f3c96c5f3db15b5abff775cfdb56f99fdad21e6d5e65c74a4fbc76061d2cc7d3bb977
-  data.tar.gz: 89a87edcd3f140d729dd0de077fcd9a9d39f39b29106a3fd247b8293a722241a31e4a7140962737b5222e98bd9f9898b55c0415d66bd504235251728258bc62b
+  metadata.gz: b457b1f450686bc06d0e196bdf3e683fc16a835d8dd790b22592fce7cc1e911b42f61258c16aab45cb49a7c38496ffe3dc3b54a6dc320861032166e8690a98ec
+  data.tar.gz: 937af1a3a9270efe743e0a475510f4ca6f64d87ba04cdc1cd94ea5b0590b50e95f2eff8adf5e453cc04640ae99bfac5cbb7144546675623d0d727603f5e7653a

data/README.md

@@ -159,13 +159,11 @@ Oj.default_options = {:mode => :compat }
 
 ## Releases
 
-**Release 2.14.0**
+**Release 2.14.1**
 
- - More tweaking on decimal rounding.
+ - Fixed bug that reverted to BigDecimal when a decimal had preceeding zeros
+   after the decimal point.
 
- - Made dump options available in the default options and not only in the mimic
-   generate calls.
-  
 [Older release notes](http://www.ohler.com/dev/oj_misc/release_notes.html).
 
 ## Compatibility

data/ext/oj/parse.c

@@ -428,7 +428,9 @@ read_num(ParseInfo pi) {
 	int	dec_cnt = 0;
 
 	for (; '0' <= *pi->cur && *pi->cur <= '9'; pi->cur++) {
-	    dec_cnt++;
+	    if (0 < ni.i) {
+		dec_cnt++;
+	    }
 	    if (ni.big) {
 		ni.big++;
 	    } else {
@@ -441,12 +443,13 @@ read_num(ParseInfo pi) {
 	    }
 	}
 	if ('.' == *pi->cur) {
-	    dec_cnt = 0;
 	    pi->cur++;
 	    for (; '0' <= *pi->cur && *pi->cur <= '9'; pi->cur++) {
 		int	d = (*pi->cur - '0');
 
-		dec_cnt++;
+		if (0 < ni.num) {
+		    dec_cnt++;
+		}
 		ni.num = ni.num * 10 + d;
 		ni.div *= 10;
 		ni.di++;

data/ext/oj/sparse.c

@@ -431,7 +431,9 @@ read_num(ParseInfo pi) {
 	int	dec_cnt = 0;
 
 	for (; '0' <= c && c <= '9'; c = reader_get(&pi->rd)) {
-	    dec_cnt++;
+	    if (0 < ni.i) {
+		dec_cnt++;
+	    }
 	    if (ni.big) {
 		ni.big++;
 	    } else {
@@ -444,12 +446,13 @@ read_num(ParseInfo pi) {
 	    }
 	}
 	if ('.' == c) {
-	    dec_cnt = 0;
 	    c = reader_get(&pi->rd);
 	    for (; '0' <= c && c <= '9'; c = reader_get(&pi->rd)) {
 		int	d = (c - '0');
 
-		dec_cnt++;
+		if (0 < ni.num) {
+		    dec_cnt++;
+		}
 		ni.num = ni.num * 10 + d;
 		ni.div *= 10;
 		ni.di++;

data/lib/oj/version.rb

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

data/test/test_various.rb

@@ -168,6 +168,25 @@ class Juice < Minitest::Test
     dump_and_load(1, false)
   end
 
+  def test_float_parse
+    Oj.default_options = { :float_precision => 16 }
+    n = Oj.load('0.00001234567890123456')
+    assert_equal(Float, n.class)
+    assert_equal('1.234567890123456e-05', "%0.15e" % [n])
+
+    n = Oj.load('-0.00001234567890123456')
+    assert_equal(Float, n.class)
+    assert_equal('-1.234567890123456e-05', "%0.15e" % [n])
+
+    n = Oj.load('1000.0000123456789')
+    assert_equal(BigDecimal, n.class)
+    assert_equal('0.10000000123456789E4', n.to_s)
+
+    n = Oj.load('-0.000012345678901234567')
+    assert_equal(BigDecimal, n.class)
+    assert_equal('-0.12345678901234567E-4', n.to_s)
+  end
+
   def test_float_dump
     Oj.default_options = { :float_precision => 16 }
     assert_equal('1405460727.723866', Oj.dump(1405460727.723866))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 2.14.0
+  version: 2.14.1
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-04 00:00:00.000000000 Z
+date: 2015-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler