oj 3.14.2 → 3.15.0

data/test/json_gem/json_parser_test.rb

@@ -95,21 +95,21 @@ class JSONParserTest < Test::Unit::TestCase
     assert_raise(JSON::ParserError) { JSON.parse('.23') }
     assert_raise(JSON::ParserError) { JSON.parse('023') }
     assert_equal 23, JSON.parse('23')
-    assert_equal -23, JSON.parse('-23')
+    assert_equal(-23, JSON.parse('-23'))
     assert_equal_float 3.141, JSON.parse('3.141')
-    assert_equal_float -3.141, JSON.parse('-3.141')
+    assert_equal_float(-3.141, JSON.parse('-3.141'))
     assert_equal_float 3.141, JSON.parse('3141e-3')
     assert_equal_float 3.141, JSON.parse('3141.1e-3')
     assert_equal_float 3.141, JSON.parse('3141E-3')
     assert_equal_float 3.141, JSON.parse('3141.0E-3')
-    assert_equal_float -3.141, JSON.parse('-3141.0e-3')
-    assert_equal_float -3.141, JSON.parse('-3141e-3')
+    assert_equal_float(-3.141, JSON.parse('-3141.0e-3'))
+    assert_equal_float(-3.141, JSON.parse('-3141e-3'))
     assert_raise(JSON::ParserError) { JSON.parse('NaN') }
     assert JSON.parse('NaN', :allow_nan => true).nan?
     assert_raise(JSON::ParserError) { JSON.parse('Infinity') }
     assert_equal 1.0/0, JSON.parse('Infinity', :allow_nan => true)
     assert_raise(JSON::ParserError) { JSON.parse('-Infinity') }
-    assert_equal -1.0/0, JSON.parse('-Infinity', :allow_nan => true)
+    assert_equal(-1.0/0, JSON.parse('-Infinity', :allow_nan => true))
   end
 
   if Array.method_defined?(:permutation)
@@ -133,17 +133,17 @@ class JSONParserTest < Test::Unit::TestCase
   end
 
   def test_parse_arrays
-    assert_equal([1,2,3], JSON.parse('[1,2,3]'))
-    assert_equal([1.2,2,3], JSON.parse('[1.2,2,3]'))
-    assert_equal([[],[[],[]]], JSON.parse('[[],[[],[]]]'))
+    assert_equal([1, 2, 3], JSON.parse('[1,2,3]'))
+    assert_equal([1.2, 2, 3], JSON.parse('[1.2,2,3]'))
+    assert_equal([[], [[], []]], JSON.parse('[[],[[],[]]]'))
     assert_equal([], JSON.parse('[]'))
     assert_equal([], JSON.parse('  [  ]  '))
     assert_equal([1], JSON.parse('[1]'))
     assert_equal([1], JSON.parse('  [ 1  ]  '))
     ary = [[1], ["foo"], [3.14], [4711.0], [2.718], [nil],
-      [[1, -2, 3]], [false], [true]]
+           [[1, -2, 3]], [false], [true]]
     assert_equal(ary,
-      JSON.parse('[[1],["foo"],[3.14],[47.11e+2],[2718.0E-3],[null],[[1,-2,3]],[false],[true]]'))
+                 JSON.parse('[[1],["foo"],[3.14],[47.11e+2],[2718.0E-3],[null],[[1,-2,3]],[false],[true]]'))
     assert_equal(ary, JSON.parse(%Q{   [   [1] , ["foo"]  ,  [3.14] \t ,  [47.11e+2]\s
       , [2718.0E-3 ],\r[ null] , [[1, -2, 3 ]], [false ],[ true]\n ]  }))
   end
@@ -208,51 +208,51 @@ class JSONParserTest < Test::Unit::TestCase
 
   def test_symbolize_names
     assert_equal({ "foo" => "bar", "baz" => "quux" },
-      JSON.parse('{"foo":"bar", "baz":"quux"}'))
+                 JSON.parse('{"foo":"bar", "baz":"quux"}'))
     assert_equal({ :foo => "bar", :baz => "quux" },
-      JSON.parse('{"foo":"bar", "baz":"quux"}', :symbolize_names => true))
+                 JSON.parse('{"foo":"bar", "baz":"quux"}', :symbolize_names => true))
     assert_raise(ArgumentError) do
       JSON.parse('{}', :symbolize_names => true, :create_additions => true)
     end
   end
 
   def test_parse_comments
-    json = <<EOT
-{
-  "key1":"value1", // eol comment
-  "key2":"value2"  /* multi line
-                    *  comment */,
-  "key3":"value3"  /* multi line
-                    // nested eol comment
-                    *  comment */
-}
-EOT
+    json = <<~EOT
+      {
+        "key1":"value1", // eol comment
+        "key2":"value2"  /* multi line
+                          *  comment */,
+        "key3":"value3"  /* multi line
+                          // nested eol comment
+                          *  comment */
+      }
+    EOT
     assert_equal(
       { "key1" => "value1", "key2" => "value2", "key3" => "value3" },
       JSON.parse(json))
