oj 3.7.4 → 3.13.21

data/test/test_various.rb

@@ -96,68 +96,49 @@ class Juice < Minitest::Test
     Oj.default_options = @default_options
   end
 
-=begin
-  # Depending on the order the values may have changed. The set_options sets
-  # should cover the function itself.
-  def test_get_options
-    opts = Oj.default_options()
-    assert_equal({ :indent=>0,
-                   :second_precision=>9,
-                   :circular=>false,
-                   :class_cache=>true,
-                   :auto_define=>false,
-                   :symbol_keys=>false,
-                   :bigdecimal_as_decimal=>true,
-                   :use_to_json=>true,
-                   :nilnil=>false,
-                   :allow_gc=>true,
-                   :quirks_mode=>true,
-                   :allow_invalid_unicode=>false,
-                   :float_precision=>15,
-                   :mode=>:object,
-                   :escape_mode=>:json,
-                   :time_format=>:unix_zone,
-                   :bigdecimal_load=>:auto,
-                   :create_id=>'json_class'}, opts)
-  end
-=end
   def test_set_options
     orig = Oj.default_options()
     alt ={
-      :indent=>" - ",
-      :second_precision=>5,
-      :circular=>true,
-      :class_cache=>false,
-      :auto_define=>true,
-      :symbol_keys=>true,
-      :bigdecimal_as_decimal=>false,
-      :use_to_json=>false,
-      :use_to_hash=>false,
-      :use_as_json=>false,
-      :nilnil=>true,
-      :empty_string=>true,
-      :allow_gc=>false,
-      :quirks_mode=>false,
-      :allow_invalid_unicode=>true,
-      :float_precision=>13,
-      :mode=>:strict,
-      :escape_mode=>:ascii,
-      :time_format=>:unix_zone,
-      :bigdecimal_load=>:float,
-      :create_id=>'classy',
-      :create_additions=>true,
-      :space=>'z',
-      :array_nl=>'a',
-      :object_nl=>'o',
-      :space_before=>'b',
-      :nan=>:huge,
-      :hash_class=>Hash,
-      :omit_nil=>false,
-      :allow_nan=>true,
-      :integer_range=>nil,
-      :array_class=>Array,
-      :ignore=>nil,
-      :trace=>true,
+      indent: " - ",
+      second_precision: 5,
+      circular: true,
+      class_cache: false,
+      auto_define: true,
+      symbol_keys: true,
+      bigdecimal_as_decimal: false,
+      use_to_json: false,
+      use_to_hash: false,
+      use_as_json: false,
+      use_raw_json: false,
+      nilnil: true,
+      empty_string: true,
+      allow_gc: false,
+      quirks_mode: false,
+      allow_invalid_unicode: true,
+      float_precision: 13,
+      mode: :strict,
+      escape_mode: :ascii,
+      time_format: :unix_zone,
+      bigdecimal_load: :float,
+      compat_bigdecimal: true,
+      create_id: 'classy',
+      create_additions: true,
+      cache_keys: false,
+      cache_str: 5,
+      space: 'z',
+      array_nl: 'a',
+      object_nl: 'o',
+      space_before: 'b',
+      nan: :huge,
+      hash_class: Hash,
+      omit_nil: false,
+      allow_nan: true,
+      integer_range: nil,
+      array_class: Array,
+      ignore: nil,
+      ignore_under: true,
+      trace: true,
+      safe: true,
     }
     Oj.default_options = alt
     #keys = alt.keys
@@ -207,7 +188,6 @@ class Juice < Minitest::Test
     n = Oj.load('-0.000012345678901234567')
     assert_equal(BigDecimal, n.class)
     assert_equal('-0.12345678901234567E-4', n.to_s.upcase)
-
   end
 
 =begin
@@ -365,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)
@@ -420,6 +406,17 @@ class Juice < Minitest::Test
     assert_equal('-2208987661.000000000', json)
   end
 
