oj 3.14.2 → 3.15.0

data/lib/oj/state.rb

@@ -1,4 +1,3 @@
-
 module JSON
   module Ext
     module Generator
@@ -59,6 +58,7 @@ module JSON
 
           def configure(opts)
             raise TypeError.new('expected a Hash') unless opts.respond_to?(:to_h)
+
             @attrs.merge!(opts.to_h)
           end
 
@@ -84,6 +84,7 @@ module JSON
             return true if super
             return true if has_key?(key)
             return true if has_key?(key.to_s)
+
             has_key?(key.to_sym)
           end
 
@@ -113,15 +114,17 @@ module JSON
           def method_missing(m, *args, &block)
             if m.to_s.end_with?('=')
               raise ArgumentError.new("wrong number of arguments (#{args.size} for 1 with #{m}) to method #{m}") if args.nil? or 1 != args.length
+
               m = m.to_s[0..-2]
               m = m.to_sym
               return @attrs.store(m, args[0])
-	    end
-	    if @attrs.has_key?(m.to_sym)
+            end
+            if @attrs.has_key?(m.to_sym)
               raise ArgumentError.new("wrong number of arguments (#{args.size} for 0 with #{m}) to method #{m}") unless args.nil? or args.empty?
+
               return @attrs[m.to_sym]
-	    end
-	    return @attrs.send(m, *args, &block)
+            end
+            return @attrs.send(m, *args, &block)
           end
 
         end # State

data/lib/oj/version.rb

@@ -1,5 +1,4 @@
-
 module Oj
   # Current version of the module.
-  VERSION = '3.14.2'
+  VERSION = '3.15.0'
 end

data/lib/oj.rb

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
 
+# Oj module is defined in oj.c.
 module Oj
 end
 

data/pages/Options.md

@@ -265,6 +265,10 @@ to true.
 
 The number of digits after the decimal when dumping the seconds of time.
 
+### :skip_null_byte [Boolean]
+
+If true, null bytes in strings will be omitted when dumping.
+
 ### :space
 
 String inserted after the ':' character when dumping a JSON object. The

data/test/_test_active.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
-# encoding: UTF-8
+# frozen_string_literal: true
 
-$: << File.dirname(__FILE__)
+$LOAD_PATH << __dir__
 %w(lib ext test).each do |dir|
   $LOAD_PATH.unshift File.expand_path("../../#{dir}", __FILE__)
 end
@@ -13,14 +13,14 @@ require 'sqlite3'
 require 'active_record'
 require 'oj'
 
-#Oj.mimic_JSON()
+# Oj.mimic_JSON()
 Oj.default_options = {mode: :compat, indent: 2}
 
-#ActiveRecord::Base.logger = Logger.new(STDERR)
+# ActiveRecord::Base.logger = Logger.new(STDERR)
 
 ActiveRecord::Base.establish_connection(
-  :adapter => "sqlite3",
-  :database => ":memory:"
+  :adapter => 'sqlite3',
+  :database => ':memory:'
 )
 
 ActiveRecord::Schema.define do
@@ -37,8 +37,8 @@ end
 class ActiveTest < Minitest::Test
 
   def test_active
