oj 3.11.5 → 3.16.5

data/test/perf_wab.rb

@@ -1,131 +1,129 @@
 #!/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'
 require 'oj'
 
-$verbose = false
-$indent = 0
-$iter = 20000
-$with_bignum = false
-$with_nums = true
-$size = 0
+@verbose = false
+@indent = 0
+@iter = 20_000
+@with_bignum = false
+@with_nums = true
+@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("-b", "with bignum")                                { $with_bignum = 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('-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 = {
+@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
 
-Oj.default_options = { :indent => $indent, :mode => :wab }
+Oj.default_options = { :indent => @indent, :mode => :wab }
 
-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
 
-$json = Oj.dump($obj)
-$obj_json = Oj.dump($obj, :mode => :object)
-#puts "*** size: #{$obj_json.size}"
-#puts "*** #{$obj_json}"
-$failed = {} # key is same as String used in tests later
+@json = Oj.dump(@obj)
+@obj_json = Oj.dump(@obj, :mode => :object)
+# puts "*** size: #{@obj_json.size}"
+# puts "*** #{@obj_json}"
+@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:wab', $obj, 'load', 'dump') { |o| Oj.wab_load(Oj.dump(o, :mode => :wab)) }
-capture_error('Yajl', $obj, 'encode', 'parse') { |o| require 'yajl'; Yajl::Parser.parse(Yajl::Encoder.encode(o)) }
-capture_error('JSON::Ext', $obj, 'generate', 'parse') { |o|
+capture_error('Oj:wab', @obj, 'load', 'dump') { |o| Oj.wab_load(Oj.dump(o, :mode => :wab)) }
+capture_error('Yajl', @obj, 'encode', 'parse') { |o| require 'yajl'; Yajl::Parser.parse(Yajl::Encoder.encode(o)) }
+capture_error('JSON::Ext', @obj, 'generate', 'parse') { |o|
   require 'json'
   require 'json/ext'
   JSON.generator = JSON::Ext::Generator
   JSON.parser = JSON::Ext::Parser
   JSON.parse(JSON.generate(o))
 }
-capture_error('JSON::Pure', $obj, 'generate', 'parse') { |o|
+capture_error('JSON::Pure', @obj, 'generate', 'parse') { |o|
   require 'json/pure'
   JSON.generator = JSON::Pure::Generator
   JSON.parser = JSON::Pure::Parser
   JSON.parse(JSON.generate(o))
 }
 
-if $verbose
-  puts "json:\n#{$json}\n"
-  puts "object json:\n#{$obj_json}\n"
-  puts "Oj loaded object:\n#{Oj.wab_load($json)}\n"
-  puts "Yajl loaded object:\n#{Yajl::Parser.parse($json)}\n"
-  puts "JSON loaded object:\n#{JSON::Ext::Parser.new($json).parse}\n"
+if @verbose
+  puts "json:\n#{@json}\n"
+  puts "object json:\n#{@obj_json}\n"
+  puts "Oj loaded object:\n#{Oj.wab_load(@json)}\n"
+  puts "Yajl loaded object:\n#{Yajl::Parser.parse(@json)}\n"
+  puts "JSON loaded object:\n#{JSON::Ext::Parser.new(@json).parse}\n"
 end
 
 puts '-' * 80
-puts "Wab Parse Performance"
+puts 'Wab Parse Performance'
 perf = Perf.new()
-unless $failed.has_key?('JSON::Ext')
-  perf.add('JSON::Ext', 'parse') { JSON.parse($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?('JSON::Pure')
-  perf.add('JSON::Pure', 'parse') { JSON.parse($json) }
+unless @failed.key?('JSON::Pure')
+  perf.add('JSON::Pure', 'parse') { JSON.parse(@json) }
   perf.before('JSON::Pure') { JSON.parser = JSON::Pure::Parser }
 end
-unless $failed.has_key?('Oj:wab')
-  perf.add('Oj:wab', 'wab_load') { Oj.wab_load($json) }
+unless @failed.key?('Oj:wab')
+  perf.add('Oj:wab', 'wab_load') { Oj.wab_load(@json) }
 end
-perf.add('Yajl', 'parse') { Yajl::Parser.parse($json) } unless $failed.has_key?('Yajl')
-perf.run($iter)
+perf.add('Yajl', 'parse') { Yajl::Parser.parse(@json) } unless @failed.key?('Yajl')
+perf.run(@iter)
 
 puts '-' * 80
-puts "Wab Dump Performance"
+puts 'Wab Dump Performance'
 perf = Perf.new()
-unless $failed.has_key?('JSON::Ext')
-  perf.add('JSON::Ext', 'dump') { JSON.generate($obj) }
+unless @failed.key?('JSON::Ext')
+  perf.add('JSON::Ext', 'dump') { JSON.generate(@obj) }
   perf.before('JSON::Ext') { JSON.generator = JSON::Ext::Generator }
 end
-unless $failed.has_key?('JSON::Pure')
-  perf.add('JSON::Pure', 'generate') { JSON.generate($obj) }
+unless @failed.key?('JSON::Pure')
+  perf.add('JSON::Pure', 'generate') { JSON.generate(@obj) }
   perf.before('JSON::Pure') { JSON.generator = JSON::Pure::Generator }
 end
-unless $failed.has_key?('Oj:wab')
-  perf.add('Oj:wab', 'dump') { Oj.dump($obj, :mode => :wab) }
+unless @failed.key?('Oj:wab')
+  perf.add('Oj:wab', 'dump') { Oj.dump(@obj, :mode => :wab) }
 end
-perf.add('Yajl', 'encode') { Yajl::Encoder.encode($obj) } unless $failed.has_key?('Yajl')
-perf.run($iter)
+perf.add('Yajl', 'encode') { Yajl::Encoder.encode(@obj) } unless @failed.key?('Yajl')
+perf.run(@iter)
 
 puts
 puts '-' * 80
 puts
 
-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/prec.rb

@@ -2,21 +2,21 @@
 
 require 'oj'
 
-extras = {"locationLng" => -97.14690769100295}
+extras = { 'locationLng' => -97.14690769100295 }
 
-Oj.default_options = {float_precision: 17}
+Oj.default_options = { float_precision: 17 }
 
 encoded = Oj.dump(extras)
 puts encoded
 puts Oj.load(encoded)
 
-require "active_record"
+require 'active_record'
 
 Oj::Rails.set_encoder()
 Oj::Rails.set_decoder()
 
-Oj.default_options = {float_precision: 17}
-# Using Oj rails encoder, gets the correct value: {"locationLng":-97.14690769100295}
+Oj.default_options = { float_precision: 17 }
+# Using Oj rails encoder, gets the correct value: { 'locationLng':-97.14690769100295 }
 encoded = ActiveSupport::JSON.encode(extras)
 puts encoded
 puts ActiveSupport::JSON.decode(encoded)

data/test/sample/change.rb

@@ -1,4 +1,3 @@
-
 module Sample
   class Change
     attr_accessor :time

data/test/sample/dir.rb

@@ -1,4 +1,3 @@
-
 require 'etc'
 
 module Sample

data/test/sample/doc.rb

@@ -1,4 +1,3 @@
-
 require 'sample/hasprops'
 require 'sample/group'
 require 'sample/layer'

data/test/sample/file.rb

@@ -1,4 +1,3 @@
-
 require 'etc'
 
 module Sample

data/test/sample/group.rb

@@ -1,4 +1,3 @@
-
 module Sample
   class Group
     attr_reader :members

data/test/sample/hasprops.rb

@@ -1,4 +1,3 @@
-
 module Sample
   module HasProps
 

data/test/sample/layer.rb

@@ -1,4 +1,3 @@
-
 module Sample
   class Layer < Group
     attr_accessor :name

data/test/sample/rect.rb

@@ -1,4 +1,3 @@
-
 module Sample
   class Rect < Shape
 

data/test/sample/shape.rb

@@ -1,4 +1,3 @@
-
 module Sample
   class Shape
     include HasProps

data/test/sample/text.rb

@@ -1,4 +1,3 @@
-
 module Sample
   class Text < Shape
     attr_accessor :text

data/test/sample.rb

@@ -1,19 +1,19 @@
 #!/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/doc'
 
 def sample_doc(size=3)
   colors = [ :black, :gray, :white, :red, :blue, :yellow, :green, :purple, :orange ]
 
-  d = ::Sample::Doc.new('Sample')
+  d = Sample::Doc.new('Sample')
 
   # add some history
   (0..size * 10).each do |i|
@@ -22,22 +22,22 @@ def sample_doc(size=3)
 
   # add some layers
   (1..size).each do |i|
-    layer = ::Sample::Layer.new("Layer-#{i}")
+    layer = Sample::Layer.new("Layer-#{i}")
     (1..size).each do |j|
-      g = ::Sample::Group.new
+      g = Sample::Group.new
       (1..size).each do |k|
-        g2 = ::Sample::Group.new
-        r = ::Sample::Rect.new(j * 40 + 10.0, i * 10.0,
-                               10.123456 / k, 10.0 / k, colors[(i + j + k) % colors.size])
+        g2 = Sample::Group.new
+        r = Sample::Rect.new((j * 40) + 10.0, i * 10.0,
+                             10.123456 / k, 10.0 / k, colors[(i + j + k) % colors.size])
         r.add_prop(:part_of, layer.name)
         g2 << r
-        g2 << ::Sample::Text.new("#{k} in #{j}", r.left, r.top, r.width, r.height)
+        g2 << Sample::Text.new("#{k} in #{j}", r.left, r.top, r.width, r.height)
         g << g2
       end
-      g2 = ::Sample::Group.new
+      g2 = Sample::Group.new
       (1..size).each do |k|
-        o = ::Sample::Oval.new(j * 40 + 12.0, i * 10.0 + 2.0,
-                               6.0 / k, 6.0 / k, colors[(i + j + k) % colors.size])
+        o = Sample::Oval.new((j * 40) + 12.0, (i * 10.0) + 2.0,
+                             6.0 / k, 6.0 / k, colors[(i + j + k) % colors.size])
         o.add_prop(:inside, true)
         g << o
       end

data/test/sample_json.rb

@@ -1,13 +1,13 @@
 #!/usr/bin/env ruby
+# 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 'oj'
 
 def sample_json(size=3)
@@ -32,6 +32,6 @@ def sample_json(size=3)
   container
 end
 
-if $0 == __FILE__
-  File.open('sample.json', "w") { |f| f.write(Oj.dump(sample_json(3), :indent => 2)) }
+if $PROGRAM_NAME == __FILE__
+  File.write('sample.json', Oj.dump(sample_json(3), :indent => 2))
 end