oj 3.14.3 → 3.15.1

data/test/perf_parser.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'
@@ -18,26 +18,26 @@ $cache_keys = true
 $symbol_keys = false
 
 opts = OptionParser.new
-opts.on("-v", "verbose")                                  { $verbose = true }
-opts.on("-c", "--count [Int]", Integer, "iterations")     { |i| $iter = i }
-opts.on("-s", "--size [Int]", Integer, "size (~Kbytes)")  { |i| $size = i }
-opts.on("-b", "with bignum")                              { $with_bignum = true }
-opts.on("-k", "no cache")                                 { $cache_keys = false }
-opts.on("-sym", "symbol keys")                            { $symbol_keys = 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('-s', '--size [Int]', Integer, 'size (~Kbytes)')  { |i| $size = i }
+opts.on('-b', 'with bignum')                              { $with_bignum = true }
+opts.on('-k', 'no cache')                                 { $cache_keys = false }
+opts.on('-sym', 'symbol keys')                            { $symbol_keys = true }
+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, 1, nil], nil]], # mix it up array
+  'c' => 12_345,   # number
+  'd' => [ true, [false, [-123_456_789, nil], 3.9676, ['Something else.', false, 1, nil], 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
 }
-$obj['g'] = 12345678901234567890123456789 if $with_bignum
+$obj['g'] = 12_345_678_901_234_567_890_123_456_789 if $with_bignum
 
 if 0 < $size
   o = $obj
@@ -50,16 +50,14 @@ end
 $json = Oj.dump($obj)
 $failed = {} # key is same as String used in tests later
 Oj.default_options = {create_id: '^', create_additions: true, class_cache: true}
-if $cache_keys
-  Oj.default_options = {cache_keys: true, cache_str: 6, symbol_keys: $symbol_keys}
-else
-  Oj.default_options = {cache_keys: false, cache_str: -1, symbol_keys: $symbol_keys}
-end
+Oj.default_options = if $cache_keys
+                       {cache_keys: true, cache_str: 6, symbol_keys: $symbol_keys}
+                     else
+                       {cache_keys: false, cache_str: -1, symbol_keys: $symbol_keys}
+                     end
 JSON.parser = JSON::Ext::Parser
 
 class AllSaj
-  def initialize()
-  end
 
   def hash_start(key)
   end
@@ -77,12 +75,7 @@ class AllSaj
   end
 end # AllSaj
 
-class NoSaj
-  def initialize()
-  end
-end # NoSaj
-
-no_handler = NoSaj.new()
+no_handler = Object.new()
 all_handler = AllSaj.new()
 
 if $verbose
@@ -93,7 +86,7 @@ end
 p_val = Oj::Parser.new(:validate)
 
 puts '-' * 80
-puts "Validate Performance"
+puts 'Validate Performance'
 perf = Perf.new()
 perf.add('Oj::Parser.validate', 'none') { p_val.parse($json) }
 perf.add('Oj::Saj.none', 'none') { Oj.saj_parse(no_handler, $json) }
@@ -106,7 +99,7 @@ p_all.cache_keys = $cache_keys
 p_all.cache_strings = 6
 
 puts '-' * 80
-puts "Parse Callback Performance"
+puts 'Parse Callback Performance'
 perf = Perf.new()
 perf.add('Oj::Parser.saj', 'all') { p_all.parse($json) }
 perf.add('Oj::Saj.all', 'all') { Oj.saj_parse(all_handler, $json) }
@@ -119,11 +112,11 @@ p_usual.cache_strings = ($cache_keys ? 6 : 0)
 p_usual.symbol_keys = $symbol_keys
 
 puts '-' * 80
-puts "Parse Usual Performance"
+puts 'Parse Usual Performance'
 perf = Perf.new()
 perf.add('Oj::Parser.usual', '') { p_usual.parse($json) }
 perf.add('Oj::strict_load', '') { Oj.strict_load($json) }
-perf.add('JSON::Ext', 'parse') { JSON.load($json) }
+perf.add('JSON::Ext', 'parse') { JSON.parse($json) }
 perf.run($iter)
 
 ### Usual Objects ######################
@@ -134,18 +127,19 @@ perf.run($iter)
 
 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 = 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
@@ -175,15 +169,15 @@ p_usual.ignore_json_create = true
 JSON.create_id = '^'
 
 puts '-' * 80
-puts "Parse Usual Object Performance"
+puts 'Parse Usual Object Performance'
 perf = Perf.new()
 perf.add('Oj::Parser.usual', '') { p_usual.parse($obj_json) }
 perf.add('Oj::compat_load', '') { Oj.compat_load($obj_json) }
-perf.add('JSON::Ext', 'parse') { JSON.load($obj_json) }
+perf.add('JSON::Ext', 'parse') { JSON.parse($obj_json) }
 
 perf.run($iter)
 
 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_saj.rb

@@ -1,40 +1,37 @@
 #!/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 = 10000
-$gets = 0
-$fetch = false
-$write = false
-$read = false
+@verbose = false
+@indent = 0
+@iter = 10_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)
 
 class AllSaj < Oj::Saj
