oj 3.10.6 → 3.12.1

data/test/perf_strict.rb

@@ -15,6 +15,8 @@ $iter = 20000
 $with_bignum = false
 $with_nums = true
 $size = 0
+$symbolize = false
+$cache_keys = true
 
 opts = OptionParser.new
 opts.on("-v", "verbose")                                    { $verbose = true }
@@ -23,6 +25,8 @@ opts.on("-i", "--indent [Int]", Integer, "indentation")     { |i| $indent = i }
 opts.on("-s", "--size [Int]", Integer, "size (~Kbytes)")    { |i| $size = i }
 opts.on("-b", "with bignum")                                { $with_bignum = true }
 opts.on("-n", "without numbers")                            { $with_nums = false }
+opts.on("-z", "--symbolize", "symbolize keys")              { $symbolize = true }
+opts.on("-k", "--no-cache", "turn off key caching")         { $cache_keys = false }
 opts.on("-h", "--help", "Show this display")                { puts opts; Process.exit!(0) }
 files = opts.parse(ARGV)
 
@@ -51,7 +55,7 @@ else
   }
 end
 
-Oj.default_options = { :indent => $indent, :mode => :strict }
+Oj.default_options = { :indent => $indent, :mode => :strict, cache_keys: $cache_keys, cache_str: 5 }
 
 if 0 < $size
   o = $obj
@@ -62,9 +66,6 @@ if 0 < $size
 end
 
 $json = Oj.dump($obj)
-$obj_json = Oj.dump($obj, :mode => :object)
-#puts "*** size: #{$obj_json.size}"
-#puts "*** #{$obj_json}"
 $failed = {} # key is same as String used in tests later
 
 def capture_error(tag, orig, load_key, dump_key, &blk)
@@ -77,8 +78,13 @@ def capture_error(tag, orig, load_key, dump_key, &blk)
 end
 
 # Verify that all packages dump and load correctly and return the same Object as the original.
