oj 3.8.0

data/test/json_gem/json_string_matching_test.rb

@@ -0,0 +1,42 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+#frozen_string_literal: false
+
+require 'json_gem/test_helper'
+
+require 'time'
+
+class JSONStringMatchingTest < Test::Unit::TestCase
+  include Test::Unit::TestCaseOmissionSupport
+
+  class TestTime < ::Time
+    def self.json_create(string)
+      Time.parse(string)
+    end
+
+    def to_json(*)
+      %{"#{strftime('%FT%T%z')}"}
+    end
+
+    def ==(other)
+      to_i == other.to_i
+    end
+  end
+
+  def test_match_date
+    t = TestTime.new
+    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 }
+      )
+    assert_equal [ t.strftime('%FT%T%z') ],
+      JSON.parse(
+        t_json,
+        :match_string => { time_regexp => TestTime }
+      )
+  end
+end

data/test/json_gem/test_helper.rb

@@ -0,0 +1,18 @@
+$: << File.dirname(__FILE__)
+$oj_dir = File.dirname(File.dirname(File.expand_path(File.dirname(__FILE__))))
+%w(lib ext).each do |dir|
+  $: << File.join($oj_dir, dir)
+end
+
+require 'test/unit'
+REAL_JSON_GEM = !!ENV['REAL_JSON_GEM']
+
+if ENV['REAL_JSON_GEM']
+  require 'json'
+else
+  require 'oj'
+  Oj.mimic_JSON
+end
+
+NaN = JSON::NaN if defined?(JSON::NaN)
+NaN = 0.0/0 unless defined?(NaN)

data/test/perf.rb

@@ -0,0 +1,107 @@
+
+class Perf
+
+  def initialize()
+    @items = []
+  end
+
+  def add(title, op, &blk)
+    @items << Item.new(title, op, &blk)
+  end
+
+  def before(title, &blk)
+    @items.each do |i|
+      if title == i.title
+        i.set_before(&blk)
+        break
+      end
+    end
+  end
+  
+  def run(iter)
+    base = Item.new(nil, nil) { }
+    base.run(iter, 0.0)
+    @items.each do |i|
+      i.run(iter, base.duration)
+      if i.error.nil?
+        puts "#{i.title}.#{i.op} #{iter} times in %0.3f seconds or %0.3f #{i.op}/sec." % [i.duration, iter / i.duration]
+      else
+        puts "***** #{i.title}.#{i.op} failed! #{i.error}"
+      end
+    end
+    summary()
+  end
+
+  def summary()
+    fastest = nil
+    slowest = nil
+    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 "#{'-' * width}  -----------  --------------"
+    iva.each do |i|
+      if i.duration.nil?
+      else
+        puts "%*s %11.3f  %14.3f" % [width, i.title, i.duration, i.rate ]
+      end
+    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('  ')
+    iva.each do |i|
+      line = ["%*s" % [width, i.title]]
+      iva.each do |o|
+        line << "%*.2f" % [width, o.duration / i.duration]
+      end
+      puts line.join('  ')
+    end
+    puts
+  end
+
+  class Item
+    attr_accessor :title
+    attr_accessor :op
+    attr_accessor :blk
+    attr_accessor :duration
+    attr_accessor :rate
+    attr_accessor :error
+
+    def initialize(title, op, &blk)
+      @title = title
+      @blk = blk
+      @op = op
+      @duration = nil
+      @rate = nil
+      @error = nil
+      @before = nil
+    end
+
+    def set_before(&blk)
+      @before = blk
+    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
+    end
+
+  end # Item
+end # Perf

data/test/perf_compat.rb