-    User.find_or_create_by(first_name: "John", last_name: "Smith", email: "john@example.com")
-    User.find_or_create_by(first_name: "Joan", last_name: "Smith", email: "joan@example.com")
+    User.find_or_create_by(first_name: 'John', last_name: 'Smith', email: 'john@example.com')
+    User.find_or_create_by(first_name: 'Joan', last_name: 'Smith', email: 'joan@example.com')
 
     # Single instance.
     assert_equal(%|{
@@ -71,6 +71,5 @@ class ActiveTest < Minitest::Test
 
     # Array of instances as json. (not Oj)
     assert_equal(%|[{"id":1,"first_name":"John","last_name":"Smith","email":"john@example.com"},{"id":2,"first_name":"Joan","last_name":"Smith","email":"joan@example.com"}]|, User.all.to_json)
-
   end
 end

data/test/_test_active_mimic.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
-# encoding: UTF-8
+# frozen_string_literal: true
 
-$: << File.dirname(__FILE__)
+$LOAD_PATH << __dir__
 %w(lib ext test).each do |dir|
   $LOAD_PATH.unshift File.expand_path("../../#{dir}", __FILE__)
 end
@@ -16,11 +16,11 @@ require 'oj'
 Oj.mimic_JSON()
 Oj.default_options = {mode: :compat, indent: 2}
 
-#ActiveRecord::Base.logger = Logger.new(STDERR)
+# ActiveRecord::Base.logger = Logger.new(STDERR)
 
 ActiveRecord::Base.establish_connection(
-  :adapter => "sqlite3",
-  :database => ":memory:"
+  :adapter => 'sqlite3',
+  :database => ':memory:'
 )
 
 ActiveRecord::Schema.define do
@@ -37,8 +37,8 @@ end
 class ActiveTest < Minitest::Test
 
   def test_active
-    User.find_or_create_by(first_name: "John", last_name: "Smith", email: "john@example.com")
-    User.find_or_create_by(first_name: "Joan", last_name: "Smith", email: "joan@example.com")
+    User.find_or_create_by(first_name: 'John', last_name: 'Smith', email: 'john@example.com')
+    User.find_or_create_by(first_name: 'Joan', last_name: 'Smith', email: 'joan@example.com')
 
     # Single instance.
     assert_equal(%|{
@@ -91,6 +91,5 @@ class ActiveTest < Minitest::Test
   }
 ]
 |, User.all.to_json)
-
   end
 end

data/test/_test_mimic_rails.rb

@@ -1,10 +1,10 @@
 #!/usr/bin/env ruby
-# encoding: UTF-8
+# frozen_string_literal: true
 
-$: << File.dirname(__FILE__)
+$LOAD_PATH << __dir__
 
 require 'helper'
-#Oj.mimic_JSON
+# Oj.mimic_JSON
 require 'rails/all'
 
 require 'active_model'
@@ -36,14 +36,12 @@ end
 class MimicRails < Minitest::Test
 
   def test_mimic_exception
-    begin
-      ActiveSupport::JSON.decode("{")
-      puts "Failed"
-    rescue ActiveSupport::JSON.parse_error
-      assert(true)
-    rescue Exception
-      assert(false, 'Expected a JSON::ParserError')
-    end
+    ActiveSupport::JSON.decode('{')
+    puts 'Failed'
+  rescue ActiveSupport::JSON.parse_error
+    assert(true)
+  rescue Exception
+    assert(false, 'Expected a JSON::ParserError')
   end
 
   def test_dump_string
@@ -84,18 +82,17 @@ class MimicRails < Minitest::Test
     category = Category.new(1, 'test')
     serializer = CategorySerializer.new(category)
 
-    json = serializer.to_json()
+    serializer.to_json()
     puts "*** serializer.to_json() #{serializer.to_json()}"
-    json = serializer.as_json()
+    serializer.as_json()
     puts "*** serializer.as_json() #{serializer.as_json()}"
-    json = JSON.dump(serializer)
+    JSON.dump(serializer)
     puts "*** JSON.dump(serializer) #{JSON.dump(serializer)}"
 
     puts "*** category.to_json() #{category.to_json()}"
     puts "*** category.as_json() #{category.as_json()}"
     puts "*** JSON.dump(serializer) #{JSON.dump(category)}"
     puts "*** Oj.dump(serializer) #{Oj.dump(category)}"
-
   end
 
   def test_dump_object_array
@@ -104,7 +101,7 @@ class MimicRails < Minitest::Test
     cat2 = Category.new(2, 'test')
     a = Array.wrap([cat1, cat2])
 
-    #serializer = CategorySerializer.new(a)
+    # serializer = CategorySerializer.new(a)
 
     puts "*** a.to_json() #{a.to_json()}"
     puts "*** a.as_json() #{a.as_json()}"
@@ -114,13 +111,13 @@ class MimicRails < Minitest::Test
 
   def test_dump_time
     Oj.default_options= {:indent => 2}
-    now = ActiveSupport::TimeZone['America/Chicago'].parse("2014-11-01 13:20:47")
+    now = ActiveSupport::TimeZone['America/Chicago'].parse('2014-11-01 13:20:47')
     json = Oj.dump(now, mode: :object, time_format: :xmlschema)
-    #puts "*** json: #{json}"
+    # puts "*** json: #{json}"
 
     oj_dump = Oj.load(json, mode: :object, time_format: :xmlschema)
-    #puts "Now: #{now}\n Oj: #{oj_dump}"
-    assert_equal("2014-11-01T13:20:47-05:00", oj_dump.xmlschema)
+    # puts "Now: #{now}\n Oj: #{oj_dump}"
+    assert_equal('2014-11-01T13:20:47-05:00', oj_dump.xmlschema)
   end
 
 end # MimicRails

data/test/activerecord/result_test.rb

@@ -13,13 +13,12 @@ Oj.default_options = { mode: :rails }
 
 class ActiveRecordResultTest < Minitest::Test
   def test_hash_rows
-
     result = ActiveRecord::Result.new(["one", "two"],
-				      [
-					["row 1 col 1", "row 1 col 2"],
-					["row 2 col 1", "row 2 col 2"],
-					["row 3 col 1", "row 3 col 2"],
-				      ])
+                                      [
+                                        ["row 1 col 1", "row 1 col 2"],
+                                        ["row 2 col 1", "row 2 col 2"],
+                                        ["row 3 col 1", "row 3 col 2"],
+                                      ])
     #puts "*** result: #{Oj.dump(result, indent: 2)}"
     json_result = if ActiveRecord.version >= Gem::Version.new("6")
                     result.to_a

