oj 3.11.5 → 3.16.5

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"
-  $failed.each { |tag,msg| puts "***** #{tag}: #{msg}" }
+  puts 'The following packages were not included for the reason listed'
+  $failed.each { |tag, msg| puts "***** #{tag}: #{msg}" }
 end

data/test/perf_dump.rb

@@ -0,0 +1,50 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+$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
+
+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) }
+opts.parse(ARGV)
+
+@obj = {
+  'a' => 'Alpha', # string
+  'b' => true,    # boolean
+  '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 }
+
+if 0 < @size
+  o = @obj
+  @obj = []
+  (4 * @size).times do
+    @obj << o
+  end
+end
+
+@json = Oj.dump(@obj)
+GC.start
+start = Time.now
+@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]

data/test/perf_fast.rb

@@ -1,35 +1,35 @@
 #!/usr/bin/env ruby -wW1
-# 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 'yajl'
+# require 'yajl'
 require 'perf'
 require 'json'
 require 'json/ext'
 require 'oj'
 
-$verbose = false
-$indent = 0
-$iter = 100000
-$gets = 0
-$fetch = false
-$write = false
-$read = false
+@verbose = false
+@indent = 0
+@iter = 100_000
+@gets = 0
+@fetch = false
+@write = false
+@read = false
 
 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("-g", "--gets [Int]", Integer, "number of gets")  { |i| $gets = i }
-opts.on("-f", "fetch")                                    { $fetch = true }
-opts.on("-w", "write")                                    { $write = true }
-opts.on("-r", "read")                                     { $read = true }
-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('-g', '--gets [Int]', Integer, 'number of gets')  { |i| @gets = i }
+opts.on('-f', 'fetch')                                    { @fetch = true }
+opts.on('-w', 'write')                                    { @write = true }
+opts.on('-r', 'read')                                     { @read = true }
+opts.on('-h', '--help', 'Show this display')              { puts opts; Process.exit!(0) }
+opts.parse(ARGV)
 
 # This just navigates to each leaf of the JSON structure.
 def dig(obj, &blk)
@@ -37,83 +37,81 @@ def dig(obj, &blk)
   when Array
     obj.each { |e| dig(e, &blk) }
   when Hash
-    obj.values.each { |e| dig(e, &blk) }
+    obj.each_value { |e| dig(e, &blk) }
   else
     blk.yield(obj)
   end
 end
 
