oj 3.14.3 → 3.15.0

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,7 +23,7 @@ $json = %{{
 class AllSaj < Oj::Saj
   attr_accessor :calls
 
-  def initialize()
+  def initialize
     @calls = []
 
     super
@@ -97,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
@@ -113,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
@@ -179,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
 
@@ -51,12 +50,12 @@ class AllHandler < Oj::ScHandler
     key
   end
 
-  def array_start()
+  def array_start
     @calls << [:array_start]
     []
   end
 
-  def array_end()
+  def array_end
     @calls << [:array_end]
   end
 
@@ -64,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
 
@@ -76,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
@@ -136,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
@@ -152,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
@@ -231,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'],
@@ -244,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
@@ -369,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)
@@ -378,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
@@ -396,7 +396,7 @@ 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 {
@@ -405,7 +405,7 @@ class ScpTest < Minitest::Test
         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
 
@@ -159,10 +155,10 @@ class StrictJuice < Minitest::Test
     skip 'TruffleRuby causes SEGV' if RUBY_ENGINE == 'truffleruby'
 
     begin
-      n = 10000
+      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,15 +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()
@@ -293,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
@@ -303,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
@@ -313,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
@@ -425,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