data/test/files.rb

@@ -1,29 +1,29 @@
 #!/usr/bin/env ruby -wW2
+# frozen_string_literal: true
 
-if $0 == __FILE__
-  $: << '.'
-  $: << '..'
-  $: << '../lib'
-  $: << '../ext'
+if $PROGRAM_NAME == __FILE__
+  $LOAD_PATH << '.'
+  $LOAD_PATH << '..'
+  $LOAD_PATH << '../lib'
+  $LOAD_PATH << '../ext'
 end
 
-require 'pp'
 require 'sample/file'
 require 'sample/dir'
 
 def files(dir)
-  d = ::Sample::Dir.new(dir)
+  d = Sample::Dir.new(dir)
   Dir.new(dir).each do |fn|
     next if fn.start_with?('.')
+
     filename = File.join(dir, fn)
-    #filename = '.' == dir ? fn : File.join(dir, fn)
-    if File.directory?(filename)
-      d << files(filename)
-    else
-      d << ::Sample::File.new(filename)
-    end
+    # filename = '.' == dir ? fn : File.join(dir, fn)
+    d << if File.directory?(filename)
+           files(filename)
+         else
+           Sample::File.new(filename)
+         end
   end
-  #pp d
+  # pp d
   d
 end
-

data/test/foo.rb

@@ -1,58 +1,15 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
-$: << '.'
-$: << File.join(File.dirname(__FILE__), "../lib")
-$: << File.join(File.dirname(__FILE__), "../ext")
+$LOAD_PATH << '.'
+$LOAD_PATH << File.join(__dir__, '../lib')
+$LOAD_PATH << File.join(__dir__, '../ext')
 
-require "oj"
+require 'oj'
 
-class Stuff
-  attr_accessor :alpha, :bravo, :charlie, :delta, :echo, :foxtrot, :golf, :hotel, :india, :juliet
-  def self.json_create(arg)
-    obj = self.new
-    obj.alpha = arg["alpha"]
-    obj.bravo = arg["bravo"]
-    obj.charlie = arg["charlie"]
-    obj.delta = arg["delta"]
-    obj.echo = arg["echo"]
-    obj.foxtrot = arg["foxtrot"]
-    obj.golf = arg["golf"]
-    obj.hotel = arg["hotel"]
-    obj.india = arg["india"]
-    obj.juliet = arg["juliet"]
-    obj
-  end
-end
+GC.stress = true
 
