oj 3.10.6 → 3.10.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6c2164398794345431cbf21fe2598c7a68498dc21a49868103f9227470c5cdc
-  data.tar.gz: 81ddcee2018723c2ca4a9c668d78043d60647a83ab99057cdce3bd92ebad56fd
+  metadata.gz: 21e870cbb9a2f1c2b99efd6522ce9c284828865b922e299232e60abd4e916f7e
+  data.tar.gz: d1d93c3d58b7ed858e1a4ea89698861485bbeeb19b01bc66e3e8890ab7d93583
 SHA512:
-  metadata.gz: 546bcdf0ee93a8b170970ac0a9e26497ee4b903f606f1fc2640e77093765ea9d63d58501c4472fb742d810ac1adddbb31caaaa19b2cf984af1b0345b529a4aa3
-  data.tar.gz: 51745a18bc008d4ba5bac4a459ec2231997998efdf56de1e56b3bdd2b5e972733ed12a43be7ff10f54827825ae7e9a5c3532629c044f4c71ebe0934a05e2d334
+  metadata.gz: 7c5d6b2d7a7830b80ecc23436e50b0f42f53e82febe31ceb0168f440e5368ed323c19433894724beea83e7587013170b6a38be92b65b073d9881f8176a8d283b
+  data.tar.gz: 1558090a4a1b066418b9f36064c845ab99e423246f26af8aff682e8f09b8cfce29531f6e677c6e4d8b16056406251b2fe54b463e4ddef121adced8c9d3c167b2

data/ext/oj/parse.c

