oj 3.7.4 → 3.13.23

data/test/perf_scp.rb

@@ -14,16 +14,16 @@ require 'oj'
 
 $verbose = false
 $indent = 0
-$iter = 50000
+$iter = 50_000
 $with_bignum = false
-$size = 0
+$size = 1
 
 opts = OptionParser.new
 opts.on("-v", "verbose")                                  { $verbose = true }
 opts.on("-c", "--count [Int]", Integer, "iterations")     { |i| $iter = i }
 opts.on("-i", "--indent [Int]", Integer, "indentation")   { |i| $indent = i }
-opts.on("-s", "--size [Int]", Integer, "size (~Kbytes)")    { |i| $size = i }
-opts.on("-b", "with bignum")                                { $with_bignum = true }
+opts.on("-s", "--size [Int]", Integer, "size (~Kbytes)")  { |i| $size = i }
+opts.on("-b", "with bignum")                              { $with_bignum = true }
 opts.on("-h", "--help", "Show this display")              { puts opts; Process.exit!(0) }
 files = opts.parse(ARGV)
 
@@ -47,7 +47,7 @@ if 0 < $size
   end
 end
 
-Oj.default_options = { :indent => $indent, :mode => :compat }
+Oj.default_options = { :indent => $indent, :mode => :strict, cache_keys: true, cache_str: 5 }
 
 $json = Oj.dump($obj)
 $failed = {} # key is same as String used in tests later
@@ -105,7 +105,7 @@ class AllHandler < Oj::ScHandler
 
   def hash_set(h, key, value)
   end
-  
+
   def array_append(a, value)
   end
 
@@ -137,10 +137,11 @@ end
 puts '-' * 80
 puts "Parse Performance"
 perf = Perf.new()
-perf.add('Oj::Saj', 'all') { Oj.saj_parse(saj_handler, $json) }
-perf.add('Oj::Saj', 'none') { Oj.saj_parse(no_saj, $json) }
-perf.add('Oj::Scp', 'all') { Oj.sc_parse(sc_handler, $json) }
-perf.add('Oj::Scp', 'none') { Oj.sc_parse(no_handler, $json) }
+perf.add('Oj::Saj.all', 'all') { Oj.saj_parse(saj_handler, $json) }
+perf.add('Oj::Saj.none', 'none') { Oj.saj_parse(no_saj, $json) }
+perf.add('Oj::Scp.all', 'all') { Oj.sc_parse(sc_handler, $json) }
+perf.add('Oj::Scp.none', 'none') { Oj.sc_parse(no_handler, $json) }
+perf.add('Oj::load', 'none') { Oj.wab_load($json) }
 perf.add('Yajl', 'parse') { Yajl::Parser.parse($json) } unless $failed.has_key?('Yajl')
 perf.add('JSON::Ext', 'parse') { JSON::Ext::Parser.new($json).parse } unless $failed.has_key?('JSON::Ext')
 perf.run($iter)

data/test/perf_strict.rb

@@ -15,6 +15,8 @@ $iter = 20000
 $with_bignum = false
 $with_nums = true
 $size = 0
+$symbolize = false
+$cache_keys = true
 
 opts = OptionParser.new
 opts.on("-v", "verbose")                                    { $verbose = true }
@@ -23,6 +25,8 @@ opts.on("-i", "--indent [Int]", Integer, "indentation")     { |i| $indent = i }
 opts.on("-s", "--size [Int]", Integer, "size (~Kbytes)")    { |i| $size = i }
 opts.on("-b", "with bignum")                                { $with_bignum = true }
 opts.on("-n", "without numbers")                            { $with_nums = false }
+opts.on("-z", "--symbolize", "symbolize keys")              { $symbolize = true }
+opts.on("-k", "--no-cache", "turn off key caching")         { $cache_keys = false }
 opts.on("-h", "--help", "Show this display")                { puts opts; Process.exit!(0) }
 files = opts.parse(ARGV)
 