-$obj_json = %|{
-  "alpha": [0, 1,2,3,4,5,6,7,8,9],
-  "bravo": true,
-  "charlie": 123,
-  "delta": "some string",
-  "echo": null,
-  "^": "Stuff",
-  "foxtrot": false,
-  "golf": "gulp",
-  "hotel": {"x": true, "y": false},
-  "india": [null, true, 123],
-  "juliet": "junk"
-}|
+Oj.mimic_JSON
 
-def parse(json)
-  p_usual = Oj::Parser.new(:usual)
-  p_usual.cache_keys = true
-  p_usual.cache_strings = (p_usual.cache_keys ? 6 : 0)
-  p_usual.symbol_keys = true
-  p_usual.create_id = '^'
-  p_usual.class_cache = true
-  p_usual.ignore_json_create = true
-
-  p_usual.parse(json)
-  nil
-end
-
-parse($obj_json)
-
-Oj.mem_report()
-
-Oj.mem_report()
+Oj.add_to_json(Hash)
+pp JSON('{ "a": 1, "b": 2 }', :object_class => JSON::GenericObject)

data/test/helper.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-#
+
 # Ubuntu does not accept arguments to ruby when called using env. To get warnings to show up the -w options is
 # required. That can be set in the RUBYOPT environment variable.
 # export RUBYOPT=-w
@@ -15,15 +15,13 @@ require 'minitest/autorun'
 require 'stringio'
 require 'date'
 require 'bigdecimal'
-require 'pp'
 require 'oj'
 
-
 def verify_gc_compaction
   # This method was added in Ruby 3.0.0. Calling it this way asks the GC to
   # move objects around, helping to find object movement bugs.
-  if defined?(GC.verify_compaction_references) == 'method' && !(RbConfig::CONFIG['host_os'] =~ /(mingw|mswin)/)
-    if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.2.0")
+  if defined?(GC.verify_compaction_references) == 'method' && RbConfig::CONFIG['host_os'] !~ /(mingw|mswin)/
+    if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.2.0')
       GC.verify_compaction_references(expand_heap: true, toward: :empty)
     else
       GC.verify_compaction_references(double_heap: true, toward: :empty)
@@ -31,12 +29,11 @@ def verify_gc_compaction
   end
 end
 
-
 $ruby = RUBY_DESCRIPTION.split(' ')[0]
 $ruby = 'ree' if 'ruby' == $ruby && RUBY_DESCRIPTION.include?('Ruby Enterprise Edition')
 
 class Range
-  def to_hash()
-    { 'begin' => self.begin, 'end' => self.end, 'exclude_end' => self.exclude_end? }
+  def to_hash
+    { 'begin' => self.begin, 'end' => self.end, 'exclude_end' => exclude_end? }
   end
 end

data/test/isolated/shared.rb

@@ -21,7 +21,7 @@ class SharedMimicTest < Minitest::Test
     alias == eql?
 
     def as_json()
-      {"json_class" => self.class.to_s,"x" => @x,"y" => @y}
+      {"json_class" => self.class.to_s, "x" => @x, "y" => @y}
     end
 
     def self.json_create(h)
@@ -207,7 +207,6 @@ class SharedMimicTest < Minitest::Test
 --],#
 --"a"~:*1#
 }} == json)
-
   end
 
 # fast_generate
@@ -261,6 +260,8 @@ class SharedMimicTest < Minitest::Test
     obj = JSON.parse(json, :create_additions => true)
     JSON.create_id = 'json_class'
     assert_equal(jam, obj)
+
+    assert_nothing_raised { JSON.create_id = nil }
   end
   def test_parse_bang
     json = %{{"a":1,"b":[true,false]}}

data/test/json_gem/json_addition_test.rb

@@ -191,9 +191,9 @@ class JSONAdditionTest < Test::Unit::TestCase
     assert_equal d, JSON.parse(d.to_json, :create_additions => true)
     d = DateTime.parse(now.utc.to_s) # of = 0
     assert_equal d, JSON.parse(d.to_json, :create_additions => true)
