oj 3.14.2 → 3.15.0

data/test/test_parser_saj.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
-# encoding: UTF-8
+# frozen_string_literal: true
 
-$: << File.dirname(__FILE__)
+$LOAD_PATH << __dir__
 
 require 'helper'
 
@@ -23,8 +23,10 @@ $json = %|{
 class AllSaj < Oj::Saj
   attr_accessor :calls
 
-  def initialize()
+  def initialize
     @calls = []
+
+    super
   end
 
   def hash_start(key)
@@ -56,7 +58,7 @@ end # AllSaj
 class LocSaj
   attr_accessor :calls
 
-  def initialize()
+  def initialize
     @calls = []
   end
 
@@ -126,7 +128,7 @@ class SajTest < Minitest::Test
     p = Oj::Parser.new(:saj)
     p.handler = handler
     p.parse(json)
-    assert_equal([[:add_value, 12345, nil]], handler.calls)
+    assert_equal([[:add_value, 12_345, nil]], handler.calls)
   end
 
   def test_float
@@ -135,7 +137,7 @@ class SajTest < Minitest::Test
     p = Oj::Parser.new(:saj)
     p.handler = handler
     p.parse(json)
-    assert_equal([[:add_value, 12345.6789, nil]], handler.calls)
+    assert_equal([[:add_value, 12_345.6789, nil]], handler.calls)
   end
 
   def test_float_exp
@@ -146,7 +148,7 @@ class SajTest < Minitest::Test
     p.parse(json)
     assert_equal(1, handler.calls.size)
     assert_equal(:add_value, handler.calls[0][0])
-    assert_equal((12345.6789e7 * 10000).to_i, (handler.calls[0][1] * 10000).to_i)
+    assert_equal((12_345.6789e7 * 10_000).to_i, (handler.calls[0][1] * 10_000).to_i)
   end
 
   def test_bignum
@@ -157,7 +159,7 @@ class SajTest < Minitest::Test
     p.parse(json)
     assert_equal(1, handler.calls.size)
     assert_equal(:add_value, handler.calls[0][0])
-    assert_equal(-118999, (handler.calls[0][1] * 10000).to_i)
+    assert_equal(-118_999, (handler.calls[0][1] * 10_000).to_i)
   end
 
   def test_bignum_loc
@@ -175,10 +177,10 @@ class SajTest < Minitest::Test
     p.handler = handler
     p.parse(json)
     assert_equal(6, handler.calls.size)
-    assert_equal(1_923_380, (handler.calls[1][1] * 10000).to_i)
+    assert_equal(1_923_380, (handler.calls[1][1] * 10_000).to_i)
     handler.calls[1][1] = 1_923_380
     assert_equal([[:hash_start, nil, 1, 1],
-                  [:add_value, 1923380, 'width', 2, 30],
+                  [:add_value, 1_923_380, 'width', 2, 30],
                   [:hash_start, 'xaxis', 3, 12],
                   [:add_value, 'y', 'anchor', 4, 17],
                   [:hash_end, 'xaxis', 5, 3],
@@ -260,13 +262,13 @@ class SajTest < Minitest::Test
     p.handler = handler
     p.parse(json)
     assert_equal([
-		   [:array_start, nil],
+                   [:array_start, nil],
                    [:add_value, true, nil],
                    [:array_end, nil],
-		   [:array_start, nil],
+                   [:array_start, nil],
                    [:add_value, false, nil],
                    [:array_end, nil],
-		 ], handler.calls)
+                 ], handler.calls)
   end
 
   def test_io
@@ -276,11 +278,11 @@ class SajTest < Minitest::Test
     p.handler = handler
     p.load(StringIO.new(json))
     assert_equal([
-		   [:array_start, nil],
-		   [:add_value, true, nil],
-		   [:add_value, false, nil],
-		   [:array_end, nil],
-		 ], handler.calls)
+                   [:array_start, nil],
+                   [:add_value, true, nil],
+                   [:add_value, false, nil],
+                   [:array_end, nil],
+                 ], handler.calls)
   end
 
   def test_file
@@ -289,11 +291,11 @@ class SajTest < Minitest::Test
     p.handler = handler
     p.file('saj_test.json')
     assert_equal([
-		   [:array_start, nil],
-		   [:add_value, true, nil],
-		   [:add_value, false, nil],
-		   [:array_end, nil],
-		 ], handler.calls)
+                   [:array_start, nil],
+                   [:add_value, true, nil],
+                   [:add_value, false, nil],
+                   [:array_end, nil],
+                 ], handler.calls)
   end
 
   def test_default
