oj 3.14.1 → 3.14.3

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)

data/test/test_scp.rb

@@ -47,6 +47,7 @@ class AllHandler < Oj::ScHandler
     @calls << [:hash_key, key]
     return 'too' if 'two' == key
     return :symbol if 'symbol' == key
+
     key
   end
 
@@ -346,12 +347,10 @@ class ScpTest < Minitest::Test
   end
 
   def test_bad_bignum
-    if '2.4.0' < RUBY_VERSION
-      handler = AllHandler.new()
-      json = %|{"big":-e123456789}|
-      assert_raises Exception do # Can be either Oj::ParseError or ArgumentError depending on Ruby version
-	Oj.sc_parse(handler, json)
-      end
+    handler = AllHandler.new()
+    json = %|{"big":-e123456789}|
+    assert_raises Exception do # Can be either Oj::ParseError or ArgumentError depending on Ruby version
+      Oj.sc_parse(handler, json)
     end
   end
 
@@ -402,6 +401,7 @@ class ScpTest < Minitest::Test
       c.puts json[0..11]
       10.times {
         break if c.closed?
+
         sleep(0.1)
       }
       unless c.closed?

data/test/test_strict.rb

@@ -152,7 +152,7 @@ class StrictJuice < 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
@@ -160,7 +160,7 @@ class StrictJuice < Minitest::Test
 
     begin
       n = 10000
-      Oj.strict_load('[' * n + ']' * n)
+      Oj.strict_load(('[' * n) + (']' * n))
     rescue Exception => e
       assert(false, e.message)
     end
@@ -266,12 +266,14 @@ class StrictJuice < 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_various.rb

@@ -36,7 +36,7 @@ class Juice < Minitest::Test
       super
     end
 
-    def to_json()
+    def to_json(*_args)
       %{{"json_class":"#{self.class}","x":#{@x},"y":#{@y}}}
     end
 
@@ -286,7 +286,6 @@ class Juice < Minitest::Test
 --],#
 --"a"~:*1#
 }} == json)
-
   end
 
   def test_null_char
@@ -319,7 +318,7 @@ class Juice < Minitest::Test
 }
     results = []
     Oj.load(json, :mode => :strict) { |x, start, len| results << [x, start, len] }
-    assert_equal([[{"a"=>1}, 0, 7], [[1,2], 7, 6], [[3,4], 13, 5], [{"b"=>2}, 18, 8]], results)
+    assert_equal([[{"a"=>1}, 0, 7], [[1, 2], 7, 6], [[3, 4], 13, 5], [{"b"=>2}, 18, 8]], results)
   end
 
   def test_multiple_json_no_callback
@@ -575,21 +574,21 @@ class Juice < Minitest::Test
 
     IO.pipe do |r, w|
       if fork
-	r.close
-	#w.nonblock = false
-	a = []
-	10_000.times do |i|
-	  a << i
-	end
-	Oj.to_stream(w, a, indent: 2)
-	w.close
+        r.close
+        #w.nonblock = false
+        a = []
+        10_000.times do |i|
+          a << i
+        end
+        Oj.to_stream(w, a, indent: 2)
+        w.close
       else
-	w.close
-	sleep(0.1) # to force a busy
-	cnt = 0
-	r.each_line { cnt += 1 }
-	r.close
-	Process.exit(0)
+        w.close
+        sleep(0.1) # to force a busy
+        cnt = 0
+        r.each_line { cnt += 1 }
+        r.close
+        Process.exit(0)
       end
     end
   end
@@ -693,24 +692,22 @@ class Juice < Minitest::Test
     msg = ''
     assert_raises(Oj::ParseError) {
       begin
-	Oj.load(%|{
+        Oj.load(%|{
   "first": [
     1, 2, { "third": 123x }
   ]
 }|)
       rescue Oj::ParseError => e
-	msg = e.message
-	raise e
+        msg = e.message
+        raise e
       end
     }
     assert_equal('after first[2].third', msg.split('(')[1].split(')')[0])
   end
 
   def test_bad_bignum
-    if '2.4.0' < RUBY_VERSION
-      assert_raises Oj::ParseError do
-	Oj.load(%|{ "big": -e123456789 }|, mode: :strict)
-      end
+    assert_raises Oj::ParseError do
+      Oj.load(%|{ "big": -e123456789 }|, mode: :strict)
     end
   end
 

data/test/test_wab.rb

@@ -32,7 +32,6 @@ module WAB
   end # UUID
 end # WAB
 
-
 class WabJuice < Minitest::Test
 
   module TestModule
@@ -101,7 +100,7 @@ class WabJuice < 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
@@ -109,7 +108,7 @@ class WabJuice < Minitest::Test
 
     begin
       n = 10000
-      Oj.wab_load('[' * n + ']' * n)
+      Oj.wab_load(('[' * n) + (']' * n))
     rescue Exception => e
       assert(false, e.message)
     end
@@ -189,12 +188,14 @@ class WabJuice < 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.wab_load(f)
     f.close()

data/test/test_writer.rb

@@ -96,7 +96,7 @@ class OjWriter < Minitest::Test
     w.push_value(nil)
     w.push_value("a string")
     w.push_value({'a' => 65})
-    w.push_value([1,2])
+    w.push_value([1, 2])
     w.pop()
     assert_equal(%|[
   7,

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 3.14.1
+  version: 3.14.3
 platform: ruby
 authors:
 - Peter Ohler
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-01 00:00:00.000000000 Z
+date: 2023-04-07 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
@@ -30,20 +44,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -111,6 +111,8 @@ files:
 - ext/oj/fast.c
 - ext/oj/intern.c
 - ext/oj/intern.h
+- ext/oj/mem.c
+- ext/oj/mem.h
 - ext/oj/mimic_json.c
 - ext/oj/object.c
 - ext/oj/odd.c
@@ -174,15 +176,6 @@ files:
 - test/_test_active_mimic.rb
 - test/_test_mimic_rails.rb
 - test/activerecord/result_test.rb
-- test/activesupport4/decoding_test.rb
-- test/activesupport4/encoding_test.rb
-- test/activesupport4/test_helper.rb
-- test/activesupport5/abstract_unit.rb
-- test/activesupport5/decoding_test.rb
-- test/activesupport5/encoding_test.rb
-- test/activesupport5/encoding_test_cases.rb
-- test/activesupport5/test_helper.rb
-- test/activesupport5/time_zone_test_helpers.rb
 - test/activesupport6/abstract_unit.rb
 - test/activesupport6/decoding_test.rb
 - test/activesupport6/encoding_test.rb
@@ -297,14 +290,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: A fast JSON parser and serializer.