-$obj = {
+@obj = {
   'a' => 'Alpha', # string
   'b' => true,    # boolean
-  'c' => 12345,   # number
-  'd' => [ true, [false, {'12345' => 12345, 'nil' => nil}, 3.967, { 'x' => 'something', 'y' => false, 'z' => true}, nil]], # mix it up array
+  'c' => 12_345,   # number
+  'd' => [ true, [false, {'12345' => 12_345, 'nil' => nil}, 3.967, { 'x' => 'something', 'y' => false, 'z' => true}, nil]], # mix it up array
   'e' => { 'one' => 1, 'two' => 2 }, # hash
   'f' => nil,     # nil
-  'g' => 12345678901234567890123456789, # big number
+  'g' => 12_345_678_901_234_567_890_123_456_789, # big number
   '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 => :compat }
+Oj.default_options = { :indent => @indent, :mode => :compat }
 
-$json = Oj.dump($obj)
-$failed = {} # key is same as String used in tests later
+@json = Oj.dump(@obj)
+@failed = {} # key is same as String used in tests later
 
 def capture_error(tag, orig, load_key, dump_key, &blk)
-  begin
-    obj = blk.call(orig)
-    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)
+  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.
-capture_error('Oj::Doc', $obj, 'load', 'dump') { |o| Oj::Doc.open(Oj.dump(o, :mode => :strict)) { |f| f.fetch() } }
-#capture_error('Yajl', $obj, 'encode', 'parse') { |o| Yajl::Parser.parse(Yajl::Encoder.encode(o)) }
-capture_error('JSON::Ext', $obj, 'generate', 'parse') { |o| JSON.generator = JSON::Ext::Generator; JSON::Ext::Parser.new(JSON.generate(o)).parse }
+capture_error('Oj::Doc', @obj, 'load', 'dump') { |o| Oj::Doc.open(Oj.dump(o, :mode => :strict)) { |f| f.fetch() } }
+# capture_error('Yajl', @obj, 'encode', 'parse') { |o| Yajl::Parser.parse(Yajl::Encoder.encode(o)) }
+capture_error('JSON::Ext', @obj, 'generate', 'parse') { |o| JSON.generator = JSON::Ext::Generator; JSON::Ext::Parser.new(JSON.generate(o)).parse }
 
-if $verbose
-  puts "json:\n#{$json}\n"
+if @verbose
+  puts "json:\n#{@json}\n"
 end
 
 puts '-' * 80
-puts "Parse Performance"
+puts 'Parse Performance'
 perf = Perf.new()
-perf.add('Oj::Doc', 'parse') { Oj::Doc.open($json) {|f| } } unless $failed.has_key?('Oj::Doc')
-#perf.add('Yajl', 'parse') { Yajl::Parser.parse($json) } unless $failed.has_key?('Yajl')
-perf.add('JSON::Ext', 'parse') { JSON::Ext::Parser.new($json).parse } unless $failed.has_key?('JSON::Ext')
-perf.run($iter)
+perf.add('Oj::Doc', 'parse') { Oj::Doc.open(@json) { |f| } } unless @failed.key?('Oj::Doc')
+# perf.add('Yajl', 'parse') { Yajl::Parser.parse(@json) } unless @failed.has_key?('Yajl')
+perf.add('JSON::Ext', 'parse') { JSON::Ext::Parser.new(@json).parse } unless @failed.key?('JSON::Ext')
+perf.run(@iter)
 
 puts '-' * 80
-puts "JSON generation Performance"
-Oj::Doc.open($json) do |doc|
+puts 'JSON generation Performance'
+Oj::Doc.open(@json) do |doc|
   perf = Perf.new()
   perf.add('Oj::Doc', 'dump') { doc.dump() }
-#  perf.add('Yajl', 'encode') { Yajl::Encoder.encode($obj) }
-  perf.add('JSON::Ext', 'fast_generate') { JSON.fast_generate($obj) }
+  # perf.add('Yajl', 'encode') { Yajl::Encoder.encode(@obj) }
+  perf.add('JSON::Ext', 'fast_generate') { JSON.fast_generate(@obj) }
   perf.before('JSON::Ext') { JSON.generator = JSON::Ext::Generator }
-  perf.run($iter)
+  perf.run(@iter)
 end
 
-if 0 < $gets
+if 0 < @gets
   puts '-' * 80
-  puts "Parse and get all values Performance"
+  puts 'Parse and get all values Performance'
   perf = Perf.new()
-  perf.add('Oj::Doc', 'parse') { Oj::Doc.open($json) {|f| $gets.times { f.each_value() {} } } } unless $failed.has_key?('Oj::Doc')
-#  perf.add('Yajl', 'parse') { $gets.times { dig(Yajl::Parser.parse($json)) {} } } unless $failed.has_key?('Yajl')
-  perf.add('JSON::Ext', 'parse') { $gets.times { dig(JSON::Ext::Parser.new($json).parse) {} } } unless $failed.has_key?('JSON::Ext')
-  perf.run($iter)
+  perf.add('Oj::Doc', 'parse') { Oj::Doc.open(@json) { |f| @gets.times { f.each_value() {} } } } unless @failed.key?('Oj::Doc')
+  # perf.add('Yajl', 'parse') { @gets.times { dig(Yajl::Parser.parse(@json)) {} } } unless @failed.has_key?('Yajl')
+  perf.add('JSON::Ext', 'parse') { @gets.times { dig(JSON::Ext::Parser.new(@json).parse) {} } } unless @failed.key?('JSON::Ext')
+  perf.run(@iter)
 end
 
-if $fetch
+if @fetch
   puts '-' * 80
-  puts "fetch nested Performance"
-  json_hash = Oj.load($json, :mode => :strict)
-  Oj::Doc.open($json) do |fast|
-    #puts "*** C fetch: #{fast.fetch('/d/2/4/y')}"
-    #puts "*** Ruby fetch: #{json_hash.fetch('d', []).fetch(1, []).fetch(3, []).fetch('x', nil)}"
+  puts 'fetch nested Performance'
+  json_hash = Oj.load(@json, :mode => :strict)
+  Oj::Doc.open(@json) do |fast|
+    # puts "*** C fetch: #{fast.fetch('/d/2/4/y')}"
+    # puts "*** Ruby fetch: #{json_hash.fetch('d', []).fetch(1, []).fetch(3, []).fetch('x', nil)}"
     perf = Perf.new()
     perf.add('Oj::Doc', 'fetch') { fast.fetch('/d/2/4/x'); fast.fetch('/h/a/b/c/d/e/f/g'); fast.fetch('/i/1/1/1/1/1/1/1') }
     # version that fails gracefully
@@ -123,42 +121,42 @@ if $fetch
       json_hash.fetch('i', []).fetch(0, []).fetch(0, []).fetch(0, []).fetch(0, []).fetch(0, []).fetch(0, []).fetch(0, nil)
     end
     # version that raises if the path is incorrect
-#    perf.add('Ruby', 'fetch') { $fetch.times { json_hash['d'][1][3][1] } }
-    perf.run($iter)
+    # perf.add('Ruby', 'fetch') { @fetch.times { json_hash['d'][1][3][1] } }
+    perf.run(@iter)
   end
 end
 
-if $write
+if @write
   puts '-' * 80
-  puts "JSON write to file Performance"
-  Oj::Doc.open($json) do |doc|
+  puts 'JSON write to file Performance'
+  Oj::Doc.open(@json) do |doc|
     perf = Perf.new()
     perf.add('Oj::Doc', 'dump') { doc.dump(nil, 'oj.json') }
-#    perf.add('Yajl', 'encode') { File.open('yajl.json', 'w') { |f| Yajl::Encoder.encode($obj, f) } }
-    perf.add('JSON::Ext', 'fast_generate') { File.open('json_ext.json', 'w') { |f| f.write(JSON.fast_generate($obj)) } }
+    # perf.add('Yajl', 'encode') { File.open('yajl.json', 'w') { |f| Yajl::Encoder.encode(@obj, f) } }
+    perf.add('JSON::Ext', 'fast_generate') { File.write('json_ext.json', JSON.fast_generate(@obj)) }
     perf.before('JSON::Ext') { JSON.generator = JSON::Ext::Generator }
-    perf.run($iter)
+    perf.run(@iter)
   end
 end
 
-if $read
+if @read
   puts '-' * 80
-  puts "JSON read from file Performance"
-  Oj::Doc.open($json) { |doc| doc.dump(nil, 'oj.json') }
-#  File.open('yajl.json', 'w') { |f| Yajl::Encoder.encode($obj, f) }
+  puts 'JSON read from file Performance'
+  Oj::Doc.open(@json) { |doc| doc.dump(nil, 'oj.json') }
+  # File.open('yajl.json', 'w') { |f| Yajl::Encoder.encode(@obj, f) }
   JSON.generator = JSON::Ext::Generator
-  File.open('json_ext.json', 'w') { |f| f.write(JSON.fast_generate($obj)) }
-  Oj::Doc.open($json) do |doc|
+  File.write('json_ext.json', JSON.fast_generate(@obj))
+  Oj::Doc.open(@json) do |_doc|
     perf = Perf.new()
-    perf.add('Oj::Doc', 'open_file') { ::Oj::Doc.open_file('oj.json') }
-#    perf.add('Yajl', 'decode') { Yajl::decoder.decode(File.read('yajl.json')) }
+    perf.add('Oj::Doc', 'open_file') { Oj::Doc.open_file('oj.json') }
+    # perf.add('Yajl', 'decode') { Yajl::decoder.decode(File.read('yajl.json')) }
     perf.add('JSON::Ext', '') { JSON.parse(File.read('json_ext.json')) }
     perf.before('JSON::Ext') { JSON.parser = JSON::Ext::Parser }
-    perf.run($iter)
+    perf.run(@iter)
   end
 end
 
-unless $failed.empty?
-  puts "The following packages were not included for the reason listed"
-  $failed.each { |tag,msg| puts "***** #{tag}: #{msg}" }
+unless @failed.empty?
+  puts 'The following packages were not included for the reason listed'
+  @failed.each { |tag, msg| puts "***** #{tag}: #{msg}" }
 end

data/test/perf_file.rb

@@ -1,58 +1,57 @@
 #!/usr/bin/env ruby -wW1
+# frozen_string_literal: true
 
-$: << '.'
-$: << '../lib'
-$: << '../ext'
+$LOAD_PATH << '.'
+$LOAD_PATH << '../lib'
+$LOAD_PATH << '../ext'
 
-if __FILE__ == $0
-  if (i = ARGV.index('-I'))
-    x,path = ARGV.slice!(i, 2)
-    $: << path
-  end
+if __FILE__ == $PROGRAM_NAME && (i = ARGV.index('-I'))
+  _, path = ARGV.slice!(i, 2)
+  $LOAD_PATH << path
 end
 
 require 'optparse'
 require 'oj'
 require 'perf'
 
-$indent = 0
-$iter = 1
-$size = 1
+@indent = 0
+@iter = 1
+@size = 1
 
 opts = OptionParser.new
 
-opts.on("-r", "read")                                       { do_read = true }
-opts.on("-c", "--count [Int]", Integer, "iterations")       { |i| $iter = i }
-opts.on("-i", "--indent [Int]", Integer, "indent")          { |i| $indent = i }
-opts.on("-s", "--size [Int]", Integer, "size in Mbytes")    { |s| $size = s }
+opts.on('-r', 'read')                                       { true }
+opts.on('-c', '--count [Int]', Integer, 'iterations')       { |v| @iter = v }
+opts.on('-i', '--indent [Int]', Integer, 'indent')          { |v| @indent = v }
+opts.on('-s', '--size [Int]', Integer, 'size in Mbytes')    { |s| @size = s }
 
-opts.on("-h", "--help", "Show this display")                { puts opts; Process.exit!(0) }
-files = opts.parse(ARGV)
+opts.on('-h', '--help', 'Show this display')                { puts opts; Process.exit!(0) }
+opts.parse(ARGV)
 
-$obj = {
+@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' => 12345678901234567890123456789, #_bignum
+  'g' => 12_345_678_901_234_567_890_123_456_789, # _bignum
   'h' => { 'a' => { 'b' => { 'c' => { 'd' => {'e' => { 'f' => { 'g' => nil }}}}}}}, # deep hash, not that deep
   'i' => [[[[[[[nil]]]]]]]  # deep array, again, not that deep
 }
 
-json = Oj.dump($obj, :indent => $indent)
-cnt = ($size * 1024 * 1024 + json.size) / json.size
-cnt = 1 if 0 == $size
+json = Oj.dump(@obj, :indent => @indent)
+cnt = ((@size * 1024 * 1024) + json.size) / json.size
+cnt = 1 if 0 == @size
 
 filename = 'tmp.json'
-File.open(filename, "w") { |f|
+File.open(filename, 'w') { |f|
   cnt.times do
-    Oj.to_stream(f, $obj, :indent => $indent)
+    Oj.to_stream(f, @obj, :indent => @indent)
   end
 }
 
-Oj.default_options = { :mode => :strict, :indent => $indent }
+Oj.default_options = { :mode => :strict, :indent => @indent }
 
 puts '-' * 80
 puts "Read from #{cnt * json.size / (1024 * 1024)} Mb file Performance"
@@ -60,5 +59,4 @@ perf = Perf.new()
 perf.add('Oj.load_file', '') { Oj.load_file(filename) }
 perf.add('Oj.load(string)', '') { Oj.load(File.read(filename)) }
 perf.add('Oj.load(file)', '') { File.open(filename, 'r') { |f| Oj.load(f) } }
-perf.run($iter)
-
+perf.run(@iter)