-capture_error('Oj:strict', $obj, 'load', 'dump') { |o| Oj.strict_load(Oj.dump(o, :mode => :strict)) }
-capture_error('Yajl', $obj, 'encode', 'parse') { |o| require 'yajl'; Yajl::Parser.parse(Yajl::Encoder.encode(o)) }
+capture_error('Oj:strict', $obj, 'load', 'dump') { |o|
+  Oj.strict_load(Oj.dump(o))
+}
+capture_error('Yajl', $obj, 'encode', 'parse') { |o|
+  require 'yajl'
+  Yajl::Parser.parse(Yajl::Encoder.encode(o))
+}
 capture_error('JSON::Ext', $obj, 'generate', 'parse') { |o|
   require 'json'
   require 'json/ext'
@@ -86,16 +92,11 @@ capture_error('JSON::Ext', $obj, 'generate', 'parse') { |o|
   JSON.parser = JSON::Ext::Parser
   JSON.parse(JSON.generate(o))
 }
-capture_error('JSON::Pure', $obj, 'generate', 'parse') { |o|
-  require 'json/pure'
-  JSON.generator = JSON::Pure::Generator
-  JSON.parser = JSON::Pure::Parser
-  JSON.parse(JSON.generate(o))
-}
+
+Oj.default_options = { symbol_keys: $symbolize }
 
 if $verbose
   puts "json:\n#{$json}\n"
-  puts "object json:\n#{$obj_json}\n"
   puts "Oj loaded object:\n#{Oj.strict_load($json)}\n"
   puts "Yajl loaded object:\n#{Yajl::Parser.parse($json)}\n"
   puts "JSON loaded object:\n#{JSON::Ext::Parser.new($json).parse}\n"
@@ -105,15 +106,12 @@ puts '-' * 80
 puts "Strict Parse Performance"
 perf = Perf.new()
 unless $failed.has_key?('JSON::Ext')
-  perf.add('JSON::Ext', 'parse') { JSON.parse($json) }
+  perf.add('JSON::Ext', 'parse') { JSON.parse($json, symbolize_names: $symbolize) }
   perf.before('JSON::Ext') { JSON.parser = JSON::Ext::Parser }
 end
-unless $failed.has_key?('JSON::Pure')
-  perf.add('JSON::Pure', 'parse') { JSON.parse($json) }
-  perf.before('JSON::Pure') { JSON.parser = JSON::Pure::Parser }
-end
 unless $failed.has_key?('Oj:strict')
   perf.add('Oj:strict', 'strict_load') { Oj.strict_load($json) }
+  perf.add('Oj:wab', 'wab_load') { Oj.wab_load($json) }
 end
 perf.add('Yajl', 'parse') { Yajl::Parser.parse($json) } unless $failed.has_key?('Yajl')
 perf.run($iter)
@@ -125,12 +123,8 @@ unless $failed.has_key?('JSON::Ext')
   perf.add('JSON::Ext', 'dump') { JSON.generate($obj) }
   perf.before('JSON::Ext') { JSON.generator = JSON::Ext::Generator }
 end
-unless $failed.has_key?('JSON::Pure')
-  perf.add('JSON::Pure', 'generate') { JSON.generate($obj) }
-  perf.before('JSON::Pure') { JSON.generator = JSON::Pure::Generator }
-end
 unless $failed.has_key?('Oj:strict')
-  perf.add('Oj:strict', 'dump') { Oj.dump($obj, :mode => :strict) }
+  perf.add('Oj:strict', 'dump') { Oj.dump($obj) }
 end
 perf.add('Yajl', 'encode') { Yajl::Encoder.encode($obj) } unless $failed.has_key?('Yajl')
 perf.run($iter)

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/sample_json.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby -wW2
+#!/usr/bin/env ruby
 
 if $0 == __FILE__
   $: << '.'

data/test/test_compat.rb

@@ -178,7 +178,7 @@ class CompatJuice < Minitest::Test
     assert_equal('"abc"', json)
   end
 
-  def test_time
+  def test_time_xml_schema
     t = Time.xmlschema("2012-01-05T23:58:07.123456000+09:00")
     #t = Time.local(2012, 1, 5, 23, 58, 7, 123456)
     json = Oj.dump(t, :mode => :compat)
@@ -236,6 +236,12 @@ class CompatJuice < Minitest::Test
     assert_equal({"a\nb" => true, "c\td" => false}, obj)
   end
 
+  def test_invalid_escapes_handled
+    json = '{"subtext":"\"404er\” \w \k \3 \a"}'
+    obj = Oj.compat_load(json)
+    assert_equal({"subtext" => "\"404er” w k 3 a"}, obj)
+  end
+
   def test_hash_escaping
     json = Oj.to_json({'<>' => '<>'}, mode: :compat)
     assert_equal(json, '{"<>":"<>"}')
@@ -271,12 +277,19 @@ class CompatJuice < Minitest::Test
   # BigDecimal
   def test_bigdecimal
     # BigDecimals are dumped as strings and can not be restored to the
-    # original value.
+    # original value without using an undocumented feature of the JSON gem.
     json = Oj.dump(BigDecimal('3.14159265358979323846'))
     # 2.4.0 changes the exponent to lowercase
     assert_equal('"0.314159265358979323846e1"', json.downcase)
   end
 
+  def test_decimal_class
+    big = BigDecimal('3.14159265358979323846')
+    # :decimal_class is the undocumented feature.
+    json = Oj.load('3.14159265358979323846', mode: :compat, decimal_class: BigDecimal)
+    assert_equal(big, json)
+  end
+
   def test_infinity
     assert_raises(Oj::ParseError) { Oj.load('Infinity', :mode => :strict) }
     x = Oj.load('Infinity', :mode => :compat)
@@ -284,7 +297,7 @@ class CompatJuice < Minitest::Test
   end
 
   # Time
-  def test_time
+  def test_time_from_time_object
     t = Time.new(2015, 1, 5, 21, 37, 7.123456, -8 * 3600)
     expect = '"' + t.to_s + '"'
     json = Oj.dump(t)

data/test/test_custom.rb

@@ -118,6 +118,17 @@ 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_float_parse_fast
+    f = Oj.load("12.123456789012345678", mode: :custom, bigdecimal_load: :fast);
+    assert_equal(Float, f.class)
+    assert(12.12345678901234 <= f && f < 12.12345678901236)
+  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_fast.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# encoding: UTF-8
+# encoding: utf-8
 
 $: << File.dirname(__FILE__)
 
@@ -279,10 +279,26 @@ class DocTest < Minitest::Test
        ['/array/1', {'num' => 3, 'string' => 'message', 'hash' => {'h2' => {'a' => [1, 2, 3]}}}],
        ['/array', [{'num' => 3, 'string' => 'message', 'hash' => {'h2' => {'a' => [1, 2, 3]}}}]],
        ['/', {'array' => [{'num' => 3, 'string' => 'message', 'hash' => {'h2' => {'a' => [1, 2, 3]}}}], 'boolean' => true}],
+       ['/nothing', nil],
+       ['/array/10', nil],
       ].each do |path,val|
