oj 1.2.5 → 1.2.6

data/README.md

@@ -24,9 +24,11 @@ A fast JSON parser and Object marshaller as a Ruby gem.
 
 ## <a name="release">Release Notes</a>
 
-### Release 1.2.5
+### Release 1.2.6
 
- - Added support for create_id in Oj and in mimic_JSON mode
+ - Cleaned up documentation errors.
+
+ - Added support for OS X Ruby 1.8.7.
 
 ## <a name="description">Description</a>
 

data/ext/oj/extconf.rb

@@ -20,7 +20,7 @@ dflags = {
   'HAS_ENCODING_SUPPORT' => (('ruby' == type || 'rubinius' == type) && '1' == version[0] && '9' == version[1]) ? 1 : 0,
   'HAS_NANO_TIME' => ('ruby' == type && '1' == version[0] && '9' == version[1]) ? 1 : 0,
   'HAS_RSTRUCT' => ('ruby' == type || 'ree' == type) ? 1 : 0,
-  'HAS_IVAR_HELPERS' => ('ruby' == type && '1' == version[0] && '9' == version[1]) ? 1 : 0,
+  'HAS_IVAR_HELPERS' => ('ruby' == type && '1' == version[0] && '9' == version[1] && '2' <= version[2]) ? 1 : 0,
   'HAS_PROC_WITH_BLOCK' => ('ruby' == type && '1' == version[0] && '9' == version[1]) ? 1 : 0,
   'HAS_TOP_LEVEL_ST_H' => ('ree' == type || ('ruby' == type &&  '1' == version[0] && '8' == version[1])) ? 1 : 0,
 }

data/ext/oj/fast.c

@@ -1591,6 +1591,10 @@ doc_close(VALUE self) {
     }
     return Qnil;
 }
