oj 1.2.11 → 1.2.12

data/README.md

@@ -4,12 +4,20 @@ A fast JSON parser and Object marshaller as a Ruby gem.
 ## <a name="installation">Installation</a>
     gem install oj
 
+## <a name="documentation">Documentation</a>
+
+*Documentation*: http://www.ohler.com/oj
+
 ## <a name="source">Source</a>
 
 *GitHub* *repo*: https://github.com/ohler55/oj
 
 *RubyGems* *repo*: https://rubygems.org/gems/oj
 
+## <a name="follow">Follow @oxgem on Twitter</a>
+
+[Follow @peterohler on Twitter](http://twitter.com/#!/peterohler) for announcements and news about the Oj gem.
+
 ## <a name="build_status">Build Status</a>
 
 [![Build Status](https://secure.travis-ci.org/ohler55/oj.png?branch=master)](http://travis-ci.org/ohler55/oj)
@@ -24,21 +32,11 @@ A fast JSON parser and Object marshaller as a Ruby gem.
 
 ## <a name="release">Release Notes</a>
 
-### Release 1.2.11
-
- - Added :max_stack option to limit the size of string allocated on the stack.
-
-### Release 1.2.10
-
- - Added check for circular on loading of circular dumped JSON.
-
- - Added support for direct serialization of BigDecimal, Rational, Date, and DateTime.
-
- - Added json.rb to $" in mimic mode to avoid pulling in the real JSON by accident.
+### Release 1.2.12
 
- - Oj is now thread safe for all functions.
+ - Fixed GC bug in Oj::Doc, the fast parser.
 
- - The / (solidus) character is now placed in strings without being escaped.
+ - Serialization of Exceptions in Ruby 1.8.7 now includes message and backtrace.
 
 ## <a name="description">Description</a>
 

data/ext/oj/dump.c

@@ -1146,6 +1146,39 @@ dump_obj_attrs(VALUE obj, VALUE clas, slot_t id, int depth, Out out) {
 	}
 #else
 	size = d2 * out->indent + 1;
+#if HAS_EXCEPTION_MAGIC
+	if (Qtrue == rb_obj_is_kind_of(obj, rb_eException)) {
+	    if (',' != *(out->cur - 1)) {
+		*out->cur++ = ',';
+	    }
+	    // message
+	    if (out->end - out->cur <= (long)size) {
+		grow(out, size);
+	    }
+	    fill_indent(out, d2);
+	    dump_cstr("~mesg", 5, 0, 0, out);
+	    *out->cur++ = ':';
+	    dump_val(rb_funcall2(obj, rb_intern("message"), 0, 0), d2, out);
+	    if (out->end - out->cur <= 2) {
+		grow(out, 2);
+	    }
+	    *out->cur++ = ',';
+	    // backtrace
+	    if (out->end - out->cur <= (long)size) {
+		grow(out, size);
+	    }
+	    fill_indent(out, d2);
+	    dump_cstr("~bt", 3, 0, 0, out);
+	    *out->cur++ = ':';
+	    dump_val(rb_funcall2(obj, rb_intern("backtrace"), 0, 0), d2, out);
+	    if (out->end - out->cur <= 2) {
+		grow(out, 2);
+	    }
+	    if (0 < cnt) {
+		*out->cur++ = ',';
+	    }
+	}
+#endif
 	for (i = cnt; 0 < i; i--, np++) {
 	    if (out->end - out->cur <= (long)size) {
 		grow(out, size);

data/ext/oj/extconf.rb

@@ -22,6 +22,7 @@ dflags = {
   'HAS_NANO_TIME' => ('ruby' == type && ('1' == version[0] && '9' == version[1]) || '2' <= version[0]) ? 1 : 0,
   'HAS_RSTRUCT' => ('ruby' == type || 'ree' == type) ? 1 : 0,
   'HAS_IVAR_HELPERS' => ('ruby' == type && ('1' == version[0] && '9' == version[1]) || '2' <= version[0]) ? 1 : 0,
+  'HAS_EXCEPTION_MAGIC' => ('ruby' == type && ('1' == version[0] && '9' == version[1]) || '2' <= version[0]) ? 0 : 1,
   'HAS_PROC_WITH_BLOCK' => ('ruby' == type && ('1' == version[0] && '9' == version[1]) || '2' <= version[0]) ? 1 : 0,
   'HAS_TOP_LEVEL_ST_H' => ('ree' == type || ('ruby' == type &&  '1' == version[0] && '8' == version[1])) ? 1 : 0,
   'SAFE_CACHE' => nil,

data/ext/oj/fast.c

@@ -562,7 +562,7 @@ read_obj(ParseInfo pi) {
 	} else if (',' == *pi->s) {
 	    pi->s++;
 	} else {
-	    printf("*** '%s'\n", pi->s);
+	    //printf("*** '%s'\n", pi->s);
 	    raise_error("invalid format, expected , or } while in an object", pi->str, pi->s);
 	}
 	*end = '\0';
@@ -839,10 +839,12 @@ parse_json(VALUE clas, char *json, int given, int allocated) {
     pi.doc = doc;
     // last arg is free func void* func(void*)
     doc->self = rb_data_object_alloc(clas, doc, 0, free_doc_cb);
+    rb_gc_register_address(&doc->self);
     doc->json = json;
     DATA_PTR(doc->self) = doc;
     result = rb_protect(protect_open_proc, (VALUE)&pi, &ex);
     if (given || 0 != ex) {
+	rb_gc_unregister_address(&doc->self);
 	DATA_PTR(doc->self) = 0;
 	doc_free(pi.doc);
 	if (allocated) {
@@ -1318,11 +1320,12 @@ doc_type(int argc, VALUE *argv, VALUE self) {
  */
 static VALUE
 doc_fetch(int argc, VALUE *argv, VALUE self) {
-    Doc		doc = self_doc(self);
+    Doc		doc;
     Leaf	leaf;
     VALUE	val = Qnil;
     const char	*path = 0;
 
+    doc = self_doc(self);
     if (1 <= argc) {
 	Check_Type(*argv, T_STRING);
 	path = StringValuePtr(*argv);
@@ -1584,6 +1587,7 @@ static VALUE
 doc_close(VALUE self) {
     Doc		doc = self_doc(self);
 
+    rb_gc_unregister_address(&doc->self);
     DATA_PTR(doc->self) = 0;
     if (0 != doc) {
 	xfree(doc->json);

data/ext/oj/load.c

@@ -510,7 +510,22 @@ read_obj(ParseInfo pi) {
 #ifdef SAFE_CACHE
 		    pthread_mutex_unlock(&oj_cache_mutex);
 #endif
+#if HAS_EXCEPTION_MAGIC
+		    if ('~' == *ks && Qtrue == rb_obj_is_kind_of(obj, rb_eException)) {
+			if (0 == strcmp("~mesg", ks)) {
+			    VALUE	args[1];
+
+			    args[0] = val;
+			    obj = rb_class_new_instance(1, args, rb_class_of(obj));
+			} else if (0 == strcmp("~bt", ks)) {
+			    rb_funcall(obj, rb_intern("set_backtrace"), 1, val);
+			}
+		    } else {
+			rb_ivar_set(obj, var_id, val);
+		    }
+#else
 		    rb_ivar_set(obj, var_id, val);
+#endif
 		} else if (T_HASH == obj_type) {
 		    if (Yes == pi->options->sym_key) {
 			rb_hash_aset(obj, rb_str_intern(key), val);

data/lib/oj/version.rb

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

data/test/boo.rb

@@ -0,0 +1,26 @@
+#!/usr/bin/env ruby -wW1
+# encoding: UTF-8
+
+$: << File.join(File.dirname(__FILE__), "../lib")
+$: << File.join(File.dirname(__FILE__), "../ext")
+
+require 'yajl'
+require 'oj'
+
+iter = 100
+s = File.read("boo.json")
+start = Time.now
+iter.times do
+  Oj.load(s)
+end
+oj_dt = Time.now - start
+puts "%d Oj.load()s in %0.3f seconds or %0.1f loads/second" % [iter, oj_dt, iter/oj_dt]
+
+start = Time.now
+iter.times do
+  Yajl::Parser.parse(s)
+end
+yajl_dt = Time.now - start
+puts "%d Yajl::Parser.parse()s in %0.3f seconds or %0.1f parsed/second" % [iter, yajl_dt, iter/yajl_dt]
+
+puts "Oj is %0.1f times faster than YAJL" % [yajl_dt / oj_dt]

data/test/bug.rb

@@ -0,0 +1,18 @@
+
+$: << File.join(File.dirname(__FILE__), "../lib")
+$: << File.join(File.dirname(__FILE__), "../ext")
+
+require 'oj'
+require 'bigdecimal'
+
+stuff = [
+  BigDecimal.new('10'),
+  Date.today,
+  Time.now,
+  DateTime.now
+]
+
+puts Oj.dump(stuff, :mode => :strict)
+puts Oj.dump(stuff, :mode => :compat)
+puts Oj.dump(stuff, :mode => :object)
+

data/test/{perf2.rb → foo.rb}

@@ -15,19 +15,6 @@ 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",
@@ -36,41 +23,36 @@ s = %{
 }
 }
 
-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]
+oj_dt = Time.now - start
+puts "%d Oj.load()s in %0.3f seconds or %0.1f loads/msec" % [iter, oj_dt, iter/oj_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]
+yajl_dt = Time.now - start
+puts "%d Yajl::Parser.parse()s in %0.3f seconds or %0.1f parses/msec" % [iter, yajl_dt, iter/yajl_dt/1000.0]
 
-puts
+puts "Oj is %0.1f times faster than YAJL at parsing." % [yajl_dt / oj_dt]
 
+
+obj = Oj.load(s)
 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]
+oj_dt = Time.now - start
+puts "%d Oj.dump()s in %0.3f seconds or %0.1f dumps/msec" % [iter, oj_dt, iter/oj_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]
+yajl_dt = Time.now - start
+puts "%d Yajl::Encoder.encode()s in %0.3f seconds or %0.1f encodes/msec" % [iter, yajl_dt, iter/yajl_dt/1000.0]
 
-puts
+puts "Oj is %0.1f times faster than YAJL at dumping." % [yajl_dt / oj_dt]

data/test/oj-test/test.rb

@@ -0,0 +1,140 @@
+require 'cgi'
+require 'oj'
+
+AD_MARKUP = CGI.escape("asdf" * 100)
+
+SEATBID = '{
+  "bid" : [{
+    "id": "1",
+    "impid" : "102",
+    "price": 9.43,
+    "adid" : "314",
+    "nurl": "http://adserver.com/winnotice?impid=102",
+    "adm" : "' + AD_MARKUP + '",
+    "adomain" : ["advertiserdomain.com"],
+    "iurl" : "http://adserver.com/pathtosampleimage",
+    "cid" : "campaign111",
+    "crid" : "creative112",
+    "attr" : [1,2,3,4,5,6,7,12]
+  }],
+  "seat"  : "512",
+  "group" : "128"
+}'
+
+
+LARGE_JSON = '{
+  "id": "1234567890",
+  "units" : 0,
+  "bidid": "abc1123",
+  "cur": "EUR",
+  "seatbid": [' + ([SEATBID] * 100).join(', ') +  ']
+}'
+
+
+class Bid
+
+  attr_accessor :id,
+    :bidid,
+    :cur,
+    :seat,
+    :group,
+    :impid,
+    :price,
+    :units,
+    :adid,
+    :nurl,
+    :adm,
+    :adomain,
+    :iurl,
+    :cid,
+    :crid,
+    :attr,
+    :nbr,
+    :partner_id
+
+  alias :currency   :cur
+  alias :auction_id :id
+
+  def parsed_adm
+    return replace_macros(self.adm)
+  end
+
+  def parsed_nurl
+    return replace_macros(self.nurl)
+  end
+
+  def replace_macros(template)
+    return nil if !template
+    {
+      '${AUCTION_ID}'        => self.id,
+      '${AUCTION_BID_ID}'    => self.bidid,
+      '${AUCTION_IMP_ID}'    => self.impid,
+      '${AUCTION_SEAT_ID}'   => self.seat,
+      '${AUCTION_AD_ID}'     => self.adid,
+      '${AUCTION_PRICE}'     => self.price,
+      '${AUCTION_CURRENCY}'  => self.cur,
+      '${AUCTION_UNITS}'     => self.units,
+    }.each do |macro, v|
+        template = template.gsub(macro, v.to_s)
+      end
+      template
+  end
+end
+
+#GC.disable
+
+class BidResponseParser
+  REQUIRED_ATTRIBUTES = [:id, :impid, :price].freeze
+
+  def self.parse(json)
+    return nil if !json
+    extract_fast(json)
+  end
+
+  def self.extract_fast(json)
+    doc = Oj::Doc.open(json)
+    #Oj::Doc.open(json) do |doc|
+      bid = Bid.new
+
+      # bid-response object
+      bid.id      = doc.fetch '/id'
+
+      bid.bidid   = doc.fetch '/bidid'
+      bid.units   = doc.fetch('/units') || 0
+      bid.cur     = doc.fetch '/cur'
+      bid.nbr     = doc.fetch('/nbr') || 0 # Mobile RTB 1.0 only
+
+      # EM: we do not expect more than 1 bid object in the response,
+      # as we only send single ads in the bid-request (no multi-ad-auctions) atm.
+      # seatbid-obj
+      bid.seat    = doc.fetch '/seatbid/0/seat'
+      bid.group   = doc.fetch '/seatbid/0/group'
+
+      # bid-obj
+      bid_path = '/seatbid/0/bid/0'
+      bid.impid   = doc.fetch "#{bid_path}/impid"
+      bid.adid    = doc.fetch "#{bid_path}/adid"
+      bid.nurl    = doc.fetch "#{bid_path}/nurl"
+      bid.adm     = doc.fetch "#{bid_path}/adm"
+      bid.adomain = doc.fetch "#{bid_path}/adomain"
+      bid.iurl    = doc.fetch "#{bid_path}/iurl"
+      bid.cid     = doc.fetch "#{bid_path}/cid"
+      bid.crid    = doc.fetch "#{bid_path}/crid"
+      bid.attr    = doc.fetch "#{bid_path}/attr"
+
+      # sadly we need to check this explicitly, because nil.to_f returns 0.0
+      if doc.fetch("#{bid_path}/price") == nil
+        raise "required attribute price missing"
+      end
+
+      bid.price = doc.fetch("#{bid_path}/price").to_f
+
+    doc.close # needed when not in Proc to cleanup
+      return bid
+    #end
+  end
+end
+
+1000.times do
+  BidResponseParser.parse(LARGE_JSON)
+end

data/test/tests.rb

@@ -519,10 +519,14 @@ class Juice < ::Test::Unit::TestCase
     #puts "*** #{json}"
     e2 = Oj.load(json, :mode => :strict)
     assert_equal(err.class.to_s, e2['^o'])
-    unless RUBY_VERSION.start_with?('1.8') || 'rubinius' == $ruby
-      assert_equal(err.message, e2['~mesg'])
-      assert_equal(err.backtrace, e2['~bt'])
-      e2 = Oj.load(json, :mode => :object)
+    assert_equal(err.message, e2['~mesg'])
+    assert_equal(err.backtrace, e2['~bt'])
+    e2 = Oj.load(json, :mode => :object)
+    if RUBY_VERSION.start_with?('1.8') || 'rubinius' == $ruby
+      assert_equal(e.class, e2.class);
+      assert_equal(e.message, e2.message);
+      assert_equal(e.backtrace, e2.backtrace);
+    else
       assert_equal(e, e2);
     end
   end

data/test/where.rb

@@ -0,0 +1,54 @@
+#!/usr/bin/env ruby -wW1
+# 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 = 1000000
+
+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("-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, [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
+}
+
+Oj.default_options = { :indent => $indent, :mode => :strict }
+
+$json = Oj.dump($obj)
+
+if $verbose
+  puts "json:\n#{$json}\n"
+end
+
+puts '-' * 80
+puts "Parse Performance"
+Oj::Fast.open($json) do |fast|
+  fast.move('/d/2/4/2')
+  puts fast.where2?
+  puts fast.where?
+  perf = Perf.new()
+  perf.add('Oj:fast', 'where') { fast.where? }
+  perf.add('Oj:fast2', 'where2') { fast.where2? }
+  perf.run($iter)
+end
+puts

metadata

@@ -1,27 +1,24 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: oj
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.2.12
   prerelease: 
-  version: 1.2.11
 platform: ruby
-authors: 
+authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-06-21 00:00:00 Z
+date: 2012-07-06 00:00:00.000000000 Z
 dependencies: []
-
-description: "The fastest JSON parser and object serializer. "
+description: ! 'The fastest JSON parser and object serializer. '
 email: peter@ohler.com
 executables: []
-
-extensions: 
+extensions:
 - ext/oj/extconf.rb
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
-files: 
+files:
 - lib/oj/bag.rb
 - lib/oj/version.rb
 - lib/oj.rb
@@ -35,13 +32,14 @@ files:
 - ext/oj/fast.c
 - ext/oj/load.c
 - ext/oj/oj.c
+- test/boo.rb
+- test/bug.rb
 - test/files.rb
+- test/foo.rb
+- test/oj-test/test.rb
 - test/perf.rb
-- test/perf1.rb
-- test/perf2.rb
 - test/perf_fast.rb
 - test/perf_obj.rb
-- test/perf_obj_old.rb
 - test/perf_simple.rb
 - test/perf_strict.rb
 - test/sample/change.rb
@@ -61,37 +59,35 @@ files:
 - test/test_fast.rb
 - test/test_mimic.rb
 - test/tests.rb
+- test/where.rb
 - LICENSE
 - README.md
 homepage: http://www.ohler.com/oj
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.md
-require_paths: 
+require_paths:
 - lib
 - ext
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: oj
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A fast JSON parser and serializer.
 test_files: []
-
 has_rdoc: true

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/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