@@ -51,7 +55,7 @@ else
   }
 end
 
-Oj.default_options = { :indent => $indent, :mode => :strict }
+Oj.default_options = { :indent => $indent, :mode => :strict, cache_keys: $cache_keys, cache_str: 5 }
 
 if 0 < $size
   o = $obj
@@ -62,9 +66,6 @@ if 0 < $size
 end
 
 $json = Oj.dump($obj)
-$obj_json = Oj.dump($obj, :mode => :object)
-#puts "*** size: #{$obj_json.size}"
-#puts "*** #{$obj_json}"
 $failed = {} # key is same as String used in tests later
 
 def capture_error(tag, orig, load_key, dump_key, &blk)
@@ -77,8 +78,13 @@ def capture_error(tag, orig, load_key, dump_key, &blk)
 end
 
 # Verify that all packages dump and load correctly and return the same Object as the original.
-capture_error('Oj:strict', $obj, 'load', 'dump') { |o| Oj.strict_load(Oj.dump(o, :mode => :strict)) }
-capture_error('Yajl', $obj, 'encode', 'parse') { |o| require 'yajl'; Yajl::Parser.parse(Yajl::Encoder.encode(o)) }
+capture_error('Oj:strict', $obj, 'load', 'dump') { |o|
+  Oj.strict_load(Oj.dump(o))
+}
+capture_error('Yajl', $obj, 'encode', 'parse') { |o|
+  require 'yajl'
+  Yajl::Parser.parse(Yajl::Encoder.encode(o))
+}
 capture_error('JSON::Ext', $obj, 'generate', 'parse') { |o|
   require 'json'
   require 'json/ext'
@@ -86,16 +92,11 @@ capture_error('JSON::Ext', $obj, 'generate', 'parse') { |o|
   JSON.parser = JSON::Ext::Parser
   JSON.parse(JSON.generate(o))
 }
-capture_error('JSON::Pure', $obj, 'generate', 'parse') { |o|
-  require 'json/pure'
-  JSON.generator = JSON::Pure::Generator
-  JSON.parser = JSON::Pure::Parser
-  JSON.parse(JSON.generate(o))
-}
+
+Oj.default_options = { symbol_keys: $symbolize }
 
 if $verbose
   puts "json:\n#{$json}\n"
-  puts "object json:\n#{$obj_json}\n"
   puts "Oj loaded object:\n#{Oj.strict_load($json)}\n"
   puts "Yajl loaded object:\n#{Yajl::Parser.parse($json)}\n"
   puts "JSON loaded object:\n#{JSON::Ext::Parser.new($json).parse}\n"
@@ -105,15 +106,12 @@ puts '-' * 80
 puts "Strict Parse Performance"
 perf = Perf.new()
 unless $failed.has_key?('JSON::Ext')
-  perf.add('JSON::Ext', 'parse') { JSON.parse($json) }
+  perf.add('JSON::Ext', 'parse') { JSON.parse($json, symbolize_names: $symbolize) }
   perf.before('JSON::Ext') { JSON.parser = JSON::Ext::Parser }
 end
-unless $failed.has_key?('JSON::Pure')
-  perf.add('JSON::Pure', 'parse') { JSON.parse($json) }
-  perf.before('JSON::Pure') { JSON.parser = JSON::Pure::Parser }
-end
 unless $failed.has_key?('Oj:strict')
   perf.add('Oj:strict', 'strict_load') { Oj.strict_load($json) }
+  perf.add('Oj:wab', 'wab_load') { Oj.wab_load($json) }
 end
 perf.add('Yajl', 'parse') { Yajl::Parser.parse($json) } unless $failed.has_key?('Yajl')
 perf.run($iter)
@@ -125,12 +123,8 @@ unless $failed.has_key?('JSON::Ext')
   perf.add('JSON::Ext', 'dump') { JSON.generate($obj) }
   perf.before('JSON::Ext') { JSON.generator = JSON::Ext::Generator }
 end
-unless $failed.has_key?('JSON::Pure')
-  perf.add('JSON::Pure', 'generate') { JSON.generate($obj) }
-  perf.before('JSON::Pure') { JSON.generator = JSON::Pure::Generator }
-end
 unless $failed.has_key?('Oj:strict')
-  perf.add('Oj:strict', 'dump') { Oj.dump($obj, :mode => :strict) }
+  perf.add('Oj:strict', 'dump') { Oj.dump($obj) }
 end
 perf.add('Yajl', 'encode') { Yajl::Encoder.encode($obj) } unless $failed.has_key?('Yajl')
 perf.run($iter)

data/test/prec.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'oj'
+
+extras = {"locationLng" => -97.14690769100295}
+
+Oj.default_options = {float_precision: 17}
+
+encoded = Oj.dump(extras)
+puts encoded
+puts Oj.load(encoded)
+
+require "active_record"
+
+Oj::Rails.set_encoder()
+Oj::Rails.set_decoder()
+
+Oj.default_options = {float_precision: 17}
+# Using Oj rails encoder, gets the correct value: {"locationLng":-97.14690769100295}
+encoded = ActiveSupport::JSON.encode(extras)
+puts encoded
+puts ActiveSupport::JSON.decode(encoded)
+puts Oj.load(encoded)

data/test/sample_json.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby -wW2
+#!/usr/bin/env ruby
 
 if $0 == __FILE__
   $: << '.'

data/test/test_compat.rb

@@ -147,16 +147,9 @@ class CompatJuice < Minitest::Test
 
   def test_encode
     opts = Oj.default_options
-    Oj.default_options = { :ascii_only => false }
-    unless 'jruby' == $ruby
-      dump_and_load("ぴーたー", false)
-    end
     Oj.default_options = { :ascii_only => true }
     json = Oj.dump("ぴーたー")
     assert_equal(%{"\\u3074\\u30fc\\u305f\\u30fc"}, json)
-    unless 'jruby' == $ruby
-      dump_and_load("ぴーたー", false)
-    end
     Oj.default_options = opts
   end
 
@@ -185,7 +178,7 @@ class CompatJuice < Minitest::Test
     assert_equal('"abc"', json)
   end
 
-  def test_time
+  def test_time_xml_schema
     t = Time.xmlschema("2012-01-05T23:58:07.123456000+09:00")
     #t = Time.local(2012, 1, 5, 23, 58, 7, 123456)
     json = Oj.dump(t, :mode => :compat)
@@ -243,6 +236,17 @@ class CompatJuice < Minitest::Test
     assert_equal({"a\nb" => true, "c\td" => false}, obj)
   end
 
+  def test_invalid_escapes_handled
+    json = '{"subtext":"\"404er\” \w \k \3 \a"}'
+    obj = Oj.compat_load(json)
+    assert_equal({"subtext" => "\"404er” w k 3 a"}, obj)
+  end
+
+  def test_hash_escaping
+    json = Oj.to_json({'<>' => '<>'}, mode: :compat)
+    assert_equal(json, '{"<>":"<>"}')
+  end
+
   def test_bignum_object
     dump_and_load(7 ** 55, false)
   end
@@ -273,12 +277,19 @@ class CompatJuice < Minitest::Test
   # BigDecimal
   def test_bigdecimal
     # BigDecimals are dumped as strings and can not be restored to the
-    # original value.
+    # original value without using an undocumented feature of the JSON gem.
     json = Oj.dump(BigDecimal('3.14159265358979323846'))
     # 2.4.0 changes the exponent to lowercase
     assert_equal('"0.314159265358979323846e1"', json.downcase)
   end
 
+  def test_decimal_class
+    big = BigDecimal('3.14159265358979323846')
+    # :decimal_class is the undocumented feature.
+    json = Oj.load('3.14159265358979323846', mode: :compat, decimal_class: BigDecimal)
+    assert_equal(big, json)
+  end
+
   def test_infinity
     assert_raises(Oj::ParseError) { Oj.load('Infinity', :mode => :strict) }
     x = Oj.load('Infinity', :mode => :compat)
@@ -286,7 +297,7 @@ class CompatJuice < Minitest::Test
   end
 
   # Time
-  def test_time
+  def test_time_from_time_object
     t = Time.new(2015, 1, 5, 21, 37, 7.123456, -8 * 3600)
     expect = '"' + t.to_s + '"'
     json = Oj.dump(t)
@@ -477,6 +488,31 @@ class CompatJuice < Minitest::Test
     assert_equal([1,2], Oj.load(s, :mode => :compat))
   end
 
+  def test_parse_large_string
+    error = assert_raises() { Oj.load(%|{"a":"aaaaaaaaaa\0aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"}|) }
+    assert(error.message.include?('NULL byte in string'))
+
+    error = assert_raises() { Oj.load(%|{"a":"aaaaaaaaaaaaaaaaaaaa                       }|) }
+    assert(error.message.include?('quoted string not terminated'))
+
+    json =<<~JSON
+    {
+      "a": "\\u3074\\u30fc\\u305f\\u30fc",
+      "b": "aaaaaaaaaaaaaaaaaaaaaaaaaaaa"
+    }
+    JSON
+    assert_equal("ぴーたー", Oj.load(json)['a'])
+  end
+
+  def test_parse_large_escaped_string
+    invalid_json = %|{"a":\"aaaa\\nbbbb\\rcccc\\tddd\\feee\\bf\/\\\\\\u3074\\u30fc\\u305f\\u30fc                             }|
+    error = assert_raises() { Oj.load(invalid_json) }
+    assert(error.message.include?('quoted string not terminated'))
+
+    json = "\"aaaa\\nbbbb\\rcccc\\tddd\\feee\\bf\/\\\\\\u3074\\u30fc\\u305f\\u30fc             \""
+    assert_equal("aaaa\nbbbb\rcccc\tddd\feee\bf/\\ぴーたー             ", Oj.load(json))
+  end
+
   def dump_and_load(obj, trace=false)
     json = Oj.dump(obj)
     puts json if trace

data/test/test_custom.rb

@@ -20,11 +20,12 @@ class CustomJuice < Minitest::Test
   end
 
   class Jeez
-    attr_accessor :x, :y
+    attr_accessor :x, :y, :_z
 
     def initialize(x, y)
       @x = x
       @y = y
+      @_z = x.to_s
     end
     def ==(o)
       self.class == o.class && @x == o.x && @y = o.y
@@ -32,6 +33,9 @@ class CustomJuice < Minitest::Test
     def to_json(*args)
       %|{"xx":#{@x},"yy":#{y}}|
     end
+    def raw_json(depth, indent)
+      %|{"xxx":#{@x},"yyy":#{y}}|
+    end
     def as_json(*args)
       {'a' => @x, :b => @y }
     end
@@ -40,6 +44,40 @@ class CustomJuice < Minitest::Test
     end
   end
 
+  class AsJson
+    attr_accessor :x, :y
+
+    def initialize(x, y)
+      @x = x
+      @y = y
+    end
+    def ==(o)
+      self.class == o.class && @x == o.x && @y = o.y
+    end
+    def as_json(*args)
+      {'a' => @x, :b => @y }
+    end
+  end
+
+  class AsRails
+    attr_accessor :x, :y
+
+    def initialize(x, y)
+      @x = x
+      @y = y
+    end
+    def ==(o)
+      self.class == o.class && @x == o.x && @y = o.y
+    end
+    def as_json(*args)
+      a = @x
+      a = a.as_json if a.respond_to?('as_json')
+      b = @y
+      b = b.as_json if b.respond_to?('as_json')
+      {'a' => a, :b => b }
+    end
+  end
+
   def setup
     @default_options = Oj.default_options
     Oj.default_options = { :mode => :custom }
@@ -80,6 +118,17 @@ class CustomJuice < Minitest::Test
     dump_and_load(-2.48e100 * 1.0e10, false)
   end
 
+  def test_float_parse
+    f = Oj.load("12.123456789012345678", mode: :custom, bigdecimal_load: :float);
+    assert_equal(Float, f.class)
+  end
+
+  def test_float_parse_fast
+    f = Oj.load("12.123456789012345678", mode: :custom, bigdecimal_load: :fast);
+    assert_equal(Float, f.class)
+    assert(12.12345678901234 <= f && f < 12.12345678901236)
+  end
+
   def test_nan_dump
     assert_equal('null', Oj.dump(0/0.0, :nan => :null))
     assert_equal('3.3e14159265358979323846', Oj.dump(0/0.0, :nan => :huge))
@@ -92,7 +141,7 @@ class CustomJuice < Minitest::Test
     end
     assert(false, "*** expected an exception")
   end
-  
+
   def test_infinity_dump
     assert_equal('null', Oj.dump(1/0.0, :nan => :null))
     assert_equal('3.0e14159265358979323846', Oj.dump(1/0.0, :nan => :huge))
@@ -151,6 +200,8 @@ class CustomJuice < Minitest::Test
   end
 
   def test_deep_nest
+    skip 'TruffleRuby causes SEGV' if RUBY_ENGINE == 'truffleruby'
+
     begin
       n = 10000
       Oj.strict_load('[' * n + ']' * n)
@@ -187,7 +238,7 @@ class CustomJuice < Minitest::Test
                                                         '19' => {
                                                           '20' => {}}}}}}}}}}}}}}}}}}}}}, false)
   end