-    d = DateTime.civil(2008, 6, 17, 11, 48, 32, Rational(1,24))
+    d = DateTime.civil(2008, 6, 17, 11, 48, 32, Rational(1, 24))
     assert_equal d, JSON.parse(d.to_json, :create_additions => true)
-    d = DateTime.civil(2008, 6, 17, 11, 48, 32, Rational(12,24))
+    d = DateTime.civil(2008, 6, 17, 11, 48, 32, Rational(12, 24))
     assert_equal d, JSON.parse(d.to_json, :create_additions => true)
   end
 

data/test/json_gem/json_common_interface_test.rb

@@ -29,7 +29,7 @@ class JSONCommonInterfaceTest < Test::Unit::TestCase
     #@json = '{"a":2,"b":5.23683071,"c":"c","d":[1,"b",3.14],"e":{"foo":"bar"},'\
     #'"g":"\\"\\u0000\\u001f","h":1000.0,"i":0.001}'
     @json = '{"a":2,"c":"c","d":[1,"b",3.14],"e":{"foo":"bar"},'\
-	    '"g":"\\"\\u0000\\u001f","h":1000.0,"i":0.001}'
+            '"g":"\\"\\u0000\\u001f","h":1000.0,"i":0.001}'
   end
 
   def test_index
@@ -43,15 +43,15 @@ class JSONCommonInterfaceTest < Test::Unit::TestCase
   # functionality and perform better.
 
   def test_parser
-    assert_match /::Parser\z/, JSON.parser.name
+    assert_match(/::Parser\z/, JSON.parser.name)
   end
 
   def test_generator
-    assert_match /::Generator\z/, JSON.generator.name
+    assert_match(/::Generator\z/, JSON.generator.name)
   end
 
   def test_state
-    assert_match /::Generator::State\z/, JSON.state.name
+    assert_match(/::Generator::State\z/, JSON.state.name)
   end
 
   # This doesn't have anything to do with JSON parsing or generation. It seems

data/test/json_gem/json_ext_parser_test.rb

@@ -2,6 +2,7 @@
 # encoding: UTF-8
 
 #frozen_string_literal: false
+
 require 'json_gem/test_helper'
 
 class JSONExtParserTest < Test::Unit::TestCase

data/test/json_gem/json_fixtures_test.rb

@@ -2,6 +2,7 @@
 # encoding: UTF-8
 
 #frozen_string_literal: false
+
 require 'json_gem/test_helper'
 
 class JSONFixturesTest < Test::Unit::TestCase
@@ -16,7 +17,7 @@ class JSONFixturesTest < Test::Unit::TestCase
     for name, source in @passed
       begin
         assert JSON.parse(source),
-          "Did not pass for fixture '#{name}': #{source.inspect}"
+               "Did not pass for fixture '#{name}': #{source.inspect}"
       rescue => e
         warn "\nCaught #{e.class}(#{e}) for fixture '#{name}': #{source.inspect}\n#{e.backtrace * "\n"}"
         raise e
@@ -27,7 +28,7 @@ class JSONFixturesTest < Test::Unit::TestCase
   def test_failing
     for name, source in @failed
       assert_raise(JSON::ParserError, JSON::NestingError,
-        "Did not fail for fixture '#{name}': #{source.inspect}") do
+                   "Did not fail for fixture '#{name}': #{source.inspect}") do
         JSON.parse(source)
       end
     end

data/test/json_gem/json_generator_test.rb

@@ -22,24 +22,24 @@ class JSONGeneratorTest < Test::Unit::TestCase
     }
     @json2 = '{"a":2,"b":3.141,"c":"c","d":[1,"b",3.14],"e":{"foo":"bar"},' +
       '"g":"\\"\\u0000\\u001f","h":1000.0,"i":0.001}'
-    @json3 = <<'EOT'.chomp
-{
-  "a": 2,
-  "b": 3.141,
-  "c": "c",
-  "d": [
-    1,
-    "b",
-    3.14
-  ],
-  "e": {
-    "foo": "bar"
-  },
-  "g": "\"\u0000\u001f",
-  "h": 1000.0,
-  "i": 0.001
-}
-EOT
+    @json3 = <<~'EOT'.chomp
+      {
+        "a": 2,
+        "b": 3.141,
+        "c": "c",
+        "d": [
+          1,
+          "b",
+          3.14
+        ],
+        "e": {
+          "foo": "bar"
+        },
+        "g": "\"\u0000\u001f",
+        "h": 1000.0,
+        "i": 0.001
+      }
+    EOT
   end
 
   def test_generate
