oj 2.0.0 → 3.0.0

data/test/a.rb

@@ -1,38 +0,0 @@
-#!/usr/bin/env ruby -wW1
-# encoding: UTF-8
-
-$: << File.dirname(__FILE__)
-$: << File.join(File.dirname(__FILE__), "../lib")
-$: << File.join(File.dirname(__FILE__), "../ext")
-
-require 'pp'
-require 'oj'
-require 'perf'
-
-obj = [[1],[2],[3],[4],[5],[6],[7],[8],[9]]
-obj = [[],[],[],[],[],[],[],[],[]]
-obj = {
-  '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
-  '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
-}
-
-json = Oj.dump(obj, mode: :compat)
-
-puts json
-#pp Oj.saj_parse(nil, json)
-pp Oj.t_parse(json)
-
-if true
-  perf = Perf.new()
-  perf.add('SAJ', 'oj') { Oj.saj_parse(nil, json) }
-  perf.add('T', 'oj') { Oj.t_parse(json) }
-  perf.add('load', 'oj') { Oj.load(json) }
-  perf.run(10000)
-end

data/test/perf1.rb

@@ -1,64 +0,0 @@
-#!/usr/bin/env ruby -wW1
-# encoding: UTF-8
-
-$: << File.join(File.dirname(__FILE__), "../lib")
-$: << File.join(File.dirname(__FILE__), "../ext")
-
-#require 'test/unit'
-require 'optparse'
-require 'oj'
-require 'ox'
-
-$indent = 2
-
-opts = OptionParser.new
-opts.on("-h", "--help", "Show this display")                { puts opts; Process.exit!(0) }
-files = opts.parse(ARGV)
-
-iter = 100000
-s = %{
-{ "class": "Foo::Bar",
-  "attr1": [ true, [false, [12345, null], 3.967, ["something", false], null]],
-  "attr2": { "one": 1 }
-}
-}
-#s = File.read('sample.json')
-
-Oj.default_options = { :indent => 0 }
-
-obj = Oj.load(s)
-xml = Ox.dump(obj, :indent => 0)
-
-puts xml
-
-start = Time.now
-iter.times do
-  Oj.load(s)
-end
-dt = Time.now - start
-puts "%d Oj.load()s in %0.3f seconds or %0.1f loads/msec" % [iter, dt, iter/dt/1000.0]
-
-start = Time.now
-iter.times do
-  Ox.load(xml)
-end
-dt = Time.now - start
-puts "%d Ox.load()s in %0.3f seconds or %0.1f loads/msec" % [iter, dt, iter/dt/1000.0]
-
-puts
-
-start = Time.now
-iter.times do
-  Oj.dump(obj)
-end
-dt = Time.now - start
-puts "%d Oj.dump()s in %0.3f seconds or %0.1f dumps/msec" % [iter, dt, iter/dt/1000.0]
-
-start = Time.now
-iter.times do
-  Ox.dump(obj)
-end
-dt = Time.now - start
-puts "%d Ox.dump()s in %0.3f seconds or %0.1f dumps/msec" % [iter, dt, iter/dt/1000.0]
-
-puts

data/test/perf2.rb

