oj 3.14.3 → 3.15.1

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(%|{

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(%|{

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,11 +82,11 @@ 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()}"
@@ -103,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()}"
@@ -113,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/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 '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,15 +1,20 @@
 #!/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 'active_support'
+require 'json'
+require 'oj'
 
-GC.stress = true
+Oj.mimic_JSON()
+# Oj::Rails.mimic_JSON()
 
-require "oj"
-Oj.mimic_JSON
-
-Oj.add_to_json(Hash)
-pp JSON('{ "a": 1, "b": 2 }', :object_class => JSON::GenericObject)
+begin
+  ::JSON.parse('{ "foo": 84e }')
+  #::JSON.parse('{ "foo": 84eb234 }')
+rescue Exception => e
+  puts "#{e.class}: #{e.message}"
+end

data/test/helper.rb

@@ -20,8 +20,8 @@ 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)
@@ -33,7 +33,7 @@ $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/mem.rb

@@ -1,16 +1,17 @@
 #!/usr/bin/env ruby
-# encoding: UTF-8
+# frozen_string_literal: true
 
-$: << '.'
-$: << File.join(File.dirname(__FILE__), "../lib")
-$: << File.join(File.dirname(__FILE__), "../ext")
+require 'English'
+$LOAD_PATH << '.'
+$LOAD_PATH << File.join(__dir__, '../lib')
+$LOAD_PATH << File.join(__dir__, '../ext')
 
 require 'oj'
 
 Oj.default_options = { mode: :rails, cache_keys: false, cache_str: -1 }
 
 def mem
-  `ps -o rss= -p #{$$}`.to_i
+  `ps -o rss= -p #{$PROCESS_ID}`.to_i
 end
 
 ('a'..'z').each { |a|
@@ -20,8 +21,8 @@ end
         ('a'..'z').each { |e|
           ('a'..'z').each { |f|
             key = "#{a}#{b}#{c}#{d}#{e}#{f}"
-            x = Oj.load(%|{ "#{key}": 101}|)
-            #Oj.dump(x)
+            Oj.load(%|{ "#{key}": 101}|)
+            # Oj.dump(x)
           }
         }
       }

data/test/perf.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 class Perf
 
-  def initialize()
+  def initialize
     @items = []
   end
 
@@ -18,7 +20,7 @@ class Perf
   end
 
   def run(iter)
-    base = Item.new(nil, nil) { }
+    base = Item.new(nil, nil) {}
     base.run(iter, 0.0)
     @items.each do |i|
       i.run(iter, base.duration)
@@ -31,9 +33,7 @@ class Perf
     summary()
   end
 
-  def summary()
-    fastest = nil
-    slowest = nil
+  def summary
     width = 6
     @items.each do |i|
       next if i.duration.nil?
@@ -44,23 +44,20 @@ class Perf
     iva.delete_if { |i| i.duration.nil? }
     iva = iva.sort_by { |i| i.duration }
     puts
-    puts "Summary:"
-    puts "%*s  time (secs)  rate (ops/sec)" % [width, 'System']
+    puts 'Summary:'
+    puts '%*s  time (secs)  rate (ops/sec)' % [width, 'System']
     puts "#{'-' * width}  -----------  --------------"
     iva.each do |i|
-      if i.duration.nil?
-      else
-        puts "%*s %11.3f  %14.3f" % [width, i.title, i.duration, i.rate ]
-      end
+      puts '%*s %11.3f  %14.3f' % [width, i.title, i.duration, i.rate ] unless i.duration.nil?
     end
     puts
     puts "Comparison Matrix\n(performance factor, 2.0 means row is twice as fast as column)"
-    puts ([' ' * width] + iva.map { |i| "%*s" % [width, i.title] }).join('  ')
-    puts (['-' * width] + iva.map { |i| '-' * width }).join('  ')
+    puts ([' ' * width] + iva.map { |i| '%*s' % [width, i.title] }).join('  ')
+    puts (['-' * width] + iva.map { |_i| '-' * width }).join('  ')
     iva.each do |i|
-      line = ["%*s" % [width, i.title]]
+      line = ['%*s' % [width, i.title]]
       iva.each do |o|
-        line << ("%*.2f" % [width, o.duration / i.duration])
+        line << ('%*.2f' % [width, o.duration / i.duration])
       end
       puts line.join('  ')
     end
@@ -90,17 +87,15 @@ class Perf
     end
 
     def run(iter, base)
-      begin
-        GC.start
-        @before.call unless @before.nil?
-        start = Time.now
-        iter.times { @blk.call }
-        @duration = Time.now - start - base
-        @duration = 0.0 if @duration < 0.0
-        @rate = iter / @duration
-      rescue Exception => e
-        @error = "#{e.class}: #{e.message}"
-      end
+      GC.start
+      @before.call unless @before.nil?
+      start = Time.now
+      iter.times { @blk.call }
+      @duration = Time.now - start - base
+      @duration = 0.0 if @duration < 0.0
+      @rate = iter / @duration
+    rescue Exception => e
+      @error = "#{e.class}: #{e.message}"
     end
 
   end # Item

data/test/perf_compat.rb

@@ -1,9 +1,9 @@
 #!/usr/bin/env ruby
-# encoding: UTF-8
+# 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 'optparse'
 require 'perf'
@@ -11,25 +11,23 @@ require 'oj'
 
 $verbose = false
 $indent = 0
-$iter = 20000
+$iter = 20_000
 $size = 0
 
 opts = OptionParser.new
-opts.on("-v", "verbose")                                    { $verbose = true }
-opts.on("-c", "--count [Int]", Integer, "iterations")       { |i| $iter = i }
-opts.on("-i", "--indent [Int]", Integer, "indentation")     { |i| $indent = i }
-opts.on("-s", "--size [Int]", Integer, "size (~Kbytes)")    { |i| $size = i }
-opts.on("-h", "--help", "Show this display")                { puts opts; Process.exit!(0) }
-files = opts.parse(ARGV)
+opts.on('-v', 'verbose')                                    { $verbose = true }
+opts.on('-c', '--count [Int]', Integer, 'iterations')       { |i| $iter = i }
+opts.on('-i', '--indent [Int]', Integer, 'indentation')     { |i| $indent = i }
+opts.on('-s', '--size [Int]', Integer, 'size (~Kbytes)')    { |i| $size = i }
+opts.on('-h', '--help', 'Show this display')                { puts opts; Process.exit!(0) }
+opts.parse(ARGV)
 
 def capture_error(tag, orig, load_key, dump_key, &blk)
-  begin
-    obj = blk.call(orig)
-    puts obj unless orig == obj
-    raise "#{tag} #{dump_key} and #{load_key} did not return the same object as the original." unless orig == obj
-  rescue Exception => e
-    $failed[tag] = "#{e.class}: #{e.message}"
-  end
+  obj = blk.call(orig)
+  puts obj unless orig == obj
+  raise "#{tag} #{dump_key} and #{load_key} did not return the same object as the original." unless orig == obj
+rescue Exception => e
+  $failed[tag] = "#{e.class}: #{e.message}"
 end
 
 # Verify that all packages dump and load correctly and return the same Object as the original.
@@ -39,7 +37,7 @@ capture_error('JSON::Ext', $obj, 'generate', 'parse') { |o|
   require 'json/ext'
   JSON.generator = JSON::Ext::Generator
   JSON.parser = JSON::Ext::Parser
-  JSON.load(JSON.generate(o))
+  JSON.parse(JSON.generate(o))
 }
 
 module One
@@ -47,7 +45,7 @@ module One
     module Three
       class Empty
 
-        def initialize()
+        def initialize
           @a = 1
           @b = 2
           @c = 3
@@ -58,16 +56,16 @@ module One
         end
         alias == eql?
 
-        def as_json(*a)
+        def as_json(*_a)
           {JSON.create_id => self.class.name, 'a' => @a, 'b' => @b, 'c' => @c }
         end
-        
-        def to_json(*a)
+
+        def to_json(*_a)
           JSON.generate(as_json())
         end
 
-        def self.json_create(h)
-          self.new()
+        def self.json_create(_h)
+          new()
         end
       end # Empty
     end # Three
@@ -77,8 +75,8 @@ end # One
 $obj = {
   'a' => 'Alpha', # string
   'b' => true,    # boolean
-  'c' => 12345,   # number
-  'd' => [ true, [false, [-123456789, nil], 3.9676, ['Something else.', false], nil]], # mix it up array
+  'c' => 12_345,   # number
+  'd' => [ true, [false, [-123_456_789, nil], 3.9676, ['Something else.', false], nil]], # mix it up array
   'e' => { 'zero' => nil, 'one' => 1, 'two' => 2, 'three' => [3], 'four' => [0, 1, 2, 3, 4] }, # hash
   'f' => nil,     # nil
   'g' => One::Two::Three::Empty.new(),
@@ -109,13 +107,13 @@ if $verbose
 end
 
 puts '-' * 80
-puts "Compat Parse Performance"
+puts 'Compat Parse Performance'
 perf = Perf.new()
-unless $failed.has_key?('JSON::Ext')
-  perf.add('JSON::Ext', 'parse') { JSON.load($json) }
+unless $failed.key?('JSON::Ext')
+  perf.add('JSON::Ext', 'parse') { JSON.parse($json) }
   perf.before('JSON::Ext') { JSON.parser = JSON::Ext::Parser }
 end
-unless $failed.has_key?('Oj:compat')
+unless $failed.key?('Oj:compat')
   perf.add('Oj:compat', 'compat_load') { Oj.compat_load($json) }
 end
 perf.run($iter)
@@ -125,6 +123,6 @@ puts '-' * 80
 puts
 
 unless $failed.empty?
-  puts "The following packages were not included for the reason listed"
+  puts 'The following packages were not included for the reason listed'
   $failed.each { |tag, msg| puts "***** #{tag}: #{msg}" }
 end

data/test/perf_dump.rb

@@ -1,50 +1,50 @@
 #!/usr/bin/env ruby
-# encoding: UTF-8
+# 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 'optparse'
 require 'oj'
 
-$verbose = false
-$indent = 2
-$iter = 100_000
-$size = 2
+@verbose = false
+@indent = 2
+@iter = 100_000
+@size = 2
 
 opts = OptionParser.new
-opts.on("-v", "verbose")                                    { $verbose = true }
-opts.on("-c", "--count [Int]", Integer, "iterations")       { |i| $iter = i }
-opts.on("-i", "--indent [Int]", Integer, "indentation")     { |i| $indent = i }
-opts.on("-s", "--size [Int]", Integer, "size (~Kbytes)")    { |i| $size = i }
-opts.on("-h", "--help", "Show this display")                { puts opts; Process.exit!(0) }
-files = opts.parse(ARGV)
-
-$obj = {
+opts.on('-v', 'verbose')                                    { @verbose = true }
+opts.on('-c', '--count [Int]', Integer, 'iterations')       { |i| @iter = i }
+opts.on('-i', '--indent [Int]', Integer, 'indentation')     { |i| @indent = i }
+opts.on('-s', '--size [Int]', Integer, 'size (~Kbytes)')    { |i| @size = i }
+opts.on('-h', '--help', 'Show this display')                { puts opts; Process.exit!(0) }
+opts.parse(ARGV)
+
+@obj = {
   'a' => 'Alpha', # string
   'b' => true,    # boolean
-  'c' => 12345,   # number
-  'd' => [ true, [false, [-123456789, nil], 3.9676, ['Something else.', false], nil]], # mix it up array
+  'c' => 12_345,   # number
+  'd' => [ true, [false, [-123_456_789, nil], 3.9676, ['Something else.', false], nil]], # mix it up array
   'e' => { 'zero' => nil, 'one' => 1, 'two' => 2, 'three' => [3], 'four' => [0, 1, 2, 3, 4] }, # hash
   'f' => nil,     # nil
   'h' => { 'a' => { 'b' => { 'c' => { 'd' => {'e' => { 'f' => { 'g' => nil }}}}}}}, # deep hash, not that deep
   'i' => [[[[[[[nil]]]]]]]  # deep array, again, not that deep
 }
 
-Oj.default_options = { :indent => $indent, :mode => :strict }
+Oj.default_options = { :indent => @indent, :mode => :strict }
 
-if 0 < $size
-  o = $obj
-  $obj = []
-  (4 * $size).times do
-    $obj << o
+if 0 < @size
+  o = @obj
+  @obj = []
+  (4 * @size).times do
+    @obj << o
   end
 end
 
-$json = Oj.dump($obj)
+@json = Oj.dump(@obj)
 GC.start
 start = Time.now
-$iter.times { Oj.dump($obj) }
+@iter.times { Oj.dump(@obj) }
 duration = Time.now - start
-puts "Dumped #{$json.length} byte JSON #{$iter} times in %0.3f seconds or %0.3f iteration/sec." % [duration, $iter / duration]
+puts "Dumped #{@json.length} byte JSON #{@iter} times in %0.3f seconds or %0.3f iteration/sec." % [duration, @iter / duration]