-  
+
   def test_hash_escaped_key
     json = %{{"a\nb":true,"c\td":false}}
     obj = Oj.load(json)
@@ -210,7 +261,10 @@ class CustomJuice < Minitest::Test
 
   def test_object
     obj = Jeez.new(true, 58)
-    Oj.dump(obj, :create_id => "^o", :use_to_json => false, :use_as_json => false, :use_to_hash => false)
+    json = Oj.dump(obj, create_id: "^o", use_to_json: false, use_as_json: false, use_to_hash: false)
+    assert_equal(%|{"x":true,"y":58,"_z":"true"}|, json)
+    json = Oj.dump(obj, create_id: "^o", use_to_json: false, use_as_json: false, use_to_hash: false, ignore_under: true)
+    assert_equal(%|{"x":true,"y":58}|, json)
     dump_and_load(obj, false, :create_id => "^o", :create_additions => true)
   end
 
@@ -232,6 +286,66 @@ class CustomJuice < Minitest::Test
     assert_equal(%|{"b":true,"n":58}|, json)
   end
 
+  def test_object_raw_json
+    obj = Jeez.new(true, 58)
+    json = Oj.dump(obj, :use_to_json => true, :use_as_json => false, :use_raw_json => true, :use_to_hash => false)
+    assert_equal(%|{"xxx":true,"yyy":58}|, json)
+  end
+
+  def test_raw_json_stringwriter
+    obj = Oj::StringWriter.new(:indent => 0)
+    obj.push_array()
+    obj.pop()
+    json = Oj.dump(obj, :use_raw_json => true)
+    assert_equal(%|[]|, json)
+  end
+
+  def test_as_raw_json_stringwriter
+    obj = Oj::StringWriter.new(:indent => 0)
+    obj.push_array()
+    obj.push_value(3)
+    obj.pop()
+    j = AsJson.new(1, obj)
+
+    json = Oj.dump(j, use_raw_json: true, use_as_json: true, indent: 2)
+    assert_equal(%|{
+  "a":1,
+  "b":[3]
+}
+|, json)
+
+    json = Oj.dump(j, use_raw_json: false, use_as_json: true, indent: 2)
+    assert_equal(%|{
+  "a":1,
+  "b":{}
+}
+|, json)
+  end
+
+  def test_rails_as_raw_json_stringwriter
+    obj = Oj::StringWriter.new(:indent => 0)
+    obj.push_array()
+    obj.push_value(3)
+    obj.pop()
+    j = AsRails.new(1, obj)
+    json = Oj.dump(j, mode: :rails, use_raw_json: true, indent: 2)
+    assert_equal(%|{
+  "a":1,
+  "b":{}
+}
+|, json)
+
+    Oj::Rails.optimize
+    json = Oj.dump(j, mode: :rails, use_raw_json: true, indent: 2)
+    Oj::Rails.deoptimize
+    assert_equal(%|{
+  "a":1,
+  "b":[3]
+}
+|, json)
+
+  end
+
   def test_symbol
     json = Oj.dump(:abc)
     assert_equal('"abc"', json)