-        assert_equal(val, doc.fetch(path))
+	if val.nil?
+	  assert_nil(doc.fetch(path))
+	else
+          assert_equal(val, doc.fetch(path))
+	end
       end
     end
+    # verify empty hash and arrays return nil when a member is requested
+    Oj::Doc.open('{}') do |doc|
+      assert_nil(doc.fetch('/x'))
+      assert_nil(doc.fetch('/0'))
+    end
+    Oj::Doc.open('[]') do |doc|
+      assert_nil(doc.fetch('/x'))
+      assert_nil(doc.fetch('/0'))
+    end
+
   end
 
   def test_move_fetch_path
@@ -297,6 +313,20 @@ class DocTest < Minitest::Test
     end
   end
 
+  def test_exisits
+    Oj::Doc.open(@json1) do |doc|
+      [['/array/1', true],
+       ['/array/1', true],
+       ['/array/1/hash', true],
+       ['/array/1/dash', false],
+       ['/array/3', false],
+       ['/nothing', false],
+      ].each do |path,val|
+        assert_equal(val, doc.exists?(path))
+      end
+    end
+  end
+
   def test_home
     Oj::Doc.open(@json1) do |doc|
       doc.move('/array/1/num')

data/test/test_generate.rb

@@ -0,0 +1,21 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+$: << File.dirname(__FILE__)
+$oj_dir = File.dirname(File.expand_path(File.dirname(__FILE__)))
+%w(lib ext).each do |dir|
+  $: << File.join($oj_dir, dir)
+end
+
+require 'minitest'
+require 'minitest/autorun'
+require 'oj'
+
+class Generator < Minitest::Test
+
+  def test_before
+    json = Oj.generate({})
+    assert_equal("{}", json)
+  end
+
+end

data/test/test_hash.rb

@@ -25,5 +25,15 @@ class Hashi < Minitest::Test
     assert_equal(3, obj[:abc])
     assert_equal(3, obj.abc())
   end
+
+  def test_marshal
+    h = Oj::EasyHash.new()
+    h['abc'] = 3
+    out = Marshal.dump(h)
+
+    obj = Marshal.load(out)
+    assert_equal(Oj::EasyHash, obj.class)
+    assert_equal(3, obj[:abc])
+  end
   
 end # HashTest

data/test/test_rails.rb

@@ -23,4 +23,13 @@ class RailsJuice < Minitest::Test
     assert_equal('0.123e3', json.downcase)
   end
 
+  def test_invalid_encoding
+    assert_raises(EncodingError) {
+      Oj.dump("\"\xf3j", mode: :rails)
+    }
+    assert_raises(EncodingError) {
+      Oj.dump("\xf3j", mode: :rails)
+    }
+  end
+
 end

data/test/test_scp.rb

@@ -328,7 +328,7 @@ class ScpTest < Minitest::Test
     IO.pipe do |read_io, write_io|
       if fork
         write_io.close
