oj 3.13.9 → 3.16.1

data/test/prec.rb

@@ -2,7 +2,7 @@
 
 require 'oj'
 
-extras = {"locationLng" => -97.14690769100295}
+extras = {'locationLng' => -97.14690769100295}
 
 Oj.default_options = {float_precision: 17}
 
@@ -10,13 +10,13 @@ encoded = Oj.dump(extras)
 puts encoded
 puts Oj.load(encoded)
 
-require "active_record"
+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}
+# Using Oj rails encoder, gets the correct value: {'locationLng':-97.14690769100295}
 encoded = ActiveSupport::JSON.encode(extras)
 puts encoded
 puts ActiveSupport::JSON.decode(encoded)

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

@@ -1,19 +1,19 @@
 #!/usr/bin/env ruby -wW2
+# frozen_string_literal: true
 
-if $0 == __FILE__
-  $: << '.'
-  $: << '..'
-  $: << '../lib'
-  $: << '../ext'
+if $PROGRAM_NAME == __FILE__
+  $LOAD_PATH << '.'
+  $LOAD_PATH << '..'
+  $LOAD_PATH << '../lib'
+  $LOAD_PATH << '../ext'
 end
 
-require 'pp'
 require 'sample/doc'
 
 def sample_doc(size=3)
   colors = [ :black, :gray, :white, :red, :blue, :yellow, :green, :purple, :orange ]
 
-  d = ::Sample::Doc.new('Sample')
+  d = Sample::Doc.new('Sample')
 
   # add some history
   (0..size * 10).each do |i|
@@ -22,22 +22,22 @@ def sample_doc(size=3)
 
   # add some layers
   (1..size).each do |i|
-    layer = ::Sample::Layer.new("Layer-#{i}")
+    layer = Sample::Layer.new("Layer-#{i}")
     (1..size).each do |j|
-      g = ::Sample::Group.new
+      g = Sample::Group.new
       (1..size).each do |k|
-        g2 = ::Sample::Group.new
-        r = ::Sample::Rect.new(j * 40 + 10.0, i * 10.0,
-                               10.123456 / k, 10.0 / k, colors[(i + j + k) % colors.size])
+        g2 = Sample::Group.new
+        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
-        g2 << ::Sample::Text.new("#{k} in #{j}", r.left, r.top, r.width, r.height)
+        g2 << Sample::Text.new("#{k} in #{j}", r.left, r.top, r.width, r.height)
         g << g2
       end
-      g2 = ::Sample::Group.new
+      g2 = Sample::Group.new
       (1..size).each do |k|
-        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 = 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
       end

data/test/sample_json.rb

@@ -1,13 +1,13 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
-if $0 == __FILE__
-  $: << '.'
-  $: << '..'
-  $: << '../lib'
-  $: << '../ext'
+if $PROGRAM_NAME == __FILE__
+  $LOAD_PATH << '.'
+  $LOAD_PATH << '..'
+  $LOAD_PATH << '../lib'
+  $LOAD_PATH << '../ext'
 end
 
-require 'pp'
 require 'oj'
 
 def sample_json(size=3)
@@ -32,6 +32,6 @@ def sample_json(size=3)
   container
 end
 
-if $0 == __FILE__
-  File.open('sample.json', "w") { |f| f.write(Oj.dump(sample_json(3), :indent => 2)) }
+if $PROGRAM_NAME == __FILE__
+  File.write('sample.json', Oj.dump(sample_json(3), :indent => 2))
 end

data/test/test_compat.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'
@@ -29,18 +29,16 @@ class CompatJuice < Minitest::Test
     end
     alias == eql?
 
