oj 3.13.9 → 3.16.1

data/test/test_wab.rb

@@ -1,10 +1,10 @@
 #!/usr/bin/env ruby
-# encoding: UTF-8
+# frozen_string_literal: true
 
-$: << File.dirname(__FILE__)
-$oj_dir = File.dirname(File.expand_path(File.dirname(__FILE__)))
+$LOAD_PATH << __dir__
+@oj_dir = File.dirname(File.expand_path(__dir__))
 %w(lib ext).each do |dir|
-  $: << File.join($oj_dir, dir)
+  $LOAD_PATH << File.join(@oj_dir, dir)
 end
 
 require 'minitest'
@@ -19,20 +19,22 @@ require 'oj'
 module WAB
   class UUID
     attr_reader :id
+
     def initialize(id)
       @id = id.downcase
-      raise Exception.new("Invalid UUID format.") if /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/.match(@id).nil?
+      raise StandardError.new('Invalid UUID format.') if /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/.match(@id).nil?
     end
+
     def to_s
       @id
     end
+
     def ==(other)
       other.is_a?(self.class) && @id == other.id
     end
   end # UUID
 end # WAB
 
-
 class WabJuice < Minitest::Test
 
   module TestModule
@@ -52,16 +54,16 @@ class WabJuice < Minitest::Test
 
   def test_fixnum
     dump_and_load(0, false)
-    dump_and_load(12345, false)
-    dump_and_load(-54321, false)
+    dump_and_load(12_345, false)
+    dump_and_load(-54_321, false)
     dump_and_load(1, false)
   end
 
   def test_float
     dump_and_load(0.0, false)
-    dump_and_load(12345.6789, false)
+    dump_and_load(12_345.6789, false)
     dump_and_load(70.35, false)
-    dump_and_load(-54321.012, false)
+    dump_and_load(-54_321.012, false)
     dump_and_load(1.7775, false)
     dump_and_load(2.5024, false)
     dump_and_load(2.48e16, false)
@@ -89,7 +91,7 @@ class WabJuice < Minitest::Test
   end
 
   def test_encode
-    dump_and_load("ぴーたー", false)
+    dump_and_load('ぴーたー', false)
   end
 
   def test_array
@@ -101,23 +103,25 @@ class WabJuice < Minitest::Test
   end
 
   def test_array_deep
-    dump_and_load([1,[2,[3,[4,[5,[6,[7,[8,[9,[10,[11,[12,[13,[14,[15,[16,[17,[18,[19,[20]]]]]]]]]]]]]]]]]]]], false)
+    dump_and_load([1, [2, [3, [4, [5, [6, [7, [8, [9, [10, [11, [12, [13, [14, [15, [16, [17, [18, [19, [20]]]]]]]]]]]]]]]]]]]], false)
   end
 
   def test_deep_nest
+    skip 'TruffleRuby causes SEGV' if RUBY_ENGINE == 'truffleruby'
+
     begin
-      n = 10000
-      Oj.wab_load('[' * n + ']' * n)
+      n = 10_000
+      Oj.wab_load(('[' * n) + (']' * n))
     rescue Exception => e
-      assert(false, e.message)
+      refute(e.message)
     end
   end
 
   # Hash
   def test_hash
     dump_and_load({}, false)
-    dump_and_load({ true: true, false: false}, false)
-    dump_and_load({ true: true, array: [], hash: { }}, false)
+    dump_and_load({ tru: true, fals: false}, false)
+    dump_and_load({ tru: true, array: [], hash: {}}, false)
   end
 
   def test_hash_non_sym_keys
@@ -126,25 +130,25 @@ class WabJuice < Minitest::Test
 
   def test_hash_deep
     dump_and_load({x1: {
-                      x2: {
-                        x3: {
-                          x4: {
-                            x5: {
-                              x6: {
-                                x7: {
-                                  x8: {
-                                    x9: {
-                                      x10: {
-                                        x11: {
-                                          x12: {
-                                            x13: {
-                                              x14: {
-                                                x15: {
-                                                  x16: {
-                                                    x17: {
-                                                      x18: {
-                                                        x19: {
-                                                          x20: {}}}}}}}}}}}}}}}}}}}}}, false)
+                     x2: {
+                       x3: {
+                         x4: {
+                           x5: {
+                             x6: {
+                               x7: {
+                                 x8: {
+                                   x9: {
+                                     x10: {
+                                       x11: {
+                                         x12: {
+                                           x13: {
+                                             x14: {
+                                               x15: {
+                                                 x16: {
+                                                   x17: {
+                                                     x18: {
+                                                       x19: {
+                                                         x20: {}}}}}}}}}}}}}}}}}}}}}, false)
   end
 
   def test_non_str_hash
