oj 2.0.0 → 3.0.0

data/test/perf_fast.rb

@@ -6,7 +6,7 @@ $: << File.join(File.dirname(__FILE__), "../lib")
 $: << File.join(File.dirname(__FILE__), "../ext")
 
 require 'optparse'
-require 'yajl'
+#require 'yajl'
 require 'perf'
 require 'json'
 require 'json/ext'
@@ -14,7 +14,7 @@ require 'oj'
 
 $verbose = false
 $indent = 0
-$iter = 10000
+$iter = 100000
 $gets = 0
 $fetch = false
 $write = false
@@ -71,7 +71,7 @@ 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('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
@@ -82,7 +82,7 @@ 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('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)
 
@@ -91,7 +91,7 @@ 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('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)
@@ -102,7 +102,7 @@ if 0 < $gets
   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('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
@@ -134,7 +134,7 @@ if $write
   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('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)
@@ -145,13 +145,13 @@ 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) }
+#  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('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)

data/test/perf_file.rb

@@ -0,0 +1,64 @@
+#!/usr/bin/env ruby -wW1
+
+$: << '.'
+$: << '../lib'
+$: << '../ext'
+
+if __FILE__ == $0
+  if (i = ARGV.index('-I'))
+    x,path = ARGV.slice!(i, 2)
+    $: << path
+  end
+end
+
+require 'optparse'
+require 'oj'
+require 'perf'
+
+$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("-h", "--help", "Show this display")                { puts opts; Process.exit!(0) }
+files = 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
+  'e' => { 'zero' => nil, 'one' => 1, 'two' => 2, 'three' => [3], 'four' => [0, 1, 2, 3, 4] }, # hash
+  'f' => nil,     # nil
+  'g' => 12345678901234567890123456789, #_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
+
+filename = 'tmp.json'
+File.open(filename, "w") { |f|
+  cnt.times do
+    Oj.to_stream(f, $obj, :indent => $indent)
+  end
+}
+
+Oj.default_options = { :mode => :strict, :indent => $indent }
+
+puts '-' * 80
+puts "Read from #{cnt * json.size / (1024 * 1024)} Mb file Performance"
+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)
+

data/test/{perf_obj.rb → perf_object.rb}

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby -wW1
+#!/usr/bin/env ruby
 
 $: << '.'
 $: << '../lib'
@@ -20,6 +20,7 @@ require 'files'
 
 $circular = false
 $indent = 0
+$allow_gc = true
 
 do_sample = false
 do_files = false
@@ -29,10 +30,14 @@ do_dump = false
 do_read = false
 do_write = false
 $iter = 1000
+$mult = 1
 
 opts = OptionParser.new
 opts.on("-c", "circular options")                           { $circular = true }
 
+opts.on("-x", "use sample instead of files")                { do_sample = true }
+opts.on("-g", "no GC during parsing")                       { $allow_gc = false }
+
 opts.on("-s", "load and dump as sample Ruby object")        { do_sample = true }
 opts.on("-f", "load and dump as files Ruby object")         { do_files = true }
 
@@ -43,6 +48,7 @@ opts.on("-w", "write")                                      { do_write = true }
 opts.on("-a", "load, dump, read and write")                 { do_load = true; do_dump = true; do_read = true; do_write = true }
 
 opts.on("-i", "--iterations [Int]", Integer, "iterations")  { |i| $iter = i }
+opts.on("-m", "--multiply [Int]", Integer, "multiplier")    { |i| $mult = i }
 
 opts.on("-h", "--help", "Show this display")                { puts opts; Process.exit!(0) }
 files = opts.parse(ARGV)
@@ -61,32 +67,39 @@ end
 
 # prepare all the formats for input
 if files.empty?
-  $obj = do_sample ? sample_doc(2) : files('..')
+  $obj = []
+  $mult.times do
+    $obj << (do_sample ? sample_doc(2) : files('..'))
+  end
+
   $mars = Marshal.dump($obj)
   $xml = Ox.dump($obj, :indent => $indent, :circular => $circular)
-  $json = Oj.dump($obj, :indent => $indent, :circular => $circular)
+  $json = Oj.dump($obj, :indent => $indent, :circular => $circular, :mode => :object)
   File.open('sample.xml', 'w') { |f| f.write($xml) }
   File.open('sample.json', 'w') { |f| f.write($json) }
   File.open('sample.marshal', 'w') { |f| f.write($mars) }
 else
   puts "loading and parsing #{files}\n\n"
-  # TBD change to allow xml and json
   data = files.map do |f|
     $xml = File.read(f)
     $obj = Ox.load($xml);
     $mars = Marshal.dump($obj)
-    $json = Oj.dump($obj, :indent => $indent, circular: $circular)
+    $json = Oj.dump($obj, :indent => $indent, :circular => $circular)
   end
 end
 
-Oj.default_options = { :mode => :object, :indent => $indent, :circular => $circular }
+Oj.default_options = { :mode => :object, :indent => $indent, :circular => $circular, :allow_gc => $allow_gc }
+#puts "json: #{$json.size}"
+#puts "xml: #{$xml.size}"
+#puts "marshal: #{$mars.size}"
+
 
 if do_load
   puts '-' * 80
   puts "Load Performance"
   perf = Perf.new()
+  perf.add('Oj.object', 'load') { Oj.object_load($json) }
   perf.add('Ox', 'load') { Ox.load($xml, :mode => :object) }
-  perf.add('Oj', 'load') { Oj.load($json) }
   perf.add('Marshal', 'load') { Marshal.load($mars) }
   perf.run($iter)
 end
@@ -95,8 +108,8 @@ if do_dump
   puts '-' * 80
   puts "Dump Performance"
   perf = Perf.new()
-  perf.add('Ox', 'dump') { Ox.dump($obj, :indent => $indent, :circular => $circular) }
   perf.add('Oj', 'dump') { Oj.dump($obj) }
+  perf.add('Ox', 'dump') { Ox.dump($obj, :indent => $indent, :circular => $circular) }
   perf.add('Marshal', 'dump') { Marshal.dump($obj) }
   perf.run($iter)
 end
@@ -105,8 +118,9 @@ if do_read
   puts '-' * 80
   puts "Read from file Performance"
   perf = Perf.new()
-  perf.add('Ox', 'load_file') { Ox.load_file('sample.xml', :mode => :object) }
   perf.add('Oj', 'load') { Oj.load_file('sample.json') }
+  #perf.add('Oj', 'load') { Oj.load(File.read('sample.json')) }
+  perf.add('Ox', 'load_file') { Ox.load_file('sample.xml', :mode => :object) }
   perf.add('Marshal', 'load') { Marshal.load(File.new('sample.marshal')) }
   perf.run($iter)
 end
@@ -115,8 +129,8 @@ if do_write
   puts '-' * 80
   puts "Write to file Performance"
   perf = Perf.new()
-  perf.add('Ox', 'to_file') { Ox.to_file('sample.xml', $obj, :indent => $indent, :circular => $circular) }
   perf.add('Oj', 'to_file') { Oj.to_file('sample.json', $obj) }
+  perf.add('Ox', 'to_file') { Ox.to_file('sample.xml', $obj, :indent => $indent, :circular => $circular) }
   perf.add('Marshal', 'dump') { Marshal.dump($obj, File.new('sample.marshal', 'w')) }
   perf.run($iter)
 end

data/test/perf_scp.rb

@@ -0,0 +1,151 @@
+#!/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 = 50000
+$with_bignum = false
+$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)
+
+$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
+  '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
+
+if 0 < $size
+  o = $obj
+  $obj = []
+  (4 * $size).times do
+    $obj << o
+  end
+end
+
+Oj.default_options = { :indent => $indent, :mode => :compat }
+
+$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
+
+  def hash_end(key)
+  end
+
+  def array_start(key)
+  end
+
+  def array_end(key)
+  end
+
+  def add_value(value, key)
+  end
+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()
+  end
+
+  def hash_start()
+    return nil
+  end
+
+  def hash_end()
+  end
+
+  def array_start()
+    return nil
+  end
+
+  def array_end()
+  end
+
+  def add_value(value)
+  end
+
+  def hash_set(h, key, value)
+  end
+  
+  def array_append(a, value)
+  end
+
+end # AllHandler
+
+saj_handler = AllSaj.new()
+no_saj = NoSaj.new()
+
+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
+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 }
+
+if $verbose
+  puts "json:\n#{$json}\n"
+end
+
+puts '-' * 80
+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('Oj::Scp', 'all') { Oj.sc_parse(sc_handler, $json) }
+perf.add('Oj::Scp', 'none') { Oj.sc_parse(no_handler, $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}" }
+end

data/test/perf_strict.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby -wW1
+#!/usr/bin/env ruby
 # encoding: UTF-8
 
 $: << '.'
@@ -6,76 +6,22 @@ $: << File.join(File.dirname(__FILE__), "../lib")
 $: << File.join(File.dirname(__FILE__), "../ext")
 
 require 'optparse'
-#require 'yajl'
 require 'perf'
-#require 'json'
-#require 'json/pure'
-#require 'json/ext'
-#require 'msgpack'
 require 'oj'
-#require 'ox'
-
-class Jazz
-  attr_accessor :boolean, :number, :string
-
-  def initialize()
-    @boolean = true
-    @number = 58
-    @string = "A string"
-  end
-
-  def eql?(o)
-    (self.class == o.class &&
-     boolean == o.boolean &&
-     number == o.number &&
-     string == o.string)
-  end
-  alias == eql?
-
-  def to_json(*) # Yajl and JSON have different signatures
-    %{
-{ "json_class":"Jazz",
-  "boolean":#{@boolean},
-  "number":#{@number},
-  "string":"#{@string}"
-}}
-  end
-
-  def to_hash()
-    { 'json_class' => "Jazz",
-      'boolean' => @boolean,
-      'number' => @number,
-      'string' => @string
-    }
-  end
-  alias as_json to_hash
-
-  def to_msgpack(out='')
-    to_hash().to_msgpack(out)
-  end
-
-  def self.json_create(h)
-    j = self.new()
-    j.instance_variable_set(:@boolean, h['boolean'])
-    j.instance_variable_set(:@number, h['number'])
-    j.instance_variable_set(:@string, h['string'])
-    j
-  end
-end
 
 $verbose = false
 $indent = 0
-$iter = 10000
-$with_object = true
-$with_bignum = true
+$iter = 20000
+$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("-o", "without objects")                            { $with_object = false }
-opts.on("-b", "without bignum")                             { $with_bignum = false }
+opts.on("-s", "--size [Int]", Integer, "size (~Kbytes)")    { |i| $size = i }
+opts.on("-b", "with bignum")                                { $with_bignum = true }
 opts.on("-n", "without numbers")                            { $with_nums = false }
 opts.on("-h", "--help", "Show this display")                { puts opts; Process.exit!(0) }
 files = opts.parse(ARGV)
@@ -85,10 +31,9 @@ if $with_nums
     'a' => 'Alpha', # string
     'b' => true,    # boolean
     'c' => 12345,   # number
-    'd' => [ true, [false, [12345, nil], 3.967, ['something', false], nil]], # mix it up array
-    'e' => { 'one' => 1, 'two' => 2 }, # hash
+    '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' => 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
   }
