oj 3.14.2 → 3.14.3

data/test/perf_once.rb

@@ -14,10 +14,10 @@ File.open(filename, "w") { |f|
   ('a'..'z').each { |a|
     ('a'..'z').each { |b|
       ('a'..'z').each { |c|
-	('a'..'z').each { |d|
-	  f.puts(%|"#{a}#{b}#{c}#{d}":#{cnt},|)
-	  cnt += 1
-	}
+        ('a'..'z').each { |d|
+          f.puts(%|"#{a}#{b}#{c}#{d}":#{cnt},|)
+          cnt += 1
+        }
       }
     }
   }

data/test/perf_parser.rb

@@ -164,7 +164,6 @@ $obj_json = %|{
   "juliet": "junk"
 }|
 
-
 p_usual = Oj::Parser.new(:usual)
 p_usual.cache_keys = $cache_keys
 p_usual.cache_strings = ($cache_keys ? 6 : 0)
@@ -186,5 +185,5 @@ perf.run($iter)
 
 unless $failed.empty?
   puts "The following packages were not included for the reason listed"
-  $failed.each { |tag,msg| puts "***** #{tag}: #{msg}" }
+  $failed.each { |tag, msg| puts "***** #{tag}: #{msg}" }
 end

data/test/perf_saj.rb

@@ -93,7 +93,6 @@ if $verbose
   puts "json:\n#{$json}\n"
 end
 
-
 puts '-' * 80
 puts "Parse Performance"
 perf = Perf.new()
@@ -105,5 +104,5 @@ perf.run($iter)
 
 unless $failed.empty?
   puts "The following packages were not included for the reason listed"
-  $failed.each { |tag,msg| puts "***** #{tag}: #{msg}" }
+  $failed.each { |tag, msg| puts "***** #{tag}: #{msg}" }
 end

data/test/perf_scp.rb

@@ -148,5 +148,5 @@ perf.run($iter)
 
 unless $failed.empty?
   puts "The following packages were not included for the reason listed"
-  $failed.each { |tag,msg| puts "***** #{tag}: #{msg}" }
+  $failed.each { |tag, msg| puts "***** #{tag}: #{msg}" }
 end

data/test/perf_simple.rb

@@ -21,7 +21,7 @@ class Jazz
     @array = [true, false, nil]
     @hash = { 'one' => 1, 'two' => 2 }
   end
-  def to_json()
+  def to_json(*_args)
     %{
     { "boolean":#{@boolean},
       "number":#{@number},
@@ -177,7 +177,7 @@ puts "%d Ox.load()s in %0.3f seconds or %0.1f loads/msec" % [$iter, dt, $iter/dt
 
 puts "Parser results:"
 puts "gem       seconds  parses/msec  X faster than #{base_name} (higher is better)"
-parse_results.each do |name,dt|
+parse_results.each do |name, dt|
   if 0.0 == dt
     puts "#{name} failed to generate JSON"
     next
@@ -276,7 +276,7 @@ puts "%d Ox.dump()s in %0.3f seconds or %0.1f dumps/msec" % [$iter, dt, $iter/dt
 
 puts "Parser results:"
 puts "gem       seconds  dumps/msec  X faster than #{base_name} (higher is better)"
-parse_results.each do |name,dt|
+parse_results.each do |name, dt|
   if 0.0 == dt
     puts "#{name} failed to generate JSON"
     next

data/test/perf_strict.rb

@@ -135,5 +135,5 @@ puts
 
 unless $failed.empty?
   puts "The following packages were not included for the reason listed"
-  $failed.each { |tag,msg| puts "***** #{tag}: #{msg}" }
+  $failed.each { |tag, msg| puts "***** #{tag}: #{msg}" }
 end

data/test/perf_wab.rb

@@ -127,5 +127,5 @@ puts
 
 unless $failed.empty?
   puts "The following packages were not included for the reason listed"
-  $failed.each { |tag,msg| puts "***** #{tag}: #{msg}" }
+  $failed.each { |tag, msg| puts "***** #{tag}: #{msg}" }
 end

data/test/sample/change.rb

@@ -1,4 +1,3 @@
-
 module Sample
   class Change
     attr_accessor :time

data/test/sample/dir.rb

@@ -1,4 +1,3 @@
-
 require 'etc'
 
 module Sample

data/test/sample/doc.rb

@@ -1,4 +1,3 @@
-
 require 'sample/hasprops'
 require 'sample/group'
 require 'sample/layer'

data/test/sample/file.rb

@@ -1,4 +1,3 @@
-
 require 'etc'
 
 module Sample

data/test/sample/group.rb

@@ -1,4 +1,3 @@
-
 module Sample
   class Group
     attr_reader :members

data/test/sample/hasprops.rb

@@ -1,4 +1,3 @@
-
 module Sample
   module HasProps
 

data/test/sample/layer.rb

@@ -1,4 +1,3 @@
-
 module Sample
   class Layer < Group
     attr_accessor :name

data/test/sample/rect.rb

@@ -1,4 +1,3 @@
-
 module Sample
   class Rect < Shape
 

data/test/sample/shape.rb

@@ -1,4 +1,3 @@
-
 module Sample
   class Shape
     include HasProps

data/test/sample/text.rb

@@ -1,4 +1,3 @@
-
 module Sample
   class Text < Shape
     attr_accessor :text

data/test/sample.rb

@@ -7,7 +7,6 @@ if $0 == __FILE__
   $: << '../ext'
 end
 
-require 'pp'
 require 'sample/doc'
 
 def sample_doc(size=3)
@@ -27,7 +26,7 @@ def sample_doc(size=3)
       g = ::Sample::Group.new
       (1..size).each do |k|
         g2 = ::Sample::Group.new
-        r = ::Sample::Rect.new(j * 40 + 10.0, i * 10.0,
+        r = ::Sample::Rect.new((j * 40) + 10.0, i * 10.0,
                                10.123456 / k, 10.0 / k, colors[(i + j + k) % colors.size])
         r.add_prop(:part_of, layer.name)
         g2 << r
@@ -36,7 +35,7 @@ def sample_doc(size=3)
       end
       g2 = ::Sample::Group.new
       (1..size).each do |k|
-        o = ::Sample::Oval.new(j * 40 + 12.0, i * 10.0 + 2.0,
+        o = ::Sample::Oval.new((j * 40) + 12.0, (i * 10.0) + 2.0,
                                6.0 / k, 6.0 / k, colors[(i + j + k) % colors.size])
         o.add_prop(:inside, true)
         g << o

data/test/sample_json.rb

@@ -7,7 +7,6 @@ if $0 == __FILE__
   $: << '../ext'
 end
 
-require 'pp'
 require 'oj'
 
 def sample_json(size=3)

data/test/test_compat.rb

@@ -30,7 +30,7 @@ class CompatJuice < Minitest::Test
     alias == eql?
 
     def to_json(*a)
-      %|{"json_class":"#{self.class.to_s}","x":#{@x},"y":#{@y}}|
+      %|{"json_class":"#{self.class}","x":#{@x},"y":#{@y}}|
     end
 
     def self.json_create(h)
@@ -170,7 +170,7 @@ class CompatJuice < 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_symbol
@@ -341,12 +341,14 @@ class CompatJuice < Minitest::Test
 
   def test_io_file
     filename = File.join(File.dirname(__FILE__), 'open_file_test.json')
-    File.open(filename, 'w') { |f| f.write(%{{
+    File.open(filename, 'w') { |f|
+      f.write(%{{
   "x":true,
   "y":58,
   "z": [1,2,3]
 }
-}) }
+})
+    }
     f = File.new(filename)
     obj = Oj.compat_load(f)
     f.close()
@@ -485,7 +487,7 @@ class CompatJuice < Minitest::Test
 
   def test_parse_to_s
     s = Stringy.new
-    assert_equal([1,2], Oj.load(s, :mode => :compat))
+    assert_equal([1, 2], Oj.load(s, :mode => :compat))
   end
 
   def test_parse_large_string
@@ -496,10 +498,10 @@ class CompatJuice < Minitest::Test
     assert(error.message.include?('quoted string not terminated'))
 
     json =<<~JSON
-    {
-      "a": "\\u3074\\u30fc\\u305f\\u30fc",
-      "b": "aaaaaaaaaaaaaaaaaaaaaaaaaaaa"
-    }
+      {
+        "a": "\\u3074\\u30fc\\u305f\\u30fc",
+        "b": "aaaaaaaaaaaaaaaaaaaaaaaaaaaa"
+      }
     JSON
     assert_equal("ぴーたー", Oj.load(json)['a'])
   end

data/test/test_custom.rb

@@ -196,7 +196,7 @@ class CustomJuice < 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
@@ -204,7 +204,7 @@ class CustomJuice < Minitest::Test
 
     begin
       n = 10000
-      Oj.strict_load('[' * n + ']' * n)
+      Oj.strict_load(('[' * n) + (']' * n))
     rescue Exception => e
       assert(false, e.message)
     end
@@ -343,7 +343,6 @@ class CustomJuice < Minitest::Test
   "b":[3]
 }
 |, json)
-
   end
 
   def test_symbol
@@ -450,12 +449,9 @@ class CustomJuice < Minitest::Test
   end
 
   def test_datetime_unix_zone
-    # older versions seems to have issues getting the utc offset.
-    if '2.4' <= RUBY_VERSION
-      obj = DateTime.new(2017, 1, 5, 10, 20, 30, '-0500')
-      json = Oj.dump(obj, :indent => 2, time_format: :unix_zone)
-      assert_equal('1483629630.000000000e-18000', json)
-    end
+    obj = DateTime.new(2017, 1, 5, 10, 20, 30, '-0500')
+    json = Oj.dump(obj, :indent => 2, time_format: :unix_zone)
+    assert_equal('1483629630.000000000e-18000', json)
   end
 
   def test_datetime_ruby

data/test/test_debian.rb

@@ -16,7 +16,7 @@ class DebJuice < Minitest::Test
     end
     alias == eql?
 
-  end# Jam
+  end # Jam
 
   # contributed by sauliusg to fix as_json
   class Orange < Jam

data/test/test_fast.rb

@@ -91,11 +91,7 @@ class DocTest < Minitest::Test
   def test_fixnum
     json = %{12345}
     Oj::Doc.open(json) do |doc|
-      if '2.4.0' <= RUBY_VERSION
-        assert_equal(Integer, doc.type)
-      else
-        assert_equal(Fixnum, doc.type)
-      end
+      assert_equal(Integer, doc.type)
       assert_equal(12345, doc.fetch())
     end
   end
@@ -211,7 +207,7 @@ class DocTest < Minitest::Test
        ['/array/1', 'hash/h2/a/2', '/array/1/hash/h2/a/2'],
        ['/array/1/hash', '../string', '/array/1/string'],
        ['/array/1/hash', '..', '/array/1'],
-      ].each do |start,path,where|
+      ].each do |start, path, where|
         doc.move(start)
         doc.move(path)
         assert_equal(where, doc.where?)
@@ -220,21 +216,16 @@ class DocTest < Minitest::Test
   end
 
   def test_type
-    if '2.4.0' <= RUBY_VERSION
-      num_class = Integer
-    else
-      num_class = Fixnum
-    end
     Oj::Doc.open(@json1) do |doc|
       [['/', Hash],
        ['/array', Array],
        ['/array/1', Hash],
-       ['/array/1/num', num_class],
+       ['/array/1/num', Integer],
        ['/array/1/string', String],
        ['/array/1/hash/h2/a', Array],
-       ['/array/1/hash/../num', num_class],
+       ['/array/1/hash/../num', Integer],
        ['/array/1/hash/../..', Array],
-      ].each do |path,type|
+      ].each do |path, type|
         assert_equal(type, doc.type(path))
       end
     end
@@ -251,7 +242,7 @@ class DocTest < Minitest::Test
        ['/array/1/hash/../num', 'num'],
        ['/array/1/hash/..', 1],
        ['/array/1/hash/../..', 'array'],
-      ].each do |path,key|
+      ].each do |path, key|
         doc.move(path)
         if key.nil?
           assert_nil(doc.local_key())
@@ -273,7 +264,7 @@ 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}],
-      ].each do |path,val|
+      ].each do |path, val|
         doc.move(path)
         assert_equal(val, doc.fetch())
       end
@@ -293,7 +284,7 @@ class DocTest < Minitest::Test
        ['/', {'array' => [{'num' => 3, 'string' => 'message', 'hash' => {'h2' => {'a' => [1, 2, 3]}}}], 'boolean' => true}],
        ['/nothing', nil],
        ['/array/10', nil],
-      ].each do |path,val|
+      ].each do |path, val|
         if val.nil?
           assert_nil(doc.fetch(path))
         else
