oj 3.14.2 → 3.14.3

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.2
+  version: 3.14.3
 platform: ruby
 authors:
 - Peter Ohler
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-10 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
@@ -176,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
@@ -299,7 +290,7 @@ 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:
   - - ">="

data/test/activesupport4/decoding_test.rb

@@ -1,108 +0,0 @@
-# encoding: utf-8
-require 'activesupport4/test_helper'
-require 'active_support/json'
-require 'active_support/time'
-
-class TestJSONDecoding < ActiveSupport::TestCase
-  class Foo
-    def self.json_create(object)
-      "Foo"
-    end
-  end
-
-  TESTS = {
-    %q({"returnTo":{"\/categories":"\/"}})        => {"returnTo" => {"/categories" => "/"}},
-    %q({"return\\"To\\":":{"\/categories":"\/"}}) => {"return\"To\":" => {"/categories" => "/"}},
-    %q({"returnTo":{"\/categories":1}})          => {"returnTo" => {"/categories" => 1}},
-    %({"returnTo":[1,"a"]})                    => {"returnTo" => [1, "a"]},
-    %({"returnTo":[1,"\\"a\\",", "b"]})        => {"returnTo" => [1, "\"a\",", "b"]},
-    %({"a": "'", "b": "5,000"})                  => {"a" => "'", "b" => "5,000"},
-    %({"a": "a's, b's and c's", "b": "5,000"})   => {"a" => "a's, b's and c's", "b" => "5,000"},
-    # multibyte
-    %({"matzue": "松江", "asakusa": "浅草"}) => {"matzue" => "松江", "asakusa" => "浅草"},
-    %({"a": "2007-01-01"})                       => {'a' => Date.new(2007, 1, 1)},
-    %({"a": "2007-01-01 01:12:34 Z"})            => {'a' => Time.utc(2007, 1, 1, 1, 12, 34)},
-    %(["2007-01-01 01:12:34 Z"])                 => [Time.utc(2007, 1, 1, 1, 12, 34)],
-    %(["2007-01-01 01:12:34 Z", "2007-01-01 01:12:35 Z"]) => [Time.utc(2007, 1, 1, 1, 12, 34), Time.utc(2007, 1, 1, 1, 12, 35)],
-    # no time zone
-    %({"a": "2007-01-01 01:12:34"})              => {'a' => "2007-01-01 01:12:34"},
-    # invalid date
-    %({"a": "1089-10-40"})                       => {'a' => "1089-10-40"},
-    # xmlschema date notation
-    %({"a": "2009-08-10T19:01:02Z"})             => {'a' => Time.utc(2009, 8, 10, 19, 1, 2)},
-    %({"a": "2009-08-10T19:01:02+02:00"})        => {'a' => Time.utc(2009, 8, 10, 17, 1, 2)},
-    %({"a": "2009-08-10T19:01:02-05:00"})        => {'a' => Time.utc(2009, 8, 11, 00, 1, 2)},
-    # needs to be *exact*
-    %({"a": " 2007-01-01 01:12:34 Z "})          => {'a' => " 2007-01-01 01:12:34 Z "},
-    %({"a": "2007-01-01 : it's your birthday"})  => {'a' => "2007-01-01 : it's your birthday"},
-    %([])    => [],
-    %({})    => {},
-    %({"a":1})     => {"a" => 1},
-    %({"a": ""})    => {"a" => ""},
-    %({"a":"\\""}) => {"a" => "\""},
-    %({"a": null})  => {"a" => nil},
-    %({"a": true})  => {"a" => true},
-    %({"a": false}) => {"a" => false},
-    %q({"bad":"\\\\","trailing":""}) => {"bad" => "\\", "trailing" => ""},
-    %q({"a": "http:\/\/test.host\/posts\/1"}) => {"a" => "http://test.host/posts/1"},
-    %q({"a": "\u003cunicode\u0020escape\u003e"}) => {"a" => "<unicode escape>"},
-    %q({"a": "\\\\u0020skip double backslashes"}) => {"a" => "\\u0020skip double backslashes"},
-    %q({"a": "\u003cbr /\u003e"}) => {'a' => "<br />"},
-    %q({"b":["\u003ci\u003e","\u003cb\u003e","\u003cu\u003e"]}) => {'b' => ["<i>","<b>","<u>"]},
-    # test combination of dates and escaped or unicode encoded data in arrays
-    %q([{"d":"1970-01-01", "s":"\u0020escape"},{"d":"1970-01-01", "s":"\u0020escape"}]) =>
-      [{'d' => Date.new(1970, 1, 1), 's' => ' escape'},{'d' => Date.new(1970, 1, 1), 's' => ' escape'}],
-    %q([{"d":"1970-01-01","s":"http:\/\/example.com"},{"d":"1970-01-01","s":"http:\/\/example.com"}]) =>
-      [{'d' => Date.new(1970, 1, 1), 's' => 'http://example.com'},
-       {'d' => Date.new(1970, 1, 1), 's' => 'http://example.com'}],
-    # tests escaping of "\n" char with Yaml backend
-    %q({"a":"\n"})  => {"a"=>"\n"},
-    %q({"a":"\u000a"}) => {"a"=>"\n"},
-    %q({"a":"Line1\u000aLine2"}) => {"a"=>"Line1\nLine2"},
-    # prevent json unmarshalling
-    %q({"json_class":"TestJSONDecoding::Foo"}) => {"json_class"=>"TestJSONDecoding::Foo"},
-    # json "fragments" - these are invalid JSON, but ActionPack relies on this
-    %q("a string") => "a string",
-    %q(1.1) => 1.1,
-    %q(1) => 1,
-    %q(-1) => -1,
-    %q(true) => true,
-    %q(false) => false,
-    %q(null) => nil
-  }
-
-  TESTS.each_with_index do |(json, expected), index|
-    test "json decodes #{index}" do
-      prev = ActiveSupport.parse_json_times
-      ActiveSupport.parse_json_times = true
-      silence_warnings do
-        if expected.nil?
-          assert_nil ActiveSupport::JSON.decode(json), "JSON decoding failed for #{json}"
-        else
-          assert_equal expected, ActiveSupport::JSON.decode(json), "JSON decoding failed for #{json}"
-        end
-      end
-      ActiveSupport.parse_json_times = prev
-    end
-  end
-
-  test "json decodes time json with time parsing disabled" do
-    prev = ActiveSupport.parse_json_times
-    ActiveSupport.parse_json_times = false
-    expected = {"a" => "2007-01-01 01:12:34 Z"}
-    assert_equal expected, ActiveSupport::JSON.decode(%({"a": "2007-01-01 01:12:34 Z"}))
-    ActiveSupport.parse_json_times = prev
-  end
-
-  def test_failed_json_decoding
-    assert_raise(ActiveSupport::JSON.parse_error) { ActiveSupport::JSON.decode(%(undefined)) }
-    assert_raise(ActiveSupport::JSON.parse_error) { ActiveSupport::JSON.decode(%({a: 1})) }
-    assert_raise(ActiveSupport::JSON.parse_error) { ActiveSupport::JSON.decode(%({: 1})) }
-    assert_raise(ActiveSupport::JSON.parse_error) { ActiveSupport::JSON.decode(%()) }
-  end
-
-  def test_cannot_pass_unsupported_options
-    assert_raise(ArgumentError) { ActiveSupport::JSON.decode("", create_additions: true) }
-  end
-end
-