@@ -302,10 +304,10 @@ class SajTest < Minitest::Test
     Oj::Parser.saj.handler = handler
     Oj::Parser.saj.parse(json)
     assert_equal([
-		   [:array_start, nil],
+                   [:array_start, nil],
                    [:add_value, true, nil],
                    [:array_end, nil],
-		 ], handler.calls)
+                 ], handler.calls)
   end
 
   def test_loc

data/test/test_parser_usual.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
-# encoding: utf-8
+# frozen_string_literal: true
 
-$: << File.dirname(__FILE__)
+$LOAD_PATH << __dir__
 
 require 'helper'
 
@@ -40,10 +40,10 @@ class UsualTest < Minitest::Test
     [
       ['[]', []],
       ['[false]', [false]],
-      ['[true,false]', [true,false]],
+      ['[true,false]', [true, false]],
       ['[[]]', [[]]],
-      ['[true,[],false]', [true,[],false]],
-      ['[true,[true],false]', [true,[true],false]],
+      ['[true,[],false]', [true, [], false]],
+      ['[true,[true],false]', [true, [true], false]],
     ].each { |x|
       doc = p.parse(x[0])
       assert_equal(x[1], doc)
@@ -67,7 +67,7 @@ class UsualTest < Minitest::Test
 
   def test_symbol_keys
     p = Oj::Parser.new(:usual)
-    assert_equal(false, p.symbol_keys)
+    refute(p.symbol_keys)
     p.symbol_keys = true
     doc = p.parse('{"a": true, "b": false}')
     assert_equal({a: true, b: false}, doc)

data/test/test_rails.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
-# encoding: utf-8
+# frozen_string_literal: true
 
-$: << File.dirname(__FILE__)
+$LOAD_PATH << __dir__
 
 require 'helper'
 

data/test/test_saj.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
-# encoding: UTF-8
+# frozen_string_literal: true
 
-$: << File.dirname(__FILE__)
+$LOAD_PATH << __dir__
 
 require 'helper'
 
@@ -23,8 +23,10 @@ $json = %{{
 class AllSaj < Oj::Saj
   attr_accessor :calls
 
-  def initialize()
+  def initialize
     @calls = []
+
+    super
   end
 
   def hash_start(key)
@@ -95,14 +97,14 @@ class SajTest < Minitest::Test
     handler = AllSaj.new()
     json = %{12345}
     Oj.saj_parse(handler, json)
-    assert_equal([[:add_value, 12345, nil]], handler.calls)
+    assert_equal([[:add_value, 12_345, nil]], handler.calls)
   end
 
   def test_float
     handler = AllSaj.new()
     json = %{12345.6789}
     Oj.saj_parse(handler, json)
-    assert_equal([[:add_value, 12345.6789, nil]], handler.calls)
+    assert_equal([[:add_value, 12_345.6789, nil]], handler.calls)
   end
 
   def test_float_exp
@@ -111,7 +113,7 @@ class SajTest < Minitest::Test
     Oj.saj_parse(handler, json)
     assert_equal(1, handler.calls.size)
     assert_equal(:add_value, handler.calls[0][0])
-    assert_equal((12345.6789e7 * 10000).to_i, (handler.calls[0][1] * 10000).to_i)
+    assert_equal((12_345.6789e7 * 10_000).to_i, (handler.calls[0][1] * 10_000).to_i)
   end
 
   def test_array_empty
@@ -177,10 +179,10 @@ class SajTest < Minitest::Test
     handler = AllSaj.new()
     json = %{12345xyz}
     Oj.saj_parse(handler, json)
-    assert_equal([:add_value, 12345, nil], handler.calls.first)
+    assert_equal([:add_value, 12_345, nil], handler.calls.first)
     type, message, line, column = handler.calls.last
     assert_equal([:error, 1, 6], [type, line, column])
-    assert_match(%r{invalid format, extra characters at line 1, column 6 \[(?:[A-Za-z]:\/)?(?:[a-z\.]+/)*saj\.c:\d+\]}, message)
+    assert_match(%r{invalid format, extra characters at line 1, column 6 \[(?:[A-Za-z]:/)?(?:[a-z.]+/)*saj\.c:\d+\]}, message)
   end
 
 end

data/test/test_scp.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
-# encoding: UTF-8
+# frozen_string_literal: true
 
-$: << File.dirname(__FILE__)
+$LOAD_PATH << __dir__
 
 require 'helper'
 require 'socket'
@@ -23,23 +23,22 @@ $json = %{{
 }}
 
 class NoHandler < Oj::ScHandler
-  def initialize()
-  end
 end
 
 class AllHandler < Oj::ScHandler
   attr_accessor :calls
 
-  def initialize()
+  def initialize
+    super
     @calls = []
   end
 
-  def hash_start()
+  def hash_start
     @calls << [:hash_start]
     {}
   end
 
-  def hash_end()
+  def hash_end
     @calls << [:hash_end]
   end
 
@@ -47,15 +46,16 @@ class AllHandler < Oj::ScHandler
     @calls << [:hash_key, key]
     return 'too' if 'two' == key
     return :symbol if 'symbol' == key
+
     key
   end
 
-  def array_start()
+  def array_start
     @calls << [:array_start]
     []
   end
 
-  def array_end()
+  def array_end
     @calls << [:array_end]
   end
 
@@ -63,11 +63,11 @@ class AllHandler < Oj::ScHandler
     @calls << [:add_value, value]
   end
 
-  def hash_set(h, key, value)
+  def hash_set(_h, key, value)
     @calls << [:hash_set, key, value]
   end
 
-  def array_append(a, value)
+  def array_append(_a, value)
     @calls << [:array_append, value]
   end
 
@@ -75,18 +75,19 @@ end # AllHandler
 
 class Closer < AllHandler
   attr_accessor :io
+
   def initialize(io)
     super()
     @io = io
   end
 
-  def hash_start()
+  def hash_start
     @calls << [:hash_start]
     @io.close
     {}
   end
 
-  def hash_set(h, key, value)
+  def hash_set(_h, key, value)
     @calls << [:hash_set, key, value]
     @io.close
   end
@@ -135,14 +136,14 @@ class ScpTest < Minitest::Test
     handler = AllHandler.new()
     json = %{12345}
     Oj.sc_parse(handler, json)
-    assert_equal([[:add_value, 12345]], handler.calls)
+    assert_equal([[:add_value, 12_345]], handler.calls)
   end
 
   def test_float
     handler = AllHandler.new()
     json = %{12345.6789}
     Oj.sc_parse(handler, json)
-    assert_equal([[:add_value, 12345.6789]], handler.calls)
+    assert_equal([[:add_value, 12_345.6789]], handler.calls)
   end
 
   def test_float_exp
@@ -151,7 +152,7 @@ class ScpTest < Minitest::Test
     Oj.sc_parse(handler, json)
     assert_equal(1, handler.calls.size)
     assert_equal(:add_value, handler.calls[0][0])
-    assert_equal((12345.6789e7 * 10000).to_i, (handler.calls[0][1] * 10000).to_i)
+    assert_equal((12_345.6789e7 * 10_000).to_i, (handler.calls[0][1] * 10_000).to_i)
   end
 
   def test_array_empty
@@ -230,9 +231,9 @@ class ScpTest < Minitest::Test
                   [:array_start],
                   [:hash_start],
                   [:hash_key, 'num'],
-                  [:hash_set, "num", 3],
+                  [:hash_set, 'num', 3],
                   [:hash_key, 'string'],
-                  [:hash_set, "string", "message"],
+                  [:hash_set, 'string', 'message'],
                   [:hash_key, 'hash'],
                   [:hash_start],
                   [:hash_key, 'h2'],
@@ -243,17 +244,17 @@ class ScpTest < Minitest::Test
                   [:array_append, 2],
                   [:array_append, 3],
                   [:array_end],
-                  [:hash_set, "a", []],
+                  [:hash_set, 'a', []],
                   [:hash_end],
-                  [:hash_set, "h2", {}],
+                  [:hash_set, 'h2', {}],
                   [:hash_end],
-                  [:hash_set, "hash", {}],
+                  [:hash_set, 'hash', {}],
                   [:hash_end],
                   [:array_append, {}],
                   [:array_end],
-                  [:hash_set, "array", []],
+                  [:hash_set, 'array', []],
                   [:hash_key, 'boolean'],
-                  [:hash_set, "boolean", true],
+                  [:hash_set, 'boolean', true],
                   [:hash_end],
                   [:add_value, {}]], handler.calls)
   end
@@ -346,12 +347,10 @@ class ScpTest < Minitest::Test
   end
 
   def test_bad_bignum
-    if '2.4.0' < RUBY_VERSION
-      handler = AllHandler.new()
-      json = %|{"big":-e123456789}|
-      assert_raises Exception do # Can be either Oj::ParseError or ArgumentError depending on Ruby version
-	Oj.sc_parse(handler, json)
-      end
+    handler = AllHandler.new()
+    json = %|{"big":-e123456789}|
+    assert_raises Exception do # Can be either Oj::ParseError or ArgumentError depending on Ruby version
+      Oj.sc_parse(handler, json)
     end
   end
 
@@ -370,7 +369,7 @@ class ScpTest < Minitest::Test
         rescue Exception => e
           err = e.class.to_s
         end
-        assert_equal("IOError", err)
+        assert_equal('IOError', err)
         assert_equal([[:hash_start],
                       [:hash_key, 'one'],
                       [:hash_set, 'one', true]], handler.calls)
@@ -379,8 +378,8 @@ class ScpTest < Minitest::Test
         write_io.write json[0..11]
         sleep(0.1)
         begin
-          write_io.write json[12..-1]
-        rescue Exception => e
+          write_io.write json[12..]
+        rescue Exception
           # ignore, should fail to write
         end
         write_io.close
@@ -397,15 +396,16 @@ class ScpTest < Minitest::Test
       # Not able to open a socket to run the test. Might be Travis.
       return
     end
-    Thread.start(json) do |j|
+    Thread.start(json) do |_j|
       c = server.accept()
       c.puts json[0..11]
       10.times {
         break if c.closed?
+
         sleep(0.1)
       }
       unless c.closed?
-        c.puts json[12..-1]
+        c.puts json[12..]
         c.close
       end
     end
@@ -422,7 +422,7 @@ class ScpTest < Minitest::Test
     rescue Exception => e
       err = e.class.to_s
     end
-    assert_equal("IOError", err)
+    assert_equal('IOError', err)
     assert_equal([[:hash_start],
                   [:hash_key, 'one'],
                   [:hash_set, 'one', true]], handler.calls)

data/test/test_strict.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'
@@ -52,16 +52,16 @@ class StrictJuice < 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)
@@ -78,7 +78,7 @@ class StrictJuice < Minitest::Test
       assert(true)
       return
     end