@@ -0,0 +1,130 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+$: << '.'
+$: << File.join(File.dirname(__FILE__), "../lib")
+$: << File.join(File.dirname(__FILE__), "../ext")
+
+require 'optparse'
+require 'perf'
+require 'oj'
+
+$verbose = false
+$indent = 0
+$iter = 20000
+$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)
+
+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
+end
+
+# Verify that all packages dump and load correctly and return the same Object as the original.
+capture_error('Oj:compat', $obj, 'load', 'dump') { |o| Oj.compat_load(Oj.dump(o, :mode => :compat)) }
+capture_error('JSON::Ext', $obj, 'generate', 'parse') { |o|
+  require 'json'
+  require 'json/ext'
+  JSON.generator = JSON::Ext::Generator
+  JSON.parser = JSON::Ext::Parser
+  JSON.load(JSON.generate(o))
+}
+
+module One
+  module Two
+    module Three
+      class Empty
+
+        def initialize()
+          @a = 1
+          @b = 2
+          @c = 3
+        end
+
+        def eql?(o)
+          self.class == o.class && @a == o.a && @b = o.b && @c = o.c
+        end
+        alias == eql?
+
+        def as_json(*a)
+          {JSON.create_id => self.class.name, 'a' => @a, 'b' => @b, 'c' => @c }
+        end
+        
+        def to_json(*a)
+          JSON.generate(as_json())
+        end
+
+        def self.json_create(h)
+          self.new()
+        end
+      end # Empty
+    end # Three
+  end # Two
+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
+  '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(),
+  '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, :use_to_json => true, :create_additions => true, :create_id => '^o' }
+
+if 0 < $size
+  s = Oj.dump($obj).size + 1
+  cnt = $size * 1024 / s
+  o = $obj
+  $obj = []
+  cnt.times do
+    $obj << o
+  end
+end
+
+$json = Oj.dump($obj)
+$failed = {} # key is same as String used in tests later
+
+if $verbose
+  puts "size: #{$json.size}"
+  puts "json:\n#{$json}\n"
+  puts "Oj:compat loaded object:\n#{Oj.compat_load($json)}\n"
+  puts "JSON loaded object:\n#{JSON::Ext::Parser.new($json).parse}\n"
+end
+
+puts '-' * 80
+puts "Compat Parse Performance"
+perf = Perf.new()
+unless $failed.has_key?('JSON::Ext')
+  perf.add('JSON::Ext', 'parse') { JSON.load($json) }
+  perf.before('JSON::Ext') { JSON.parser = JSON::Ext::Parser }
+end
+unless $failed.has_key?('Oj:compat')
+  perf.add('Oj:compat', 'compat_load') { Oj.compat_load($json) }
+end
+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}" }
+end

data/test/perf_fast.rb

@@ -0,0 +1,164 @@
+#!/usr/bin/env ruby -wW1
+# encoding: UTF-8
+
+$: << '.'
+$: << File.join(File.dirname(__FILE__), "../lib")
+$: << File.join(File.dirname(__FILE__), "../ext")
+
+require 'optparse'
+#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
+
+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)
+
+# This just navigates to each leaf of the JSON structure.
+def dig(obj, &blk)
+  case obj
+  when Array
+    obj.each { |e| dig(e, &blk) }
+  when Hash
+    obj.values.each { |e| dig(e, &blk) }
+  else
+    blk.yield(obj)
+  end
+end
+
+$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
+  'e' => { 'one' => 1, 'two' => 2 }, # hash
+  'f' => nil,     # nil
+  'g' => 12345678901234567890123456789, # 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 }
+
+$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
+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 }
+
+if $verbose
+  puts "json:\n#{$json}\n"
+end
+
+puts '-' * 80
+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)
+
+puts '-' * 80
+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.before('JSON::Ext') { JSON.generator = JSON::Ext::Generator }
+  perf.run($iter)
+end
+
+if 0 < $gets
+  puts '-' * 80
+  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)
+end
+
+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)}"
+    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
+    perf.add('Ruby', 'fetch') do
+      json_hash.fetch('d', []).fetch(1, []).fetch(3, []).fetch('x', nil)
+      json_hash.fetch('h', {}).fetch('a', {}).fetch('b', {}).fetch('c', {}).fetch('d', {}).fetch('e', {}).fetch('f', {}).fetch('g', {})
+      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)
+  end
+end
+
+if $write
+  puts '-' * 80
+  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.before('JSON::Ext') { JSON.generator = JSON::Ext::Generator }
+    perf.run($iter)
+  end
+end
+
+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) }
+  JSON.generator = JSON::Ext::Generator
+  File.open('json_ext.json', 'w') { |f| f.write(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('JSON::Ext', '') { JSON.parse(File.read('json_ext.json')) }
+    perf.before('JSON::Ext') { JSON.parser = JSON::Ext::Parser }
+    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}" }
+end