oj 3.13.21 → 3.13.22

data/test/test_custom.rb

@@ -260,8 +260,6 @@ class CustomJuice < Minitest::Test
   end
 
   def test_object
-    skip 'TruffleRuby fails this spec with `RuntimeError: rb_ivar_foreach not implemented`' if RUBY_ENGINE == 'truffleruby'
-
     obj = Jeez.new(true, 58)
     json = Oj.dump(obj, create_id: "^o", use_to_json: false, use_as_json: false, use_to_hash: false)
     assert_equal(%|{"x":true,"y":58,"_z":"true"}|, json)
@@ -407,15 +405,11 @@ class CustomJuice < Minitest::Test
   end
 
   def test_range
-    skip 'TruffleRuby fails this spec' if RUBY_ENGINE == 'truffleruby'
-
     obj = 3..8
     dump_and_load(obj, false, :create_id => "^o", :create_additions => true)
   end
 
   def test_date
-    skip 'TruffleRuby causes SEGV' if RUBY_ENGINE == 'truffleruby'
-
     obj = Date.new(2017, 1, 5)
     dump_and_load(obj, false, :create_id => "^o", :create_additions => true)
   end
@@ -445,8 +439,6 @@ class CustomJuice < Minitest::Test
   end
 
   def test_datetime
-    skip 'TruffleRuby causes SEGV' if RUBY_ENGINE == 'truffleruby'
-
     obj = DateTime.new(2017, 1, 5, 10, 20, 30)
     dump_and_load(obj, false, :create_id => "^o", :create_additions => true)
   end
@@ -493,8 +485,15 @@ class CustomJuice < Minitest::Test
     skip 'TruffleRuby fails this spec' if RUBY_ENGINE == 'truffleruby'
 
     obj = Time.now()
-    dump_load_dump(obj, false, :time_format => :unix, :create_id => "^o", :create_additions => true)
-    dump_load_dump(obj, false, :time_format => :unix_zone, :create_id => "^o", :create_additions => true)
+    # These two forms should be able to recreate the time precisely,
+    # so we check they can load a dumped version and recreate the
+    # original object correctly.
+    dump_and_load(obj, false, :time_format => :unix, :create_id => "^o", :create_additions => true)
+    dump_and_load(obj, false, :time_format => :unix_zone, :create_id => "^o", :create_additions => true)
+    # These two forms will lose precision while dumping as they don't
+    # preserve full precision. We check that a dumped version is equal
+    # to that version loaded and dumped a second time, but don't check
+    # that the loaded Ruby objects is still the same as the original.
     dump_load_dump(obj, false, :time_format => :xmlschema, :create_id => "^o", :create_additions => true)
     dump_load_dump(obj, false, :time_format => :ruby, :create_id => "^o", :create_additions => true)
   end

data/test/test_file.rb

@@ -125,15 +125,12 @@ class FileJuice < Minitest::Test
 
   # Time
   def test_time_object
-    skip 'TruffleRuby fails this spec' if RUBY_ENGINE == 'truffleruby'
-
     t = Time.now()
     Oj.default_options = { :mode => :object, :time_format => :unix_zone }
     dump_and_load(t, false)
   end
   def test_time_object_early
     skip 'Windows does not support dates before 1970.' if RbConfig::CONFIG['host_os'] =~ /(mingw|mswin)/
-    skip 'TruffleRuby fails this spec' if RUBY_ENGINE == 'truffleruby'
 
     t = Time.xmlschema("1954-01-05T00:00:00.123456")
     Oj.default_options = { :mode => :object, :time_format => :unix_zone }
@@ -165,14 +162,10 @@ class FileJuice < Minitest::Test
   def test_range_object
     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)
-    elsif 'truffleruby' == $ruby
-      assert(%{{"^O":"Range","begin":1,"end":7,"exclude_end?":false}} == json)
-    else
+    if $ruby == 'ruby'
       assert_equal(%{{"^u":["Range",1,7,false]}}, json)
+    else
+      assert(%{{"^O":"Range","begin":1,"end":7,"exclude_end?":false}} == json)
     end
     dump_and_load(1..7, false)
     dump_and_load(1..1, false)

data/test/test_gc.rb

@@ -43,8 +43,6 @@ class GCTest < Minitest::Test
   end
 
   def test_parse_object_gc
-    skip 'TruffleRuby fails this spec with `RuntimeError: rb_ivar_foreach not implemented`' if RUBY_ENGINE == 'truffleruby'
-
     g = Goo.new(0, nil)
     100.times { |i| g = Goo.new(i, g) }
     json = Oj.dump(g, :mode => :object)

data/test/test_integer_range.rb

@@ -23,24 +23,18 @@ class IntegerRangeTest < Minitest::Test
   end
 
   def test_range
-    skip 'TruffleRuby fails this spec with `ArgumentError: :integer_range must be a range of Fixnum.`' if RUBY_ENGINE == 'truffleruby'
-
     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
