oj 3.11.5 → 3.16.5

data/test/json_gem/json_fixtures_test.rb

@@ -2,6 +2,7 @@
 # encoding: UTF-8
 
 #frozen_string_literal: false
+
 require 'json_gem/test_helper'
 
 class JSONFixturesTest < Test::Unit::TestCase
@@ -16,7 +17,7 @@ class JSONFixturesTest < Test::Unit::TestCase
     for name, source in @passed
       begin
         assert JSON.parse(source),
-          "Did not pass for fixture '#{name}': #{source.inspect}"
+               "Did not pass for fixture '#{name}': #{source.inspect}"
       rescue => e
         warn "\nCaught #{e.class}(#{e}) for fixture '#{name}': #{source.inspect}\n#{e.backtrace * "\n"}"
         raise e
@@ -27,7 +28,7 @@ class JSONFixturesTest < Test::Unit::TestCase
   def test_failing
     for name, source in @failed
       assert_raise(JSON::ParserError, JSON::NestingError,
-        "Did not fail for fixture '#{name}': #{source.inspect}") do
+                   "Did not fail for fixture '#{name}': #{source.inspect}") do
         JSON.parse(source)
       end
     end

data/test/json_gem/json_generator_test.rb

@@ -22,24 +22,24 @@ class JSONGeneratorTest < Test::Unit::TestCase
     }
     @json2 = '{"a":2,"b":3.141,"c":"c","d":[1,"b",3.14],"e":{"foo":"bar"},' +
       '"g":"\\"\\u0000\\u001f","h":1000.0,"i":0.001}'
-    @json3 = <<'EOT'.chomp
-{
-  "a": 2,
-  "b": 3.141,
-  "c": "c",
-  "d": [
-    1,
-    "b",
-    3.14
-  ],
-  "e": {
-    "foo": "bar"
-  },
-  "g": "\"\u0000\u001f",
-  "h": 1000.0,
-  "i": 0.001
-}
-EOT
+    @json3 = <<~'EOT'.chomp
+      {
+        "a": 2,
+        "b": 3.141,
+        "c": "c",
+        "d": [
+          1,
+          "b",
+          3.14
+        ],
+        "e": {
+          "foo": "bar"
+        },
+        "g": "\"\u0000\u001f",
+        "h": 1000.0,
+        "i": 0.001
+      }
+    EOT
   end
 
   def test_generate
@@ -64,27 +64,29 @@ EOT
     parsed_json = JSON.parse(json)
     assert_equal(@hash, parsed_json)
     json = JSON.pretty_generate({1=>2})
-    assert_equal(<<'EOT'.chomp, json)
-{
-  "1": 2
-}
-EOT
+    assert_equal(<<~'EOT'.chomp, json)
+      {
+        "1": 2
+      }
+    EOT
     parsed_json = JSON.parse(json)
     assert_equal({"1"=>2}, parsed_json)
     assert_equal '666', JSON.pretty_generate(666)
+    json_nil_opts = JSON.pretty_generate({1=>2}, nil)
+    assert_equal json, json_nil_opts
   end
 
   def test_generate_custom
     state = JSON::State.new(:space_before => " ", :space => "   ", :indent => "<i>", :object_nl => "\n", :array_nl => "<a_nl>")
-    json = JSON.generate({1=>{2=>3,4=>[5,6]}}, state)
-    assert_equal(<<'EOT'.chomp, json)
-{
-<i>"1" :   {
-<i><i>"2" :   3,
-<i><i>"4" :   [<a_nl><i><i><i>5,<a_nl><i><i><i>6<a_nl><i><i>]
-<i>}
-}
-EOT
+    json = JSON.generate({1=>{2=>3, 4=>[5, 6]}}, state)
+    assert_equal(<<~'EOT'.chomp, json)
+      {
+      <i>"1" :   {
+      <i><i>"2" :   3,
+      <i><i>"4" :   [<a_nl><i><i><i>5,<a_nl><i><i><i>6<a_nl><i><i>]
+      <i>}
+      }
+    EOT
   end
 
   def test_fast_generate
@@ -113,7 +115,7 @@ EOT
   end
 
   # TBD Implement JSON.state to return state class.
-  # set state attibutes from defaults
+  # set state attributes from defaults
   # implement methods
   # circular should use circular in defaults or maybe always set to true, allow changes with [:check_circular]=
   def test_states
@@ -140,6 +142,8 @@ EOT
     # seems to occur on travis but not locally.
     actual = state.to_h
     actual.delete(:escape_slash)