@@ -1,76 +0,0 @@
-#!/usr/bin/env ruby -wW1
-# encoding: UTF-8
-
-$: << File.join(File.dirname(__FILE__), "../lib")
-$: << File.join(File.dirname(__FILE__), "../ext")
-
-#require 'test/unit'
-require 'optparse'
-require 'yajl'
-require 'oj'
-
-$indent = 2
-
-opts = OptionParser.new
-opts.on("-h", "--help", "Show this display")                { puts opts; Process.exit!(0) }
-files = opts.parse(ARGV)
-
-class Foo
-  def initialize()
-    @x = true
-    @y = 58
-  end
-  def to_json()
-    %{{"x":#{@x},"y":#{@y}}}
-  end
-  def to_hash()
-    { 'x' => @x, 'y' => @y }
-  end
-end
-
-iter = 100000
-s = %{
-{ "class": "Foo::Bar",
-  "attr1": [ true, [false, [12345, null], 3.967, ["something", false], null]],
-  "attr2": { "one": 1 }
-}
-}
-
-obj = Oj.load(s)
-obj["foo"] = Foo.new()
-
-Oj.default_options = { :indent => 0, :effort => :internal }
-
-puts
-
-start = Time.now
-iter.times do
-  Oj.load(s)
-end
-dt = Time.now - start
-puts "%d Oj.load()s in %0.3f seconds or %0.1f loads/msec" % [iter, dt, iter/dt/1000.0]
-
-start = Time.now
-iter.times do
-  Yajl::Parser.parse(s)
-end
-dt = Time.now - start
-puts "%d Yajl::Parser.parse()s in %0.3f seconds or %0.1f parses/msec" % [iter, dt, iter/dt/1000.0]
-
-puts
-
-start = Time.now
-iter.times do
-  Oj.dump(obj)
-end
-dt = Time.now - start
-puts "%d Oj.dump()s in %0.3f seconds or %0.1f dumps/msec" % [iter, dt, iter/dt/1000.0]
-
-start = Time.now
-iter.times do
-  Yajl::Encoder.encode(obj)
-end
-dt = Time.now - start
-puts "%d Yajl::Encoder.encode()s in %0.3f seconds or %0.1f encodes/msec" % [iter, dt, iter/dt/1000.0]
-
-puts

data/test/perf_obj_old.rb

@@ -1,213 +0,0 @@
-#!/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 'ox'
-require 'oj'
-require 'perf'
-require 'sample'
-require 'files'
-
-$verbose = 0
-$circular = false
-$indent = 0
-
-do_sample = false
-do_files = false
-
-do_load = false
-do_dump = false
-do_read = false
-do_write = false
-$iter = 1000
-
-opts = OptionParser.new
-opts.on("-v", "increase verbosity")                         { $verbose += 1 }
-
-opts.on("-c", "circular options")                           { $circular = true }
-
-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 }
-
-opts.on("-l", "load")                                       { do_load = true }
-opts.on("-d", "dump")                                       { do_dump = true }
-opts.on("-r", "read")                                       { do_read = true }
-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("-h", "--help", "Show this display")                { puts opts; Process.exit!(0) }
-files = opts.parse(ARGV)
-
-if files.empty?
-  data = []
-  obj = do_sample ? sample_doc(2) : files('..')
-  mars = Marshal.dump(obj)
-  xml = Ox.dump(obj, :indent => $indent, circular: $circular)
-  json = Oj.dump(obj, :indent => $indent, circular: $circular)
-  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) }
-  data << { :file => 'sample.xml', :obj => obj, :xml => xml, :marshal => mars, :json => json }
-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)
-    { :file => f, :obj => obj, :xml => xml, :marshal => mars, :json => json }
-  end
-end
-
-$ox_load_time = 0
-$mars_load_time = 0
-$ox_dump_time = 0
-$oj_dump_time = 0
-$mars_dump_time = 0
-
-def perf_load(d)
-  filename = d[:file]
-  marshal_filename = 'sample.marshal'
-  xml = d[:xml]
-  mars = d[:marshal]
-  json = d[:json]
-
-  if 0 < $verbose
-    obj = Ox.load(xml, :mode => :object, :trace => $verbose)
-    return
-  end
-  start = Time.now
-  (1..$iter).each do
-    obj = Ox.load(xml, :mode => :object)
-  end
-  $ox_load_time = Time.now - start
-  puts "Parsing #{$iter} times with Ox took #{$ox_load_time} seconds."
-
-  start = Time.now
-  (1..$iter).each do
-    obj = Oj.load(json, :mode => :object)
-  end
-  $oj_load_time = Time.now - start
-  puts "Parsing #{$iter} times with Oj took #{$oj_load_time} seconds."
-  
-  start = Time.now
-  (1..$iter).each do
-    obj = Marshal.load(mars)
-  end
-  $mars_load_time = Time.now - start
-  puts "Marshalling #{$iter} times took #{$mars_load_time} seconds."
-  puts ">>> Ox is %0.1f faster than Marshal loading.\n\n" % [$mars_load_time/$ox_load_time]
-end
-
-def perf_dump(d)
-  obj = d[:obj]
-
-  start = Time.now
-  (1..$iter).each do
-    xml = Ox.dump(obj, :indent => $indent, :circular => $circular)
-    #puts "*** ox:\n#{xml}"
-  end
-  $ox_dump_time = Time.now - start
-  puts "Ox dumping #{$iter} times with ox took #{$ox_dump_time} seconds."
-
-  Oj.default_options = {:indent => $indent}
-  start = Time.now
-  (1..$iter).each do
-    json = Oj.dump(obj)
-  end
-  $oj_dump_time = Time.now - start
-  puts "Oj dumping #{$iter} times with oj took #{$oj_dump_time} seconds."
-
-  obj = d[:obj]
-  start = Time.now
-  (1..$iter).each do
-    m = Marshal.dump(obj)
-  end
-  $mars_dump_time = Time.now - start
-  puts "Marshal dumping #{$iter} times took #{$mars_dump_time} seconds."
-  puts ">>> Ox is %0.1f faster than Marshal dumping.\n\n" % [$mars_dump_time/$ox_dump_time]
-end
-
-def perf_read(d)
-  ox_read_time = 0
-  mars_read_time = 0
-
-  filename = d[:file]
-  marshal_filename = 'sample.marshal'
-  xml = d[:xml]
-  mars = d[:marshal]
-
-  # now load from the file
-  start = Time.now
-  (1..$iter).each do
-    obj = Ox.load_file(filename, :mode => :object)
-  end
-  ox_read_time = Time.now - start
-  puts "Loading and parsing #{$iter} times with ox took #{ox_read_time} seconds."
-
-  start = Time.now
-  (1..$iter).each do
-    m = File.read(marshal_filename)
-    obj = Marshal.load(m)
-  end
-  mars_read_time = Time.now - start
-  puts "Reading and marshalling #{$iter} times took #{mars_read_time} seconds."
-  puts ">>> Ox is %0.1f faster than Marshal loading and parsing.\n\n" % [mars_read_time/ox_read_time]
-
-end
-
-def perf_write(d)
-  ox_write_time = 0
-  mars_write_time = 0
-  
-  ox_filename = 'out.xml'
-  marshal_filename = 'out.marshal'
-  obj = d[:obj]
-
-  start = Time.now
-  (1..$iter).each do
-    xml = Ox.to_file(ox_filename, obj, :indent => $indent)
-  end
-  ox_write_time = Time.now - start
-  puts "Ox dumping #{$iter} times with ox took #{ox_write_time} seconds."
-
-  start = Time.now
-  (1..$iter).each do
-    m = Marshal.dump(obj, circular: $circular)
-    File.open(marshal_filename, "w") { |f| f.write(m) }
-  end
-  mars_write_time = Time.now - start
-  puts "Marshal dumping and writing #{$iter} times took #{mars_write_time} seconds."
-  puts ">>> Ox is %0.1f faster than Marshal dumping.\n\n" % [mars_write_time/ox_write_time]
-
-end
-
-#if do_sample or do_files
-  data.each do |d|
-    puts "Using file #{d[:file]}."
-    
-    perf_load(d) if do_load
-    perf_dump(d) if do_dump
-    if do_load and do_dump
-      puts ">>> Ox is %0.1f faster than Marshal dumping and loading.\n\n" % [($mars_load_time + $mars_dump_time)/($ox_load_time + $ox_dump_time)] unless 0 == $mars_load_time
-    end
-
-    perf_read(d) if do_read
-    perf_write(d) if do_write
-
-  end
-#end