-    assert(false, "*** expected an exception")
+    assert(false, '*** expected an exception')
   end
 
   def test_infinity_dump
@@ -90,7 +90,7 @@ class StrictJuice < Minitest::Test
       assert(true)
       return
     end
-    assert(false, "*** expected an exception")
+    assert(false, '*** expected an exception')
   end
 
   def test_neg_infinity_dump
@@ -102,7 +102,7 @@ class StrictJuice < Minitest::Test
       assert(true)
       return
     end
-    assert(false, "*** expected an exception")
+    assert(false, '*** expected an exception')
   end
 
   def test_string
@@ -115,15 +115,11 @@ class StrictJuice < Minitest::Test
   def test_encode
     opts = Oj.default_options
     Oj.default_options = { :ascii_only => false }
-    unless 'jruby' == $ruby
-      dump_and_load("ぴーたー", false)
-    end
+    dump_and_load('ぴーたー', false)
     Oj.default_options = { :ascii_only => true }
-    json = Oj.dump("ぴーたー")
+    json = Oj.dump('ぴーたー')
     assert_equal(%{"\\u3074\\u30fc\\u305f\\u30fc"}, json)
-    unless 'jruby' == $ruby
-      dump_and_load("ぴーたー", false)
-    end
+    dump_and_load('ぴーたー', false)
     Oj.default_options = opts
   end
 