@@ -99,18 +44,27 @@ else
     'b' => true,
     'c' => '12345',
     'd' => [ true, [false, ['12345', nil], '3.967', ['something', false], nil]],
-    'e' => { 'one' => '1', 'two' => '2' },
+    'e' => { 'zero' => '0', 'one' => '1', 'two' => '2' },
     'f' => nil,
     'h' => { 'a' => { 'b' => { 'c' => { 'd' => {'e' => { 'f' => { 'g' => nil }}}}}}}, # deep hash, not that deep
     'i' => [[[[[[[nil]]]]]]]  # deep array, again, not that deep
   }
 end
-$obj['j'] = Jazz.new() if $with_object
 
-Oj.default_options = { :indent => $indent, :mode => :compat }
+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)
 $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)
@@ -123,15 +77,7 @@ def capture_error(tag, orig, load_key, dump_key, &blk)
 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.load(Oj.dump(o)) }
-capture_error('Oj', $obj, 'load', 'dump') { |o| Oj.load(Oj.dump(o, :mode => :compat), :mode => :compat) }
-capture_error('Ox', $obj, 'load', 'dump') { |o|
-  require 'ox'
-  Ox.default_options = { :indent => $indent, :mode => :object }
-  $xml = Ox.dump($obj, :indent => $indent)
-  Ox.load(Ox.dump(o, :mode => :object), :mode => :object)
-}
-capture_error('MessagePack', $obj, 'unpack', 'pack') { |o| require 'msgpack'; MessagePack.unpack(MessagePack.pack($obj)) }
+capture_error('Oj:strict', $obj, 'load', 'dump') { |o| Oj.strict_load(Oj.dump(o, :mode => :strict)) }
 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'