-    def to_json(*a)
-      %|{"json_class":"#{self.class.to_s}","x":#{@x},"y":#{@y}}|
+    def to_json(*_a)
+      %|{"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
 
   class Argy
-    def initialize()
-    end
 
     def to_json(*a)
       %|{"args":"#{a}"}|
@@ -48,10 +46,8 @@ class CompatJuice < Minitest::Test
   end # Argy
 
   class Stringy
-    def initialize()
-    end
 
-    def to_s()
+    def to_s
       %|[1,2]|
     end
   end # Stringy
@@ -61,20 +57,17 @@ class CompatJuice < Minitest::Test
       module Three
         class Deep
 
-          def initialize()
-          end
-
           def eql?(o)
             self.class == o.class
           end
           alias == eql?
 
-          def to_json(*a)
+          def to_json(*_a)
             %|{"json_class":"#{self.class.name}"}|
           end
 
-          def self.json_create(h)
-            self.new()
+          def self.json_create(_h)
+            new()
           end
         end # Deep
       end # Three
@@ -106,24 +99,30 @@ class CompatJuice < 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_fixnum_array
+    data = (1..1000).to_a
+    json = Oj.dump(data, mode: :compat)
+    assert_equal("[#{data.join(',')}]", json)
+  end
+
   def test_float
     dump_and_load(0.0, false)
     dump_and_load(0.56, false)
     dump_and_load(3.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)
     dump_and_load(2.48e100 * 1.0e10, false)
     dump_and_load(-2.48e100 * 1.0e10, false)
-    dump_and_load(1405460727.723866, false)
+    dump_and_load(1_405_460_727.723866, false)
     dump_and_load(0.5773, false)
     dump_and_load(0.6768, false)
     dump_and_load(0.685, false)
@@ -148,7 +147,7 @@ class CompatJuice < Minitest::Test
   def test_encode
     opts = Oj.default_options
     Oj.default_options = { :ascii_only => true }
-    json = Oj.dump("ぴーたー")
+    json = Oj.dump('ぴーたー')
     assert_equal(%{"\\u3074\\u30fc\\u305f\\u30fc"}, json)
     Oj.default_options = opts
   end
@@ -170,7 +169,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
@@ -179,8 +178,8 @@ class CompatJuice < Minitest::Test
   end
 
   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)
+    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)
     assert_equal(%{"2012-01-05 23:58:07 +0900"}, json)
   end
@@ -199,8 +198,9 @@ class CompatJuice < Minitest::Test
   def test_non_str_hash
     json = Oj.dump({ 1 => true, 0 => false }, :mode => :compat)
     h = Oj.load(json, :mode => :strict)
-    assert_equal({ "1" => true, "0" => false }, h)
+    assert_equal({ '1' => true, '0' => false }, h)
   end
+
   def test_hash
     dump_and_load({}, false)
     dump_and_load({ 'true' => true, 'false' => false}, false)
@@ -239,12 +239,12 @@ class CompatJuice < Minitest::Test
   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)
+    assert_equal({'subtext' => '"404er” w k 3 a'}, obj)
   end
 
   def test_hash_escaping
     json = Oj.to_json({'<>' => '<>'}, mode: :compat)
-    assert_equal(json, '{"<>":"<>"}')
+    assert_equal('{"<>":"<>"}', json)
   end
 
   def test_bignum_object
@@ -271,7 +271,7 @@ class CompatJuice < Minitest::Test
   def test_bignum_compat
     json = Oj.dump(7 ** 55, :mode => :compat)
     b = Oj.load(json, :mode => :strict)
-    assert_equal(30226801971775055948247051683954096612865741943, b)
+    assert_equal(30_226_801_971_775_055_948_247_051_683_954_096_612_865_741_943, b)
   end
 
   # BigDecimal
@@ -313,7 +313,7 @@ class CompatJuice < Minitest::Test
     if x.is_a?(String)
       assert_equal(orig.to_s, x)
     else # better be a Hash
-      assert_equal({"year" => orig.year, "month" => orig.month, "day" => orig.day, "start" => orig.start}, x)
+      assert_equal({'year' => orig.year, 'month' => orig.month, 'day' => orig.day, 'start' => orig.start}, x)
     end
   end
 
@@ -340,13 +340,13 @@ class CompatJuice < 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.compat_load(f)
     f.close()
@@ -410,7 +410,7 @@ class CompatJuice < Minitest::Test
 
   # A child to_json should not be called.
   def test_json_object_child