@@ -152,17 +148,17 @@ class StrictJuice < 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.strict_load('[' * n + ']' * n)
+      n = 10_000
+      Oj.strict_load(('[' * n) + (']' * n))
     rescue Exception => e
-      assert(false, e.message)
+      refute(e.message)
     end
   end
 
@@ -209,7 +205,7 @@ class StrictJuice < Minitest::Test
       assert(true)
       return
     end
-    assert(false, "*** expected an exception")
+    assert(false, '*** expected an exception')
   end
 
   def test_bignum_object
@@ -238,7 +234,7 @@ class StrictJuice < Minitest::Test
       assert(true)
       return
     end
-    assert(false, "*** expected an exception")
+    assert(false, '*** expected an exception')
   end
 
   def test_range
@@ -248,7 +244,7 @@ class StrictJuice < Minitest::Test
       assert(true)
       return
     end
-    assert(false, "*** expected an exception")
+    assert(false, '*** expected an exception')
   end
 
   # Stream IO
@@ -265,13 +261,13 @@ class StrictJuice < 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.strict_load(f)
     f.close()
@@ -291,7 +287,7 @@ class StrictJuice < Minitest::Test
       assert(true)
       return
     end
-    assert(false, "*** expected an exception")
+    assert(false, '*** expected an exception')
   end
 
   def test_class
@@ -301,7 +297,7 @@ class StrictJuice < Minitest::Test
       assert(true)
       return
     end
-    assert(false, "*** expected an exception")
+    assert(false, '*** expected an exception')
   end
 
   def test_module
@@ -311,7 +307,7 @@ class StrictJuice < Minitest::Test
       assert(true)
       return
     end
-    assert(false, "*** expected an exception")
+    assert(false, '*** expected an exception')
   end
 
   # symbol_keys option
@@ -423,7 +419,7 @@ class StrictJuice < Minitest::Test
   def dump_and_load(obj, trace=false)
     json = Oj.dump(obj, :indent => 2)
     puts json if trace
-    loaded = Oj.strict_load(json);
+    loaded = Oj.strict_load(json)
     if obj.nil?
       assert_nil(loaded)
     else