oj 1.2.10 → 1.2.11

data/README.md

@@ -24,6 +24,10 @@ 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.

data/ext/oj/oj.c

@@ -40,9 +40,6 @@
 
 #include "oj.h"
 
-// maximum to allocate on the stack, arbitrary limit
-#define SMALL_JSON	65536
-
 typedef struct _YesNoOpt {
     VALUE	sym;
     char	*attr;
@@ -83,6 +80,7 @@ static VALUE	circular_sym;
 static VALUE	compat_sym;
 static VALUE	create_id_sym;
 static VALUE	indent_sym;
+static VALUE	max_stack_sym;
 static VALUE	mode_sym;
 static VALUE	null_sym;
 static VALUE	object_sym;
@@ -117,6 +115,7 @@ struct _Options	oj_default_options = {
     No,			// ascii_only
     ObjectMode,		// mode
     json_class,		// create_id
+    65536,		// max_stack
     0,			// dump_opts
 };
 
@@ -145,6 +144,7 @@ oj_get_odd(VALUE clas) {
  * - symbol_keys: [true|false|nil] use symbols instead of strings for hash keys
  * - mode: [:object|:strict|:compat|:null] load and dump modes to use for JSON
  * - create_id: [String|nil] create id for json compatible object encoding, default is 'json_create'
+ * - max_stack: [Fixnum|nil] maximum json size to allocate on the stack, default is 65536
  * @return [Hash] all current option settings.
  */
 static VALUE
@@ -152,6 +152,7 @@ get_def_opts(VALUE self) {
     VALUE	opts = rb_hash_new();
     
     rb_hash_aset(opts, indent_sym, INT2FIX(oj_default_options.indent));
+    rb_hash_aset(opts, max_stack_sym, INT2FIX(oj_default_options.max_stack));
     rb_hash_aset(opts, circular_sym, (Yes == oj_default_options.circular) ? Qtrue : ((No == oj_default_options.circular) ? Qfalse : Qnil));
     rb_hash_aset(opts, auto_define_sym, (Yes == oj_default_options.auto_define) ? Qtrue : ((No == oj_default_options.auto_define) ? Qfalse : Qnil));
     rb_hash_aset(opts, ascii_only_sym, (Yes == oj_default_options.ascii_only) ? Qtrue : ((No == oj_default_options.ascii_only) ? Qfalse : Qnil));
@@ -186,6 +187,7 @@ get_def_opts(VALUE self) {
  *	  the Oj gem. The :null mode ignores non-supported Objects and
  *	  replaces them with a null.
  * @param [String|nil] :create_id create id for json compatible object encoding
+ * @param [Fixnum|nil] :max_stack maximum size to allocate on the stack for a JSON String
  * @return [nil]
  */
 static VALUE
@@ -206,6 +208,17 @@ set_def_opts(VALUE self, VALUE opts) {
 	Check_Type(v, T_FIXNUM);
 	oj_default_options.indent = FIX2INT(v);
     }
+    v = rb_hash_aref(opts, max_stack_sym);
+    if (Qnil != v) {
+	int	i;
+
+	Check_Type(v, T_FIXNUM);
+	i = FIX2INT(v);
+	if (0 > i) {
+	    i = 0;
+	}
+	oj_default_options.max_stack = (size_t)i;
+    }
 
     v = rb_hash_lookup(opts, mode_sym);
     if (Qnil == v) {
@@ -311,7 +324,7 @@ load_with_opts(VALUE input, Options copts) {
     if (rb_type(input) == T_STRING) {
 	// the json string gets modified so make a copy of it
 	len = RSTRING_LEN(input) + 1;
-	if (SMALL_JSON < len) {
+	if (copts->max_stack < len) {
 	    json = ALLOC_N(char, len);
 	} else {
 	    json = ALLOCA_N(char, len);
@@ -324,7 +337,7 @@ load_with_opts(VALUE input, Options copts) {
 	if (oj_stringio_class == clas) {
 	    s = rb_funcall2(input, oj_string_id, 0, 0);
 	    len = RSTRING_LEN(s) + 1;
-	    if (SMALL_JSON < len) {
+	    if (copts->max_stack < len) {
 		json = ALLOC_N(char, len);
 	    } else {
 		json = ALLOCA_N(char, len);
@@ -338,7 +351,7 @@ load_with_opts(VALUE input, Options copts) {
 
 	    len = lseek(fd, 0, SEEK_END);
 	    lseek(fd, 0, SEEK_SET);
-	    if (SMALL_JSON < len) {
+	    if (copts->max_stack < len) {
 		json = ALLOC_N(char, len + 1);
 	    } else {
 		json = ALLOCA_N(char, len + 1);
@@ -351,7 +364,7 @@ load_with_opts(VALUE input, Options copts) {
 	} else if (rb_respond_to(input, oj_read_id)) {
 	    s = rb_funcall2(input, oj_read_id, 0, 0);
 	    len = RSTRING_LEN(s) + 1;
-	    if (SMALL_JSON < len) {
+	    if (copts->max_stack < len) {
 		json = ALLOC_N(char, len);
 	    } else {
 		json = ALLOCA_N(char, len);
@@ -362,7 +375,7 @@ load_with_opts(VALUE input, Options copts) {
 	}
     }
     obj = oj_parse(json, copts);
-    if (SMALL_JSON < len) {
+    if (copts->max_stack < len) {
 	xfree(json);
     }
     return obj;
@@ -407,6 +420,7 @@ load_file(int argc, VALUE *argv, VALUE self) {
     unsigned long	len;
     VALUE		obj;
     struct _Options	options = oj_default_options;
+    size_t		max_stack = oj_default_options.max_stack;
 
     Check_Type(*argv, T_STRING);
     path = StringValuePtr(*argv);
@@ -415,7 +429,7 @@ load_file(int argc, VALUE *argv, VALUE self) {
     }
     fseek(f, 0, SEEK_END);
     len = ftell(f);
-    if (SMALL_JSON < len) {
+    if (max_stack < len) {
 	json = ALLOC_N(char, len + 1);
     } else {
 	json = ALLOCA_N(char, len + 1);
@@ -431,7 +445,7 @@ load_file(int argc, VALUE *argv, VALUE self) {
 	parse_options(argv[1], &options);
     }
     obj = oj_parse(json, &options);
-    if (SMALL_JSON < len) {
+    if (max_stack < len) {
 	xfree(json);
     }
     return obj;
@@ -832,11 +846,12 @@ void Init_oj() {
     compat_sym = ID2SYM(rb_intern("compat"));		rb_gc_register_address(&compat_sym);
     create_id_sym = ID2SYM(rb_intern("create_id"));	rb_gc_register_address(&create_id_sym);
     indent_sym = ID2SYM(rb_intern("indent"));		rb_gc_register_address(&indent_sym);
+    max_stack_sym = ID2SYM(rb_intern("max_stack"));	rb_gc_register_address(&max_stack_sym);
     mode_sym = ID2SYM(rb_intern("mode"));		rb_gc_register_address(&mode_sym);
-    symbol_keys_sym = ID2SYM(rb_intern("symbol_keys"));	rb_gc_register_address(&symbol_keys_sym);
     null_sym = ID2SYM(rb_intern("null"));		rb_gc_register_address(&null_sym);
     object_sym = ID2SYM(rb_intern("object"));		rb_gc_register_address(&object_sym);
     strict_sym = ID2SYM(rb_intern("strict"));		rb_gc_register_address(&strict_sym);
+    symbol_keys_sym = ID2SYM(rb_intern("symbol_keys"));	rb_gc_register_address(&symbol_keys_sym);
 
     oj_slash_string = rb_str_new2("/");			rb_gc_register_address(&oj_slash_string);
 

data/ext/oj/oj.h

@@ -101,6 +101,7 @@ typedef struct _Options {
     char	ascii_only;	// YesNo
     char	mode;		// Mode
     const char	*create_id;	// 0 or string
+    size_t	max_stack;	// max size to allocate on the stack
     DumpOpts	dump_opts;
 } *Options;
 

data/lib/oj/version.rb

@@ -1,5 +1,5 @@
 
 module Oj
   # Current version of the module. 
-  VERSION = '1.2.10'
+  VERSION = '1.2.11'
 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/{foo.rb → perf2.rb}

@@ -15,6 +15,19 @@ 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",
@@ -23,36 +36,41 @@ 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
-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]
+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
-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]
+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 "Oj is %0.1f times faster than YAJL at parsing." % [yajl_dt / oj_dt]
+puts
 
-
-obj = Oj.load(s)
 start = Time.now
 iter.times do
   Oj.dump(obj)
 end
-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]
+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
-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]
+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 "Oj is %0.1f times faster than YAJL at dumping." % [yajl_dt / oj_dt]
+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/tests.rb

@@ -109,6 +109,7 @@ class Juice < ::Test::Unit::TestCase
                    :symbol_keys=>false,
                    :ascii_only=>false,
                    :mode=>:object,
+                   :max_stack=>65536,
                    :create_id=>'json_class'}, opts)
   end
 
@@ -120,6 +121,7 @@ class Juice < ::Test::Unit::TestCase
       :symbol_keys=>false,
       :ascii_only=>false,
       :mode=>:object,
+      :max_stack=>65536,
       :create_id=>'json_class'}
     o2 = {
       :indent=>4,
@@ -128,6 +130,7 @@ class Juice < ::Test::Unit::TestCase
       :symbol_keys=>true,
       :ascii_only=>true,
       :mode=>:compat,
+      :max_stack=>4000,
       :create_id=>nil}
     o3 = { :indent => 4 }
     Oj.default_options = o2

metadata

@@ -1,24 +1,27 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: oj
-version: !ruby/object:Gem::Version
-  version: 1.2.10
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 1.2.11
 platform: ruby
-authors:
+authors: 
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-20 00:00:00.000000000 Z
+
+date: 2012-06-21 00:00:00 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
@@ -32,13 +35,13 @@ 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/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
@@ -58,35 +61,37 @@ 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/boo.rb

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

@@ -1,18 +0,0 @@
-
-$: << 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/where.rb

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