@@ -310,7 +301,6 @@ class DocTest < Minitest::Test
       assert_nil(doc.fetch('/x'))
       assert_nil(doc.fetch('/0'))
     end
-
   end
 
   def test_move_fetch_path
@@ -318,7 +308,7 @@ class DocTest < Minitest::Test
       [['/array/1', 'num', 3],
        ['/array/1', 'string', 'message'],
        ['/array/1/hash', 'h2/a', [1, 2, 3]],
-      ].each do |path,fetch_path,val|
+      ].each do |path, fetch_path, val|
         doc.move(path)
         assert_equal(val, doc.fetch(fetch_path))
       end
@@ -333,7 +323,7 @@ class DocTest < Minitest::Test
        ['/array/1/dash', false],
        ['/array/3', false],
        ['/nothing', false],
-      ].each do |path,val|
+      ].each do |path, val|
         assert_equal(val, doc.exists?(path), "failed for #{path.inspect}")
       end
     end

data/test/test_file.rb

@@ -19,21 +19,21 @@ class FileJuice < Minitest::Test
     end
     alias == eql?
 
-  end# Jam
+  end # Jam
 
   class Jeez < Jam
     def initialize(x, y)
       super
     end
 
-    def to_json()
+    def to_json(*_args)
       %{{"json_class":"#{self.class}","x":#{@x},"y":#{@y}}}
     end
 
     def self.json_create(h)
       self.new(h['x'], h['y'])
     end
-  end# Jeez
+  end # Jeez
 
   class Orange < Jam
     def initialize(x, y)
@@ -212,11 +212,11 @@ class FileJuice < Minitest::Test
 
   def test_load_unicode_path
     json =<<~JSON
-    {
-      "x":true,
-      "y":58,
-      "z": [1,2,3]
-    }
+      {
+        "x":true,
+        "y":58,
+        "z": [1,2,3]
+      }
     JSON
 
     Tempfile.create('file_test_conceição1.json') do |f|

data/test/test_integer_range.rb

@@ -49,7 +49,7 @@ class IntegerRangeTest < Minitest::Test
   end
 
   def test_modes_without_opt
-    test = {safe:0, unsafe: 10000000000000000000}
+    test = {safe: 0, unsafe: 10000000000000000000}
     exp = '{"safe":0,"unsafe":10000000000000000000}'
 
     [:strict, :null, :compat, :rails, :custom].each do |mode|
@@ -63,7 +63,7 @@ class IntegerRangeTest < Minitest::Test
   end
 
   def test_accept_nil_and_false
-    test = {safe:0, unsafe: 10000000000000000000}
+    test = {safe: 0, unsafe: 10000000000000000000}
     exp = '{"safe":0,"unsafe":10000000000000000000}'
 
     assert_equal(exp, Oj.dump(test, integer_range: nil))

data/test/test_null.rb

@@ -152,7 +152,7 @@ class NullJuice < 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
 
   # Hash
@@ -245,12 +245,14 @@ class NullJuice < Minitest::Test
 
   def test_io_file
     filename = File.join(File.dirname(__FILE__), 'open_file_test.json')
-    File.open(filename, 'w') { |f| f.write(%{{
+    File.open(filename, 'w') { |f|
+      f.write(%{{
   "x":true,
   "y":58,
   "z": [1,2,3]
 }
-}) }
+})
+    }
     f = File.new(filename)
     obj = Oj.strict_load(f)
     f.close()

data/test/test_object.rb

@@ -301,7 +301,7 @@ class ObjectJuice < 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
 
   # Hash
@@ -377,12 +377,14 @@ class ObjectJuice < Minitest::Test
 
   def test_io_file
     filename = File.join(File.dirname(__FILE__), 'open_file_test.json')
-    File.open(filename, 'w') { |f| f.write(%{{
+    File.open(filename, 'w') { |f|
+      f.write(%{{
   "x":true,
   "y":58,
   "z": [1,2,3]
 }
-}) }
+})
+    }
     f = File.new(filename)
     obj = Oj.object_load(f)
     f.close()
@@ -651,7 +653,7 @@ class ObjectJuice < Minitest::Test
 
     json = %{{"~#x":[1,2]}}
     h = Oj.object_load(json)
-    assert_equal({'~#x' => [1,2]}, h);
+    assert_equal({'~#x' => [1, 2]}, h);
   end
 
   def test_json_struct
@@ -839,7 +841,6 @@ class ObjectJuice < Minitest::Test
     assert_equal(h2['b'].__id__, h2.__id__)
   end
 
-
   def test_json_object_missing_fields
     json = %{{ "^u": [ "ObjectJuice::Stuck",1]}}
 

data/test/test_parser_saj.rb

@@ -25,6 +25,8 @@ class AllSaj < Oj::Saj
 
   def initialize()
     @calls = []
+
+    super
   end
 
   def hash_start(key)
@@ -260,13 +262,13 @@ class SajTest < Minitest::Test
     p.handler = handler
     p.parse(json)
     assert_equal([
-		   [:array_start, nil],
-                   [:add_value, true, nil],
-                   [:array_end, nil],
-		   [:array_start, nil],
-                   [:add_value, false, nil],
-                   [:array_end, nil],
-		 ], handler.calls)
+      [:array_start, nil],
+      [:add_value, true, nil],
+      [:array_end, nil],
+      [:array_start, nil],
+      [:add_value, false, nil],
+      [:array_end, nil],
+    ], 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],
-                   [:add_value, true, nil],
-                   [:array_end, nil],
-		 ], handler.calls)
+      [:array_start, nil],
+      [:add_value, true, nil],
+      [:array_end, nil],
+    ], handler.calls)
   end
 
   def test_loc

data/test/test_parser_usual.rb

@@ -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)

data/test/test_saj.rb

@@ -25,6 +25,8 @@ class AllSaj < Oj::Saj
 
   def initialize()
     @calls = []
+
+    super
   end
 
   def hash_start(key)