+    actual.delete(:strict)
+    actual.delete(:script_safe)
     assert_equal({
       :allow_nan             => false,
       :array_nl              => "\n",
@@ -160,6 +164,8 @@ EOT
     # seems to occur on travis but not locally.
     actual = state.to_h
     actual.delete(:escape_slash)
+    actual.delete(:strict)
+    actual.delete(:script_safe)
     assert_equal({
       :allow_nan             => false,
       :array_nl              => "",
@@ -180,6 +186,8 @@ EOT
     # seems to occur on travis but not locally.
     actual = state.to_h
     actual.delete(:escape_slash)
+    actual.delete(:strict)
+    actual.delete(:script_safe)
     assert_equal({
       :allow_nan             => false,
       :array_nl              => "",
@@ -292,7 +300,9 @@ EOT
     assert_equal '2', state.indent
   end
 
-  if defined?(JSON::Ext::Generator)
+  if defined?(JSON::Ext::Generator) && Process.respond_to?(:fork)
+    # forking to avoid modifying core class of a parent process and
+    # introducing race conditions of tests are run in parallel
     def test_broken_bignum # [ruby-core:38867]
       pid = fork do
         x = 1 << 64
@@ -309,9 +319,6 @@ EOT
       end
       _, status = Process.waitpid2(pid)
       assert status.success?
-    rescue NotImplementedError
-      # forking to avoid modifying core class of a parent process and
-      # introducing race conditions of tests are run in parallel
     end
   end
 
@@ -351,7 +358,7 @@ EOT
     too_deep_ary = eval too_deep
     assert_raise(JSON::NestingError) { JSON.generate too_deep_ary }
     assert_raise(JSON::NestingError) { JSON.generate too_deep_ary, :max_nesting => 100 }
-    ok = JSON.generate too_deep_ary, :max_nesting => 101
+    ok = JSON.generate too_deep_ary, :max_nesting => 102
     assert_equal too_deep, ok
     ok = JSON.generate too_deep_ary, :max_nesting => nil
     assert_equal too_deep, ok
@@ -392,4 +399,15 @@ EOT
       assert_equal '["foo"]', JSON.generate([s.new('foo')])
     end
   end
+
+  def test_invalid_to_json
+    omit if REAL_JSON_GEM
+
+    data = Object.new
+    def data.to_json(*)
+      nil
+    end
+
+    assert_raises(TypeError) { JSON.generate(data) }
+  end
 end

data/test/json_gem/json_generic_object_test.rb

@@ -29,26 +29,26 @@ class JSONGenericObjectTest < Test::Unit::TestCase
 
   def test_parse_json
     x = JSON(
-        '{ "json_class": "JSON::GenericObject", "a": 1, "b": 2 }',
-        :create_additions => true
-             )
-    assert_kind_of Hash,
-      JSON(
         '{ "json_class": "JSON::GenericObject", "a": 1, "b": 2 }',
         :create_additions => true
       )
+    assert_kind_of Hash,
+                   JSON(
+                     '{ "json_class": "JSON::GenericObject", "a": 1, "b": 2 }',
+                     :create_additions => true
+                   )
     switch_json_creatable do
       assert_equal @go, l =
-        JSON(
-          '{ "json_class": "JSON::GenericObject", "a": 1, "b": 2 }',
-             :create_additions => true
-        )
+                          JSON(
+                            '{ "json_class": "JSON::GenericObject", "a": 1, "b": 2 }',
+                            :create_additions => true
+                          )
       assert_equal 1, l.a
       assert_equal @go,
-        l = JSON('{ "a": 1, "b": 2 }', :object_class => JSON::GenericObject)
+                   l = JSON('{ "a": 1, "b": 2 }', :object_class => JSON::GenericObject)
       assert_equal 1, l.a
       assert_equal JSON::GenericObject[:a => JSON::GenericObject[:b => 2]],
-        l = JSON('{ "a": { "b": 2 } }', :object_class => JSON::GenericObject)
+                   l = JSON('{ "a": { "b": 2 } }', :object_class => JSON::GenericObject)
       assert_equal 2, l.a.b
     end
   end

data/test/json_gem/json_parser_test.rb

@@ -31,7 +31,7 @@ class JSONParserTest < Test::Unit::TestCase
     }
     assert_equal(Encoding::UTF_8, e.message.encoding, bug10705)
     assert_include(e.message, json, bug10705)
-  end if defined?(Encoding::UTF_8)
+  end if defined?(Encoding::UTF_8) and defined?(JSON::Ext::Parser)
 
   def test_parsing
     parser = JSON::Parser.new('"test"')
@@ -95,21 +95,21 @@ class JSONParserTest < Test::Unit::TestCase
     assert_raise(JSON::ParserError) { JSON.parse('.23') }
     assert_raise(JSON::ParserError) { JSON.parse('023') }
     assert_equal 23, JSON.parse('23')
-    assert_equal -23, JSON.parse('-23')
+    assert_equal(-23, JSON.parse('-23'))
     assert_equal_float 3.141, JSON.parse('3.141')
-    assert_equal_float -3.141, JSON.parse('-3.141')
+    assert_equal_float(-3.141, JSON.parse('-3.141'))
     assert_equal_float 3.141, JSON.parse('3141e-3')
     assert_equal_float 3.141, JSON.parse('3141.1e-3')
     assert_equal_float 3.141, JSON.parse('3141E-3')
     assert_equal_float 3.141, JSON.parse('3141.0E-3')
-    assert_equal_float -3.141, JSON.parse('-3141.0e-3')
-    assert_equal_float -3.141, JSON.parse('-3141e-3')
+    assert_equal_float(-3.141, JSON.parse('-3141.0e-3'))
+    assert_equal_float(-3.141, JSON.parse('-3141e-3'))
     assert_raise(JSON::ParserError) { JSON.parse('NaN') }
     assert JSON.parse('NaN', :allow_nan => true).nan?
     assert_raise(JSON::ParserError) { JSON.parse('Infinity') }
     assert_equal 1.0/0, JSON.parse('Infinity', :allow_nan => true)
     assert_raise(JSON::ParserError) { JSON.parse('-Infinity') }
-    assert_equal -1.0/0, JSON.parse('-Infinity', :allow_nan => true)
+    assert_equal(-1.0/0, JSON.parse('-Infinity', :allow_nan => true))
   end
 
   if Array.method_defined?(:permutation)
@@ -133,17 +133,17 @@ class JSONParserTest < Test::Unit::TestCase
   end
 
   def test_parse_arrays
-    assert_equal([1,2,3], JSON.parse('[1,2,3]'))
-    assert_equal([1.2,2,3], JSON.parse('[1.2,2,3]'))
-    assert_equal([[],[[],[]]], JSON.parse('[[],[[],[]]]'))
+    assert_equal([1, 2, 3], JSON.parse('[1,2,3]'))
+    assert_equal([1.2, 2, 3], JSON.parse('[1.2,2,3]'))
+    assert_equal([[], [[], []]], JSON.parse('[[],[[],[]]]'))
     assert_equal([], JSON.parse('[]'))
     assert_equal([], JSON.parse('  [  ]  '))
     assert_equal([1], JSON.parse('[1]'))
     assert_equal([1], JSON.parse('  [ 1  ]  '))
     ary = [[1], ["foo"], [3.14], [4711.0], [2.718], [nil],
-      [[1, -2, 3]], [false], [true]]
+           [[1, -2, 3]], [false], [true]]
     assert_equal(ary,
-      JSON.parse('[[1],["foo"],[3.14],[47.11e+2],[2718.0E-3],[null],[[1,-2,3]],[false],[true]]'))
+                 JSON.parse('[[1],["foo"],[3.14],[47.11e+2],[2718.0E-3],[null],[[1,-2,3]],[false],[true]]'))
     assert_equal(ary, JSON.parse(%Q{   [   [1] , ["foo"]  ,  [3.14] \t ,  [47.11e+2]\s
       , [2718.0E-3 ],\r[ null] , [[1, -2, 3 ]], [false ],[ true]\n ]  }))
   end
@@ -208,51 +208,51 @@ class JSONParserTest < Test::Unit::TestCase
 
   def test_symbolize_names
     assert_equal({ "foo" => "bar", "baz" => "quux" },
-      JSON.parse('{"foo":"bar", "baz":"quux"}'))
+                 JSON.parse('{"foo":"bar", "baz":"quux"}'))
     assert_equal({ :foo => "bar", :baz => "quux" },
-      JSON.parse('{"foo":"bar", "baz":"quux"}', :symbolize_names => true))
+                 JSON.parse('{"foo":"bar", "baz":"quux"}', :symbolize_names => true))
     assert_raise(ArgumentError) do
       JSON.parse('{}', :symbolize_names => true, :create_additions => true)
     end
   end
 
   def test_parse_comments
-    json = <<EOT
-{
-  "key1":"value1", // eol comment
-  "key2":"value2"  /* multi line
-                    *  comment */,
-  "key3":"value3"  /* multi line
-                    // nested eol comment
-                    *  comment */
-}
-EOT
+    json = <<~EOT
+      {
+        "key1":"value1", // eol comment
+        "key2":"value2"  /* multi line
+                          *  comment */,
+        "key3":"value3"  /* multi line
+                          // nested eol comment
+                          *  comment */
+      }
+    EOT
     assert_equal(
       { "key1" => "value1", "key2" => "value2", "key3" => "value3" },
       JSON.parse(json))
-    json = <<EOT
-{
-  "key1":"value1"  /* multi line
-                    // nested eol comment
-                    /* illegal nested multi line comment */
-                    *  comment */
-}
-EOT
+    json = <<~EOT
+      {
+        "key1":"value1"  /* multi line
+                          // nested eol comment
+                          /* illegal nested multi line comment */
+                          *  comment */
+      }
+    EOT
     assert_raise(JSON::ParserError) { JSON.parse(json) }
-    json = <<EOT
-{
-  "key1":"value1"  /* multi line
-                   // nested eol comment
-                   closed multi comment */
-                   and again, throw an Error */
-}
-EOT
+    json = <<~EOT
+      {
+        "key1":"value1"  /* multi line
+                         // nested eol comment
+                         closed multi comment */
+                         and again, throw an Error */
+      }
+    EOT
     assert_raise(JSON::ParserError) { JSON.parse(json) }
-    json = <<EOT
-{
-  "key1":"value1"  /*/*/
-}
-EOT
+    json = <<~EOT
+      {
+        "key1":"value1"  /*/*/
+      }
+    EOT
     assert_equal({ "key1" => "value1" }, JSON.parse(json))
   end
 
@@ -269,6 +269,13 @@ EOT
     assert_equal too_deep_ary, ok
     ok = JSON.parse too_deep, :max_nesting => 0
     assert_equal too_deep_ary, ok
+
+    unless ENV['REAL_JSON_GEM']
+      # max_nesting should be reset to 0 if not included in options
+      # This behavior is not compatible with Ruby standard JSON gem
+      ok = JSON.parse too_deep, {}
+      assert_equal too_deep_ary, ok
+    end
   end
 
   def test_backslash
@@ -341,7 +348,7 @@ EOT
 
   def test_parse_array_custom_array_derived_class
     res = JSON.parse('[1,2]', :array_class => SubArray)
-    assert_equal([1,2], res)
+    assert_equal([1, 2], res)
     assert_equal(SubArray, res.class)
     assert res.shifted?
   end
@@ -349,7 +356,7 @@ EOT
   def test_parse_array_custom_non_array_derived_class
     res = JSON.parse('[1,2]', :array_class => SubArrayWrapper)
     assert_equal(SubArrayWrapper, res.class)
-    assert_equal([1,2], res.data)
+    assert_equal([1, 2], res.data)
     assert res.shifted?
   end
 
@@ -435,7 +442,7 @@ EOT
     assert obj_again['foo']['bar']
     assert_equal obj, obj_again
     assert_equal ["foo"],
-      JSON(JSON(SubArray2["foo"]), :create_additions => true)
+                 JSON(JSON(SubArray2["foo"]), :create_additions => true)
   end
 
   def test_generate_core_subclasses_with_default_to_json

data/test/json_gem/json_string_matching_test.rb

@@ -28,15 +28,15 @@ class JSONStringMatchingTest < Test::Unit::TestCase
     t_json = [ t ].to_json
     time_regexp = /\A\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}[+-]\d{4}\z/
     assert_equal [ t ],