-    obj = { "child" => Jeez.new(true, 58) }
+    obj = { 'child' => Jeez.new(true, 58) }
     assert_equal('{"child":{"json_class":"CompatJuice::Jeez","x":true,"y":58}}', Oj.dump(obj))
   end
 
@@ -431,10 +431,10 @@ class CompatJuice < Minitest::Test
     begin
       Oj.compat_load(json, :create_additions => true)
     rescue Exception => e
-      assert_equal("ArgumentError", e.class().name)
+      assert_equal('ArgumentError', e.class().name)
       return
     end
-    assert(false, "*** expected an exception")
+    assert(false, '*** expected an exception')
   end
 
   def test_json_object_create_cache
@@ -450,7 +450,7 @@ class CompatJuice < Minitest::Test
     expected = Jeez.new(true, 58)
     json = Oj.to_json(expected)
     json.gsub!('json_class', '_class_')
-    obj = Oj.compat_load(json, :create_id => "_class_", :create_additions => true)
+    obj = Oj.compat_load(json, :create_id => '_class_', :create_additions => true)
     assert_equal(expected, obj)
   end
 
@@ -467,10 +467,28 @@ class CompatJuice < Minitest::Test
   end
 
   def test_arg_passing
-    json = Oj.to_json(Argy.new(), :max_nesting=> 40)
+    json = Oj.to_json(Argy.new(), :max_nesting => 40)
     assert_equal(%|{"args":"[{:max_nesting=>40}]"}|, json)
   end
 
+  def test_max_nesting
+    assert_raises() { Oj.to_json([[[[[]]]]], :max_nesting => 3) }
+    assert_raises() { Oj.dump([[[[[]]]]], :max_nesting => 3, :mode=>:compat) }
+
+    assert_raises() { Oj.to_json([[]], :max_nesting => 1) }
+    assert_equal('[[]]', Oj.to_json([[]], :max_nesting => 2))
+
+    assert_raises() { Oj.dump([[]], :max_nesting => 1, :mode=>:compat) }
+    assert_equal('[[]]', Oj.dump([[]], :max_nesting => 2, :mode=>:compat))
+
+    assert_raises() { Oj.to_json([[3]], :max_nesting => 1) }
+    assert_equal('[[3]]', Oj.to_json([[3]], :max_nesting => 2))
+
+    assert_raises() { Oj.dump([[3]], :max_nesting => 1, :mode=>:compat) }
+    assert_equal('[[3]]', Oj.dump([[3]], :max_nesting => 2, :mode=>:compat))
+
+  end
+
   def test_bad_unicode
     assert_raises() { Oj.to_json("\xE4xy") }
   end
@@ -485,13 +503,47 @@ 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
+    error = assert_raises() { Oj.load(%|{"a":"aaaaaaaaaa\0aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"}|) }
+    assert_includes(error.message, 'NULL byte in string')
+
+    error = assert_raises() { Oj.load(%|{"a":"aaaaaaaaaaaaaaaaaaaa                       }|) }
+    assert_includes(error.message, '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_includes(error.message, '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 test_invalid_to_s
+    obj = Object.new
+    def obj.to_s
+      nil
+    end
+
+    assert_raises(TypeError) { Oj.dump(obj, mode: :compat) }
   end
 
   def dump_and_load(obj, trace=false)
     json = Oj.dump(obj)
     puts json if trace
-    loaded = Oj.compat_load(json, :create_additions => true);
+    loaded = Oj.compat_load(json, :create_additions => true)
     if obj.nil?
       assert_nil(loaded)
     else
@@ -503,7 +555,7 @@ class CompatJuice < Minitest::Test
   def dump_to_json_and_load(obj, trace=false)
     json = Oj.to_json(obj, :indent => '  ')
     puts json if trace
-    loaded = Oj.compat_load(json, :create_additions => true);
+    loaded = Oj.compat_load(json, :create_additions => true)
     if obj.nil?
       assert_nil(loaded)
     else