oj 2.7.2 → 2.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f30913f8e7b9a96cd9388dcd6959330f34960c04
-  data.tar.gz: 8bb5882a6def1fbb9348f0ac0a48f59d1d7468f4
+  metadata.gz: 86fa5360a8dad0be6218e5b707229d1123242f5c
+  data.tar.gz: bd7112345eca19080d314ef865db6d377a81596a
 SHA512:
-  metadata.gz: 70e9ec5a16483c18e964d2ab4f8801c111353018fef608fc035de8bbd19b855baf825659e55a1af11a0ed9795902316517a27ad58b82cc05b81773f5678a434a
-  data.tar.gz: c9f605979c2b2051a8257fcb57a125aa3b5da8d833829a36701655415951deb6540b11ba7c7e2a69e622d6920725685c817cda08419e70c7d0cbc9183a6c0c2f
+  metadata.gz: ccc6d971d9a8f0be85cb7c67b523a981d756c73fb1a2d1bd499f61bb1120a6da5925d8723cca8c008e8e2b281be7e81c20574358fb20b8b53340fb88f74439bc
+  data.tar.gz: 172de575b67abc4012818a9e526be9661bd78e0817bb62db6c060692f3dfd19fd29f5d40240d3d45e9557085fa34ebf9de2a1d23fe43daacf781cb7665d0b4eb

data/README.md