-      JSON.parse(
-        t_json,
-        :create_additions => true,
-        :match_string => { time_regexp => TestTime }
-      )
+                 JSON.parse(
+                   t_json,
+                   :create_additions => true,
+                   :match_string => { time_regexp => TestTime }
+                 )
     assert_equal [ t.strftime('%FT%T%z') ],
-      JSON.parse(
-        t_json,
-        :match_string => { time_regexp => TestTime }
-      )
+                 JSON.parse(
+                   t_json,
+                   :match_string => { time_regexp => TestTime }
+                 )
   end
 end

data/test/json_gem/test_helper.rb

@@ -15,10 +15,14 @@ else
   require 'oj'
   Oj.mimic_JSON
 
+  # This method was added in Ruby 3.0.0. Calling it this way asks the GC to
+  # move objects around, helping to find object movement bugs.
   if defined?(GC.verify_compaction_references) == 'method'
-    # This method was added in Ruby 3.0.0. Calling it this way asks the GC to
-    # move objects around, helping to find object movement bugs.
-    GC.verify_compaction_references(double_heap: true, toward: :empty)
+    if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.2.0")
+      GC.verify_compaction_references(expand_heap: true, toward: :empty)
+    else
+      GC.verify_compaction_references(double_heap: true, toward: :empty)
+    end
   end
 end
 

