oj 3.11.5 → 3.16.5

data/test/test_fast.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
-# encoding: UTF-8
+# frozen_string_literal: true
 
-$: << File.dirname(__FILE__)
+$LOAD_PATH << __dir__
 
 require 'helper'
 
@@ -36,11 +36,22 @@ class DocTest < Minitest::Test
     end
   end
 
+  def test_leaf_of_existing_path
+    json = %{{"foo": 1, "fizz": true}}
+    Oj::Doc.open(json) do |doc|
+      %w(/foo/bar /fizz/bar).each do |path|
+        assert_nil(doc.fetch(path))
+        assert_equal(:default, doc.fetch(path, :default))
+        refute(doc.exists?(path))
+      end
+    end
+  end
+
   def test_true
     json = %{true}
     Oj::Doc.open(json) do |doc|
       assert_equal(TrueClass, doc.type)
-      assert_equal(true, doc.fetch())
+      assert(doc.fetch())
     end
   end
 
@@ -48,7 +59,7 @@ class DocTest < Minitest::Test
     json = %{false}
     Oj::Doc.open(json) do |doc|
       assert_equal(FalseClass, doc.type)
-      assert_equal(false, doc.fetch())
+      refute(doc.fetch())
     end
   end
 
@@ -64,7 +75,7 @@ class DocTest < Minitest::Test
     json = %{"ぴーたー"}
     Oj::Doc.open(json) do |doc|
       assert_equal(String, doc.type)
-      assert_equal("ぴーたー", doc.fetch())
+      assert_equal('ぴーたー', doc.fetch())
     end
   end
 
@@ -72,19 +83,15 @@ class DocTest < Minitest::Test
     json = %{"\\u3074\\u30fc\\u305f\\u30fc"}
     Oj::Doc.open(json) do |doc|
       assert_equal(String, doc.type)
-      assert_equal("ぴーたー", doc.fetch())
+      assert_equal('ぴーたー', doc.fetch())
     end
   end
 
   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(12345, doc.fetch())
+      assert_equal(Integer, doc.type)
+      assert_equal(12_345, doc.fetch())
     end
   end
 
@@ -92,7 +99,7 @@ class DocTest < Minitest::Test
     json = %{12345.6789}
     Oj::Doc.open(json) do |doc|
       assert_equal(Float, doc.type)
-      assert_equal(12345.6789, doc.fetch())
+      assert_in_delta(12_345.6789, doc.fetch())
     end
   end
 
@@ -100,8 +107,8 @@ class DocTest < Minitest::Test
     json = %{12345.6789e7}
     Oj::Doc.open(json) do |doc|
       assert_equal(Float, doc.type)
-      #assert_equal(12345.6789e7, doc.fetch())
-      assert_equal(12345.6789e7.to_i, doc.fetch().to_i)
+      # assert_equal(12345.6789e7, doc.fetch())
+      assert_equal(12_345.6789e7.to_i, doc.fetch().to_i)
     end
   end
 
@@ -109,7 +116,7 @@ class DocTest < Minitest::Test
     json = %{[]}
     Oj::Doc.open(json) do |doc|
       assert_equal(Array, doc.type)
-      assert_equal([], doc.fetch())
+      assert_empty(doc.fetch())
     end
   end
 
@@ -125,7 +132,7 @@ class DocTest < Minitest::Test
     json = %{{}}
     Oj::Doc.open(json) do |doc|
       assert_equal(Hash, doc.type)
-      assert_equal({}, doc.fetch())
+      assert_empty(doc.fetch())
     end
   end
 
@@ -160,7 +167,8 @@ class DocTest < Minitest::Test
 
   def test_move
     Oj::Doc.open(@json1) do |doc|
