oj 2.18.3 → 3.13.14

data/test/test_fast.rb

@@ -1,28 +1,28 @@
 #!/usr/bin/env ruby
-# encoding: UTF-8
+# coding: utf-8
+# frozen_string_literal: true
 
 $: << File.dirname(__FILE__)
 
 require 'helper'
 
-$json1 = %|{
-  "array": [
-    {
-      "num"   : 3,
-      "string": "message",
-      "hash"  : {
-        "h2"  : {
-          "a" : [ 1, 2, 3 ]
-        }
-      }
-    }
-  ],
-  "boolean" : true
-}|
-
 class DocTest < Minitest::Test
   def setup
     @default_options = Oj.default_options
+    @json1 = %|{
+      "array": [
+        {
+          "num"   : 3,
+          "string": "message",
+          "hash"  : {
+            "h2"  : {
+              "a" : [ 1, 2, 3 ]
+            }
+          }
+        }
+      ],
+      "boolean" : true
+    }|
   end
 
   def teardown
@@ -33,7 +33,18 @@ class DocTest < Minitest::Test
     json = %{null}
     Oj::Doc.open(json) do |doc|
       assert_equal(NilClass, doc.type)
-      assert_equal(nil, doc.fetch())
+      assert_nil(doc.fetch())
+    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
 
@@ -80,7 +91,11 @@ class DocTest < Minitest::Test
   def test_fixnum
     json = %{12345}
     Oj::Doc.open(json) do |doc|
-      assert_equal(Fixnum, doc.type)
+      if '2.4.0' <= RUBY_VERSION
+        assert_equal(Integer, doc.type)
+      else
+        assert_equal(Fixnum, doc.type)
+      end
       assert_equal(12345, doc.fetch())
     end
   end
@@ -156,7 +171,7 @@ class DocTest < Minitest::Test
   end
 
   def test_move