data/test/mem.rb

@@ -0,0 +1,34 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require 'English'
+$LOAD_PATH << '.'
+$LOAD_PATH << File.join(__dir__, '../lib')
+$LOAD_PATH << File.join(__dir__, '../ext')
+
+require 'oj'
+
+Oj.default_options = { mode: :rails, cache_keys: false, cache_str: -1 }
+
+def mem
+  `ps -o rss= -p #{$PROCESS_ID}`.to_i
+end
+
+('a'..'z').each { |a|
+  ('a'..'z').each { |b|
+    ('a'..'z').each { |c|
+      ('a'..'z').each { |d|
+        ('a'..'z').each { |e|
+          ('a'..'z').each { |f|
+            key = "#{a}#{b}#{c}#{d}#{e}#{f}"
+            Oj.load(%|{ "#{key}": 101}|)
+            # Oj.dump(x)
+          }
+        }
+      }
+    }
+    puts "#{a}#{b} #{mem}"
+  }
+}
+
+Oj::Parser.new(:usual)

data/test/perf.rb

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
 
 class Perf
 
-  def initialize()
+  def initialize
     @items = []
   end
 
@@ -17,9 +18,9 @@ class Perf
       end
     end
   end
-  
+
   def run(iter)
-    base = Item.new(nil, nil) { }
+    base = Item.new(nil, nil) {}
     base.run(iter, 0.0)
     @items.each do |i|
       i.run(iter, base.duration)
