oj 0.5.1 → 0.5.2

data/README.md

@@ -18,7 +18,9 @@ A fast JSON parser and Object marshaller as a Ruby gem.
 
 ## <a name="release">Release Notes</a>
 
-### Release 0.5
+### Release 0.5.2
+
+- Release 0.5.2 fixes encoding and float encoding.
 
 This is the first release sith a version of 0.5 indicating it is only half
 done. Basic load() and dump() is supported for Hash, Array, NilClass,

data/ext/oj/dump.c

@@ -158,7 +158,7 @@ grow(Out out, size_t len) {
 
 inline static void
 dump_hex(u_char c, Out out) {
-    u_char	d = c & 0xF0;
+    u_char	d = (c >> 4) & 0x0F;
 
     if (9 < d) {
 	*out->cur++ = (d - 10) + 'a';

data/ext/oj/load.c

@@ -116,7 +116,7 @@ parse(char *json, Options options) {
     /* initialize parse info */
     pi.str = json;
     pi.s = json;
-    pi.encoding = 0;
+    pi.encoding = ('\0' == *options->encoding) ? 0 : rb_enc_find(options->encoding);
     pi.options = options;
     if (Qundef == (obj = read_next(&pi))) {
 	raise_error("no object read", pi.str, pi.s);
@@ -298,14 +298,17 @@ read_num(ParseInfo pi) {
 	    e = e * 10 + (*pi->s - '0');
 	}
     }
-    if (neg) {
-	n = -n;
-    }
     if (0 == e && 0 == a && 1 == div) {
+	if (neg) {
+	    n = -n;
+	}
 	return LONG2NUM(n);
     } else {
 	double	d = (double)n + (double)a / (double)div;
 
+	if (neg) {
+	    d = -d;
+	}
 	if (0 != e) {
 	    if (eneg) {
 		e = -e;

data/ext/oj/oj.c

@@ -41,14 +41,6 @@ typedef struct _YesNoOpt {
     char        *attr;
 } *YesNoOpt;
 
-struct _Options  default_options = {
-    { '\0' },		// encoding
-    2,			// indent
-    No,			// circular
-    NoMode,		// mode
-    TolerantEffort,	// effort
-};
-
 void Init_oj();
 
 VALUE    Oj = Qnil;
@@ -64,6 +56,13 @@ VALUE   simple_sym;
 VALUE   strict_sym;
 VALUE   tolerant_sym;
 
+static struct _Options  default_options = {
+    { '\0' },		// encoding
+    0,			// indent
+    No,			// circular
+    NoMode,		// mode
+    TolerantEffort,	// effort
+};
 
 /* call-seq: default_options() => Hash
  *
@@ -106,8 +105,13 @@ get_def_opts(VALUE self) {
  * @param [Fixnum] :indent number of spaces to indent each element in an XML document
  * @param [String] :encoding character encoding for the JSON file
  * @param [true|false|nil] :circular support circular references while dumping
- * @param [:object|:simple|nil] :mode load method to use for JSON
- * @param [:strict|:tolerant|:lazy] :effort set the tolerance level for loading
+ * @param [:object|:simple|nil] :mode load and dump methods to use for JSON
+ * @param [:strict|:tolerant|:lazy] :effort set the tolerance level for
+ *        loading. :strict raises an exception when a non-supported Object is
+ *        encountered. :tolerant attempts to extract variable values from an
+ *        Object using to_json() then it walks the Object's variables. The
+ *        :lazy mode ignores non-supported Objects and replaces them with a
+ *        null.
  * @return [nil]
  */
 static VALUE
@@ -121,8 +125,10 @@ set_def_opts(VALUE self, VALUE opts) {
     
     Check_Type(opts, T_HASH);
 
-    v = rb_hash_aref(opts, encoding_sym);
-    if (Qnil == v) {
+    v = rb_hash_lookup2(opts, encoding_sym, Qundef);
+    if (Qundef == v) {
+	// no change
+    } else if (Qnil == v) {
         *default_options.encoding = '\0';
     } else {
         Check_Type(v, T_STRING);
@@ -135,8 +141,10 @@ set_def_opts(VALUE self, VALUE opts) {
         default_options.indent = FIX2INT(v);
     }
 
-    v = rb_hash_aref(opts, mode_sym);
-    if (Qnil == v) {
+    v = rb_hash_lookup2(opts, mode_sym, Qundef);
+    if (Qundef == v) {
+	// no change
+    } else if (Qnil == v) {
         default_options.mode = NoMode;
     } else if (object_sym == v) {
         default_options.mode = ObjectMode;
@@ -146,8 +154,10 @@ set_def_opts(VALUE self, VALUE opts) {
         rb_raise(rb_eArgError, ":mode must be :object, :simple, or nil.\n");
     }
 
-    v = rb_hash_aref(opts, effort_sym);
-    if (Qnil == v) {
+    v = rb_hash_lookup2(opts, effort_sym, Qundef);
+    if (Qundef == v) {
+	// no change
+    } else if (Qnil == v) {
         default_options.effort = NoEffort;
     } else if (strict_sym == v) {
         default_options.effort = StrictEffort;
@@ -159,8 +169,10 @@ set_def_opts(VALUE self, VALUE opts) {
         rb_raise(rb_eArgError, ":effort must be :strict, :tolerant, :lazy, or nil.\n");
     }
     for (o = ynos; 0 != o->attr; o++) {
-        v = rb_hash_lookup(opts, o->sym);
-        if (Qnil == v) {
+        v = rb_hash_lookup2(opts, o->sym, Qundef);
+	if (Qundef == v) {
+	    // no change
+	} else if (Qnil == v) {
             *o->attr = NotSet;
         } else if (Qtrue == v) {
             *o->attr = Yes;
@@ -246,13 +258,13 @@ load(char *json, int argc, VALUE *argv, VALUE self) {
     return obj;
 }
 
-/* call-seq: load(xml, options) => Hash, Array, String, Fixnum, Float, true, false, or nil
+/* call-seq: load(json, options) => Hash, Array, String, Fixnum, Float, true, false, or nil
  *
  * Parses a JSON document String into a Hash, Array, String, Fixnum, Float,
- * true, false, or nil Raises an exception if the JSON is * malformed or the
+ * true, false, or nil. Raises an exception if the JSON is malformed or the
  * classes specified are not valid.
  * @param [String] json JSON String
- * @param [Hash] options load options
+ * @param [Hash] options load options (same as default_options)
  */
 static VALUE
 load_str(int argc, VALUE *argv, VALUE self) {
@@ -294,6 +306,12 @@ load_file(int argc, VALUE *argv, VALUE self) {
     return load(json, argc - 1, argv + 1, self);
 }
 
+/* call-seq: dump(obj, options) => json-string
+ *
+ * Dumps an Object (obj) to a string.
+ * @param [Object] obj Object to serialize as an JSON document String
+ * @param [Hash] options same as default_options
+ */
 static VALUE
 dump(int argc, VALUE *argv, VALUE self) {
     char                *json;
@@ -340,6 +358,7 @@ void Init_oj() {
     simple_sym = ID2SYM(rb_intern("simple"));		rb_ary_push(keep, simple_sym);
     strict_sym = ID2SYM(rb_intern("strict"));		rb_ary_push(keep, strict_sym);
     tolerant_sym = ID2SYM(rb_intern("tolerant"));	rb_ary_push(keep, tolerant_sym);
+    default_options.effort = TolerantEffort;
 }
 
 void

data/lib/oj/version.rb

@@ -1,5 +1,5 @@
 
 module Oj
   # Current version of the module. 
-  VERSION = '0.5.1'
+  VERSION = '0.5.2'
 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/foo.rb

@@ -0,0 +1,58 @@
+#!/usr/bin/env ruby -wW1
+# encoding: UTF-8
+
+$: << File.join(File.dirname(__FILE__), "../lib")
+$: << File.join(File.dirname(__FILE__), "../ext")
+
+#require 'test/unit'
+require 'optparse'
+require 'yajl'
+require 'oj'
+
+$indent = 2
+
+opts = OptionParser.new
+opts.on("-h", "--help", "Show this display")                { puts opts; Process.exit!(0) }
+files = opts.parse(ARGV)
+
+iter = 100000
+s = %{
+{ "class": "Foo::Bar",
+  "attr1": [ true, [false, [12345, null], 3.967, ["something", false], null]],
+  "attr2": { "one": 1 }
+}
+}
+
+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]
+
+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]
+
+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
+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
+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 "Oj is %0.1f times faster than YAJL at dumping." % [yajl_dt / oj_dt]

data/test/perf_simple.rb

@@ -0,0 +1,65 @@
+#!/usr/bin/env ruby -wW1
+# encoding: UTF-8
+
+$: << File.join(File.dirname(__FILE__), "../lib")
+$: << File.join(File.dirname(__FILE__), "../ext")
+
+#require 'test/unit'
+require 'optparse'
+require 'yajl'
+require 'oj'
+
+$indent = 2
+
+opts = OptionParser.new
+opts.on("-h", "--help", "Show this display")                { puts opts; Process.exit!(0) }
+files = opts.parse(ARGV)
+
+iter = 100000
+s = %{
+{ "class": "Foo::Bar",
+  "attr1": [ true, [false, [12345, null], 3.967, ["something", false], null]],
+  "attr2": { "one": 1 }
+}
+}
+
+Oj.default_options = { :indent => 0 }
+
+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]
+
+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]
+
+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]
+
+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]
+
+puts "Oj is %0.1f times faster than YAJL at dumping." % [yajl_dt / oj_dt]
+
+puts

data/test/simple.rb

@@ -0,0 +1,104 @@
+#!/usr/bin/env ruby -wW1
+# encoding: UTF-8
+
+$: << File.join(File.dirname(__FILE__), "../lib")
+$: << File.join(File.dirname(__FILE__), "../ext")
+
+require 'test/unit'
+require 'oj'
+
+class Juice < ::Test::Unit::TestCase
+
+  def test_get_options
+    opts = Oj.default_options()
+    assert_equal(opts, {
+                   :encoding=>nil,
+                   :indent=>0,
+                   :circular=>false,
+                   :mode=>nil,
+                   :effort=>:tolerant})
+  end
+
+  def test_set_options
+    orig = {
+      :encoding=>nil,
+      :indent=>0,
+      :circular=>false,
+      :mode=>nil,
+      :effort=>:tolerant}
+    o2 = {
+      :encoding=>"UTF-8",
+      :indent=>4,
+      :circular=>true,
+      :mode=>:object,
+      :effort=>:strict }
+    o3 = { :indent => 4 }
+    Oj.default_options = o2
+    opts = Oj.default_options()
+    assert_equal(opts, o2);
+    Oj.default_options = o3 # see if it throws an exception
+    Oj.default_options = orig # return to original
+  end
+
+  def test_nil
+    dump_and_load(nil, false)
+  end
+
+  def test_true
+    dump_and_load(true, false)
+  end
+
+  def test_false
+    dump_and_load(false, false)
+  end
+
+  def test_fixnum
+    dump_and_load(0, false)
+    dump_and_load(12345, false)
+    dump_and_load(-54321, false)
+    dump_and_load(1, false)
+  end
+
+  def test_float
+    dump_and_load(0.0, false)
+    dump_and_load(12345.6789, false)
+    dump_and_load(-54321.012, true)
+    dump_and_load(2.48e16, false)
+  end
+
+  def test_string
+    dump_and_load('', false)
+    dump_and_load('abc', false)
+    dump_and_load("abc\ndef", false)
+    dump_and_load("a\u0041", false)
+  end
+
+  def test_array
+    dump_and_load([], false)
+    dump_and_load([true, false], false)
+    dump_and_load(['a', 1, nil], false)
+    dump_and_load([[nil]], false)
+    dump_and_load([[nil], 58], false)
+  end
+
+  def test_hash
+    dump_and_load({}, false)
+    dump_and_load({ 'true' => true, 'false' => false}, false)
+    dump_and_load({ 'true' => true, 'array' => [], 'hash' => { }}, false)
+  end
+  
+  def test_encode
+    Oj.default_options = { :encoding => 'UTF-8' }
+    dump_and_load("ぴーたー", false)
+    Oj.default_options = { :encoding => nil }
+  end
+
+  def dump_and_load(obj, trace=false)
+    json = Oj.dump(obj, :indent => 2)
+    puts json if trace
+    loaded = Oj.load(json, :mode => :simple);
+    assert_equal(obj, loaded)
+    loaded
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -11,10 +11,7 @@ bindir: bin
 cert_chain: []
 date: 2012-02-19 00:00:00.000000000 Z
 dependencies: []
-description: ! "A fast JSON parser and object serializer that uses only standard C
-  lib.\n            \nOptimized JSON (Oj), as the name implies was written to provide
-  speed optimized\nJSON handling. It was designed to be an alternative to Yajl and
-  other Ruby\nJSON parsers and as an alternative to Marshal for Object serialization. "
+description: ! 'The fastest JSON parser and object serializer. '
 email: peter@ohler.com
 executables: []
 extensions:
@@ -29,6 +26,10 @@ files:
 - ext/oj/dump.c
 - ext/oj/load.c
 - ext/oj/oj.c
+- test/boo.rb
+- test/foo.rb
+- test/perf_simple.rb
+- test/simple.rb
 - LICENSE
 - README.md
 homepage: https://github.com/ohler55/oj