data/test/test_mimic.rb

@@ -1,208 +0,0 @@
-#!/usr/bin/env ruby
-# encoding: UTF-8
-
-# Ubuntu does not accept arguments to ruby when called using env. To get warnings to show up the -w options is
-# required. That can be set in the RUBYOPT environment variable.
-# export RUBYOPT=-w
-
-$VERBOSE = true
-
-$: << File.join(File.dirname(__FILE__), "../lib")
-$: << File.join(File.dirname(__FILE__), "../ext")
-
-require 'test/unit'
-require 'stringio'
-require 'oj'
-
-$ruby = RUBY_DESCRIPTION.split(' ')[0]
-$ruby = 'ree' if 'ruby' == $ruby && RUBY_DESCRIPTION.include?('Ruby Enterprise Edition')
-
-class Jam
-  attr_accessor :x, :y
-
-  def initialize(x, y)
-    @x = x
-    @y = y
-  end
-
-  def eql?(o)
-    self.class == o.class && @x == o.x && @y == o.y
-  end
-  alias == eql?
-
-  def to_json()
-    %{{"json_class":"#{self.class}","x":#{@x},"y":#{@y}}}
-  end
-
-  def self.json_create(h)
-    self.new(h['x'], h['y'])
-  end
-
-end # Jam
-
-class Mimic < ::Test::Unit::TestCase
-
-  def test0_mimic_json
-    assert(defined?(JSON).nil?)
-    Oj.mimic_JSON
-    assert(!defined?(JSON).nil?)
-  end
-
-# dump
-  def test_dump_string
-    json = JSON.dump([1, true, nil])
-    assert_equal(%{[1,true,null]}, json)
-  end
-
-  def test_dump_io
-    s = StringIO.new()
-    json = JSON.dump([1, true, nil], s)
-    assert_equal(s, json)
-    assert_equal(%{[1,true,null]}, s.string)
-  end
-  # TBD options
-
-# load
-  def test_load_string
-    json = %{{"a":1,"b":[true,false]}}
-    obj = JSON.load(json)
-    assert_equal({ 'a' => 1, 'b' => [true, false]}, obj)
-  end
-
-  def test_load_io
-    json = %{{"a":1,"b":[true,false]}}
-    obj = JSON.load(StringIO.new(json))
-    assert_equal({ 'a' => 1, 'b' => [true, false]}, obj)
-  end
-
-  def test_load_proc
-    Oj.mimic_JSON # TBD
-    children = []
-    json = %{{"a":1,"b":[true,false]}}
-    if 'rubinius' == $ruby || 'jruby' == $ruby || '1.8.7' == RUBY_VERSION
-      obj = JSON.load(json) {|x| children << x }
-    else
-      p = Proc.new {|x| children << x }
-      obj = JSON.load(json, p)
-    end
-    assert_equal({ 'a' => 1, 'b' => [true, false]}, obj)
-    # JRuby 1.7.0 rb_yield() is broken and converts the [true, falser] array into true
-    unless 'jruby' == $ruby && '1.9.3' == RUBY_VERSION
-      assert([1, true, false, [true, false], { 'a' => 1, 'b' => [true, false]}] == children ||
-             [true, false, [true, false], 1, { 'a' => 1, 'b' => [true, false]}] == children,
-             "children don't match")
-    end
-  end
-
-# []
-  def test_bracket_load
-    json = %{{"a":1,"b":[true,false]}}
-    obj = JSON[json]
-    assert_equal({ 'a' => 1, 'b' => [true, false]}, obj)
-  end
-
-  def test_bracket_dump
-    json = JSON[[1, true, nil]]
-    assert_equal(%{[1,true,null]}, json)
-  end
-
-# generate
-  def test_generate
-    json = JSON.generate({ 'a' => 1, 'b' => [true, false]})
-    assert(%{{"a":1,"b":[true,false]}} == json ||
-           %{{"b":[true,false],"a":1}} == json)
-  end
-  def test_generate_options
-    json = JSON.generate({ 'a' => 1, 'b' => [true, false]},
-                         :indent => "--",
-                         :array_nl => "\n",
-                         :object_nl => "#\n",
-                         :space => "*",
-                         :space_before => "~")
-    assert(%{{#
---"a"~:*1,#
---"b"~:*[
-----true,
-----false
---]#
-}} == json ||
-%{{#
---"b"~:*[
-----true,
-----false
---],#
---"a"~:*1#
-}} == json)
-
-  end
-
-# fast_generate
-  def test_fast_generate
-    json = JSON.generate({ 'a' => 1, 'b' => [true, false]})
-    assert(%{{"a":1,"b":[true,false]}} == json ||
-           %{{"b":[true,false],"a":1}} == json)
-  end
-
-# pretty_generate
-  def test_pretty_generate
-    json = JSON.pretty_generate({ 'a' => 1, 'b' => [true, false]})
-    assert(%{{
-  "a" : 1,
-  "b" : [
-    true,
-    false
-  ]
-}} == json ||
-%{{
-  "b" : [
-    true,
-    false
-  ],
-  "a" : 1
-}} == json)
-  end
-
-# parse
-  def test_parse
-    json = %{{"a":1,"b":[true,false]}}
-    obj = JSON.parse(json)
-    assert_equal({ 'a' => 1, 'b' => [true, false]}, obj)
-  end
-  def test_parse_sym_names
-    json = %{{"a":1,"b":[true,false]}}
-    obj = JSON.parse(json, :symbolize_names => true)
-    assert_equal({ :a => 1, :b => [true, false]}, obj)
-  end
-  def test_parse_additions
-    jam = Jam.new(true, 58)
-    json = Oj.dump(jam, :mode => :compat)
-    obj = JSON.parse(json)
-    assert_equal(jam, obj)
-    obj = JSON.parse(json, :create_additions => true)
-    assert_equal(jam, obj)
-    obj = JSON.parse(json, :create_additions => false)
-    assert_equal({'json_class' => 'Jam', 'x' => true, 'y' => 58}, obj)
-    json.gsub!('json_class', 'kson_class')
-    JSON.create_id = 'kson_class'
-    obj = JSON.parse(json, :create_additions => true)
-    JSON.create_id = 'json_class'
-    assert_equal(jam, obj)
-  end
-  def test_parse_bang
-    json = %{{"a":1,"b":[true,false]}}
-    obj = JSON.parse!(json)
-    assert_equal({ 'a' => 1, 'b' => [true, false]}, obj)
-  end
-
-# recurse_proc
-  def test_recurse_proc
-    children = []
-    JSON.recurse_proc({ 'a' => 1, 'b' => [true, false]}) { |x| children << x }
-    # JRuby 1.7.0 rb_yield() is broken and converts the [true, falser] array into true
-    unless 'jruby' == $ruby && '1.9.3' == RUBY_VERSION
-      assert([1, true, false, [true, false], { 'a' => 1, 'b' => [true, false]}] == children ||
-             [true, false, [true, false], 1, { 'b' => [true, false], 'a' => 1}] == children)
-    end
-  end
-
-end # Mimic