@@ -453,6 +453,7 @@ read_num(ParseInfo pi) {
 	    // except when mimicing the JSON gem or in strict mode.
 	    if (StrictMode == pi->options.mode || CompatMode == pi->options.mode) {
 		int	pos = (int)(pi->cur - ni.str);
+
 		if (1 == pos || (2 == pos && ni.neg)) {
 		    oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "not a number");
 		    return;
@@ -468,11 +469,19 @@ read_num(ParseInfo pi) {
 		if (0 < ni.num || 0 < ni.i) {
 		    dec_cnt++;
 		}
-		ni.num = ni.num * 10 + d;
-		ni.div *= 10;
-		ni.di++;
-		if (INT64_MAX <= ni.div || DEC_MAX < dec_cnt) {
-		    ni.big = 1;
+		if (INT64_MAX <= ni.div) {
+		    if (!ni.no_big) {
+			ni.big = true;
+		    }
+		} else {
+		    ni.num = ni.num * 10 + d;
+		    ni.div *= 10;
+		    ni.di++;
+		    if (INT64_MAX <= ni.div || DEC_MAX < dec_cnt) {
+			if (!ni.no_big) {
+			    ni.big = true;
+			}
+		    }
 		}
 	    }
 	}
@@ -490,7 +499,7 @@ read_num(ParseInfo pi) {
 	    for (; '0' <= *pi->cur && *pi->cur <= '9'; pi->cur++) {
 		ni.exp = ni.exp * 10 + (*pi->cur - '0');
 		if (EXP_MAX <= ni.exp) {
-		    ni.big = 1;
+		    ni.big = true;
 		}
 	    }
 	    if (eneg) {
@@ -810,22 +819,35 @@ oj_num_as_value(NumInfo ni) {
 		}
 	    } else {
 		double	d;
+		double	d2;
 
 		ld = roundl(ld);
 		// You would expect that staying with a long double would be
 		// more accurate but it fails to match what Ruby generates so
 		// drop down to a double.
 		if (0 < x) {
-		    d = (double)ld * pow(10.0, x);
+		    d = (double)(ld * powl(10.0, x));
+		    d2 = (double)ld * pow(10.0, x);
 		} else if (0 > x) {
-		    d = (double)ld / pow(10.0, -x);
+		    d = (double)(ld / powl(10.0, -x));
+		    d2 = (double)ld / pow(10.0, -x);
 		} else {
 		    d = (double)ld;
+		    d2 = d;
 		}
-		if (ni->neg) {
-		    d = -d;
+		if (d != d2) {
+		    volatile VALUE	bd = rb_str_new(ni->str, ni->len);
+
+		    rnum = rb_rescue2(parse_big_decimal, bd, rescue_big_decimal, bd, rb_eException, 0);
+		    if (ni->no_big) {
+			rnum = rb_funcall(rnum, rb_intern("to_f"), 0);
+		    }
+		} else {
+		    if (ni->neg) {
+			d = -d;
+		    }
+		    rnum = rb_float_new(d);
 		}
-		rnum = rb_float_new(d);
 	    }
 	}
     }
@@ -848,6 +870,12 @@ oj_set_error_at(ParseInfo pi, VALUE err_clas, const char* file, int line, const
     if (p + 3 < end) {
 	*p++ = ' ';
 	*p++ = '(';
+	*p++ = 'a';
+	*p++ = 'f';
+	*p++ = 't';
+	*p++ = 'e';
+	*p++ = 'r';
+	*p++ = ' ';
 	start = p;
 	for (vp = pi->stack.head; vp < pi->stack.tail; vp++) {
 	    if (end <= p + 1 + vp->klen) {

data/ext/oj/sparse.c

@@ -409,6 +409,7 @@ read_num(ParseInfo pi) {
     ni.neg = 0;
     ni.hasExp = 0;
     ni.no_big = (FloatDec == pi->options.bigdec_load);
+
     c = reader_get(&pi->rd);
     if ('-' == c) {
 	c = reader_get(&pi->rd);
@@ -469,11 +470,19 @@ read_num(ParseInfo pi) {
 		if (0 < ni.num || 0 < ni.i) {
 		    dec_cnt++;
 		}
-		ni.num = ni.num * 10 + d;
-		ni.div *= 10;
-		ni.di++;
-		if (INT64_MAX <= ni.div || DEC_MAX < dec_cnt) {
-		    ni.big = 1;
+		if (INT64_MAX <= ni.div) {
+		    if (!ni.no_big) {
+			ni.big = true;
+		    }
+		} else {
+		    ni.num = ni.num * 10 + d;
+		    ni.div *= 10;
+		    ni.di++;
+		    if (INT64_MAX <= ni.div || DEC_MAX < dec_cnt) {
+			if (!ni.no_big) {
+			    ni.big = true;
+			}
+		    }
 		}
 	    }
 	}

data/lib/oj/version.rb

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

data/pages/Options.md

@@ -80,16 +80,16 @@ dynamically modifying classes or reloading classes then don't use this.
 
 ### :create_additions
 
-A flag indicating the :create_id key when encountered during parsing should
-creating an Object mactching the class name specified in the value associated
-with the key.
+A flag indicating that the :create_id key, when encountered during parsing,
+should create an Object matching the class name specified in the value
+associated with the key.
 
 ### :create_id [String]
 
 The :create_id option specifies that key is used for dumping and loading when
 specifying the class for an encoded object. The default is `json_create`.
 
-In the `:custom` mode setting the `:create_id` to nil will cause Complex,
+In the `:custom` mode, setting the `:create_id` to nil will cause Complex,
 Rational, Range, and Regexp to be output as strings instead of as JSON
 objects.
 
@@ -179,7 +179,7 @@ customization.
 ### :nan [Symbol]
 
 How to dump Infinity, -Infinity, and NaN in :null, :strict, and :compat
-mode. Default is :auto but is ignored in the :compat and :rails mode.
+mode. Default is :auto but is ignored in the :compat and :rails modes.
 
  - `:null` places a null
 
@@ -252,7 +252,7 @@ The :time_format when dumping.
 
  - `:unix` time is output as a decimal number in seconds since epoch including fractions of a second.
 
- - `:unix_zone` similar to the `:unix` format but with the timezone encoded in
+ - `:unix_zone` is similar to the `:unix` format but with the timezone encoded in
    the exponent of the decimal number of seconds since epoch.
 
  - `:xmlschema` time is output as a string that follows the XML schema definition.
@@ -262,16 +262,16 @@ The :time_format when dumping.
 ### :use_as_json [Boolean]
 
 Call `as_json()` methods on dump, default is false. The option is ignored in
-the :compat and :rails mode.
+the :compat and :rails modes.
 
 
 ### :use_raw_json [Boolean]
 
 Call `raw_json()` methods on dump, default is false. The option is
-accepted in the :compat and :rails mode even though it is not
+accepted in the :compat and :rails modes even though it is not
 supported by other JSON gems. It provides a means to optimize dump or
 generate performance. The `raw_json(depth, indent)` method should be
-called only by Oj. It is not intended for any other use. This is mean
+called only by Oj. It is not intended for any other use. This is meant
 to replace the abused `to_json` methods. Calling `Oj.dump` inside the
 `raw_json` with the object itself when `:use_raw_json` is true will
 result in an infinite loop.
@@ -279,9 +279,9 @@ result in an infinite loop.
 ### :use_to_hash [Boolean]
 
 Call `to_hash()` methods on dump, default is false. The option is ignored in
-the :compat and :rails mode.
+the :compat and :rails modes.
 
 ### :use_to_json [Boolean]
 
 Call `to_json()` methods on dump, default is false. The option is ignored in
-the :compat and :rails mode.
+the :compat and :rails modes.

data/test/prec.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'oj'
+
+extras = {"locationLng" => -97.14690769100295}
+
+Oj.default_options = {float_precision: 17}
+
+encoded = Oj.dump(extras)
+puts encoded
+puts Oj.load(encoded)
+
+require "active_record"
+
+Oj::Rails.set_encoder()
+Oj::Rails.set_decoder()
+
+Oj.default_options = {float_precision: 17}
+# Using Oj rails encoder, gets the correct value: {"locationLng":-97.14690769100295}
+encoded = ActiveSupport::JSON.encode(extras)
+puts encoded
+puts ActiveSupport::JSON.decode(encoded)
+puts Oj.load(encoded)

data/test/test_custom.rb

@@ -118,6 +118,11 @@ class CustomJuice < Minitest::Test
     dump_and_load(-2.48e100 * 1.0e10, false)
   end
 
+  def test_float_parse
+    f = Oj.load("12.123456789012345678", mode: :custom, bigdecimal_load: :float);
+    assert_equal(Float, f.class)
+  end
+
   def test_nan_dump
     assert_equal('null', Oj.dump(0/0.0, :nan => :null))
     assert_equal('3.3e14159265358979323846', Oj.dump(0/0.0, :nan => :huge))

data/test/test_various.rb

@@ -185,7 +185,6 @@ class Juice < Minitest::Test
     n = Oj.load('-0.000012345678901234567')
     assert_equal(BigDecimal, n.class)
     assert_equal('-0.12345678901234567E-4', n.to_s.upcase)
-
   end
 
 =begin
@@ -671,7 +670,7 @@ class Juice < Minitest::Test
 	raise e
       end
     }
-    assert_equal('first[2].third', msg.split('(')[1].split(')')[0])
+    assert_equal('after first[2].third', msg.split('(')[1].split(')')[0])
   end
 
   def test_bad_bignum

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 3.10.6
+  version: 3.10.7
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-04 00:00:00.000000000 Z
+date: 2020-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -219,6 +219,7 @@ files:
 - test/perf_simple.rb
 - test/perf_strict.rb
 - test/perf_wab.rb
+- test/prec.rb
 - test/sample.rb
 - test/sample/change.rb
 - test/sample/dir.rb
@@ -289,6 +290,7 @@ specification_version: 4
 summary: A fast JSON parser and serializer.
 test_files:
 - test/foo.rb
+- test/prec.rb
 - test/test_integer_range.rb
 - test/test_strict.rb
 - test/perf_strict.rb