@@ -147,22 +93,16 @@ capture_error('JSON::Pure', $obj, 'generate', 'parse') { |o|
   JSON.parse(JSON.generate(o))
 }
 
-begin
-  $msgpack = MessagePack.pack($obj)
-rescue Exception => e
-  $msgpack = nil
-end
-
 if $verbose
   puts "json:\n#{$json}\n"
   puts "object json:\n#{$obj_json}\n"
-  puts "Oj loaded object:\n#{Oj.load($json)}\n"
+  puts "Oj loaded object:\n#{Oj.strict_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 "Load/Parse Performance"
+puts "Strict Parse Performance"
 perf = Perf.new()
 unless $failed.has_key?('JSON::Ext')
   perf.add('JSON::Ext', 'parse') { JSON.parse($json) }
@@ -172,52 +112,31 @@ unless $failed.has_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:compat')
-  perf.add('Oj:compat', 'load') { Oj.load($json) }
-  perf.before('Oj:compat') { Oj.default_options = { :mode => :compat} }
-end
-unless $failed.has_key?('Oj')
-  perf.add('Oj', 'load') { Oj.load($obj_json) }
-  perf.before('Oj') { Oj.default_options = { :mode => :object} }
+unless $failed.has_key?('Oj:strict')
+  perf.add('Oj:strict', 'strict_load') { Oj.strict_load($json) }
 end
 perf.add('Yajl', 'parse') { Yajl::Parser.parse($json) } unless $failed.has_key?('Yajl')