-    skip 'TruffleRuby fails this spec with `ArgumentError: :integer_range must be a range of Fixnum.`' if RUBY_ENGINE == 'truffleruby'
-
     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
-    skip 'TruffleRuby fails this spec with `ArgumentError: :integer_range must be a range of Fixnum.`' if RUBY_ENGINE == 'truffleruby'
-
     test = {safe: 0, unsafe: 9007199254740993}
     exp  = '{"safe":0,"unsafe":"9007199254740993"}'
 

data/test/test_object.rb

@@ -221,13 +221,6 @@ class ObjectJuice < Minitest::Test
 
   def teardown
     Oj.default_options = @default_options
-#=begin
-    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
   end
 
   def test_nil
@@ -461,8 +454,6 @@ class ObjectJuice < Minitest::Test
   end
 
   def test_json_module_object
-    skip 'TruffleRuby fails this spec with `RuntimeError: rb_ivar_foreach not implemented`' if RUBY_ENGINE == 'truffleruby'
-
     obj = One::Two::Three::Deep.new()
     dump_and_load(obj, false)
   end
@@ -633,15 +624,11 @@ class ObjectJuice < Minitest::Test
   end
 
   def test_json_object
-    skip 'TruffleRuby fails this spec with `RuntimeError: rb_ivar_foreach not implemented`' if RUBY_ENGINE == 'truffleruby'
-
     obj = Jeez.new(true, 58)
     dump_and_load(obj, false)
   end
 
   def test_json_object_create_deep
-    skip 'TruffleRuby fails this spec with `RuntimeError: rb_ivar_foreach not implemented`' if RUBY_ENGINE == 'truffleruby'
-
     obj = One::Two::Three::Deep.new()
     dump_and_load(obj, false)
   end
@@ -678,8 +665,6 @@ class ObjectJuice < Minitest::Test
   end
 
   def test_json_anonymous_struct
-    skip 'TruffleRuby fails this spec with `TypeError: allocator undefined for Class`' if RUBY_ENGINE == 'truffleruby'
-
     s = Struct.new(:x, :y)
     obj = s.new(1, 2)
     json = Oj.dump(obj, :indent => 2, :mode => :object)
@@ -702,8 +687,6 @@ class ObjectJuice < Minitest::Test
   end
 
   def test_json_object_object