+#if 0
+// hack to keep the doc generator happy
+Oj = rb_define_module("Oj");
+#endif
 
 /* Document-class: Oj::Doc
  *

data/ext/oj/oj.c

@@ -93,7 +93,6 @@ static VALUE	space_sym;
 static VALUE	symbolize_names_sym;
 
 static VALUE	mimic = Qnil;
-static VALUE	keep = Qnil;
 
 Cache	oj_class_cache = 0;
 Cache	oj_attr_cache = 0;
@@ -370,6 +369,16 @@ load(int argc, VALUE *argv, VALUE self) {
     return load_with_opts(*argv, &options);
 }
 
+/* Document-method: load_file
+ *   call-seq: load_file(path, options) => Hash, Array, String, Fixnum, Float, true, false, or nil
+ *
+ * Parses a JSON document from a file into a Hash, Array, String, Fixnum,
+ * Float, true, false, or nil. Raises an exception if the JSON is malformed or
+ * the classes specified are not valid.
+ *
+ * @param [String] path path to a file containing a JSON document
+ * @param [Hash] options load options (same as default_options)
+ */
 static VALUE
 load_file(int argc, VALUE *argv, VALUE self) {
     char		*path;
@@ -648,7 +657,7 @@ mimic_parse(int argc, VALUE *argv, VALUE self) {
     struct _Options	options = oj_default_options;
 
     if (1 > argc) {
-	rb_raise(rb_eArgError, "Wrong number of arguments to load().\n");
+	rb_raise(rb_eArgError, "Wrong number of arguments to parse().\n");
     }
     if (2 <= argc && Qnil != argv[1]) {
 	VALUE	ropts = argv[1];
@@ -703,7 +712,8 @@ mimic_create_id(VALUE self, VALUE id) {
     return id;
 }
 
-/* call-seq: mimic_JSON() => Module
+/* Document-method: mimic_JSON
+ *    call-seq: mimic_JSON() => Module
  *
  * Creates the JSON module with methods and classes to mimic the JSON
  * gem. After this method is invoked calls that expect the JSON module will
@@ -715,11 +725,12 @@ static VALUE
 define_mimic_json(VALUE self) {
     if (Qnil == mimic) {
 	VALUE	ext;
+	VALUE	dummy;
 
 	mimic = rb_define_module("JSON");
 	ext = rb_define_module_under(mimic, "Ext");
-	rb_define_class_under(ext, "Parser", rb_cObject);
-	rb_define_class_under(ext, "Generator", rb_cObject);
+	dummy = rb_define_class_under(ext, "Parser", rb_cObject);
+	dummy = rb_define_class_under(ext, "Generator", rb_cObject);
 
 	rb_define_module_function(mimic, "parser=", no_op1, 1);
 	rb_define_module_function(mimic, "generator=", no_op1, 1);
@@ -736,12 +747,12 @@ define_mimic_json(VALUE self) {
 	rb_define_module_function(mimic, "parse", mimic_parse, -1);
 	rb_define_module_function(mimic, "parse!", mimic_parse, -1);
 
-	array_nl_sym = ID2SYM(rb_intern("array_nl"));	rb_ary_push(keep, array_nl_sym);
-	create_additions_sym = ID2SYM(rb_intern("create_additions"));	rb_ary_push(keep, create_additions_sym);
-	object_nl_sym = ID2SYM(rb_intern("object_nl"));	rb_ary_push(keep, object_nl_sym);
-	space_before_sym = ID2SYM(rb_intern("space_before"));	rb_ary_push(keep, space_before_sym);
-	space_sym = ID2SYM(rb_intern("space"));	rb_ary_push(keep, space_sym);
-	symbolize_names_sym = ID2SYM(rb_intern("symbolize_names"));	rb_ary_push(keep, symbolize_names_sym);
+	array_nl_sym = ID2SYM(rb_intern("array_nl"));			rb_gc_register_address(&array_nl_sym);
+	create_additions_sym = ID2SYM(rb_intern("create_additions"));	rb_gc_register_address(&create_additions_sym);
+	object_nl_sym = ID2SYM(rb_intern("object_nl"));			rb_gc_register_address(&object_nl_sym);
+	space_before_sym = ID2SYM(rb_intern("space_before"));		rb_gc_register_address(&space_before_sym);
+	space_sym = ID2SYM(rb_intern("space"));				rb_gc_register_address(&space_sym);
+	symbolize_names_sym = ID2SYM(rb_intern("symbolize_names"));	rb_gc_register_address(&symbolize_names_sym);
 
 	oj_default_options.mode = CompatMode;
 	oj_default_options.ascii_only = Yes;
@@ -751,7 +762,6 @@ define_mimic_json(VALUE self) {
 
 void Init_oj() {
     Oj = rb_define_module("Oj");
-    keep = rb_cv_get(Oj, "@@keep"); // needed to stop GC from deleting and reusing VALUEs
 
     rb_require("time");
     rb_require("date");
@@ -786,19 +796,19 @@ void Init_oj() {
     oj_date_class = rb_const_get(rb_cObject, rb_intern("Date"));
     oj_stringio_class = rb_const_get(rb_cObject, rb_intern("StringIO"));
 
-    ascii_only_sym = ID2SYM(rb_intern("ascii_only"));	rb_ary_push(keep, ascii_only_sym);
-    auto_define_sym = ID2SYM(rb_intern("auto_define"));	rb_ary_push(keep, auto_define_sym);
-    circular_sym = ID2SYM(rb_intern("circular"));	rb_ary_push(keep, circular_sym);
-    compat_sym = ID2SYM(rb_intern("compat"));		rb_ary_push(keep, compat_sym);
-    create_id_sym = ID2SYM(rb_intern("create_id"));	rb_ary_push(keep, create_id_sym);
-    indent_sym = ID2SYM(rb_intern("indent"));		rb_ary_push(keep, indent_sym);
-    mode_sym = ID2SYM(rb_intern("mode"));		rb_ary_push(keep, mode_sym);
-    symbol_keys_sym = ID2SYM(rb_intern("symbol_keys"));	rb_ary_push(keep, symbol_keys_sym);
-    null_sym = ID2SYM(rb_intern("null"));		rb_ary_push(keep, null_sym);
-    object_sym = ID2SYM(rb_intern("object"));		rb_ary_push(keep, object_sym);
-    strict_sym = ID2SYM(rb_intern("strict"));		rb_ary_push(keep, strict_sym);
+    ascii_only_sym = ID2SYM(rb_intern("ascii_only"));	rb_gc_register_address(&ascii_only_sym);
+    auto_define_sym = ID2SYM(rb_intern("auto_define"));	rb_gc_register_address(&auto_define_sym);
+    circular_sym = ID2SYM(rb_intern("circular"));	rb_gc_register_address(&circular_sym);
+    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);
+    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);
 
-    oj_slash_string = rb_str_new2("/");			rb_ary_push(keep, oj_slash_string);
+    oj_slash_string = rb_str_new2("/");			rb_gc_register_address(&oj_slash_string);
 
     oj_default_options.mode = ObjectMode;
 #if HAS_ENCODING_SUPPORT
@@ -827,3 +837,136 @@ _oj_raise_error(const char *msg, const char *xml, const char *current, const cha
     rb_raise(rb_eSyntaxError, "%s at line %d, column %d [%s:%d]\n", msg, xline, col, file, line);
 }
 
+// mimic JSON documentation
+
+/* Document-module: JSON
+ * 
+ * JSON is a JSON parser. This module when defined by the Oj module is a
+ * faster replacement for the original.
+ */
+/* Document-module: JSON::Ext
+ * 
+ * The Ext module is a placeholder in the mimic JSON module used for
+ * compatibility only.
+ */
+/* Document-class: JSON::Ext::Parser
+ * 
+ * The JSON::Ext::Parser is a placeholder in the mimic JSON module used for
+ * compatibility only.
+ */
+/* Document-class: JSON::Ext::Generator
+ * 
+ * The JSON::Ext::Generator is a placeholder in the mimic JSON module used for
+ * compatibility only.
+ */
+
+/* Document-method: create_id=
+ *   call-seq: create_id=(id) -> String
+ *
+ * Sets the create_id tag to look for in JSON document. That key triggers the
+ * creation of a class with the same name.
+ *
+ * @param [nil|String] id new create_id
+ * @return the id
+ */
+/* Document-method: parser=
+ *   call-seq: parser=(parser) -> nil
+ * 
+ * Does nothing other than provide compatibiltiy.
+ * @param [Object] parser ignored
+ */
+/* Document-method: generator=
+ *   call-seq: generator=(generator) -> nil
+ * 
+ * Does nothing other than provide compatibiltiy.
+ * @param [Object] generator ignored
+ */
+/* Document-method: dump
+ *   call-seq: dump(obj, anIO=nil, limit = nil) -> String
+ * 
+ * Encodes an object as a JSON String.
+ * 
+ * @param [Object] obj object to convert to encode as JSON
+ * @param [IO] anIO an IO that allows writing
+ * @param [Fixnum] limit ignored
+ */
+/* Document-method: load
+ *   call-seq: load(source, proc=nil) -> Object
+ * 
+ * Loads a Ruby Object from a JSON source that can be either a String or an
+ * IO. If Proc is given or a block is providedit is called with each nested
+ * element of the loaded Object.
+ * 
+ * @param [String|IO] source JSON source
+ * @param [Proc] proc to yield to on each element or nil
+ */
+/* Document-method: restore
+ *   call-seq: restore(source, proc=nil) -> Object
+ * 
+ * Loads a Ruby Object from a JSON source that can be either a String or an
+ * IO. If Proc is given or a block is providedit is called with each nested
+ * element of the loaded Object.
+ * 
+ * @param [String|IO] source JSON source
+ * @param [Proc] proc to yield to on each element or nil
+ */
+/* Document-method: recurse_proc
+ *   call-seq: recurse_proc(obj, &proc) -> nil
+ * 
+ * Yields to the proc for every element in the obj recursivly.
+ * 
+ * @param [Hash|Array] obj object to walk
+ * @param [Proc] proc to yield to on each element
+ */
+/* Document-method: []
+ *   call-seq: [](obj, opts={}) -> Object
+ * 
+ * If the obj argument is a String then it is assumed to be a JSON String and
+ * parsed otherwise the obj is encoded as a JSON String.
+ * 
+ * @param [String|Hash|Array] obj object to convert
+ * @param [Hash] opts same options as either generate or parse
+ */
+/* Document-method: generate
+ *   call-seq: generate(obj, opts=nil) -> String
+ * 
+ * Encode obj as a JSON String. The obj argument must be a Hash, Array, or
+ * respond to to_h or to_json. Options other than those listed such as
+ * +:allow_nan+ or +:max_nesting+ are ignored.
+ * 
+ * @param [Object|Hash|Array] obj object to convert to a JSON String
+ * @param [Hash] opts options
+ * @param [String] :indent String to use for indentation
+ * @param [String] :space String placed after a , or : delimiter
+ * @param [String] :space_before String placed before a : delimiter
+ * @param [String] :object_nl String placed after a JSON object
+ * @param [String] :array_nl String placed after a JSON array
+ */
+/* Document-method: fast_generate
+ *   call-seq: fast_generate(obj, opts=nil) -> String
+ * Same as generate().
+ * @see generate
+ */
+/* Document-method: pretty_generate
+ *   call-seq: pretty_generate(obj, opts=nil) -> String
+ * Same as generate() but with different defaults for the spacing options.
+ * @see generate
+ */
+/* Document-method: parse
+ *   call-seq: parse(source, opts=nil) -> Object
+ *
+ * Parses a JSON String or IO into a Ruby Object.  Options other than those
+ * listed such as +:allow_nan+ or +:max_nesting+ are ignored. +:object_class+ and
+ * +:array_object+ are not supported.
+ *
+ * @param [String|IO] source source to parse
+ * @param [Hash] opts options
+ * @param [true|false] :symbolize_names flag indicating JSON object keys should be Symbols instead of Strings
+ * @param [true|false] :create_additions flag indicating a key matching +create_id+ in a JSON object should trigger the creation of Ruby Object
+ * @see create_id=
+ */
+/* Document-method: parse!
+ *   call-seq: parse!(source, opts=nil) -> Object
+ * Same as parse().
+ * @see parse
+ */

data/ext/oj/oj.h

@@ -45,6 +45,8 @@ extern "C" {
 #include "ruby/encoding.h"
 #endif
 
+#include "stdint.h"
+
 #include "cache.h"
 
 #ifdef RUBINIUS_RUBY

data/lib/oj.rb

@@ -1,35 +1,27 @@
-# Copyright (c) 2011, Peter Ohler
-#
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# - Redistributions of source code must retain the above copyright notice, this
-#   list of conditions and the following disclaimer.
-#
-# - Redistributions in binary form must reproduce the above copyright notice,
-#   this list of conditions and the following disclaimer in the documentation
-#   and/or other materials provided with the distribution.
-#
-# - Neither the name of Peter Ohler nor the names of its contributors may be 
-#   used to endorse or promote products derived from this software without
-#   specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
+# Optimized JSON (Oj), as the name implies was written to provide speed
+# optimized JSON handling.
+# 
+# Oj has several dump or serialization modes which control how Objects are
+# converted to JSON. These modes are set with the :effort option in either the
+# default options or as one of the options to the dump() method.
+# 
+# - :strict mode will only allow the 7 basic JSON types to be serialized. Any other Object
+#   will raise and Exception. 
+# 
+# - :null mode replaces any Object that is not one of the JSON types is replaced by a JSON null.
+# 
+# - :object mode will dump any Object as a JSON Object with keys that match
+#   the Ruby Object's variable names without the '@' character. This is the
+#   highest performance mode.
+# 
+# - :compat mode is is the compatible with other systems. It will serialize
+#   any Object but will check to see if the Object implements a to_hash() or
+#   to_json() method. If either exists that method is used for serializing the
+#   Object. The to_hash() is more flexible and produces more consistent output
+#   so it has a preference over the to_json() method. If neither the to_json()
+#   or to_hash() methods exist then the Oj internal Object variable encoding
+#   is used.
 module Oj
-  private
-  @@keep = []
 end
 
 require 'oj/version'

data/lib/oj/version.rb

@@ -1,5 +1,5 @@
 
 module Oj
   # Current version of the module. 
-  VERSION = '1.2.5'
+  VERSION = '1.2.6'
 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/{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/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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-18 00:00:00.000000000 Z
+date: 2012-04-22 00:00:00.000000000 Z
 dependencies: []
 description: ! 'The fastest JSON parser and object serializer. '
 email: peter@ohler.com
@@ -32,13 +32,12 @@ files:
 - ext/oj/fast.c
 - ext/oj/load.c
 - ext/oj/oj.c
+- test/boo.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,6 +57,7 @@ files:
 - test/test_fast.rb
 - test/test_mimic.rb
 - test/tests.rb
+- test/where.rb
 - LICENSE
 - README.md
 homepage: http://www.ohler.com/oj
@@ -83,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: oj
-rubygems_version: 1.8.21
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: A fast JSON parser and serializer.

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