-  def initialize()
-  end
-
   def hash_start(key)
   end
 
@@ -52,57 +49,53 @@ class AllSaj < Oj::Saj
 end # AllSaj
 
 class NoSaj < Oj::Saj
-  def initialize()
-  end
 end # NoSaj
 
 saj_handler = AllSaj.new()
 no_saj = NoSaj.new()
 
-$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('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('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::Saj', 'all') { Oj.saj_parse(saj_handler, $json) }
-perf.add('Oj::Saj', 'none') { Oj.saj_parse(no_saj, $json) }
-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)
-
-unless $failed.empty?
-  puts "The following packages were not included for the reason listed"
-  $failed.each { |tag, msg| puts "***** #{tag}: #{msg}" }
+perf.add('Oj::Saj', 'all') { Oj.saj_parse(saj_handler, @json) }
+perf.add('Oj::Saj', 'none') { Oj.saj_parse(no_saj, @json) }
+# 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)
+
+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_scp.rb

@@ -1,61 +1,58 @@
 #!/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 = 50_000
-$with_bignum = false
-$size = 1
+@verbose = false
+@indent = 0
+@iter = 50_000
+@with_bignum = false
+@size = 1
 
 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("-b", "with bignum")                              { $with_bignum = true }
-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('-b', 'with bignum')                              { @with_bignum = true }
+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
 }
-$obj['g'] = 12345678901234567890123456789 if $with_bignum
+@obj['g'] = 12_345_678_901_234_567_890_123_456_789 if @with_bignum
 
-if 0 < $size
-  o = $obj
-  $obj = []
-  (4 * $size).times do
-    $obj << o
+if 0 < @size
+  ob = @obj
+  @obj = []
+  (4 * @size).times do
+    @obj << ob
   end
 end
 
-Oj.default_options = { :indent => $indent, :mode => :strict, cache_keys: true, cache_str: 5 }
+Oj.default_options = { :indent => @indent, :mode => :strict, cache_keys: true, cache_str: 5 }
 
-$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
 
 class AllSaj < Oj::Saj
-  def initialize()
-  end
-
   def hash_start(key)
   end
 
@@ -73,31 +70,24 @@ class AllSaj < Oj::Saj
 end # AllSaj
 
 class NoSaj < Oj::Saj
-  def initialize()
-  end
 end # NoSaj
 
 class NoHandler < Oj::ScHandler
-  def initialize()
-  end
 end # NoHandler
 
 class AllHandler < Oj::ScHandler
-  def initialize()
+  def hash_start
+    nil
   end
 
-  def hash_start()
-    return nil
+  def hash_end
   end
 
-  def hash_end()
+  def array_start
+    nil
   end
 
-  def array_start()
-    return nil
-  end
-
-  def array_end()
+  def array_end
   end
 
   def add_value(value)
@@ -118,35 +108,33 @@ sc_handler = AllHandler.new()
 no_handler = NoHandler.new()
 
 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('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('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::Saj.all', 'all') { Oj.saj_parse(saj_handler, $json) }
-perf.add('Oj::Saj.none', 'none') { Oj.saj_parse(no_saj, $json) }
-perf.add('Oj::Scp.all', 'all') { Oj.sc_parse(sc_handler, $json) }
-perf.add('Oj::Scp.none', 'none') { Oj.sc_parse(no_handler, $json) }
-perf.add('Oj::load', 'none') { Oj.wab_load($json) }
-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)
-
-unless $failed.empty?
-  puts "The following packages were not included for the reason listed"
-  $failed.each { |tag, msg| puts "***** #{tag}: #{msg}" }
+perf.add('Oj::Saj.all', 'all') { Oj.saj_parse(saj_handler, @json) }
+perf.add('Oj::Saj.none', 'none') { Oj.saj_parse(no_saj, @json) }
+perf.add('Oj::Scp.all', 'all') { Oj.sc_parse(sc_handler, @json) }
+perf.add('Oj::Scp.none', 'none') { Oj.sc_parse(no_handler, @json) }
+perf.add('Oj::load', 'none') { Oj.wab_load(@json) }
+# 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)
+
+unless @failed.empty?
+  puts 'The following packages were not included for the reason listed'
+  @failed.each { |tag, msg| puts "***** #{tag}: #{msg}" }
 end