-    skip 'TruffleRuby fails this spec with `RuntimeError: rb_ivar_foreach not implemented`' if RUBY_ENGINE == 'truffleruby'
-
     obj = Jeez.new(true, 58)
     json = Oj.dump(obj, mode: :object, indent: 2, ignore_under: true)
     assert(%{{
@@ -723,8 +706,6 @@ class ObjectJuice < Minitest::Test
   end
 
   def test_to_hash_object_object
-    skip 'TruffleRuby fails this spec with `RuntimeError: rb_ivar_foreach not implemented`' if RUBY_ENGINE == 'truffleruby'
-
     obj = Jazz.new(true, 58)
     json = Oj.dump(obj, :mode => :object, :indent => 2)
     assert(%{{
@@ -744,8 +725,6 @@ class ObjectJuice < Minitest::Test
   end
 
   def test_as_json_object_object
-    skip 'TruffleRuby fails this spec with `RuntimeError: rb_ivar_foreach not implemented`' if RUBY_ENGINE == 'truffleruby'
-
     obj = Orange.new(true, 58)
     json = Oj.dump(obj, :mode => :object, :indent => 2)
     assert(%{{
@@ -765,8 +744,6 @@ class ObjectJuice < Minitest::Test
   end
 
   def test_object_object_no_cache
-    skip 'TruffleRuby fails this spec with `RuntimeError: rb_ivar_foreach not implemented`' if RUBY_ENGINE == 'truffleruby'
-
     obj = Jam.new(true, 58)
     json = Oj.dump(obj, :mode => :object, :indent => 2)
     assert(%{{
@@ -795,8 +772,6 @@ class ObjectJuice < Minitest::Test
   end
 
   def test_exception
-    skip 'TruffleRuby fails this spec with `RuntimeError: rb_ivar_foreach not implemented`' if RUBY_ENGINE == 'truffleruby'
-
     err = nil
     begin
       raise StandardError.new('A Message')
@@ -827,8 +802,6 @@ class ObjectJuice < Minitest::Test
   end
 
   def test_exception_subclass
-    skip 'TruffleRuby fails this spec with `RuntimeError: rb_ivar_foreach not implemented`' if RUBY_ENGINE == 'truffleruby'
-
     err = nil
     begin
       raise SubX.new
@@ -848,12 +821,10 @@ class ObjectJuice < Minitest::Test
   def test_range_object
     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 'truffleruby' == $ruby
-      assert(%{{"^O":"Range","begin":1,"end":7,"exclude_end?":false}} == json)
-    else
+    if 'ruby' == $ruby
       assert_equal(%{{"^u":["Range",1,7,false]}}, json)
+    else
+      assert(%{{"^O":"Range","begin":1,"end":7,"exclude_end?":false}} == json)
     end
     dump_and_load(1..7, false)
     dump_and_load(1..1, false)
@@ -917,8 +888,6 @@ class ObjectJuice < Minitest::Test
   end
 
   def test_circular_object
-    skip 'TruffleRuby fails this spec with `RuntimeError: rb_ivar_foreach not implemented`' if RUBY_ENGINE == 'truffleruby'
-
     obj = Jeez.new(nil, 58)
     obj.x = obj
     json = Oj.dump(obj, :mode => :object, :indent => 2, :circular => true)
@@ -927,8 +896,6 @@ class ObjectJuice < Minitest::Test
   end
 
   def test_circular_object2
-    skip 'TruffleRuby fails this spec with `RuntimeError: rb_ivar_foreach not implemented`' if RUBY_ENGINE == 'truffleruby'
-
     obj = Jam.new(nil, 58)
     obj.x = obj
     json = Oj.dump(obj, :mode => :object, :indent => 2, :circular => true)
@@ -951,8 +918,6 @@ class ObjectJuice < Minitest::Test
   end
 
   def test_circular
-    skip 'TruffleRuby fails this spec with `RuntimeError: rb_ivar_foreach not implemented`' if RUBY_ENGINE == 'truffleruby'
-
     h = { 'a' => 7 }
     obj = Jeez.new(h, 58)
     obj.x['b'] = obj
@@ -963,8 +928,6 @@ class ObjectJuice < Minitest::Test
   end
 
   def test_circular2
-    skip 'TruffleRuby fails this spec with `RuntimeError: rb_ivar_foreach not implemented`' if RUBY_ENGINE == 'truffleruby'
-
     h = { 'a' => 7 }
     obj = Jam.new(h, 58)
     obj.x['b'] = obj
@@ -977,8 +940,6 @@ class ObjectJuice < Minitest::Test
   end
 
   def test_omit_nil
-    skip 'TruffleRuby fails this spec with `RuntimeError: rb_ivar_foreach not implemented`' if RUBY_ENGINE == 'truffleruby'
-
     jam = Jam.new({'a' => 1, 'b' => nil }, nil)
 
     json = Oj.dump(jam, :omit_nil => true, :mode => :object)
@@ -1033,22 +994,16 @@ class ObjectJuice < Minitest::Test
   end
 
   def test_auto_string
-    skip 'TruffleRuby fails this spec with `RuntimeError: rb_ivar_foreach not implemented`' if RUBY_ENGINE == 'truffleruby'
-
     s = AutoStrung.new("Pete", true)
     dump_and_load(s, false)
   end
 
   def test_auto_array
-    skip 'TruffleRuby fails this spec with `RuntimeError: rb_ivar_foreach not implemented`' if RUBY_ENGINE == 'truffleruby'
-
     a = AutoArray.new([1, 'abc', nil], true)
     dump_and_load(a, false)
   end
 
   def test_auto_hash
-    skip 'TruffleRuby fails this spec with `RuntimeError: rb_ivar_foreach not implemented`' if RUBY_ENGINE == 'truffleruby'
-
     h = AutoHash.new(nil, true)
     h['a'] = 1
     h['b'] = 2

data/test/test_parser.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# encoding: utf-8
+# encoding: UTF-8
 
 $: << File.dirname(__FILE__)
 $oj_dir = File.dirname(File.expand_path(File.dirname(__FILE__)))
@@ -7,21 +7,5 @@ $oj_dir = File.dirname(File.expand_path(File.dirname(__FILE__)))
   $: << 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
+require 'test_parser_usual'
+require 'test_parser_saj'

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_scp.rb

@@ -320,8 +320,7 @@ class ScpTest < Minitest::Test
   end
 
   def test_pipe
-    skip ' Windows does not support fork' if RbConfig::CONFIG['host_os'] =~ /(mingw|mswin)/
-    skip 'TruffleRuby fails this spec with `NotImplementedError: fork is not available`' if RUBY_ENGINE == 'truffleruby'
+    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
-    skip 'Windows does not support fork' if RbConfig::CONFIG['host_os'] =~ /(mingw|mswin)/
-    skip 'TruffleRuby fails this spec with `NotImplementedError: fork is not available`' if RUBY_ENGINE == 'truffleruby'
+    skip 'needs fork' unless Process.respond_to?(:fork)
 
     json = %{{"one":true,"two":false}}
     IO.pipe do |read_io, write_io|

data/test/test_various.rb

@@ -559,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|
@@ -574,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/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.21
+  version: 3.13.22
 platform: ruby
 authors:
 - Peter Ohler
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-19 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