@@ -368,11 +482,20 @@ class CustomJuice < Minitest::Test
   end
 
   def test_time
+    skip 'TruffleRuby fails this spec' if RUBY_ENGINE == 'truffleruby'
+
     obj = Time.now()
+    # These two forms should be able to recreate the time precisely,
+    # so we check they can load a dumped version and recreate the
+    # original object correctly.
     dump_and_load(obj, false, :time_format => :unix, :create_id => "^o", :create_additions => true)
-    dump_and_load_inspect(obj, false, :time_format => :unix_zone, :create_id => "^o", :create_additions => true)
-    dump_and_load_inspect(obj, false, :time_format => :xmlschema, :create_id => "^o", :create_additions => true)
-    dump_and_load_inspect(obj, false, :time_format => :ruby, :create_id => "^o", :create_additions => true)
+    dump_and_load(obj, false, :time_format => :unix_zone, :create_id => "^o", :create_additions => true)
+    # These two forms will lose precision while dumping as they don't
+    # preserve full precision. We check that a dumped version is equal
+    # to that version loaded and dumped a second time, but don't check
+    # that the loaded Ruby objects is still the same as the original.
+    dump_load_dump(obj, false, :time_format => :xmlschema, :create_id => "^o", :create_additions => true)
+    dump_load_dump(obj, false, :time_format => :ruby, :create_id => "^o", :create_additions => true)
   end
 
   def dump_and_load(obj, trace=false, options={})
