oj 1.1.0 → 1.1.1

data/README.md

@@ -24,15 +24,11 @@ A fast JSON parser and Object marshaller as a Ruby gem.
 
 ## <a name="release">Release Notes</a>
 
-### Release 1.1.0
+### Release 1.1.1
 
- - Errors are not longer raised when comments are encountered in JSON documents.
+ - The encoding option can now be an Encoding Object or a String.
 
- - Oj can now mimic JSON. With some expections calling JSON.mimic_JSON will allow all JSON calls to use OJ instead of JSON. This gives a speedup of more than 2x on parsing and 5x for generating over the JSON::Ext module.
-
- - Oj::Doc now allows a document to be left open and then closed with the Oj::Doc.close() class.
-
- - Changed the default encoding to UTF-8 instead of the Ruby default String encoding.
+ - Fixed Rubinius errors.
 
 ## <a name="description">Description</a>
 

data/ext/oj/dump.c

@@ -336,7 +336,7 @@ static void
 dump_float(VALUE obj, Out out) {
     char	buf[64];
     char	*b;
-    double	d = RFLOAT_VALUE(obj);
+    double	d = rb_num2dbl(obj);
     int		cnt;
 
     switch (fpclassify(d)) {

data/ext/oj/fast.c

@@ -775,7 +775,7 @@ doc_init(Doc doc) {
     doc->data = 0;
     doc->self = Qundef;
 #ifdef HAVE_RUBY_ENCODING_H
-    doc->encoding = ('\0' == *oj_default_options.encoding) ? 0 : rb_enc_find(oj_default_options.encoding);
+    doc->encoding = oj_default_options.encoding;
 #else
     doc->encoding = 0;
 #endif

data/ext/oj/load.c

@@ -520,8 +520,10 @@ read_array(ParseInfo pi, int hint) {
     VALUE	e;
     int		type = T_NONE;
     int		cnt = 0;
-    long	slen = 0;
     int		a_str;
+#ifndef NO_RSTRUCT
+    long	slen = 0;
+#endif
 
     pi->s++;
     next_non_white(pi);
@@ -896,7 +898,8 @@ oj_parse(char *json, Options options) {
 	pi.circ_array = circ_array_new();
     }
 #ifdef HAVE_RUBY_ENCODING_H
-    pi.encoding = ('\0' == *options->encoding) ? 0 : rb_enc_find(options->encoding);
+    pi.encoding = options->encoding;
+    //pi.encoding = ('\0' == *options->encoding) ? 0 : rb_enc_find(options->encoding);
 #else
     pi.encoding = 0;
 #endif

data/ext/oj/oj.c

@@ -40,7 +40,7 @@
 #include "oj.h"
 
 // maximum to allocate on the stack, arbitrary limit
-#define SMALL_XML	65536
+#define SMALL_JSON	65536
 
 typedef struct _YesNoOpt {
     VALUE       sym;
@@ -100,8 +100,7 @@ Cache   oj_class_cache = 0;
 Cache   oj_attr_cache = 0;
 
 struct _Options	oj_default_options = {
-    //    { '\0' },		// encoding
-    "UTF-8",		// encoding
+    0,			// encoding
     0,			// indent
     No,			// circular
     Yes,		// auto_define
@@ -116,8 +115,8 @@ static VALUE	define_mimic_json(VALUE self);
 /* call-seq: default_options() => Hash
  *
  * Returns the default load and dump options as a Hash. The options are
- * - indent: [Fixnum] number of spaces to indent each element in an XML document
- * - encoding: [String] character encoding for the JSON file
+ * - indent: [Fixnum] number of spaces to indent each element in an JSON document
+ * - encoding: [String|Encoding] character encoding for the JSON coument
  * - circular: [true|false|nil] support circular references while dumping
  * - auto_define: [true|false|nil] automatically define classes if they do not exist
  * - symbol_keys: [true|false|nil] use symbols instead of strings for hash keys
@@ -127,9 +126,10 @@ static VALUE	define_mimic_json(VALUE self);
 static VALUE
 get_def_opts(VALUE self) {
     VALUE       opts = rb_hash_new();
-    int         elen = (int)strlen(oj_default_options.encoding);
-
-    rb_hash_aset(opts, encoding_sym, (0 == elen) ? Qnil : rb_str_new(oj_default_options.encoding, elen));
+    
+#ifdef HAVE_RUBY_ENCODING_H
+    rb_hash_aset(opts, encoding_sym, (0 == oj_default_options.encoding) ? Qnil : rb_enc_from_encoding(oj_default_options.encoding));
+#endif
     rb_hash_aset(opts, indent_sym, INT2FIX(oj_default_options.indent));
     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));
@@ -149,7 +149,7 @@ get_def_opts(VALUE self) {
  *
  * Sets the default options for load and dump.
  * @param [Hash] opts options to change
- * @param [Fixnum] :indent number of spaces to indent each element in an XML document
+ * @param [Fixnum] :indent number of spaces to indent each element in an JSON document
  * @param [String] :encoding character encoding for the JSON file
  * @param [true|false|nil] :circular support circular references while dumping
  * @param [true|false|nil] :auto_define automatically define classes if they do not exist
@@ -178,15 +178,20 @@ set_def_opts(VALUE self, VALUE opts) {
     
     Check_Type(opts, T_HASH);
 
+#ifdef HAVE_RUBY_ENCODING_H
     if (Qtrue == rb_funcall(opts, rb_intern("has_key?"), 1, encoding_sym)) {
 	v = rb_hash_lookup(opts, encoding_sym);
 	if (Qnil == v) {
-	    *oj_default_options.encoding = '\0';
+	    oj_default_options.encoding = 0;
+	} else if (T_STRING == rb_type(v)) {
+	    oj_default_options.encoding = rb_enc_find(StringValuePtr(v));
+	} else if (rb_cEncoding == rb_obj_class(v)) {
+	    oj_default_options.encoding = rb_to_encoding(v);
 	} else {
-	    Check_Type(v, T_STRING);
-	    strncpy(oj_default_options.encoding, StringValuePtr(v), sizeof(oj_default_options.encoding) - 1);
+	    rb_raise(rb_eArgError, ":encoding must be nil, a String, or an Encoding.\n");
 	}
     }
+#endif
     v = rb_hash_aref(opts, indent_sym);
     if (Qnil != v) {
         Check_Type(v, T_FIXNUM);
@@ -245,12 +250,17 @@ parse_options(VALUE ropts, Options copts) {
             }
             copts->indent = NUM2INT(v);
         }
+#ifdef HAVE_RUBY_ENCODING_H
         if (Qnil != (v = rb_hash_lookup(ropts, encoding_sym))) {
-            if (rb_cString != rb_obj_class(v)) {
-                rb_raise(rb_eArgError, ":encoding must be a String.\n");
-            }
-            strncpy(copts->encoding, StringValuePtr(v), sizeof(copts->encoding) - 1);
+	    if (T_STRING == rb_type(v)) {
+		oj_default_options.encoding = rb_enc_find(StringValuePtr(v));
+	    } else if (rb_cEncoding == rb_obj_class(v)) {
+		oj_default_options.encoding = rb_to_encoding(v);
+	    } else {
+		rb_raise(rb_eArgError, ":encoding must be nil, a String, or an Encoding.\n");
+	    }
         }
+#endif
         if (Qnil != (v = rb_hash_lookup(ropts, mode_sym))) {
             if (object_sym == v) {
                 copts->mode = ObjectMode;
@@ -287,7 +297,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_XML < len) {
+	if (SMALL_JSON < len) {
 	    json = ALLOC_N(char, len);
 	} else {
 	    json = ALLOCA_N(char, len);
@@ -300,7 +310,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_XML < len) {
+	    if (SMALL_JSON < len) {
 		json = ALLOC_N(char, len);
 	    } else {
 		json = ALLOCA_N(char, len);
@@ -312,7 +322,7 @@ load_with_opts(VALUE input, Options copts) {
 
 	    len = lseek(fd, 0, SEEK_END);
 	    lseek(fd, 0, SEEK_SET);
-	    if (SMALL_XML < len) {
+	    if (SMALL_JSON < len) {
 		json = ALLOC_N(char, len + 1);
 	    } else {
 		json = ALLOCA_N(char, len + 1);
@@ -324,7 +334,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_XML < len) {
+	    if (SMALL_JSON < len) {
 		json = ALLOC_N(char, len);
 	    } else {
 		json = ALLOCA_N(char, len);
@@ -335,7 +345,7 @@ load_with_opts(VALUE input, Options copts) {
 	}
     }
     obj = oj_parse(json, copts);
-    if (SMALL_XML < len) {
+    if (SMALL_JSON < len) {
 	xfree(json);
     }
     return obj;
@@ -378,7 +388,7 @@ load_file(int argc, VALUE *argv, VALUE self) {
     }
     fseek(f, 0, SEEK_END);
     len = ftell(f);
-    if (SMALL_XML < len) {
+    if (SMALL_JSON < len) {
 	json = ALLOC_N(char, len + 1);
     } else {
 	json = ALLOCA_N(char, len + 1);
@@ -394,7 +404,7 @@ load_file(int argc, VALUE *argv, VALUE self) {
 	parse_options(argv[1], &options);
     }
     obj = oj_parse(json, &options);
-    if (SMALL_XML < len) {
+    if (SMALL_JSON < len) {
 	xfree(json);
     }
     return obj;
@@ -420,8 +430,8 @@ dump(int argc, VALUE *argv, VALUE self) {
     }
     rstr = rb_str_new2(json);
 #ifdef HAVE_RUBY_ENCODING_H
-    if ('\0' != *copts.encoding) {
-        rb_enc_associate(rstr, rb_enc_find(copts.encoding));
+    if (0 != copts.encoding) {
+        rb_enc_associate(rstr, copts.encoding);
     }
 #endif
     xfree(json);
@@ -465,8 +475,8 @@ mimic_dump(int argc, VALUE *argv, VALUE self) {
     }
     rstr = rb_str_new2(json);
 #ifdef ENCODING_INLINE_MAX
-    if ('\0' != *copts.encoding) {
-	rb_enc_associate(rstr, rb_enc_find(copts.encoding));
+    if (0 != copts.encoding) {
+	rb_enc_associate(rstr, copts.encoding);
     }
 #endif
     if (2 <= argc && Qnil != argv[1]) {
@@ -485,8 +495,6 @@ mimic_dump(int argc, VALUE *argv, VALUE self) {
 // This is the signature for the hash_foreach callback also.
 static int
 mimic_walk(VALUE key, VALUE obj, VALUE proc) {
-    VALUE	args[1];
-
     switch (rb_type(obj)) {
     case T_HASH:
 	rb_hash_foreach(obj, mimic_walk, proc);
@@ -504,11 +512,19 @@ mimic_walk(VALUE key, VALUE obj, VALUE proc) {
     default:
 	break;
     }
-    *args = obj;
     if (Qnil == proc) {
-	rb_yield_values2(1, args);
+	if (rb_block_given_p()) {
+	    rb_yield(obj);
+	}
     } else {
+#ifdef RUBINIUS
+        rb_raise(rb_eNotImpError, "Not supported in Rubinius.\n");
+#else
+	VALUE	args[1];
+
+	*args = obj;
 	rb_proc_call_with_block(proc, 1, args, Qnil);
+#endif
     }
     return ST_CONTINUE;
 }
@@ -516,10 +532,13 @@ mimic_walk(VALUE key, VALUE obj, VALUE proc) {
 static VALUE
 mimic_load(int argc, VALUE *argv, VALUE self) {
     VALUE	obj = load(1, argv, self);
+    VALUE	p = Qnil;
 
-    if (2 <= argc && Qnil != argv[1]) {
-	mimic_walk(Qnil, obj, argv[1]);
+    if (2 <= argc) {
+	p = argv[1];
     }
+    mimic_walk(Qnil, obj, p);
+
     return obj;
 }
 
@@ -596,8 +615,8 @@ mimic_generate_core(int argc, VALUE *argv, Options copts) {
     }
     rstr = rb_str_new2(json);
 #ifdef ENCODING_INLINE_MAX
-    if ('\0' != *copts->encoding) {
-        rb_enc_associate(rstr, rb_enc_find(copts->encoding));
+    if (0 != copts->encoding) {
+        rb_enc_associate(rstr, copts->encoding);
     }
 #endif
     xfree(json);
@@ -673,6 +692,14 @@ no_op1(VALUE self, VALUE obj) {
     return Qnil;
 }
 
+/* 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
+ * use Oj instead and be faster than the original JSON. Most options that
+ * could be passed to the JSON methods are supported. The calls to set parser
+ * or generator will not raise an Exception but will not have any effect.
+ */
 static VALUE
 define_mimic_json(VALUE self) {
     if (Qnil == mimic) {
@@ -762,6 +789,9 @@ void Init_oj() {
     oj_slash_string = rb_str_new2("/");			rb_ary_push(keep, oj_slash_string);
 
     oj_default_options.mode = ObjectMode;
+#ifdef HAVE_RUBY_ENCODING_H
+    oj_default_options.encoding = rb_enc_find("UTF-8");
+#endif
 
     oj_cache_new(&oj_class_cache);
     oj_cache_new(&oj_attr_cache);

data/ext/oj/oj.h

@@ -99,7 +99,12 @@ typedef struct _DumpOpts {
 } *DumpOpts;
 
 typedef struct _Options {
-    char        encoding[64];	// encoding, stored in the option to avoid GC invalidation in default values
+#ifdef HAVE_RUBY_ENCODING_H
+    rb_encoding	*encoding;
+#else
+    void	*encoding;
+#endif
+    //char        encoding[64];	// encoding, stored in the option to avoid GC invalidation in default values
     int         indent;		// indention for dump, default 2
     char        circular;	// YesNo
     char        auto_define;	// YesNo

data/lib/oj/version.rb

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

data/test/perf.rb

@@ -42,7 +42,7 @@ class Perf
     end
     iva = @items.clone
     iva.delete_if { |i| i.duration.nil? }
-    iva.sort_by! { |i| i.duration }
+    iva = iva.sort_by { |i| i.duration }
     puts
     puts "Summary:"
     puts "%*s  time (secs)  rate (ops/sec)" % [width, 'System']

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

@@ -6,14 +6,14 @@ $: << File.join(File.dirname(__FILE__), "../lib")
 $: << File.join(File.dirname(__FILE__), "../ext")
 
 require 'optparse'
-require 'yajl'
+#require 'yajl'
 require 'perf'
-require 'json'
-require 'json/pure'
-require 'json/ext'
-require 'msgpack'
+#require 'json'
+#require 'json/pure'
+#require 'json/ext'
+#require 'msgpack'
 require 'oj'
-require 'ox'
+#require 'ox'
 
 class Jazz
   attr_accessor :boolean, :number, :string
@@ -108,11 +108,9 @@ end
 $obj['j'] = Jazz.new() if $with_object
 
 Oj.default_options = { :indent => $indent, :mode => :compat }
-Ox.default_options = { :indent => $indent, :mode => :object }
 
 $json = Oj.dump($obj)
 $obj_json = Oj.dump($obj, :mode => :object)
-$xml = Ox.dump($obj, :indent => $indent)
 $failed = {} # key is same as String used in tests later
 
 def capture_error(tag, orig, load_key, dump_key, &blk)
@@ -127,15 +125,23 @@ end
 # Verify that all packages dump and load correctly and return the same Object as the original.
 capture_error('Oj:compat', $obj, 'load', 'dump') { |o| Oj.load(Oj.dump(o)) }
 capture_error('Oj', $obj, 'load', 'dump') { |o| Oj.load(Oj.dump(o, :mode => :compat), :mode => :compat) }
-capture_error('Ox', $obj, 'load', 'dump') { |o| Ox.load(Ox.dump(o, :mode => :object), :mode => :object) }
-capture_error('MessagePack', $obj, 'unpack', 'pack') { |o| MessagePack.unpack(MessagePack.pack($obj)) }
-capture_error('Yajl', $obj, 'encode', 'parse') { |o| Yajl::Parser.parse(Yajl::Encoder.encode(o)) }
+capture_error('Ox', $obj, 'load', 'dump') { |o|
+  require 'ox'
+  Ox.default_options = { :indent => $indent, :mode => :object }
+  $xml = Ox.dump($obj, :indent => $indent)
+  Ox.load(Ox.dump(o, :mode => :object), :mode => :object)
+}
+capture_error('MessagePack', $obj, 'unpack', 'pack') { |o| require 'msgpack'; MessagePack.unpack(MessagePack.pack($obj)) }
+capture_error('Yajl', $obj, 'encode', 'parse') { |o| require 'yajl'; Yajl::Parser.parse(Yajl::Encoder.encode(o)) }
 capture_error('JSON::Ext', $obj, 'generate', 'parse') { |o|
+  require 'json'
+  require 'json/ext'
   JSON.generator = JSON::Ext::Generator
   JSON.parser = JSON::Ext::Parser
   JSON.parse(JSON.generate(o))
 }
 capture_error('JSON::Pure', $obj, 'generate', 'parse') { |o|
+  require 'json/pure'
   JSON.generator = JSON::Pure::Generator
   JSON.parser = JSON::Pure::Parser
   JSON.parse(JSON.generate(o))

data/test/test_mimic.rb

@@ -69,10 +69,15 @@ class Mimic < ::Test::Unit::TestCase
   def test_load_proc
     children = []
     json = %{{"a":1,"b":[true,false]}}
-    p = Proc.new {|x| children << x }
-    obj = JSON.load(json, p)
+    if RUBY_ENGINE == 'rbx'
+      obj = JSON.load(json) {|x| children << x }
+    else
+      p = Proc.new {|x| children << x }
+      obj = JSON.load(json, p)
+    end
     assert_equal({ 'a' => 1, 'b' => [true, false]}, obj)
-    assert_equal([1, true, false, [true, false], { 'a' => 1, 'b' => [true, false]}], children)
+    assert([1, true, false, [true, false], { 'a' => 1, 'b' => [true, false]}] == children ||
+           [true, false, [true, false], 1, { 'a' => 1, 'b' => [true, false]}] == children)
   end
 
 # []
@@ -90,7 +95,8 @@ class Mimic < ::Test::Unit::TestCase
 # generate
   def test_generate
     json = JSON.generate({ 'a' => 1, 'b' => [true, false]})
-    assert_equal(%{{"a":1,"b":[true,false]}}, json)
+    assert(%{{"a":1,"b":[true,false]}} == json ||
+           %{{"b":[true,false],"a":1}} == json)
   end
   def test_generate_options
     json = JSON.generate({ 'a' => 1, 'b' => [true, false]},
@@ -99,33 +105,48 @@ class Mimic < ::Test::Unit::TestCase
                          :object_nl => "#\n",
                          :space => "*",
                          :space_before => "~")
-    assert_equal(%{{#
+    assert(%{{#
 --"a"~:*1,#
 --"b"~:*[
 ----true,
 ----false
 --]#
-}}, json)
+}} == json ||
+%{{#
+--"b"~:*[
+----true,
+----false
+--],#
+--"a"~:*1#
+}} == json)
+
   end
 
 # fast_generate
   def test_fast_generate
     json = JSON.generate({ 'a' => 1, 'b' => [true, false]})
-    assert_equal(%{{"a":1,"b":[true,false]}}, json)
+    assert(%{{"a":1,"b":[true,false]}} == json ||
+           %{{"b":[true,false],"a":1}} == json)
   end
 
 # pretty_generate
   def test_pretty_generate
     json = JSON.pretty_generate({ 'a' => 1, 'b' => [true, false]})
-    assert_equal(%{{
+    assert(%{{
   "a" : 1,
   "b" : [
     true,
     false
   ]
-}}, json)
+}} == json ||
+%{{
+  "b" : [
+    true,
+    false
+  ],
+  "a" : 1
+}} == json)
   end
-  # TBD with options
 
 # parse
   def test_parse
@@ -158,7 +179,8 @@ class Mimic < ::Test::Unit::TestCase
   def test_recurse_proc
     children = []
     obj = JSON.recurse_proc({ 'a' => 1, 'b' => [true, false]}) { |x| children << x }
-    assert_equal([1, true, false, [true, false], { 'a' => 1, 'b' => [true, false]}], children)
+    assert([1, true, false, [true, false], { 'a' => 1, 'b' => [true, false]}] == children ||
+           [true, false, [true, false], 1, { 'b' => [true, false], 'a' => 1}] == children)
   end
 
 end # Mimic

data/test/tests.rb

@@ -67,7 +67,7 @@ class Juice < ::Test::Unit::TestCase
 
   def test0_get_options
     opts = Oj.default_options()
-    assert_equal({ :encoding=>nil,
+    assert_equal({ :encoding=>Encoding.find('UTF-8'),
                    :indent=>0,
                    :circular=>false,
                    :auto_define=>true,
@@ -96,6 +96,7 @@ class Juice < ::Test::Unit::TestCase
     o3 = { :indent => 4 }
     Oj.default_options = o2
     opts = Oj.default_options()
+    o2[:encoding] = Encoding.find('UTF-8')
     assert_equal(opts, o2);
     Oj.default_options = o3 # see if it throws an exception
     Oj.default_options = orig # return to original

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -32,12 +32,13 @@ 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
@@ -57,7 +58,6 @@ files:
 - test/test_fast.rb
 - test/test_mimic.rb
 - test/tests.rb
-- test/where.rb
 - LICENSE
 - README.md
 homepage: https://github.com/ohler55/oj
@@ -83,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: oj
-rubygems_version: 1.8.15
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: A fast JSON parser and serializer.

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