@@ -32,35 +33,31 @@ class Perf
     summary()
   end
 
-  def summary()
-    fastest = nil
-    slowest = nil
+  def summary
     width = 6
     @items.each do |i|
       next if i.duration.nil?
+
       width = i.title.size if width < i.title.size
     end
     iva = @items.clone
     iva.delete_if { |i| i.duration.nil? }
     iva = iva.sort_by { |i| i.duration }
     puts
-    puts "Summary:"
-    puts "%*s  time (secs)  rate (ops/sec)" % [width, 'System']
+    puts 'Summary:'
+    puts '%*s  time (secs)  rate (ops/sec)' % [width, 'System']
     puts "#{'-' * width}  -----------  --------------"
     iva.each do |i|
-      if i.duration.nil?
-      else
-        puts "%*s %11.3f  %14.3f" % [width, i.title, i.duration, i.rate ]
-      end
+      puts '%*s %11.3f  %14.3f' % [width, i.title, i.duration, i.rate ] unless i.duration.nil?
     end
     puts
     puts "Comparison Matrix\n(performance factor, 2.0 means row is twice as fast as column)"
-    puts ([' ' * width] + iva.map { |i| "%*s" % [width, i.title] }).join('  ')
-    puts (['-' * width] + iva.map { |i| '-' * width }).join('  ')
+    puts ([' ' * width] + iva.map { |i| '%*s' % [width, i.title] }).join('  ')
+    puts (['-' * width] + iva.map { |_i| '-' * width }).join('  ')
     iva.each do |i|
-      line = ["%*s" % [width, i.title]]
+      line = ['%*s' % [width, i.title]]
       iva.each do |o|
-        line << "%*.2f" % [width, o.duration / i.duration]
+        line << ('%*.2f' % [width, o.duration / i.duration])
       end
       puts line.join('  ')
     end
@@ -90,17 +87,15 @@ class Perf
     end
 
     def run(iter, base)
-      begin
-        GC.start
-        @before.call unless @before.nil?
-        start = Time.now
-        iter.times { @blk.call }
-        @duration = Time.now - start - base
-        @duration = 0.0 if @duration < 0.0
-        @rate = iter / @duration
-      rescue Exception => e
-        @error = "#{e.class}: #{e.message}"
-      end
+      GC.start
+      @before.call unless @before.nil?
+      start = Time.now
+      iter.times { @blk.call }
+      @duration = Time.now - start - base
+      @duration = 0.0 if @duration < 0.0
+      @rate = iter / @duration
+    rescue Exception => e
+      @error = "#{e.class}: #{e.message}"
     end
 
   end # Item