-    Oj::Doc.open($json1) do |doc|
+    Oj::Doc.open(@json1) do |doc|
       [ '/',
         '/array',
         '/boolean',
@@ -189,7 +204,7 @@ class DocTest < Minitest::Test
   end
 
   def test_move_relative
-    Oj::Doc.open($json1) do |doc|
+    Oj::Doc.open(@json1) do |doc|
       [['/', 'array', '/array'],
        ['/array', '1/num', '/array/1/num'],
        ['/array/1/hash', 'h2/a', '/array/1/hash/h2/a'],
@@ -205,14 +220,19 @@ class DocTest < Minitest::Test
   end
 
   def test_type
-    Oj::Doc.open($json1) do |doc|
+    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', Fixnum],
+       ['/array/1/num', num_class],
        ['/array/1/string', String],
        ['/array/1/hash/h2/a', Array],
-       ['/array/1/hash/../num', Fixnum],
+       ['/array/1/hash/../num', num_class],
        ['/array/1/hash/../..', Array],
       ].each do |path,type|
         assert_equal(type, doc.type(path))
@@ -221,7 +241,7 @@ class DocTest < Minitest::Test
   end
 
   def test_local_key
-    Oj::Doc.open($json1) do |doc|
+    Oj::Doc.open(@json1) do |doc|
       [['/', nil],
        ['/array', 'array'],
        ['/array/1', 1],
@@ -233,13 +253,17 @@ class DocTest < Minitest::Test
        ['/array/1/hash/../..', 'array'],
       ].each do |path,key|
         doc.move(path)
-        assert_equal(key, doc.local_key())
+        if key.nil?
+          assert_nil(doc.local_key())
+        else
+          assert_equal(key, doc.local_key())
+        end
       end
     end
   end
 
   def test_fetch_move
-    Oj::Doc.open($json1) do |doc|
+    Oj::Doc.open(@json1) do |doc|
       [['/array/1/num', 3],
        ['/array/1/string', 'message'],
        ['/array/1/hash/h2/a', [1, 2, 3]],
@@ -257,7 +281,7 @@ class DocTest < Minitest::Test
   end
 
   def test_fetch_path
-    Oj::Doc.open($json1) do |doc|
+    Oj::Doc.open(@json1) do |doc|
       [['/array/1/num', 3],
        ['/array/1/string', 'message'],
        ['/array/1/hash/h2/a', [1, 2, 3]],
@@ -267,14 +291,30 @@ 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
-    Oj::Doc.open($json1) do |doc|
+    Oj::Doc.open(@json1) do |doc|
       [['/array/1', 'num', 3],
        ['/array/1', 'string', 'message'],
        ['/array/1/hash', 'h2/a', [1, 2, 3]],
@@ -285,8 +325,22 @@ 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|
+    Oj::Doc.open(@json1) do |doc|
       doc.move('/array/1/num')
       doc.home()
       assert_equal('/', doc.where?)
@@ -294,7 +348,7 @@ class DocTest < Minitest::Test
   end
 
   def test_each_value_root
-    Oj::Doc.open($json1) do |doc|
+    Oj::Doc.open(@json1) do |doc|
       values = []
       doc.each_value() { |v| values << v.to_s }
       assert_equal(['1', '2', '3', '3', 'message', 'true'], values.sort)
@@ -302,7 +356,7 @@ class DocTest < Minitest::Test
   end
 
   def test_each_value_move
-    Oj::Doc.open($json1) do |doc|
+    Oj::Doc.open(@json1) do |doc|
       doc.move('/array/1/hash')
       values = []
       doc.each_value() { |v| values << v.to_s }
@@ -311,7 +365,7 @@ class DocTest < Minitest::Test
   end
 
   def test_each_value_path
-    Oj::Doc.open($json1) do |doc|
+    Oj::Doc.open(@json1) do |doc|
       values = []
       doc.each_value('/array/1/hash') { |v| values << v.to_s }
       assert_equal(['1', '2', '3'], values.sort)
@@ -319,7 +373,7 @@ class DocTest < Minitest::Test
   end
 
   def test_each_child_move
-    Oj::Doc.open($json1) do |doc|
+    Oj::Doc.open(@json1) do |doc|
       locations = []
       doc.move('/array/1/hash/h2/a')
       doc.each_child() { |d| locations << d.where? }
@@ -332,7 +386,7 @@ class DocTest < Minitest::Test
   end
 
   def test_each_child_path
-    Oj::Doc.open($json1) do |doc|
+    Oj::Doc.open(@json1) do |doc|
       locations = []
       doc.each_child('/array/1/hash/h2/a') { |d| locations << d.where? }
       assert_equal(['/array/1/hash/h2/a/1', '/array/1/hash/h2/a/2', '/array/1/hash/h2/a/3'], locations)
@@ -342,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)
@@ -438,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,6 +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)/
     t = Time.xmlschema("1954-01-05T00:00:00.123456")
     Oj.default_options = { :mode => :object, :time_format => :unix_zone }
     dump_and_load(t, false)
@@ -145,7 +147,7 @@ class FileJuice < Minitest::Test
 
   # Object with to_json()
   def test_json_object_compat
-    Oj.default_options = { :mode => :compat, :use_to_json => true }
+    Oj.default_options = { :mode => :compat, :use_to_json => true, :create_additions => true }
     obj = Jeez.new(true, 58)
     json = Oj.dump(obj, :indent => 2)
     assert(%{{"json_class":"FileJuice::Jeez","x":true,"y":58}
@@ -156,30 +158,20 @@ class FileJuice < Minitest::Test
     Oj.default_options = { :mode => :compat, :use_to_json => false }
   end
 
-  def test_as_json_object_compat_hash
-    Oj.default_options = { :mode => :compat, :use_as_json => true }
-    obj = Orange.new(true, 58)
-    json = Oj.dump(obj, :indent => 2)
-    assert(!json.nil?)
-    dump_and_load(obj, false)
-  end
-
   # Range
   def test_range_object
-    unless RUBY_VERSION.start_with?('1.8')
-      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
-        assert_equal(%{{"^u":["Range",1,7,false]}}, json)
-      end
-      dump_and_load(1..7, false)
-      dump_and_load(1..1, false)
-      dump_and_load(1...7, false)
+    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
+      assert_equal(%{{"^u":["Range",1,7,false]}}, json)
     end
+    dump_and_load(1..7, false)
+    dump_and_load(1..1, false)
+    dump_and_load(1...7, false)
   end
 
   # BigNum
@@ -192,20 +184,20 @@ class FileJuice < Minitest::Test
   def test_bigdecimal_strict
     mode = Oj.default_options[:mode]
     Oj.default_options = {:mode => :strict}
-    dump_and_load(BigDecimal.new('3.14159265358979323846'), false)
+    dump_and_load(BigDecimal('3.14159265358979323846'), false)
     Oj.default_options = {:mode => mode}
   end
 
   def test_bigdecimal_null
     mode = Oj.default_options[:mode]
     Oj.default_options = {:mode => :null}
-    dump_and_load(BigDecimal.new('3.14159265358979323846'), false)
+    dump_and_load(BigDecimal('3.14159265358979323846'), false)
     Oj.default_options = {:mode => mode}
   end
 
   def test_bigdecimal_object
     Oj.default_options = {:mode => :object}
-    dump_and_load(BigDecimal.new('3.14159265358979323846'), false)
+    dump_and_load(BigDecimal('3.14159265358979323846'), false)
   end
 
   # Date
@@ -236,6 +228,8 @@ class FileJuice < Minitest::Test
       end
       assert_equal(obj.utc?, loaded.utc?)
       assert_equal(obj.utc_offset, loaded.utc_offset)
+    elsif obj.nil?
+      assert_nil(loaded)
     else
       assert_equal(obj, loaded)
     end

data/test/test_generate.rb

@@ -0,0 +1,21 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+$: << File.dirname(__FILE__)
+$oj_dir = File.dirname(File.expand_path(File.dirname(__FILE__)))
+%w(lib ext).each do |dir|
+  $: << File.join($oj_dir, dir)
+end
+
+require 'minitest'
+require 'minitest/autorun'
+require 'oj'
+
+class Generator < Minitest::Test
+
+  def test_before
+    json = Oj.generate({})
+    assert_equal("{}", json)
+  end
+
+end

data/test/test_hash.rb

@@ -5,7 +5,7 @@ $: << File.dirname(__FILE__)
 
 require 'helper'
 
-class Hashi < Minitest::Test
+class HashTest < Minitest::Test
 
   module TestModule
   end
@@ -25,5 +25,15 @@ class Hashi < Minitest::Test
     assert_equal(3, obj[:abc])
     assert_equal(3, obj.abc())
   end
+
+  def test_marshal
+    h = Oj::EasyHash.new()
+    h['abc'] = 3
+    out = Marshal.dump(h)
+
+    obj = Marshal.load(out)
+    assert_equal(Oj::EasyHash, obj.class)
+    assert_equal(3, obj[:abc])
+  end
   
 end # HashTest

data/test/test_integer_range.rb

@@ -0,0 +1,72 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+$: << File.dirname(__FILE__)
+$oj_dir = File.dirname(File.expand_path(File.dirname(__FILE__)))
+%w(lib ext).each do |dir|
+  $: << File.join($oj_dir, dir)
+end
+
+require 'minitest'
+require 'minitest/autorun'
+require 'oj'
+
+class IntegerRangeTest < Minitest::Test
+  def setup
+    @default_options = Oj.default_options
+    # in null mode other options other than the number formats are not used.
+    Oj.default_options = { :mode => :null, bigdecimal_as_decimal: true }
+  end
+
+  def teardown
+    Oj.default_options = @default_options
+  end
+
+  def test_range
+    test = {s: 0, s2: -1, s3: 1, u: -2, u2: 2, u3: 9007199254740993}
+    exp = '{"s":0,"s2":-1,"s3":1,"u":"-2","u2":"2","u3":"9007199254740993"}'
+    assert_equal(exp, Oj.dump(test, integer_range: (-1..1)))
+  end
+
+  def test_bignum
+    test = {u: -10000000000000000000, u2: 10000000000000000000}
+    exp = '{"u":"-10000000000000000000","u2":"10000000000000000000"}'
+    assert_equal(exp, Oj.dump(test, integer_range: (-1..1)))
+  end
+
+  def test_valid_modes
+    test = {safe: 0, unsafe: 9007199254740993}
+    exp  = '{"safe":0,"unsafe":"9007199254740993"}'
+
+    [:strict, :null, :compat, :rails, :custom].each do |mode|
+      assert_equal(exp, Oj.dump(test, mode: mode, integer_range: (-1..1)), "Invalid mode #{mode}")
+    end
+
+    exp = '{":safe":0,":unsafe":"9007199254740993"}'
+    [:object].each do |mode|
+      assert_equal(exp, Oj.dump(test, mode: mode, integer_range: (-1..1)), "Invalid mode #{mode}")
+    end
+  end
+
+  def test_modes_without_opt
+    test = {safe:0, unsafe: 10000000000000000000}
+    exp = '{"safe":0,"unsafe":10000000000000000000}'
+
+    [:strict, :null, :compat, :rails, :custom].each do |mode|
+      assert_equal(exp, Oj.dump(test, mode: mode), "Invalid mode #{mode}")
+    end
+
+    exp = '{":safe":0,":unsafe":10000000000000000000}'
+    [:object].each do |mode|
+      assert_equal(exp, Oj.dump(test, mode: mode), "Invalid mode #{mode}")
+    end
+  end
+
+  def test_accept_nil_and_false
+    test = {safe:0, unsafe: 10000000000000000000}
+    exp = '{"safe":0,"unsafe":10000000000000000000}'
+
+    assert_equal(exp, Oj.dump(test, integer_range: nil))
+    assert_equal(exp, Oj.dump(test, integer_range: false))
+  end
+end