+  def test_time_years
+    (-2020..2020).each { |year|
+      s = "%04d-03-01T15:14:13Z" % [year]
+      json = Oj.dump(Time.parse(s), mode: :custom, time_format: :xmlschema, second_precision: -1)
+      assert_equal(s, json[1..-2])
+
+      json = Oj.dump(Time.parse(s), mode: :custom, time_format: :xmlschema, second_precision: 3)
+      assert_equal(s[0..-2] + '.000Z', json[1..-2])
+    }
+  end
+
   # Class
   def test_class_null
     json = Oj.dump(Juice, :mode => :null)
@@ -537,7 +534,7 @@ class Juice < Minitest::Test
     assert_equal(58, obj.y)
   end
 
-# Stream Deeply Nested
+  # Stream Deeply Nested
   def test_deep_nest_dump
     begin
       a = []
@@ -550,7 +547,7 @@ class Juice < Minitest::Test
     assert(false, "*** expected an exception")
   end
 
-# Stream IO
+  # Stream IO
   def test_io_string
     src = { 'x' => true, 'y' => 58, 'z' => [1, 2, 3]}
     output = StringIO.open("", "w+")
@@ -562,6 +559,9 @@ 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|
@@ -573,6 +573,28 @@ class Juice < Minitest::Test
     assert_equal(src, obj)
   end
 