@@ -26,9 +26,9 @@ Follow [@peterohler on Twitter](http://twitter.com/#!/peterohler) for announceme
 
 [![Build Status](https://secure.travis-ci.org/ohler55/oj.png?branch=master)](http://travis-ci.org/ohler55/oj)
 
-### Current Release 2.7.2
+### Current Release 2.7.3
 
- - Added option return nil if nil is provided as input to load.
+ - Fixed bug where load and dump of Structs in modules did not work correctly.
 
 [Older release notes](http://www.ohler.com/dev/oj_misc/release_notes.html).
 

data/ext/oj/object.c

@@ -191,8 +191,10 @@ hat_value(ParseInfo pi, Val parent, const char *key, size_t klen, volatile VALUE
 		oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "Invalid struct data");
 		return 1;
 	    }
+
 	    // If struct is not defined then we let this fail and raise an exception.
-	    sc = rb_const_get(oj_struct_class, rb_to_id(*RARRAY_PTR(value)));
+	    sc = oj_name2struct(pi, *RARRAY_PTR(value));
+
             // Create a properly initialized struct instance without calling the initialize method.
             parent->val = rb_obj_alloc(sc);
             // If the JSON array has more entries than the struct class allows, we record an error.

data/ext/oj/resolve.c

@@ -119,3 +119,11 @@ oj_name2class(ParseInfo pi, const char *name, size_t len, int auto_define) {
 #endif
     return clas;
 }
+
+VALUE
+oj_name2struct(ParseInfo pi, VALUE nameVal) {
+    size_t	len = RSTRING_LEN(nameVal);
+    const char	*str = StringValuePtr(nameVal);
+
+    return resolve_classpath(pi, str, len, 0);
+}

data/ext/oj/resolve.h

@@ -34,5 +34,6 @@
 #include "ruby.h"
 
 extern VALUE	oj_name2class(ParseInfo pi, const char *name, size_t len, int auto_define);
+extern VALUE	oj_name2struct(ParseInfo pi, VALUE nameVal);
 
 #endif /* __OJ_RESOLVE_H__ */

data/lib/oj/version.rb

@@ -1,5 +1,5 @@
 
 module Oj
   # Current version of the module. 
-  VERSION = '2.7.2'
+  VERSION = '2.7.3'
 end

data/test/perf1.rb

@@ -0,0 +1,64 @@
+#!/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

@@ -0,0 +1,76 @@
+#!/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

@@ -0,0 +1,213 @@
+#!/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_object.rb

@@ -68,6 +68,10 @@ module One
       end # Deep
     end # Three
   end # Two
+
+  class Stuck2 < Struct.new(:a, :b)
+  end
+
 end # One
 
 class Stuck < Struct.new(:a, :b)
@@ -330,6 +334,13 @@ class ObjectJuice < ::Test::Unit::TestCase
     end
   end
 
+  def test_json_struct2
+    unless 'jruby' == RUBY_DESCRIPTION.split(' ')[0]
+      obj = One::Stuck2.new(false, 7)
+      dump_and_load(obj, false)
+    end
+  end
+
   def test_json_non_str_hash
     obj = { 59 => "young", false => true }
     dump_and_load(obj, false)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 2.7.2
+  version: 2.7.3
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-06 00:00:00.000000000 Z
+date: 2014-04-11 00:00:00.000000000 Z
 dependencies: []
 description: 'The fastest JSON parser and object serializer. '
 email: peter@ohler.com
@@ -56,17 +56,14 @@ files:
 - lib/oj/saj.rb
 - lib/oj/schandler.rb
 - lib/oj/version.rb
-- test/a.rb
-- test/bug.rb
 - test/debian_test.rb
-- test/e.rb
 - test/files.rb
-- test/foo.rb
-- test/lots.rb
-- test/mj.rb
 - test/perf.rb
+- test/perf1.rb
+- test/perf2.rb
 - test/perf_compat.rb
 - test/perf_fast.rb
+- test/perf_obj_old.rb
 - test/perf_object.rb
 - test/perf_saj.rb
 - test/perf_scp.rb
@@ -86,7 +83,6 @@ files:
 - test/sample/shape.rb
 - test/sample/text.rb
 - test/sample_json.rb
-- test/struct.rb
 - test/test_compat.rb
 - test/test_fast.rb
 - test/test_gc.rb
@@ -98,7 +94,6 @@ files:
 - test/test_strict.rb
 - test/test_writer.rb
 - test/tests.rb
-- test/x.rb
 homepage: http://www.ohler.com/oj
 licenses:
 - MIT
@@ -128,4 +123,3 @@ signing_key:
 specification_version: 4
 summary: A fast JSON parser and serializer.
 test_files: []
-has_rdoc: true

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/bug.rb

@@ -1,17 +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 'oj'
-
-obj = Oj.load_file('bug.json', :mode => :object)
-
-puts Oj.dump(obj, :mode => :object, :indent => 0)

data/test/e.rb

@@ -1,12 +0,0 @@
-#!/usr/bin/env ruby
-
-$: << File.join(File.dirname(__FILE__), "../lib")
-$: << File.join(File.dirname(__FILE__), "../ext")
-
-require 'oj'
-
-json = %{"\xc2\xa9\xc3\x98"}
-puts "original:\n#{json}"
-
-str = Oj.load(json)
-puts "out: #{str}"

data/test/foo.rb

@@ -1,24 +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 'oj'
-
-reltypes={}
-Oj::Doc.open_file('foo.json') do |doc|
-  doc.each_child do |target|
-    puts "#{target.local_key} is #{target.local_key.class}"
-    target.each_leaf do |score|
-      reltype=score.local_key
-      reltypes[reltype] = (reltypes[reltype] || 0) + 1
-    end
-  end
-end

data/test/lots.rb

@@ -1,68 +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 'oj'
-
-module One
-  module Two
-    module Three
-      class Empty
-
-        def initialize()
-        end
-
-        def eql?(o)
-          self.class == o.class
-        end
-        alias == eql?
-
-        def to_hash()
-          {'json_class' => "#{self.class.name}"}
-        end
-
-        def to_json(*a)
-          %{{"json_class":"#{self.class.name}"}}
-        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
-}
-
-$obj = [$obj]*10000
-
-Oj.default_options = { :indent => 2, :mode => :compat }
-
-$json = Oj.dump($obj, :mode => :compat)
-
-$result = nil
-100.times { |i|
-  print(".") if (0 == i % 10)
-  $result = Oj.compat_load($json)
-}
-
-

data/test/mj.rb

@@ -1,48 +0,0 @@
-#!/usr/bin/env ruby
-# encoding: UTF-8
-
-$: << File.join(File.dirname(__FILE__), "../lib")
-$: << File.join(File.dirname(__FILE__), "../ext")
-# $: << File.join(File.dirname(__FILE__), "../../multi_json/lib")
-
-require 'multi_json'
-require 'benchmark'
-require 'yajl'
-require 'json'
-require 'oj'
-
-iter = 1_000_000
-iter = 100_000
-
-json = %({"k1":"val1","k2":"val2","k3":"val3"})
-obj = { k1: "val1", k2: "val2", k3: "val3" }
-
-puts "Benchmarks for different JSON handlers with MultiJson."
-puts "  Ruby #{RUBY_VERSION}"
-puts "  #{iter} iterations"
-
-MultiJson.engine = :oj
-dt = Benchmark.realtime { iter.times { MultiJson.decode(json) }}
-et = Benchmark.realtime { iter.times { MultiJson.encode(obj) }}
-puts "    Oj decode: #{dt}  encode: #{et}"
-
-MultiJson.engine = :yajl
-dt = Benchmark.realtime { iter.times { MultiJson.decode(json) }}
-et = Benchmark.realtime { iter.times { MultiJson.encode(obj) }}
-puts "  Yajl decode: #{dt}  encode: #{et}"
-
-MultiJson.engine = :json_gem
-dt = Benchmark.realtime { iter.times { MultiJson.decode(json) }}
-et = Benchmark.realtime { iter.times { MultiJson.encode(obj) }}
-puts "  Json decode: #{dt}  encode: #{et}"
-
-Oj.default_options = { :mode => :compat, :time_format => :ruby }
-dt = Benchmark.realtime { iter.times { Oj.load(json) }}
-et = Benchmark.realtime { iter.times { Oj.dump(obj) }}
-puts "Raw Oj decode: #{dt}  encode: #{et}"
-
-ye = Yajl::Encoder.new
-dt = Benchmark.realtime { iter.times { Yajl::Parser.parse(json) }}
-et = Benchmark.realtime { iter.times { Yajl::Encoder.encode(obj) }}
-e2 = Benchmark.realtime { iter.times { ye.encode(obj) }}
-puts "Raw Yajl decode: #{dt} encode: #{et}, encoder: #{e2}"

data/test/struct.rb

@@ -1,29 +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 'oj'
-
-A = Struct.new(:a,:b,:c,:d)
-B = Struct.new(:e,:f)
-
-obj = [A.new(55, B.new(1, 'X'), B.new(2, 'Y'), 3)]
-
-s = Oj.dump(obj, :mode => :object)
-
-100000.times do
-  Oj.load(s, :mode => :object)
-  # ds = Oj.dump(o, :mode => :object)
-  # if ds != s
-  #   puts ds
-  #   raise "holy crap"
-  # end
-end

data/test/x.rb

@@ -1,59 +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 'oj'
-
-# Oj is not able to deserialize all classes that are a subclass of a Ruby
-# Exception. Only exception that take one required string argument in the
-# initialize() method are supported. This is an example of how to write an
-# Exception subclass that supports both a single string intializer and an
-# Exception as an argument. Additional optional arguments can be added as well.
-#
-# The reason for this restriction has to do with a design decision on the part
-# of the Ruby developers. Exceptions are special Objects. They do not follow the
-# rules of other Objects. Exceptions have 'mesg' and a 'bt' attribute. Note that
-# these are not '@mesg' and '@bt'. They can not be set using the normal C or
-# Ruby calls. The only way I have found to set the 'mesg' attribute is through
-# the initializer. Unfortunately that means any subclass that provides a
-# different initializer can not be automatically decoded. A way around this is
-# to use a create function but this example shows an alternative.
-
-class WrapException < StandardError
-  attr_reader :original
-
-  def initialize(msg_or_err)
-    if msg_or_err.is_a?(Exception)
-      super(msg_or_err.message)
-      @original = msg_or_err
-      set_backtrace(msg_or_err.backtrace)
-    else
-      super(message)
-      @original = nil
-    end
-  end
-end
-
-e = WrapException.new(RuntimeError.new("Something broke."))
-
-json = Oj.dump(e, :mode => :object)
-puts "original:\n#{json}"
-# outputs:
-# original:
-# {"^o":"WrapException","original":{"^o":"RuntimeError","~mesg":"Something broke.","~bt":null},"~mesg":"Something broke.","~bt":null}
-
-e2 = Oj.load(json, :mode => :object)
-puts "dumped, loaded, and dumped again:\n#{Oj.dump(e2, :mode => :object)}"
-# outputs:
-# original: {"^o":"WrapException","original":{"^o":"RuntimeError","~mesg":"Something broke.","~bt":null},"~mesg":"Something broke.","~bt":null}
-# dumped, loaded, and dumped again:
-# {"^o":"WrapException","original":{"^o":"RuntimeError","~mesg":"Something broke.","~bt":null},"~mesg":"Something broke.","~bt":null}
-