oj 3.16.0 → 3.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: affe42de16d26dfe301f38df7c0bc8ceee39ab25e5a6bd14bd7af6671cc3b422
-  data.tar.gz: ee1d7227f864b197aca62cb767f9202798b6d3d13cf0b5f89eae3f3a36450dbb
+  metadata.gz: 380409882636ecb1f8e3e54369f85dc11d7e167db741f5aec15bfadad2180601
+  data.tar.gz: 0c60d6f8a5b7d76904b84d378e41632f67c0e3fa2e61aeacfb680cadf15ef9dc
 SHA512:
-  metadata.gz: 8dbf6a0b5fef2b179dba864b595113f73ac27a952307559422bf1feda19fcc008a5e43a142d1bb3eb0cc4125ff18f35730208c7f82b11089ff90690e7b1f17d0
-  data.tar.gz: be09c04fa551288e2708c9151d0c966a09c3768ba15442cc54b8b4dd5850e2228b45608c06c8251c4e2ca32333353713f9c1feff81e4d34a48d1c6bf725014f6
+  metadata.gz: 1cbb6d75ab0c495c8d40983970e8fca54aa846eedb4e031368a98874f1db4ca68f160076ac59c230186316dc686923bad86196fa09bf585f501cf11fe814f9bc
+  data.tar.gz: 9d521e53c4e5311eda8abb0f89b12ae2dd3f8007abb02f0b5ff7728311f6d0b64221a493f8df66a7f223dd12c2c2ba6d47b309867f99e2fe206d440d028368a6

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 3.16.1 - 2023-09-01
+
+- Fixed exception type on number parsing. (thank you @jasonpenny)
+
 ## 3.16.0 - 2023-08-16
 
 - Added the `float_format` option.

data/ext/oj/parse.c

@@ -875,7 +875,11 @@ oj_num_as_value(NumInfo ni) {
             double d = strtod(ni->str, &end);
 
             if ((long)ni->len != (long)(end - ni->str)) {
-                rb_raise(ni->pi->err_class, "Invalid float");
+                if (Qnil == ni->pi->err_class) {
+                    rb_raise(oj_parse_error_class, "Invalid float");
+                } else {
+                    rb_raise(ni->pi->err_class, "Invalid float");
+                }
             }
             rnum = rb_float_new(d);
         }

data/lib/oj/version.rb

@@ -1,4 +1,4 @@
 module Oj
   # Current version of the module.
-  VERSION = '3.16.0'
+  VERSION = '3.16.1'
 end

data/test/foo.rb

@@ -5,10 +5,16 @@ $LOAD_PATH << '.'
 $LOAD_PATH << File.join(__dir__, '../lib')
 $LOAD_PATH << File.join(__dir__, '../ext')
 
+require 'active_support'
 require 'json'
 require 'oj'
-require 'oj/json'
 
-Oj.mimic_JSON
+Oj.mimic_JSON()
+# Oj::Rails.mimic_JSON()
 
-JSON.parse("[]")
+begin
+  ::JSON.parse('{ "foo": 84e }')
+  #::JSON.parse('{ "foo": 84eb234 }')
+rescue Exception => e
+  puts "#{e.class}: #{e.message}"
+end

data/test/perf_dump.rb

@@ -28,7 +28,7 @@ opts.parse(ARGV)
   'd' => [ true, [false, [-123_456_789, nil], 3.9676, ['Something else.', false], nil]], # mix it up array
   'e' => { 'zero' => nil, 'one' => 1, 'two' => 2, 'three' => [3], 'four' => [0, 1, 2, 3, 4] }, # hash
   'f' => nil,     # nil
-  'h' => { 'a' => { 'b' => { 'c' => { 'd' => { 'e' => { 'f' => { 'g' => nil }}}}}}}, # deep hash, not that deep
+  'h' => { 'a' => { 'b' => { 'c' => { 'd' => {'e' => { 'f' => { 'g' => nil }}}}}}}, # deep hash, not that deep
   'i' => [[[[[[[nil]]]]]]]  # deep array, again, not that deep
 }
 

data/test/prec.rb

@@ -2,9 +2,9 @@
 
 require 'oj'
 
-extras = { 'locationLng' => -97.14690769100295 }
+extras = {'locationLng' => -97.14690769100295}
 
-Oj.default_options = { float_precision: 17 }
+Oj.default_options = {float_precision: 17}
 
 encoded = Oj.dump(extras)
 puts encoded
@@ -15,8 +15,8 @@ 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 }
+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)

data/test/test_parser_debug.rb

@@ -3,7 +3,7 @@
 
 $LOAD_PATH << __dir__
 @oj_dir = File.dirname(File.expand_path(__dir__))
-%w[lib ext].each do |dir|
+%w(lib ext).each do |dir|
   $LOAD_PATH << File.join(@oj_dir, dir)
 end
 

data/test/test_strict.rb

@@ -69,6 +69,16 @@ class StrictJuice < Minitest::Test
     dump_and_load(-2.48e100 * 1.0e10, false)
   end
 
+  def test_invalid_float
+    begin
+      Oj.load("64ecb72d29191067f91ff95b")
+    rescue Oj::ParseError => e
+      assert(e.message == "Invalid float")
+      return
+    end
+    assert(false, "*** expected an exception")
+  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))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 3.16.0
+  version: 3.16.1
 platform: ruby
 authors:
 - Peter Ohler
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-16 00:00:00.000000000 Z
+date: 2023-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest