oj 3.13.14 → 3.13.22

data/test/test_parser_debug.rb

@@ -0,0 +1,27 @@
+#!/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 'stringio'
+require 'date'
+require 'bigdecimal'
+require 'oj'
+
+class ParserJuice < Minitest::Test
+
+  def test_array
+    p = Oj::Parser.new(:debug)
+    out = p.parse(%|[true, false, null, 123, -1.23, "abc"]|)
+    puts out
+    out = p.parse(%|{"abc": []}|)
+    puts out
+  end
+
+end

data/test/test_parser_saj.rb

@@ -5,7 +5,7 @@ $: << File.dirname(__FILE__)
 
 require 'helper'
 
-$json = %{{
+$json = %|{
   "array": [
     {
       "num"   : 3,
@@ -18,7 +18,7 @@ $json = %{{
     }
   ],
   "boolean" : true
-}}
+}|
 
 class AllSaj < Oj::Saj
   attr_accessor :calls
@@ -53,6 +53,35 @@ class AllSaj < Oj::Saj
 
 end # AllSaj
 
+class LocSaj
+  attr_accessor :calls
+
+  def initialize()
+    @calls = []
+  end
+
+  def hash_start(key, line, column)
+    @calls << [:hash_start, key, line, column]
+  end
+
+  def hash_end(key, line, column)
+    @calls << [:hash_end, key, line, column]
+  end
+
+  def array_start(key, line, column)
+    @calls << [:array_start, key, line, column]
+  end
+
+  def array_end(key, line, column)
+    @calls << [:array_end, key, line, column]
+  end
+
+  def add_value(value, key, line, column)
+    @calls << [:add_value, value, key, line, column]
+  end
+
+end # LocSaj
+
 class SajTest < Minitest::Test
 
   def test_nil
@@ -120,6 +149,43 @@ class SajTest < Minitest::Test
     assert_equal((12345.6789e7 * 10000).to_i, (handler.calls[0][1] * 10000).to_i)
   end
 
+  def test_bignum
+    handler = AllSaj.new()
+    json = %{-11.899999999999999}
+    p = Oj::Parser.new(:saj)
+    p.handler = handler
+    p.parse(json)
+    assert_equal(1, handler.calls.size)
+    assert_equal(:add_value, handler.calls[0][0])
+    assert_equal(-118999, (handler.calls[0][1] * 10000).to_i)
+  end
+
+  def test_bignum_loc
+    handler = LocSaj.new()
+    json = <<~JSON
+      {
+        "width": 192.33800000000002,
+        "xaxis": {
+          "anchor": "y"
+        }
+      }
+    JSON
+
+    p = Oj::Parser.new(:saj)
+    p.handler = handler
+    p.parse(json)
+    assert_equal(6, handler.calls.size)
+    assert_equal(1_923_380, (handler.calls[1][1] * 10000).to_i)
+    handler.calls[1][1] = 1_923_380
+    assert_equal([[:hash_start, nil, 1, 1],
+                  [:add_value, 1923380, 'width', 2, 30],
+                  [:hash_start, 'xaxis', 3, 12],
+                  [:add_value, 'y', 'anchor', 4, 17],
+                  [:hash_end, 'xaxis', 5, 3],
+                  [:hash_end, nil, 6, 1]],
+                 handler.calls)
+  end
+
   def test_array_empty
     handler = AllSaj.new()
     json = %{[]}
@@ -242,4 +308,28 @@ class SajTest < Minitest::Test
 		 ], handler.calls)
   end
 
+  def test_loc
+    handler = LocSaj.new()
+    Oj::Parser.saj.handler = handler
+    Oj::Parser.saj.parse($json)
+    assert_equal([[:hash_start, nil, 1, 1],
+                  [:array_start, 'array', 2, 12],
+                  [:hash_start, nil, 3, 5],
+                  [:add_value, 3, 'num', 4, 18],
+                  [:add_value, 'message', 'string', 5, 25],
+                  [:hash_start, 'hash', 6, 17],
+                  [:hash_start, 'h2', 7, 17],
+                  [:array_start, 'a', 8, 17],
+                  [:add_value, 1, nil, 8, 20],
+                  [:add_value, 2, nil, 8, 23],
+                  [:add_value, 3, nil, 8, 26],
+                  [:array_end, 'a', 8, 27],
+                  [:hash_end, 'h2', 9, 9],
+                  [:hash_end, 'hash', 10, 7],
+                  [:hash_end, nil, 11, 5],
+                  [:array_end, 'array', 12, 3],
+                  [:add_value, true, 'boolean', 13, 18],
+                  [:hash_end, nil, 14, 1]], handler.calls)
+  end
+
 end

data/test/test_scp.rb

@@ -320,8 +320,7 @@ class ScpTest < Minitest::Test
   end
 
   def test_pipe
-    # Windows does not support fork
-    return if RbConfig::CONFIG['host_os'] =~ /(mingw|mswin)/
+    skip 'needs fork' unless Process.respond_to?(:fork)
 
     handler = AllHandler.new()
     json = %{{"one":true,"two":false}}
@@ -357,8 +356,7 @@ class ScpTest < Minitest::Test
   end
 
   def test_pipe_close
-    # Windows does not support fork
-    return if RbConfig::CONFIG['host_os'] =~ /(mingw|mswin)/
+    skip 'needs fork' unless Process.respond_to?(:fork)
 
     json = %{{"one":true,"two":false}}
     IO.pipe do |read_io, write_io|

data/test/test_strict.rb

@@ -156,6 +156,8 @@ class StrictJuice < Minitest::Test
   end
 
   def test_deep_nest
+    skip 'TruffleRuby causes SEGV' if RUBY_ENGINE == 'truffleruby'
+
     begin
       n = 10000
       Oj.strict_load('[' * n + ']' * n)

data/test/test_various.rb

@@ -345,6 +345,12 @@ class Juice < Minitest::Test
     out = Oj.dump hash
     assert_equal(%{{"key":"I \\u003c3 this"}}, out)
   end
+  def test_escapes_slashes_by_default_when_configured_to_do_so
+    hash = {'key' => "I <3 this </script>"}
+    Oj.default_options = {:escape_mode => :slash}
+    out = Oj.dump hash
+    assert_equal(%{{"key":"I <3 this <\\/script>"}}, out)
+  end
   def test_escapes_entities_when_asked_to
     hash = {'key' => "I <3 this"}
     out = Oj.dump(hash, :escape_mode => :xss_safe)
@@ -553,9 +559,6 @@ class Juice < Minitest::Test
   end
 
   def test_io_file
-    # Windows does not support fork
-    return if RbConfig::CONFIG['host_os'] =~ /(mingw|mswin)/
-
     src = { 'x' => true, 'y' => 58, 'z' => [1, 2, 3]}
     filename = File.join(File.dirname(__FILE__), 'open_file_test.json')
     File.open(filename, "w") { |f|
@@ -568,6 +571,8 @@ class Juice < Minitest::Test
   end
 
   def test_io_stream
+    skip 'needs fork' unless Process.respond_to?(:fork)
+
     IO.pipe do |r, w|
       if fork
 	r.close

data/test/test_wab.rb

@@ -105,6 +105,8 @@ class WabJuice < Minitest::Test
   end
 
   def test_deep_nest
+    skip 'TruffleRuby causes SEGV' if RUBY_ENGINE == 'truffleruby'
+
     begin
       n = 10000
       Oj.wab_load('[' * n + ']' * n)

data/test/tests.rb

@@ -22,3 +22,12 @@ require 'test_rails'
 require 'test_wab'
 require 'test_writer'
 require 'test_integer_range'
+
+at_exit do
+  require 'helper'
+  if '3.1.0' <= RUBY_VERSION && !(RbConfig::CONFIG['host_os'] =~ /(mingw|mswin)/)
+    #Oj::debug_odd("teardown before GC.verify_compaction_references")
+    verify_gc_compaction
+    #Oj::debug_odd("teardown after GC.verify_compaction_references")
+  end
+end

data/test/tests_mimic.rb

@@ -12,3 +12,12 @@ require 'json_generator_test'
 require 'json_generic_object_test'
 require 'json_parser_test'
 require 'json_string_matching_test'
+
+at_exit do
+  require 'helper'
+  if '3.1.0' <= RUBY_VERSION && !(RbConfig::CONFIG['host_os'] =~ /(mingw|mswin)/)
+    #Oj::debug_odd("teardown before GC.verify_compaction_references")
+    verify_gc_compaction
+    #Oj::debug_odd("teardown after GC.verify_compaction_references")
+  end
+end

data/test/tests_mimic_addition.rb

@@ -5,3 +5,12 @@ $: << File.dirname(__FILE__)
 $: << File.join(File.dirname(__FILE__), 'json_gem')
 
 require 'json_addition_test'
+
+at_exit do
+  require 'helper'
+  if '3.1.0' <= RUBY_VERSION && !(RbConfig::CONFIG['host_os'] =~ /(mingw|mswin)/)
+    #Oj::debug_odd("teardown before GC.verify_compaction_references")
+    verify_gc_compaction
+    #Oj::debug_odd("teardown after GC.verify_compaction_references")
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 3.13.14
+  version: 3.13.22
 platform: ruby
 authors:
 - Peter Ohler
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-03 00:00:00.000000000 Z
+date: 2022-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -110,6 +110,7 @@ files:
 - ext/oj/fast.c
 - ext/oj/intern.c
 - ext/oj/intern.h
+- ext/oj/introspect.c
 - ext/oj/mimic_json.c
 - ext/oj/object.c
 - ext/oj/odd.c
@@ -130,6 +131,7 @@ files:
 - ext/oj/rxclass.h
 - ext/oj/saj.c
 - ext/oj/saj2.c
+- ext/oj/saj2.h
 - ext/oj/scp.c
 - ext/oj/sparse.c
 - ext/oj/stream_writer.c
@@ -138,6 +140,7 @@ files:
 - ext/oj/trace.c
 - ext/oj/trace.h
 - ext/oj/usual.c
+- ext/oj/usual.h
 - ext/oj/util.c
 - ext/oj/util.h
 - ext/oj/val_stack.c
@@ -257,6 +260,7 @@ files:
 - test/test_null.rb
 - test/test_object.rb
 - test/test_parser.rb
+- test/test_parser_debug.rb
 - test/test_parser_saj.rb
 - test/test_parser_usual.rb
 - test/test_rails.rb
@@ -303,108 +307,4 @@ rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: A fast JSON parser and serializer.
-test_files:
-- test/_test_active.rb
-- 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
-- test/activesupport6/encoding_test_cases.rb
-- test/activesupport6/test_common.rb
-- test/activesupport6/test_helper.rb
-- test/activesupport6/time_zone_test_helpers.rb
-- test/activesupport7/abstract_unit.rb
-- test/activesupport7/decoding_test.rb
-- test/activesupport7/encoding_test.rb
-- test/activesupport7/encoding_test_cases.rb
-- test/activesupport7/time_zone_test_helpers.rb
-- test/bar.rb
-- test/baz.rb
-- test/bug.rb
-- test/files.rb
-- test/foo.rb
-- test/helper.rb
-- test/isolated/shared.rb
-- test/isolated/test_mimic_after.rb
-- test/isolated/test_mimic_alone.rb
-- test/isolated/test_mimic_as_json.rb
-- test/isolated/test_mimic_before.rb
-- test/isolated/test_mimic_define.rb
-- test/isolated/test_mimic_rails_after.rb
-- test/isolated/test_mimic_rails_before.rb
-- test/isolated/test_mimic_redefine.rb
-- test/json_gem/json_addition_test.rb
-- test/json_gem/json_common_interface_test.rb
-- test/json_gem/json_encoding_test.rb
-- test/json_gem/json_ext_parser_test.rb
-- test/json_gem/json_fixtures_test.rb
-- test/json_gem/json_generator_test.rb
-- test/json_gem/json_generic_object_test.rb
-- test/json_gem/json_parser_test.rb
-- test/json_gem/json_string_matching_test.rb
-- test/json_gem/test_helper.rb
-- test/mem.rb
-- test/perf.rb
-- test/perf_compat.rb
-- test/perf_dump.rb
-- test/perf_fast.rb
-- test/perf_file.rb
-- test/perf_object.rb
-- test/perf_once.rb
-- test/perf_parser.rb
-- test/perf_saj.rb
-- test/perf_scp.rb
-- test/perf_simple.rb
-- test/perf_strict.rb
-- test/perf_wab.rb
-- test/prec.rb
-- test/sample/change.rb
-- test/sample/dir.rb
-- test/sample/doc.rb
-- test/sample/file.rb
-- test/sample/group.rb
-- test/sample/hasprops.rb
-- test/sample/layer.rb
-- test/sample/line.rb
-- test/sample/oval.rb
-- test/sample/rect.rb
-- test/sample/shape.rb
-- test/sample/text.rb
-- test/sample.rb
-- test/sample_json.rb
-- test/test_compat.rb
-- test/test_custom.rb
-- test/test_debian.rb
-- test/test_fast.rb
-- test/test_file.rb
-- test/test_gc.rb
-- test/test_generate.rb
-- test/test_hash.rb
-- test/test_integer_range.rb
-- test/test_null.rb
-- test/test_object.rb
-- test/test_parser.rb
-- test/test_parser_saj.rb
-- test/test_parser_usual.rb
-- test/test_rails.rb
-- test/test_saj.rb
-- test/test_scp.rb
-- test/test_strict.rb
-- test/test_various.rb
-- test/test_wab.rb
-- test/test_writer.rb
-- test/tests.rb
-- test/tests_mimic.rb
-- test/tests_mimic_addition.rb
-- test/zoo.rb
+test_files: []