-perf.add('Ox', 'load') { Ox.load($xml) } unless $failed.has_key?('Ox')
-perf.add('MessagePack', 'unpack') { MessagePack.unpack($msgpack) } unless $failed.has_key?('MessagePack')
 perf.run($iter)
 
-puts
 puts '-' * 80
-puts "Dump/Encode/Generate Performance"
+puts "Strict Dump Performance"
 perf = Perf.new()
 unless $failed.has_key?('JSON::Ext')
-  if 0 == $indent
-    perf.add('JSON::Ext', 'generate') { JSON.generate($obj) }
-  else
-    perf.add('JSON::Ext', 'generate') { JSON.pretty_generate($obj) }
-  end
+  perf.add('JSON::Ext', 'dump') { JSON.generate($obj) }
   perf.before('JSON::Ext') { JSON.generator = JSON::Ext::Generator }
 end
 unless $failed.has_key?('JSON::Pure')
-  if 0 == $indent
-    perf.add('JSON::Pure', 'generate') { JSON.generate($obj) }
-  else
-    perf.add('JSON::Pure', 'generate') { JSON.pretty_generate($obj) }
-  end
+  perf.add('JSON::Pure', 'generate') { JSON.generate($obj) }
   perf.before('JSON::Pure') { JSON.generator = JSON::Pure::Generator }
 end
-unless $failed.has_key?('Oj')
-  perf.add('Oj', 'dump') { Oj.dump($obj) }
-  perf.before('Oj') { Oj.default_options = { :mode => :object} }
-end
-unless $failed.has_key?('Oj:compat')
-  perf.add('Oj:compat', 'dump') { Oj.dump($obj) }
-  perf.before('Oj:compat') { Oj.default_options = { :mode => :compat} }
+unless $failed.has_key?('Oj:strict')
+  perf.add('Oj:strict', 'dump') { Oj.dump($obj, :mode => :strict) }
 end
 perf.add('Yajl', 'encode') { Yajl::Encoder.encode($obj) } unless $failed.has_key?('Yajl')
-perf.add('Ox', 'dump') { Ox.dump($obj) } unless $failed.has_key?('Ox')
-perf.add('MessagePack', 'pack') { MessagePack.pack($obj) } unless $failed.has_key?('MessagePack')
 perf.run($iter)
 
+puts
+puts '-' * 80
 puts
 
 unless $failed.empty?

data/test/sample.rb

@@ -10,7 +10,6 @@ end
 require 'pp'
 require 'sample/doc'
 
-
 def sample_doc(size=3)
   colors = [ :black, :gray, :white, :red, :blue, :yellow, :green, :purple, :orange ]
 
@@ -29,7 +28,7 @@ def sample_doc(size=3)
       (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])
+                               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)
@@ -38,7 +37,7 @@ def sample_doc(size=3)
       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])
+                               6.0 / k, 6.0 / k, colors[(i + j + k) % colors.size])
         o.add_prop(:inside, true)
         g << o
       end