@@ -152,7 +156,7 @@ class WabJuice < Minitest::Test
   end
 
   def test_bignum_object
-    dump_and_load(7 ** 55, false)
+    dump_and_load(7**55, false)
   end
 
   # BigDecimal
@@ -186,13 +190,13 @@ class WabJuice < Minitest::Test
   end
 
   def test_io_file
-    filename = File.join(File.dirname(__FILE__), 'open_file_test.json')
-    File.open(filename, 'w') { |f| f.write(%{{
+    filename = File.join(__dir__, 'open_file_test.json')
+    File.write(filename, %{{
   "x":true,
   "y":58,
   "z": [1,2,3]
 }
-}) }
+})
     f = File.new(filename)
     obj = Oj.wab_load(f)
     f.close()
@@ -205,13 +209,13 @@ class WabJuice < Minitest::Test
   end
 
   def test_time
-    t = Time.gm(2017, 1, 5, 23, 58, 7, 123456.789)
+    t = Time.gm(2017, 1, 5, 23, 58, 7, 123_456.789)
     json = Oj.dump(t, mode: :wab)
     assert_equal('"2017-01-05T23:58:07.123456789Z"', json)
     # must load and convert to json as the Time#== does not match identical
     # times due to the way it tracks fractional seconds.
-    loaded = Oj.wab_load(json);
-    assert_equal(json, Oj.dump(loaded, mode: :wab), "json mismatch after load")
+    loaded = Oj.wab_load(json)
+    assert_equal(json, Oj.dump(loaded, mode: :wab), 'json mismatch after load')
   end
 
   def test_uuid
@@ -295,7 +299,7 @@ class WabJuice < Minitest::Test
   def dump_and_load(obj, trace=false)
     json = Oj.dump(obj, mode: :wab, indent: 2)
     puts json if trace
-    loaded = Oj.wab_load(json);
+    loaded = Oj.wab_load(json)
     if obj.nil?
       assert_nil(loaded)
     else

data/test/test_writer.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
-# encoding: utf-8
+# frozen_string_literal: false
 
-$: << File.dirname(__FILE__)
+$LOAD_PATH << __dir__
 
 require 'helper'
 
@@ -55,13 +55,13 @@ class OjWriter < Minitest::Test
   def test_string_writer_nested_object
     w = Oj::StringWriter.new(:indent => 0)
     w.push_object()
-    w.push_object("a1")
+    w.push_object('a1')
     w.pop()
-    w.push_object("a2")
-    w.push_object("b")
+    w.push_object('a2')
+    w.push_object('b')
     w.pop()
     w.pop()
-    w.push_object("a3")
+    w.push_object('a3')
     w.pop()
     w.pop()
     assert_equal(%|{"a1":{},"a2":{"b":{}},"a3":{}}\n|, w.to_s)
@@ -94,9 +94,9 @@ class OjWriter < Minitest::Test
     w.push_value(7.3)
     w.push_value(true)
     w.push_value(nil)
-    w.push_value("a string")
+    w.push_value('a string')
     w.push_value({'a' => 65})
-    w.push_value([1,2])
+    w.push_value([1, 2])
     w.pop()
     assert_equal(%|[
   7,
@@ -118,10 +118,10 @@ class OjWriter < Minitest::Test
   def test_string_writer_block
     w = Oj::StringWriter.new(:indent => 0)
     w.push_object() {
-      w.push_object("a1") {
+      w.push_object('a1') {
         w.push_value(7, 'a7')
       }
-      w.push_array("a2") {
+      w.push_array('a2') {
         w.push_value('x')
         w.push_value(3)
       }
@@ -152,7 +152,7 @@ class OjWriter < Minitest::Test
       assert(true)
       return
     end
-    assert(false, "*** expected an exception")
+    assert(false, '*** expected an exception')
   end
 
   def test_string_writer_array_key
@@ -166,7 +166,7 @@ class OjWriter < Minitest::Test
       assert(true)
       return
     end
-    assert(false, "*** expected an exception")
+    assert(false, '*** expected an exception')
   end
 
   def test_string_writer_pop_with_key
@@ -177,7 +177,7 @@ class OjWriter < Minitest::Test
       assert(true)
       return
     end
-    assert(false, "*** expected an exception")
+    assert(false, '*** expected an exception')
   end
 
   def test_string_writer_obj_no_key
@@ -189,7 +189,7 @@ class OjWriter < Minitest::Test
       assert(true)
       return
     end
-    assert(false, "*** expected an exception")
+    assert(false, '*** expected an exception')
   end
 
   def test_string_writer_deep
@@ -208,9 +208,9 @@ class OjWriter < Minitest::Test
   def test_string_writer_pop_all
     w = Oj::StringWriter.new(:indent => 0)
     w.push_object()
-    w.push_object("a1")
+    w.push_object('a1')
     w.pop()
-    w.push_array("a2")
+    w.push_array('a2')
     w.push_value(3)
     w.push_array()
     w.pop_all()
@@ -228,23 +228,23 @@ class OjWriter < Minitest::Test
   # Stream Writer
 
   class SString < ::String
-    alias :write :concat
+    alias write concat
   end
-  
+
   def test_stream_writer_encoding
     output = SString.new.force_encoding(::Encoding::UTF_8)
     w = Oj::StreamWriter.new(output, :indent => 0)
     # Oddly enough, when pushing ASCII characters with UTF-8 encoding or even
     # ASCII-8BIT does not change the output encoding. Pushing any non-ASCII no
     # matter what the encoding changes the output encoding to ASCII-8BIT.
-    x = "香港" # Hong Kong
+    x = '香港' # Hong Kong
     x = x.force_encoding('ASCII-8BIT')
     w.push_value(x)
     assert_equal(::Encoding::UTF_8, output.encoding)
   end
 
   def test_stream_writer_empty_array
-    output = StringIO.open("", "w+")
+    output = StringIO.open('', 'w+')
     w = Oj::StreamWriter.new(output, :indent => 0)
     w.push_array()
     w.pop()
@@ -252,19 +252,19 @@ class OjWriter < Minitest::Test
   end
 
   def test_stream_writer_mixed_stringio
-    output = StringIO.open("", "w+")
+    output = StringIO.open('', 'w+')
     w = Oj::StreamWriter.new(output, :indent => 0)
     w.push_object()
-    w.push_object("a1")
+    w.push_object('a1')
     w.pop()
-    w.push_object("a2")
-    w.push_array("b")
+    w.push_object('a2')
+    w.push_array('b')
     w.push_value(7)
     w.push_value(true)
-    w.push_value("string")
+    w.push_value('string')
     w.pop()
     w.pop()
-    w.push_object("a3")
+    w.push_object('a3')
     w.pop()
     w.pop()
     result = output.string()
@@ -272,20 +272,20 @@ class OjWriter < Minitest::Test
   end
 
   def test_stream_writer_mixed_file
-    filename = File.join(File.dirname(__FILE__), 'open_file_test.json')
-    File.open(filename, "w") do |f|
+    filename = File.join(__dir__, 'open_file_test.json')
+    File.open(filename, 'w') do |f|
       w = Oj::StreamWriter.new(f, :indent => 0)
       w.push_object()
-      w.push_object("a1")
+      w.push_object('a1')
       w.pop()
-      w.push_object("a2")
-      w.push_array("b")
+      w.push_object('a2')
+      w.push_array('b')
       w.push_value(7)
       w.push_value(true)
-      w.push_value("string")
+      w.push_value('string')
       w.pop()
       w.pop()
-      w.push_object("a3")
+      w.push_object('a3')
       w.pop()
       w.pop()
     end
@@ -294,7 +294,7 @@ class OjWriter < Minitest::Test
   end
 
   def test_stream_writer_nested_key_object
-    output = StringIO.open("", "w+")
+    output = StringIO.open('', 'w+')
     w = Oj::StreamWriter.new(output, :indent => 0)
     w.push_object()
     w.push_key('a1')
@@ -316,16 +316,16 @@ class OjWriter < Minitest::Test
 
   def push_stuff(w, pop_all=true)
     w.push_object()
-    w.push_object("a1")
+    w.push_object('a1')
     w.pop()
-    w.push_object("a2")
-    w.push_array("b")
+    w.push_object('a2')
+    w.push_array('b')
     w.push_value(7)
     w.push_value(true)
-    w.push_value("string")
+    w.push_value('string')
     w.pop()
     w.pop()
-    w.push_object("a3")
+    w.push_object('a3')
     if pop_all
       w.pop_all()
     else
@@ -335,31 +335,31 @@ class OjWriter < Minitest::Test
   end
 
   def test_stream_writer_buf_small
-    output = StringIO.open("", "w+")
+    output = StringIO.open('', 'w+')
     w = Oj::StreamWriter.new(output, :indent => 0, :buffer_size => 20)
     push_stuff(w)
     assert_equal(%|{"a1":{},"a2":{"b":[7,true,"string"]},"a3":{}}\n|, output.string())
   end
 
   def test_stream_writer_buf_large
-    output = StringIO.open("", "w+")
-    w = Oj::StreamWriter.new(output, :indent => 0, :buffer_size => 16000)
+    output = StringIO.open('', 'w+')
+    w = Oj::StreamWriter.new(output, :indent => 0, :buffer_size => 16_000)
     push_stuff(w)
     assert_equal(%|{"a1":{},"a2":{"b":[7,true,"string"]},"a3":{}}\n|, output.string())
   end
 
   def test_stream_writer_buf_flush
-    output = StringIO.open("", "w+")
+    output = StringIO.open('', 'w+')
     w = Oj::StreamWriter.new(output, :indent => 0, :buffer_size => 4096)
     push_stuff(w, false)
     # no flush so nothing should be in the output yet
-    assert_equal("", output.string())
+    assert_equal('', output.string())
     w.flush()
     assert_equal(%|{"a1":{},"a2":{"b":[7,true,"string"]},"a3":{}}\n|, output.string())
   end
-  
+
   def test_stream_writer_buf_flush_small
-    output = StringIO.open("", "w+")
+    output = StringIO.open('', 'w+')
     w = Oj::StreamWriter.new(output, :indent => 0, :buffer_size => 30)
     push_stuff(w, false)
     # flush should be called at 30 bytes but since the writes are chunky flush
@@ -370,7 +370,7 @@ class OjWriter < Minitest::Test
   end
 
   def test_stream_writer_push_null_value_with_key
-    output = StringIO.open("", "w+")
+    output = StringIO.open('', 'w+')
     w = Oj::StreamWriter.new(output, :indent => 0)
     w.push_object()
     w.push_value(nil, 'nothing')

data/test/tests.rb

@@ -1,10 +1,10 @@
 #!/usr/bin/env ruby
-# encoding: UTF-8
+# frozen_string_literal: true
 
-$: << File.dirname(__FILE__)
-$oj_dir = File.dirname(File.expand_path(File.dirname(__FILE__)))
+$LOAD_PATH << __dir__
+@oj_dir = File.dirname(File.expand_path(__dir__))
 %w(lib ext).each do |dir|
-  $: << File.join($oj_dir, dir)
+  $LOAD_PATH << File.join(@oj_dir, dir)
 end
 
 require 'test_compat'
@@ -18,8 +18,16 @@ require 'test_object'
 require 'test_saj'
 require 'test_scp'
 require 'test_strict'
-require 'test_various'
 require 'test_rails'
 require 'test_wab'
 require 'test_writer'
 require 'test_integer_range'
+
+at_exit do
+  require 'helper'
+  if '3.1.0' <= RUBY_VERSION && RbConfig::CONFIG['host_os'] !~ /(mingw|mswin)/
+    # Oj::debug_odd("teardown before GC.verify_compaction_references")
+    verify_gc_compaction
+    # Oj::debug_odd("teardown after GC.verify_compaction_references")
+  end
+end

data/test/tests_mimic.rb

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
-# encoding: UTF-8
+# frozen_string_literal: true
 
-$: << File.dirname(__FILE__)
-$: << File.join(File.dirname(__FILE__), 'json_gem')
+$LOAD_PATH << __dir__
+$LOAD_PATH << File.join(__dir__, 'json_gem')
 
 require 'json_common_interface_test'
 require 'json_encoding_test'
@@ -12,3 +12,12 @@ require 'json_generator_test'
 require 'json_generic_object_test'
 require 'json_parser_test'
 require 'json_string_matching_test'
+
+at_exit do
+  require 'helper'
+  if '3.1.0' <= RUBY_VERSION && RbConfig::CONFIG['host_os'] !~ /(mingw|mswin)/
+    # Oj::debug_odd("teardown before GC.verify_compaction_references")
+    verify_gc_compaction
+    # Oj::debug_odd("teardown after GC.verify_compaction_references")
+  end
+end

data/test/tests_mimic_addition.rb

@@ -1,7 +1,16 @@
 #!/usr/bin/env ruby
-# encoding: UTF-8
+# frozen_string_literal: true
 
-$: << File.dirname(__FILE__)
-$: << File.join(File.dirname(__FILE__), 'json_gem')
+$LOAD_PATH << __dir__
+$LOAD_PATH << File.join(__dir__, 'json_gem')
 
 require 'json_addition_test'
+
+at_exit do
+  require 'helper'
+  if '3.1.0' <= RUBY_VERSION && RbConfig::CONFIG['host_os'] !~ /(mingw|mswin)/
+    # Oj::debug_odd("teardown before GC.verify_compaction_references")
+    verify_gc_compaction
+    # Oj::debug_odd("teardown after GC.verify_compaction_references")
+  end
+end