@@ -403,4 +526,19 @@ class CustomJuice < Minitest::Test
     loaded
   end
 
+  def dump_load_dump(obj, trace=false, options={})
+    options = options.merge(:indent => 2, :mode => :custom)
+    json = Oj.dump(obj, options)
+    puts json if trace
+
+    loaded = Oj.load(json, options);
+    if obj.nil?
+      assert_nil(loaded)
+    else
+      json2 = Oj.dump(loaded, options)
+      assert_equal(json, json2)
+    end
+    loaded
+  end
+
 end

data/test/test_fast.rb

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
-# encoding: UTF-8
+# coding: utf-8
+# frozen_string_literal: true
 
 $: << File.dirname(__FILE__)
 
@@ -36,6 +37,17 @@ 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|
@@ -279,10 +291,26 @@ 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}],
+       ['/nothing', nil],
+       ['/array/10', nil],
       ].each do |path,val|
-        assert_equal(val, doc.fetch(path))
+        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
@@ -297,6 +325,20 @@ class DocTest < Minitest::Test
     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 +396,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)
@@ -450,6 +505,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

@@ -130,8 +130,8 @@ class FileJuice < Minitest::Test
     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)/
+    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)
@@ -162,12 +162,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(%{{"^O":"Range","begin":1,"end":7,"exclude_end?":false}} == json)
     end
     dump_and_load(1..7, false)
     dump_and_load(1..1, false)
@@ -212,6 +210,24 @@ 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|