-      [ '/',
+      [
+        '/',
         '/array',
         '/boolean',
         '/array/1/hash/h2/a/3',
@@ -193,13 +201,14 @@ class DocTest < Minitest::Test
 
   def test_move_relative
     Oj::Doc.open(@json1) do |doc|
-      [['/', 'array', '/array'],
-       ['/array', '1/num', '/array/1/num'],
-       ['/array/1/hash', 'h2/a', '/array/1/hash/h2/a'],
-       ['/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|
+      [
+        ['/', 'array', '/array'],
+        ['/array', '1/num', '/array/1/num'],
+        ['/array/1/hash', 'h2/a', '/array/1/hash/h2/a'],
+        ['/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|
         doc.move(start)
         doc.move(path)
         assert_equal(where, doc.where?)
@@ -208,21 +217,17 @@ 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/string', String],
-       ['/array/1/hash/h2/a', Array],
-       ['/array/1/hash/../num', num_class],
-       ['/array/1/hash/../..', Array],
-      ].each do |path,type|
+      [
+        ['/', Hash],
+        ['/array', Array],
+        ['/array/1', Hash],
+        ['/array/1/num', Integer],
+        ['/array/1/string', String],
+        ['/array/1/hash/h2/a', Array],
+        ['/array/1/hash/../num', Integer],
+        ['/array/1/hash/../..', Array],
+      ].each do |path, type|
         assert_equal(type, doc.type(path))
       end
     end
@@ -230,16 +235,17 @@ class DocTest < Minitest::Test
 
   def test_local_key
     Oj::Doc.open(@json1) do |doc|
-      [['/', nil],
-       ['/array', 'array'],
-       ['/array/1', 1],
-       ['/array/1/num', 'num'],
-       ['/array/1/string', 'string'],
-       ['/array/1/hash/h2/a', 'a'],
-       ['/array/1/hash/../num', 'num'],
-       ['/array/1/hash/..', 1],
-       ['/array/1/hash/../..', 'array'],
-      ].each do |path,key|
+      [
+        ['/', nil],
+        ['/array', 'array'],
+        ['/array/1', 1],
+        ['/array/1/num', 'num'],
+        ['/array/1/string', 'string'],
+        ['/array/1/hash/h2/a', 'a'],
+        ['/array/1/hash/../num', 'num'],
+        ['/array/1/hash/..', 1],
+        ['/array/1/hash/../..', 'array'],
+      ].each do |path, key|
         doc.move(path)
         if key.nil?
           assert_nil(doc.local_key())
@@ -252,16 +258,17 @@ class DocTest < Minitest::Test
 
   def test_fetch_move
     Oj::Doc.open(@json1) do |doc|
-      [['/array/1/num', 3],
-       ['/array/1/string', 'message'],
-       ['/array/1/hash/h2/a', [1, 2, 3]],
-       ['/array/1/hash/../num', 3],
-       ['/array/1/hash/..', {'num' => 3, 'string' => 'message', 'hash' => {'h2' => {'a' => [1, 2, 3]}}}],
-       ['/array/1/hash/../..', [{'num' => 3, 'string' => 'message', 'hash' => {'h2' => {'a' => [1, 2, 3]}}}]],
-       ['/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|
+      [
+        ['/array/1/num', 3],
+        ['/array/1/string', 'message'],
+        ['/array/1/hash/h2/a', [1, 2, 3]],
+        ['/array/1/hash/../num', 3],
+        ['/array/1/hash/..', {'num' => 3, 'string' => 'message', 'hash' => {'h2' => {'a' => [1, 2, 3]}}}],
+        ['/array/1/hash/../..', [{'num' => 3, 'string' => 'message', 'hash' => {'h2' => {'a' => [1, 2, 3]}}}]],
+        ['/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|
         doc.move(path)
         assert_equal(val, doc.fetch())
       end
@@ -270,33 +277,65 @@ class DocTest < Minitest::Test
 
   def test_fetch_path
     Oj::Doc.open(@json1) do |doc|
-      [['/array/1/num', 3],
-       ['/array/1/string', 'message'],
-       ['/array/1/hash/h2/a', [1, 2, 3]],
-       ['/array/1/hash/../num', 3],
-       ['/array/1/hash/..', {'num' => 3, 'string' => 'message', 'hash' => {'h2' => {'a' => [1, 2, 3]}}}],
-       ['/array/1/hash/../..', [{'num' => 3, 'string' => 'message', 'hash' => {'h2' => {'a' => [1, 2, 3]}}}]],
-       ['/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|
-        assert_equal(val, doc.fetch(path))
+      [
+        ['/array/1/num', 3],
+        ['/array/1/string', 'message'],
+        ['/array/1/hash/h2/a', [1, 2, 3]],
+        ['/array/1/hash/../num', 3],
+        ['/array/1/hash/..', {'num' => 3, 'string' => 'message', 'hash' => {'h2' => {'a' => [1, 2, 3]}}}],
+        ['/array/1/hash/../..', [{'num' => 3, 'string' => 'message', 'hash' => {'h2' => {'a' => [1, 2, 3]}}}]],
+        ['/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}],
+        ['/nothing', nil],
+        ['/array/10', nil],
+      ].each do |path, val|
+        if val.nil?
+          assert_nil(doc.fetch(path))
+        else
+          assert_equal(val, doc.fetch(path))
+        end
       end
     end
+    # verify empty hash and arrays return nil when a member is requested
+    Oj::Doc.open('{}') do |doc|
+      assert_nil(doc.fetch('/x'))
+      assert_nil(doc.fetch('/0'))
+    end
+    Oj::Doc.open('[]') do |doc|
+      assert_nil(doc.fetch('/x'))
+      assert_nil(doc.fetch('/0'))
+    end
   end
 
   def test_move_fetch_path
     Oj::Doc.open(@json1) do |doc|
-      [['/array/1', 'num', 3],
-       ['/array/1', 'string', 'message'],
-       ['/array/1/hash', 'h2/a', [1, 2, 3]],
-      ].each do |path,fetch_path,val|
+      [
+        ['/array/1', 'num', 3],
+        ['/array/1', 'string', 'message'],
+        ['/array/1/hash', 'h2/a', [1, 2, 3]],
+      ].each do |path, fetch_path, val|
         doc.move(path)
         assert_equal(val, doc.fetch(fetch_path))
       end
     end
   end
 
+  def test_exists
+    Oj::Doc.open(@json1) do |doc|
+      [
+        ['/array/1', true],
+        ['/array/1', true],
+        ['/array/1/hash', true],
+        ['/array/1/dash', false],
+        ['/array/3', false],
+        ['/nothing', false],
+      ].each do |path, val|
+        assert_equal(val, doc.exists?(path), "failed for #{path.inspect}")
+      end
+    end
+  end
+
   def test_home
     Oj::Doc.open(@json1) do |doc|
       doc.move('/array/1/num')
@@ -354,6 +393,19 @@ class DocTest < Minitest::Test
     end
   end
 
+  def test_nested_each_child
+    h = {}
+    Oj::Doc.open('{"a":1,"c":[2],"d":3}') do |doc|
+      doc.each_child('/') do |child|
+        h[child.path] = child.fetch
+        child.each_child do |grandchild|
+          h[grandchild.path] = grandchild.fetch
+        end
+      end
+    end
+    assert_equal({'/a'=>1, '/c'=>[2], '/c/1'=>2, '/d'=>3}, h)
+  end
+
   def test_size
     Oj::Doc.open('[1,2,3]') do |doc|
       assert_equal(4, doc.size)
@@ -364,8 +416,8 @@ class DocTest < Minitest::Test
   end
 
   def test_open_file
-    filename = File.join(File.dirname(__FILE__), 'open_file_test.json')
-    File.open(filename, 'w') { |f| f.write('{"a":[1,2,3]}') }
+    filename = File.join(__dir__, 'open_file_test.json')
+    File.write(filename, '{"a":[1,2,3]}')
     Oj::Doc.open_file(filename) do |doc|
       assert_equal(5, doc.size)
     end
@@ -390,8 +442,8 @@ class DocTest < Minitest::Test
   end
 
   def test_file_open_close
-    filename = File.join(File.dirname(__FILE__), 'open_file_test.json')
-    File.open(filename, 'w') { |f| f.write('{"a":[1,2,3]}') }
+    filename = File.join(__dir__, 'open_file_test.json')
+    File.write(filename, '{"a":[1,2,3]}')
     doc = Oj::Doc.open_file(filename)
     assert_equal(Oj::Doc, doc.class)
     assert_equal(5, doc.size)
@@ -418,7 +470,6 @@ class DocTest < Minitest::Test
     doc.home()
     assert_equal(2, doc.fetch('/a/2'))
     assert_equal(2, doc.fetch('a/2'))
-    doc = nil
     GC.start
     # a print statement confirms close is called
   end
@@ -450,6 +501,11 @@ class DocTest < Minitest::Test
     assert_equal({'/a/x' => 2, '/b/y' => 4}, results)
   end
 
+  def test_doc_empty
+    result = Oj::Doc.open('') { |doc| doc.each_child {} }
+    assert_nil(result)
+  end
+
   def test_comment
     json = %{{
   "x"/*one*/:/*two*/true,//three

data/test/test_file.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
-# encoding: UTF-8
+# frozen_string_literal: true
 
-$: << File.dirname(__FILE__)
+$LOAD_PATH << __dir__
 
 require 'helper'
 
@@ -19,35 +19,29 @@ 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'])
+      new(h['x'], h['y'])
     end
-  end# Jeez
+  end # Jeez
 
   class Orange < Jam
-    def initialize(x, y)
-      super
-    end
 
-    def as_json()
+    def as_json
       { :json_class => self.class,
         :x => @x,
         :y => @y }
     end
 
     def self.json_create(h)
-      self.new(h['x'], h['y'])
+      new(h['x'], h['y'])
     end
   end
 
@@ -73,8 +67,8 @@ class FileJuice < 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
 
@@ -82,9 +76,9 @@ class FileJuice < Minitest::Test
     mode = Oj.default_options()[:mode]
     Oj.default_options = {:mode => :object}
     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)
@@ -118,9 +112,9 @@ class FileJuice < Minitest::Test
   # Symbol
   def test_symbol_object
     Oj.default_options = { :mode => :object }
-    #dump_and_load(''.to_sym, false)
+    # dump_and_load(''.to_sym, false)
     dump_and_load(:abc, false)
-    dump_and_load(':xyz'.to_sym, false)
+    dump_and_load(:":xyz", false)
   end
 
   # Time
@@ -129,10 +123,11 @@ class FileJuice < Minitest::Test
     Oj.default_options = { :mode => :object, :time_format => :unix_zone }
     dump_and_load(t, false)
   end
+
   def test_time_object_early
-    # Windows does not support dates before 1970.
-    return if RbConfig::CONFIG['host_os'] =~ /(mingw|mswin)/
-    t = Time.xmlschema("1954-01-05T00:00:00.123456")
+    skip 'Windows does not support dates before 1970.' if RbConfig::CONFIG['host_os'] =~ /(mingw|mswin)/
+
+    t = Time.xmlschema('1954-01-05T00:00:00.123456')
     Oj.default_options = { :mode => :object, :time_format => :unix_zone }
     dump_and_load(t, false)
   end
@@ -162,12 +157,10 @@ class FileJuice < Minitest::Test
   def test_range_object
     Oj.default_options = { :mode => :object }
     json = Oj.dump(1..7, :mode => :object, :indent => 0)
-    if 'rubinius' == $ruby
-      assert(%{{"^O":"Range","begin":1,"end":7,"exclude_end?":false}} == json)
-    elsif 'jruby' == $ruby
-      assert(%{{"^O":"Range","begin":1,"end":7,"exclude_end?":false}} == json)
-    else
+    if $ruby == 'ruby'
       assert_equal(%{{"^u":["Range",1,7,false]}}, json)
+    else
+      assert_equal(%{{"^O":"Range","begin":1,"end":7,"exclude_end?":false}}, json)
     end
     dump_and_load(1..7, false)
     dump_and_load(1..1, false)
@@ -212,9 +205,27 @@ class FileJuice < Minitest::Test
     dump_and_load(DateTime.new(2012, 6, 19), false)
   end
 
+  def test_load_unicode_path
+    json =<<~JSON
+      {
+        "x":true,
+        "y":58,
+        "z": [1,2,3]
+      }
+    JSON
+
+    Tempfile.create('file_test_conceição1.json') do |f|
+      f.write(json)
+      f.close
+
+      objects = Oj.load_file(f.path)
+      assert_equal(Oj.load(json), objects)
+    end
+  end
+
   def dump_and_load(obj, trace=false)
-    filename = File.join(File.dirname(__FILE__), 'file_test.json')
-    File.open(filename, "w") { |f|
+    filename = File.join(__dir__, 'file_test.json')
+    File.open(filename, 'w') { |f|
       Oj.to_stream(f, obj, :indent => 2)
     }
     puts "\n*** file: '#{File.read(filename)}'" if trace

data/test/test_gc.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
-# encoding: UTF-8
+# frozen_string_literal: true
 
-$: << File.dirname(__FILE__)
+$LOAD_PATH << __dir__
 
 require 'helper'
 
@@ -14,22 +14,24 @@ class GCTest < Minitest::Test
       @child = child
     end
 
-    def to_hash()
-      { 'json_class' => "#{self.class}", 'x' => x, 'child' => child }
+    def to_hash
+      { 'json_class' => self.class.to_s, 'x' => x, 'child' => child }
     end
 
     def self.json_create(h)
       GC.start
-      self.new(h['x'], h['child'])
+      new(h['x'], h['child'])
     end
   end # Goo
 
   def setup
     @default_options = Oj.default_options
+    GC.stress = true
   end
 
   def teardown
     Oj.default_options = @default_options
+    GC.stress = false
   end
 
   # if no crash then the GC marking is working
@@ -46,4 +48,13 @@ class GCTest < Minitest::Test
     json = Oj.dump(g, :mode => :object)
     Oj.object_load(json)
   end
+
+  def test_parse_gc
+    json = '{"a":"Alpha","b":true,"c":12345,"d":[true,[false,[-123456789,null],3.9676,["Something else.",false],null]],"e":{"zero":null,"one":1,"two":2,"three":[3],"four":[0,1,2,3,4]},"f":null,"h":{"a":{"b":{"c":{"d":{"e":{"f":{"g":null}}}}}}},"i":[[[[[[[null]]]]]]]}'
+
+    50.times do
+      data = Oj.load(json)
+      assert_equal(json, Oj.dump(data))
+    end
+  end
 end

data/test/test_generate.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'
@@ -15,7 +15,7 @@ class Generator < Minitest::Test
 
   def test_before
     json = Oj.generate({})
-    assert_equal("{}", json)
+    assert_equal('{}', json)
   end
 
 end

data/test/test_hash.rb

@@ -1,11 +1,11 @@
 #!/usr/bin/env ruby
-# encoding: UTF-8
+# frozen_string_literal: true
 
-$: << File.dirname(__FILE__)
+$LOAD_PATH << __dir__
 
 require 'helper'
 
-class Hashi < Minitest::Test
+class HashTest < Minitest::Test
 
   module TestModule
   end
@@ -19,7 +19,7 @@ class Hashi < Minitest::Test
 
   def test_load
     obj = Oj.load(%|{"abc":3}|, :mode => :compat, :hash_class => Oj::EasyHash)
-    
+
     assert_equal(Oj::EasyHash, obj.class)
     assert_equal(3, obj['abc'])
     assert_equal(3, obj[:abc])
@@ -35,5 +35,5 @@ class Hashi < Minitest::Test
     assert_equal(Oj::EasyHash, obj.class)
     assert_equal(3, obj[:abc])
   end
-  
+
 end # HashTest