+  def test_io_stream
+    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
+      else
+	w.close
+	sleep(0.1) # to force a busy
+	cnt = 0
+	r.each_line { cnt += 1 }
+	r.close
+	Process.exit(0)
+      end
+    end
+  end
+
 # comments
   def test_comment_slash
     json = %{{
@@ -682,13 +704,13 @@ class Juice < Minitest::Test
 	raise e
       end
     }
-    assert_equal('first[2].third', msg.split('(')[1].split(')')[0])
+    assert_equal('after first[2].third', msg.split('(')[1].split(')')[0])
   end
 
   def test_bad_bignum
     if '2.4.0' < RUBY_VERSION
-      assert_raises Exception do # Can be either Oj::ParseError or ArgumentError depending on Ruby version
-	Oj.load(%|{ "big": -e123456789 }|)
+      assert_raises Oj::ParseError do
+	Oj.load(%|{ "big": -e123456789 }|, mode: :strict)
       end
     end
   end

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/test_writer.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# encoding: UTF-8
+# encoding: utf-8
 
 $: << File.dirname(__FILE__)
 
@@ -227,6 +227,22 @@ class OjWriter < Minitest::Test
 
   # Stream Writer
 
+  class SString < ::String
+    alias :write :concat
+  end
+  
+  def test_stream_writer_encoding
+    output = SString.new.force_encoding(::Encoding::UTF_8)
+    w = Oj::StreamWriter.new(output, :indent => 0)
+    # Oddly enough, when pushing ASCII characters with UTF-8 encoding or even
+    # ASCII-8BIT does not change the output encoding. Pushing any non-ASCII no
+    # matter what the encoding changes the output encoding to ASCII-8BIT.
+    x = "香港" # Hong Kong
+    x = x.force_encoding('ASCII-8BIT')
+    w.push_value(x)
+    assert_equal(::Encoding::UTF_8, output.encoding)
+  end
+
   def test_stream_writer_empty_array
     output = StringIO.open("", "w+")
     w = Oj::StreamWriter.new(output, :indent => 0)
@@ -251,7 +267,8 @@ class OjWriter < Minitest::Test
     w.push_object("a3")
     w.pop()
     w.pop()
-    assert_equal(%|{"a1":{},"a2":{"b":[7,true,"string"]},"a3":{}}\n|, output.string())
+    result = output.string()
+    assert_equal(%|{"a1":{},"a2":{"b":[7,true,"string"]},"a3":{}}\n|, result)
   end
 
   def test_stream_writer_mixed_file

data/test/tests.rb

@@ -18,7 +18,7 @@ require 'test_object'
 require 'test_saj'
 require 'test_scp'
 require 'test_strict'
-require 'test_various'
+require 'test_rails'
 require 'test_wab'
 require 'test_writer'
 require 'test_integer_range'

data/test/zoo.rb

@@ -0,0 +1,13 @@
+#!/usr/bin/env ruby
+
+#require 'json'
+
+$: << File.dirname(__FILE__)
+require 'helper'
+require 'oj'
+
+Oj.mimic_JSON
+puts "\u3074"
+
+puts JSON.dump(["\u3074"])
+puts JSON.generate(["\u3074"])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 3.7.4
+  version: 3.13.21
 platform: ruby
 authors:
 - Peter Ohler
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-11-29 00:00:00.000000000 Z
+date: 2022-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -58,20 +58,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: wwtd
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
 description: The fastest JSON parser and object serializer.
 email: peter@ohler.com
 executables: []
@@ -79,20 +65,28 @@ extensions:
 - ext/oj/extconf.rb
 extra_rdoc_files:
 - README.md
-- pages/Rails.md
-- pages/JsonGem.md
-- pages/Encoding.md
-- pages/WAB.md
-- pages/Custom.md
+- LICENSE
+- CHANGELOG.md
+- RELEASE_NOTES.md
 - pages/Advanced.md
-- pages/Options.md
 - pages/Compatibility.md
+- pages/Custom.md
+- pages/Encoding.md
+- pages/JsonGem.md
 - pages/Modes.md
+- pages/Options.md
+- pages/Parser.md
+- pages/Rails.md
 - pages/Security.md
+- pages/WAB.md
 files:
+- CHANGELOG.md
 - LICENSE
 - README.md
+- RELEASE_NOTES.md
 - ext/oj/buf.h
+- ext/oj/cache.c
+- ext/oj/cache.h
 - ext/oj/cache8.c
 - ext/oj/cache8.h
 - ext/oj/circarray.c
@@ -101,6 +95,7 @@ files:
 - ext/oj/code.h
 - ext/oj/compat.c
 - ext/oj/custom.c
+- ext/oj/debug.c
 - ext/oj/dump.c
 - ext/oj/dump.h
 - ext/oj/dump_compat.c
@@ -108,13 +103,13 @@ files:
 - ext/oj/dump_object.c
 - ext/oj/dump_strict.c
 - ext/oj/encode.h
+- ext/oj/encoder.c
 - ext/oj/err.c
 - ext/oj/err.h
 - ext/oj/extconf.rb
 - ext/oj/fast.c
-- ext/oj/hash.c
-- ext/oj/hash.h
-- ext/oj/hash_test.c
+- ext/oj/intern.c
+- ext/oj/intern.h
 - ext/oj/mimic_json.c
 - ext/oj/object.c
 - ext/oj/odd.c
@@ -123,6 +118,8 @@ files:
 - ext/oj/oj.h
 - ext/oj/parse.c
 - ext/oj/parse.h
+- ext/oj/parser.c
+- ext/oj/parser.h
 - ext/oj/rails.c
 - ext/oj/rails.h
 - ext/oj/reader.c
@@ -132,6 +129,7 @@ files:
 - ext/oj/rxclass.c
 - ext/oj/rxclass.h
 - ext/oj/saj.c
+- ext/oj/saj2.c
 - ext/oj/scp.c
 - ext/oj/sparse.c
 - ext/oj/stream_writer.c
@@ -139,8 +137,12 @@ files:
 - ext/oj/string_writer.c
 - ext/oj/trace.c
 - ext/oj/trace.h
+- ext/oj/usual.c
+- ext/oj/util.c
+- ext/oj/util.h
 - ext/oj/val_stack.c
 - ext/oj/val_stack.h
+- ext/oj/validate.c
 - ext/oj/wab.c
 - lib/oj.rb
 - lib/oj/active_support_helper.rb
@@ -160,6 +162,7 @@ files:
 - pages/JsonGem.md
 - pages/Modes.md
 - pages/Options.md
+- pages/Parser.md
 - pages/Rails.md
 - pages/Security.md
 - pages/WAB.md
@@ -170,12 +173,27 @@ files:
 - 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
@@ -198,16 +216,21 @@ files:
 - 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.rb
 - test/sample/change.rb
 - test/sample/dir.rb
@@ -228,10 +251,15 @@ files:
 - 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
@@ -241,6 +269,7 @@ files:
 - test/tests.rb
 - test/tests_mimic.rb
 - test/tests_mimic_addition.rb
+- test/zoo.rb
 homepage: http://www.ohler.com/oj
 licenses:
 - MIT
@@ -251,7 +280,7 @@ metadata:
   homepage_uri: http://www.ohler.com/oj/
   source_code_uri: https://github.com/ohler55/oj
   wiki_uri: https://github.com/ohler55/oj/wiki
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--title"
 - Oj
@@ -263,94 +292,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: A fast JSON parser and serializer.
-test_files:
-- test/foo.rb
-- test/test_integer_range.rb
-- test/test_strict.rb
-- test/perf_strict.rb
-- test/tests.rb
-- test/perf_saj.rb
-- test/test_compat.rb
-- test/helper.rb
-- test/perf_file.rb
-- test/test_scp.rb
-- test/perf_compat.rb
-- test/json_gem/json_common_interface_test.rb
-- test/json_gem/json_addition_test.rb
-- test/json_gem/json_fixtures_test.rb
-- test/json_gem/json_ext_parser_test.rb
-- test/json_gem/json_string_matching_test.rb
-- test/json_gem/json_generic_object_test.rb
-- test/json_gem/json_generator_test.rb
-- test/json_gem/test_helper.rb
-- test/json_gem/json_encoding_test.rb
-- test/json_gem/json_parser_test.rb
-- test/perf_wab.rb
-- test/test_file.rb
-- test/test_object.rb
-- test/sample.rb
-- test/perf_object.rb
-- test/test_hash.rb
-- test/test_custom.rb
-- test/bar.rb
-- test/activesupport4/encoding_test.rb
-- test/activesupport4/test_helper.rb
-- test/activesupport4/decoding_test.rb
-- test/sample_json.rb
-- test/activesupport5/encoding_test_cases.rb
-- test/activesupport5/encoding_test.rb
-- test/activesupport5/time_zone_test_helpers.rb
-- test/activesupport5/test_helper.rb
-- test/activesupport5/decoding_test.rb
-- test/test_saj.rb
-- test/perf_scp.rb
-- test/test_wab.rb
-- test/test_null.rb
-- test/_test_active.rb
-- test/_test_mimic_rails.rb
-- test/test_fast.rb
-- test/perf_fast.rb
-- test/sample/change.rb
-- test/sample/text.rb
-- test/sample/doc.rb
-- test/sample/shape.rb
-- test/sample/layer.rb
-- test/sample/group.rb
-- test/sample/file.rb
-- test/sample/rect.rb
-- test/sample/hasprops.rb
-- test/sample/line.rb
-- test/sample/dir.rb
-- test/sample/oval.rb
-- test/tests_mimic.rb
-- test/perf_simple.rb
-- test/activerecord/result_test.rb
-- test/_test_active_mimic.rb
-- test/tests_mimic_addition.rb
-- test/test_writer.rb
-- test/perf.rb
-- test/isolated/test_mimic_define.rb
-- test/isolated/test_mimic_after.rb
-- test/isolated/test_mimic_rails_after.rb
-- test/isolated/test_mimic_before.rb
-- test/isolated/test_mimic_rails_before.rb
-- test/isolated/test_mimic_redefine.rb
-- test/isolated/shared.rb
-- test/isolated/test_mimic_alone.rb
-- test/isolated/test_mimic_as_json.rb
-- test/test_debian.rb
-- test/test_gc.rb
-- test/files.rb
-- test/test_various.rb
+test_files: []