@@ -64,11 +64,11 @@ EOT
     parsed_json = JSON.parse(json)
     assert_equal(@hash, parsed_json)
     json = JSON.pretty_generate({1=>2})
-    assert_equal(<<'EOT'.chomp, json)
-{
-  "1": 2
-}
-EOT
+    assert_equal(<<~'EOT'.chomp, json)
+      {
+        "1": 2
+      }
+    EOT
     parsed_json = JSON.parse(json)
     assert_equal({"1"=>2}, parsed_json)
     assert_equal '666', JSON.pretty_generate(666)
@@ -78,15 +78,15 @@ EOT
 
   def test_generate_custom
     state = JSON::State.new(:space_before => " ", :space => "   ", :indent => "<i>", :object_nl => "\n", :array_nl => "<a_nl>")
-    json = JSON.generate({1=>{2=>3,4=>[5,6]}}, state)
-    assert_equal(<<'EOT'.chomp, json)
-{
-<i>"1" :   {
-<i><i>"2" :   3,
-<i><i>"4" :   [<a_nl><i><i><i>5,<a_nl><i><i><i>6<a_nl><i><i>]
-<i>}
-}
-EOT
+    json = JSON.generate({1=>{2=>3, 4=>[5, 6]}}, state)
+    assert_equal(<<~'EOT'.chomp, json)
+      {
+      <i>"1" :   {
+      <i><i>"2" :   3,
+      <i><i>"4" :   [<a_nl><i><i><i>5,<a_nl><i><i><i>6<a_nl><i><i>]
+      <i>}
+      }
+    EOT
   end
 
   def test_fast_generate
@@ -393,4 +393,15 @@ EOT
       assert_equal '["foo"]', JSON.generate([s.new('foo')])
     end
   end
+
+  def test_invalid_to_json
+    omit if REAL_JSON_GEM
+
+    data = Object.new
+    def data.to_json(*)
+      nil
+    end
+
+    assert_raises(TypeError) { JSON.generate(data) }
+  end
 end

data/test/json_gem/json_generic_object_test.rb

@@ -29,26 +29,26 @@ class JSONGenericObjectTest < Test::Unit::TestCase
 
   def test_parse_json
     x = JSON(
-        '{ "json_class": "JSON::GenericObject", "a": 1, "b": 2 }',
-        :create_additions => true
-             )
-    assert_kind_of Hash,
-      JSON(
         '{ "json_class": "JSON::GenericObject", "a": 1, "b": 2 }',
         :create_additions => true
       )
+    assert_kind_of Hash,
+                   JSON(
+                     '{ "json_class": "JSON::GenericObject", "a": 1, "b": 2 }',
+                     :create_additions => true
+                   )
     switch_json_creatable do
       assert_equal @go, l =
-        JSON(
-          '{ "json_class": "JSON::GenericObject", "a": 1, "b": 2 }',
-             :create_additions => true
-        )
+                          JSON(
+                            '{ "json_class": "JSON::GenericObject", "a": 1, "b": 2 }',
+                            :create_additions => true
+                          )
       assert_equal 1, l.a
       assert_equal @go,
-        l = JSON('{ "a": 1, "b": 2 }', :object_class => JSON::GenericObject)
+                   l = JSON('{ "a": 1, "b": 2 }', :object_class => JSON::GenericObject)
       assert_equal 1, l.a
       assert_equal JSON::GenericObject[:a => JSON::GenericObject[:b => 2]],
-        l = JSON('{ "a": { "b": 2 } }', :object_class => JSON::GenericObject)
+                   l = JSON('{ "a": { "b": 2 } }', :object_class => JSON::GenericObject)
       assert_equal 2, l.a.b
     end
   end