-    json = <<EOT
-{
-  "key1":"value1"  /* multi line
-                    // nested eol comment
-                    /* illegal nested multi line comment */
-                    *  comment */
-}
-EOT
+    json = <<~EOT
+      {
+        "key1":"value1"  /* multi line
+                          // nested eol comment
+                          /* illegal nested multi line comment */
+                          *  comment */
+      }
+    EOT
     assert_raise(JSON::ParserError) { JSON.parse(json) }
-    json = <<EOT
-{
-  "key1":"value1"  /* multi line
-                   // nested eol comment
-                   closed multi comment */
-                   and again, throw an Error */
-}
-EOT
+    json = <<~EOT
+      {
+        "key1":"value1"  /* multi line
+                         // nested eol comment
+                         closed multi comment */
+                         and again, throw an Error */
+      }
+    EOT
     assert_raise(JSON::ParserError) { JSON.parse(json) }
-    json = <<EOT
-{
-  "key1":"value1"  /*/*/
-}
-EOT
+    json = <<~EOT
+      {
+        "key1":"value1"  /*/*/
+      }
+    EOT
     assert_equal({ "key1" => "value1" }, JSON.parse(json))
   end
 
@@ -348,7 +348,7 @@ EOT
 
   def test_parse_array_custom_array_derived_class
     res = JSON.parse('[1,2]', :array_class => SubArray)
-    assert_equal([1,2], res)
+    assert_equal([1, 2], res)
     assert_equal(SubArray, res.class)
     assert res.shifted?
   end
@@ -356,7 +356,7 @@ EOT
   def test_parse_array_custom_non_array_derived_class
     res = JSON.parse('[1,2]', :array_class => SubArrayWrapper)
     assert_equal(SubArrayWrapper, res.class)
-    assert_equal([1,2], res.data)
+    assert_equal([1, 2], res.data)
     assert res.shifted?
   end
 
@@ -442,7 +442,7 @@ EOT
     assert obj_again['foo']['bar']
     assert_equal obj, obj_again
     assert_equal ["foo"],
-      JSON(JSON(SubArray2["foo"]), :create_additions => true)
+                 JSON(JSON(SubArray2["foo"]), :create_additions => true)
   end
 
   def test_generate_core_subclasses_with_default_to_json

data/test/json_gem/json_string_matching_test.rb

@@ -28,15 +28,15 @@ class JSONStringMatchingTest < Test::Unit::TestCase
     t_json = [ t ].to_json
     time_regexp = /\A\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}[+-]\d{4}\z/
     assert_equal [ t ],
-      JSON.parse(
-        t_json,
-        :create_additions => true,
-        :match_string => { time_regexp => TestTime }
-      )
+                 JSON.parse(
+                   t_json,
+                   :create_additions => true,
+                   :match_string => { time_regexp => TestTime }
+                 )
     assert_equal [ t.strftime('%FT%T%z') ],
-      JSON.parse(
-        t_json,
-        :match_string => { time_regexp => TestTime }
-      )
+                 JSON.parse(
+                   t_json,
+                   :match_string => { time_regexp => TestTime }
+                 )
   end
 end

data/test/mem.rb

@@ -1,29 +1,30 @@
 #!/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|
   ('a'..'z').each { |b|
     ('a'..'z').each { |c|
       ('a'..'z').each { |d|
-	('a'..'z').each { |e|
-	  ('a'..'z').each { |f|
-	    key = "#{a}#{b}#{c}#{d}#{e}#{f}"
-	    x = Oj.load(%|{ "#{key}": 101}|)
-	    #Oj.dump(x)
-	  }
-	}
+        ('a'..'z').each { |e|
+          ('a'..'z').each { |f|
+            key = "#{a}#{b}#{c}#{d}#{e}#{f}"
+            Oj.load(%|{ "#{key}": 101}|)
+            # Oj.dump(x)
+          }
+        }
       }
     }
     puts "#{a}#{b} #{mem}"

data/test/perf.rb

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
 
 class Perf
 
-  def initialize()
+  def initialize
     @items = []
   end
 
@@ -19,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)
@@ -32,35 +33,31 @@ class Perf
     summary()
   end
 
-  def summary()
-    fastest = nil
-    slowest = nil
+  def summary
     width = 6
     @items.each do |i|
       next if i.duration.nil?
+
       width = i.title.size if width < i.title.size
     end
     iva = @items.clone
     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"
-  $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

@@ -1,27 +1,27 @@
 #!/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
@@ -32,19 +32,19 @@ $obj = {
   '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]