-        Oj.sc_parse(handler, read_io) {|v| p v}
+        Oj.sc_parse(handler, read_io)
         read_io.close
         assert_equal([[:hash_start],
                       [:hash_key, 'one'],

data/test/test_various.rb

@@ -120,8 +120,11 @@ class Juice < Minitest::Test
       escape_mode: :ascii,
       time_format: :unix_zone,
       bigdecimal_load: :float,
+      compat_bigdecimal: true,
       create_id: 'classy',
       create_additions: true,
+      cache_keys: false,
+      cache_str: 5,
       space: 'z',
       array_nl: 'a',
       object_nl: 'o',
@@ -185,7 +188,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 +673,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.12.1
 platform: ruby
 authors:
 - Peter Ohler
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-04 00:00:00.000000000 Z
+date: 2021-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -79,16 +79,16 @@ extensions:
 - ext/oj/extconf.rb
 extra_rdoc_files:
 - README.md
-- pages/Rails.md
-- pages/JsonGem.md
-- pages/Encoding.md
-- pages/WAB.md
-- pages/Custom.md
 - pages/Advanced.md
-- pages/Options.md
 - pages/Compatibility.md
+- pages/Custom.md
+- pages/Encoding.md
+- pages/JsonGem.md
 - pages/Modes.md
+- pages/Options.md
+- pages/Rails.md
 - pages/Security.md
+- pages/WAB.md
 files:
 - LICENSE
 - README.md
@@ -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
@@ -239,6 +240,7 @@ files:
 - test/test_fast.rb
 - test/test_file.rb
 - test/test_gc.rb
+- test/test_generate.rb
 - test/test_hash.rb
 - test/test_integer_range.rb
 - test/test_null.rb
@@ -264,7 +266,7 @@ metadata:
   homepage_uri: http://www.ohler.com/oj/
   source_code_uri: https://github.com/ohler55/oj
   wiki_uri: https://github.com/ohler55/oj/wiki
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--title"
 - Oj
@@ -276,104 +278,106 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: A fast JSON parser and serializer.
 test_files:
+- test/_test_active.rb
+- test/_test_active_mimic.rb
+- test/_test_mimic_rails.rb
+- test/activerecord/result_test.rb
+- test/activesupport4/decoding_test.rb
+- test/activesupport4/encoding_test.rb
+- test/activesupport4/test_helper.rb
+- test/activesupport5/abstract_unit.rb
+- test/activesupport5/decoding_test.rb
+- test/activesupport5/encoding_test.rb
+- test/activesupport5/encoding_test_cases.rb
+- test/activesupport5/test_helper.rb
+- test/activesupport5/time_zone_test_helpers.rb
+- test/activesupport6/abstract_unit.rb
+- test/activesupport6/decoding_test.rb
+- test/activesupport6/encoding_test.rb
+- test/activesupport6/encoding_test_cases.rb
+- test/activesupport6/test_common.rb
+- test/activesupport6/test_helper.rb
+- test/activesupport6/time_zone_test_helpers.rb
+- test/bar.rb
+- test/baz.rb
+- test/files.rb
 - test/foo.rb
-- test/test_integer_range.rb
-- test/test_strict.rb
-- test/perf_strict.rb
-- test/tests.rb
-- test/perf_saj.rb
-- test/test_compat.rb
 - test/helper.rb
-- test/perf_file.rb
-- test/test_scp.rb
-- test/perf_compat.rb
-- test/json_gem/json_common_interface_test.rb
+- test/isolated/shared.rb
+- test/isolated/test_mimic_after.rb
+- test/isolated/test_mimic_alone.rb
+- test/isolated/test_mimic_as_json.rb
+- test/isolated/test_mimic_before.rb
+- test/isolated/test_mimic_define.rb
+- test/isolated/test_mimic_rails_after.rb
+- test/isolated/test_mimic_rails_before.rb
+- test/isolated/test_mimic_redefine.rb
 - test/json_gem/json_addition_test.rb
-- test/json_gem/json_fixtures_test.rb
+- test/json_gem/json_common_interface_test.rb
+- test/json_gem/json_encoding_test.rb
 - test/json_gem/json_ext_parser_test.rb
-- test/json_gem/json_string_matching_test.rb
-- test/json_gem/json_generic_object_test.rb
+- test/json_gem/json_fixtures_test.rb
 - test/json_gem/json_generator_test.rb
-- test/json_gem/test_helper.rb
-- test/json_gem/json_encoding_test.rb
+- test/json_gem/json_generic_object_test.rb
 - test/json_gem/json_parser_test.rb
-- test/perf_wab.rb
-- test/test_file.rb
-- test/test_object.rb
-- test/sample.rb
+- test/json_gem/json_string_matching_test.rb
+- test/json_gem/test_helper.rb
+- test/perf.rb
+- test/perf_compat.rb
+- test/perf_fast.rb
+- test/perf_file.rb
 - test/perf_object.rb
-- test/test_hash.rb
-- test/test_custom.rb
-- test/bar.rb
-- test/activesupport4/encoding_test.rb
-- test/activesupport4/test_helper.rb
-- test/activesupport4/decoding_test.rb
-- test/sample_json.rb
-- test/activesupport5/encoding_test_cases.rb
-- test/activesupport5/encoding_test.rb
-- test/activesupport5/abstract_unit.rb
-- test/activesupport5/time_zone_test_helpers.rb
-- test/activesupport5/test_helper.rb
-- test/activesupport5/decoding_test.rb
-- test/test_saj.rb
+- test/perf_saj.rb
 - test/perf_scp.rb
-- test/test_wab.rb
-- test/test_null.rb
-- test/_test_active.rb
-- test/_test_mimic_rails.rb
-- test/test_fast.rb
-- test/perf_fast.rb
+- test/perf_simple.rb
+- test/perf_strict.rb
+- test/perf_wab.rb
+- test/prec.rb
 - test/sample/change.rb
-- test/sample/text.rb
+- test/sample/dir.rb
 - test/sample/doc.rb
-- test/sample/shape.rb
-- test/sample/layer.rb
-- test/sample/group.rb
 - test/sample/file.rb
-- test/sample/rect.rb
+- test/sample/group.rb
 - test/sample/hasprops.rb
+- test/sample/layer.rb
 - test/sample/line.rb
-- test/sample/dir.rb
 - test/sample/oval.rb
-- test/tests_mimic.rb
-- test/perf_simple.rb
-- test/zoo.rb
-- test/activerecord/result_test.rb
-- test/_test_active_mimic.rb
-- test/baz.rb
-- test/tests_mimic_addition.rb
-- test/test_writer.rb
-- test/test_rails.rb
-- test/perf.rb
-- test/isolated/test_mimic_define.rb
-- test/isolated/test_mimic_after.rb
-- test/isolated/test_mimic_rails_after.rb
-- test/isolated/test_mimic_before.rb
-- test/isolated/test_mimic_rails_before.rb
-- test/isolated/test_mimic_redefine.rb
-- test/isolated/shared.rb
-- test/isolated/test_mimic_alone.rb
-- test/isolated/test_mimic_as_json.rb
+- test/sample/rect.rb
+- test/sample/shape.rb
+- test/sample/text.rb
+- test/sample.rb
+- test/sample_json.rb
+- test/test_compat.rb
+- test/test_custom.rb
 - test/test_debian.rb
+- test/test_fast.rb
+- test/test_file.rb
 - test/test_gc.rb
-- test/files.rb
+- test/test_generate.rb
+- test/test_hash.rb
+- test/test_integer_range.rb
+- test/test_null.rb
+- test/test_object.rb
+- test/test_rails.rb
+- test/test_saj.rb
+- test/test_scp.rb
+- test/test_strict.rb
 - test/test_various.rb
-- test/activesupport6/encoding_test_cases.rb
-- test/activesupport6/encoding_test.rb
-- test/activesupport6/abstract_unit.rb
-- test/activesupport6/time_zone_test_helpers.rb
-- test/activesupport6/test_helper.rb
-- test/activesupport6/test_common.rb
-- test/activesupport6/decoding_test.rb
+- test/test_wab.rb
+- test/test_writer.rb
+- test/tests.rb
+- test/tests_mimic.rb
+- test/tests_mimic_addition.rb
+- test/zoo.rb