oj 1.2.9 → 1.2.10

data/ext/oj/oj.c

@@ -29,6 +29,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <pthread.h> // TBD LOCK
 #include <stdlib.h>
 #include <errno.h>
 #include <stdio.h>
@@ -55,18 +56,21 @@ ID	oj_as_json_id;
 ID	oj_fileno_id;
 ID	oj_instance_variables_id;
 ID	oj_json_create_id;
+ID	oj_new_id;
 ID	oj_read_id;
 ID	oj_string_id;
 ID	oj_to_hash_id;
 ID	oj_to_json_id;
+ID	oj_to_s_id;
 ID	oj_to_sym_id;
-ID	oj_write_id;
+ID	oj_to_time_id;
 ID	oj_tv_nsec_id;
 ID	oj_tv_sec_id;
 ID	oj_tv_usec_id;
+ID	oj_write_id;
 
 VALUE	oj_bag_class;
-VALUE	oj_date_class;
+VALUE	oj_bigdecimal_class;
 VALUE	oj_stringio_class;
 VALUE	oj_struct_class;
 VALUE	oj_time_class;
@@ -101,6 +105,8 @@ Cache	oj_attr_cache = 0;
 rb_encoding	*oj_utf8_encoding = 0;
 #endif
 
+pthread_mutex_t	oj_cache_mutex; // only used if SAFE_CACHE defined
+
 static const char	json_class[] = "json_class";
 
 struct _Options	oj_default_options = {
@@ -116,6 +122,20 @@ struct _Options	oj_default_options = {
 
 static VALUE	define_mimic_json(VALUE self);
 
+static struct _Odd	odds[4]; // bump up if new Odd classes are added
+
+Odd
+oj_get_odd(VALUE clas) {
+    Odd	odd = odds;
+
+    for (; Qundef != odd->clas; odd++) {
+	if (clas == odd->clas) {
+	    return odd;
+	}
+    }
+    return 0;
+}
+
 /* call-seq: default_options() => Hash
  *
  * Returns the default load and dump options as a Hash. The options are
@@ -764,10 +784,14 @@ define_mimic_json(VALUE self) {
 }
 
 void Init_oj() {
+    Odd	odd;
+    ID	*idp;
+
     Oj = rb_define_module("Oj");
 
     rb_require("time");
     rb_require("date");
+    rb_require("bigdecimal");
     rb_require("stringio");
 
     rb_define_module_function(Oj, "default_options", get_def_opts, 0);
@@ -783,20 +807,23 @@ void Init_oj() {
     oj_fileno_id = rb_intern("fileno");
     oj_instance_variables_id = rb_intern("instance_variables");
     oj_json_create_id = rb_intern("json_create");
+    oj_new_id = rb_intern("new");
     oj_read_id = rb_intern("read");
     oj_string_id = rb_intern("string");
     oj_to_hash_id = rb_intern("to_hash");
     oj_to_json_id = rb_intern("to_json");
+    oj_to_s_id = rb_intern("to_s");
     oj_to_sym_id = rb_intern("to_sym");
-    oj_write_id = rb_intern("write");
+    oj_to_time_id = rb_intern("to_time");
     oj_tv_nsec_id = rb_intern("tv_nsec");
     oj_tv_sec_id = rb_intern("tv_sec");
     oj_tv_usec_id = rb_intern("tv_usec");
+    oj_write_id = rb_intern("write");
 
     oj_bag_class = rb_const_get_at(Oj, rb_intern("Bag"));
     oj_struct_class = rb_const_get(rb_cObject, rb_intern("Struct"));
     oj_time_class = rb_const_get(rb_cObject, rb_intern("Time"));
-    oj_date_class = rb_const_get(rb_cObject, rb_intern("Date"));
+    oj_bigdecimal_class = rb_const_get(rb_cObject, rb_intern("BigDecimal"));
     oj_stringio_class = rb_const_get(rb_cObject, rb_intern("StringIO"));
 
     ascii_only_sym = ID2SYM(rb_intern("ascii_only"));	rb_gc_register_address(&ascii_only_sym);
@@ -821,6 +848,51 @@ void Init_oj() {
     oj_cache_new(&oj_class_cache);
     oj_cache_new(&oj_attr_cache);
 
+    odd = odds;
+    // Rational
+    idp = odd->attrs;
+    odd->clas = rb_const_get(rb_cObject, rb_intern("Rational"));
+    odd->create_obj = rb_cObject;
+    odd->create_op = rb_intern("Rational");
+    odd->attr_cnt = 2;
+    *idp++ = rb_intern("numerator");
+    *idp++ = rb_intern("denominator");
+    *idp++ = 0;
+    // Date
+    odd++;
+    idp = odd->attrs;
+    odd->clas = rb_const_get(rb_cObject, rb_intern("Date"));
+    odd->create_obj = odd->clas;
+    odd->create_op = oj_new_id;
+    odd->attr_cnt = 4;
+    *idp++ = rb_intern("year");
+    *idp++ = rb_intern("month");
+    *idp++ = rb_intern("day");
+    *idp++ = rb_intern("start");
+    *idp++ = 0;
+    // DateTime
+    odd++;
+    idp = odd->attrs;
+    odd->clas = rb_const_get(rb_cObject, rb_intern("DateTime"));
+    odd->create_obj = odd->clas;
+    odd->create_op = oj_new_id;
+    odd->attr_cnt = 8;
+    *idp++ = rb_intern("year");
+    *idp++ = rb_intern("month");
+    *idp++ = rb_intern("day");
+    *idp++ = rb_intern("hour");
+    *idp++ = rb_intern("min");
+    *idp++ = rb_intern("sec");
+    *idp++ = rb_intern("offset");
+    *idp++ = rb_intern("start");
+    *idp++ = 0;
+    odd++;
+    // The end. bump up the size of odds if a new class is added.
+    odd->clas = Qundef;
+
+#ifdef SAFE_CACHE
+    pthread_mutex_init(&oj_cache_mutex, 0);
+#endif
     oj_init_doc();
 }
 

data/ext/oj/oj.h

@@ -46,6 +46,7 @@ extern "C" {
 #endif
 
 #include "stdint.h"
+#include <pthread.h> // for SAFE_CACHE
 
 #include "cache.h"
 
@@ -64,6 +65,8 @@ enum st_retval {ST_CONTINUE = 0, ST_STOP = 1, ST_DELETE = 2, ST_CHECK};
 
 #define raise_error(msg, xml, current) _oj_raise_error(msg, xml, current, __FILE__, __LINE__)
 
+#define MAX_ODD_ARGS	10
+
 typedef enum {
     Yes	   = 'y',
     No	   = 'n',
@@ -101,6 +104,14 @@ typedef struct _Options {
     DumpOpts	dump_opts;
 } *Options;
 
+typedef struct _Odd {
+    VALUE	clas;			// Ruby class
+    VALUE	create_obj;
+    ID		create_op;
+    int		attr_cnt;
+    ID		attrs[MAX_ODD_ARGS];	// 0 terminated attr IDs
+} *Odd;
+
 enum {
     STR_VAL  = 0x00,
     COL_VAL  = 0x01,
@@ -133,6 +144,8 @@ extern void	_oj_raise_error(const char *msg, const char *xml, const char *curren
 
 extern void	oj_init_doc(void);
 
+extern Odd	oj_get_odd(VALUE clas);
+
 extern VALUE	Oj;
 extern struct _Options	oj_default_options;
 #if HAS_ENCODING_SUPPORT
@@ -140,7 +153,7 @@ extern rb_encoding	*oj_utf8_encoding;
 #endif
 
 extern VALUE	oj_bag_class;
-extern VALUE	oj_date_class;
+extern VALUE	oj_bigdecimal_class;
 extern VALUE	oj_doc_class;
 extern VALUE	oj_stringio_class;
 extern VALUE	oj_struct_class;
@@ -151,10 +164,13 @@ extern VALUE	oj_slash_string;
 extern ID	oj_as_json_id;
 extern ID	oj_instance_variables_id;
 extern ID	oj_json_create_id;
+extern ID	oj_new_id;
 extern ID	oj_string_id;
 extern ID	oj_to_hash_id;
 extern ID	oj_to_json_id;
+extern ID	oj_to_s_id;
 extern ID	oj_to_sym_id;
+extern ID	oj_to_time_id;
 extern ID	oj_tv_nsec_id;
 extern ID	oj_tv_sec_id;
 extern ID	oj_tv_usec_id;
@@ -162,6 +178,8 @@ extern ID	oj_tv_usec_id;
 extern Cache	oj_class_cache;
 extern Cache	oj_attr_cache;
 
+extern pthread_mutex_t	oj_cache_mutex;
+
 #if defined(__cplusplus)
 #if 0
 { /* satisfy cc-mode */

data/lib/oj/version.rb

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

data/test/boo.rb

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

data/test/bug.rb

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

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

@@ -15,19 +15,6 @@ opts = OptionParser.new
 opts.on("-h", "--help", "Show this display")                { puts opts; Process.exit!(0) }
 files = opts.parse(ARGV)
 
-class Foo
-  def initialize()
-    @x = true
-    @y = 58
-  end
-  def to_json()
-    %{{"x":#{@x},"y":#{@y}}}
-  end
-  def to_hash()
-    { 'x' => @x, 'y' => @y }
-  end
-end
-
 iter = 100000
 s = %{
 { "class": "Foo::Bar",
@@ -36,41 +23,36 @@ s = %{
 }
 }
 
-obj = Oj.load(s)
-obj["foo"] = Foo.new()
-
-Oj.default_options = { :indent => 0, :effort => :internal }
-
-puts
-
 start = Time.now
 iter.times do
   Oj.load(s)
 end
-dt = Time.now - start
-puts "%d Oj.load()s in %0.3f seconds or %0.1f loads/msec" % [iter, dt, iter/dt/1000.0]
+oj_dt = Time.now - start
+puts "%d Oj.load()s in %0.3f seconds or %0.1f loads/msec" % [iter, oj_dt, iter/oj_dt/1000.0]
 
 start = Time.now
 iter.times do
   Yajl::Parser.parse(s)
 end
-dt = Time.now - start
-puts "%d Yajl::Parser.parse()s in %0.3f seconds or %0.1f parses/msec" % [iter, dt, iter/dt/1000.0]
+yajl_dt = Time.now - start
+puts "%d Yajl::Parser.parse()s in %0.3f seconds or %0.1f parses/msec" % [iter, yajl_dt, iter/yajl_dt/1000.0]
 
-puts
+puts "Oj is %0.1f times faster than YAJL at parsing." % [yajl_dt / oj_dt]
 
+
+obj = Oj.load(s)
 start = Time.now
 iter.times do
   Oj.dump(obj)
 end
-dt = Time.now - start
-puts "%d Oj.dump()s in %0.3f seconds or %0.1f dumps/msec" % [iter, dt, iter/dt/1000.0]
+oj_dt = Time.now - start
+puts "%d Oj.dump()s in %0.3f seconds or %0.1f dumps/msec" % [iter, oj_dt, iter/oj_dt/1000.0]
 
 start = Time.now
 iter.times do
   Yajl::Encoder.encode(obj)
 end
-dt = Time.now - start
-puts "%d Yajl::Encoder.encode()s in %0.3f seconds or %0.1f encodes/msec" % [iter, dt, iter/dt/1000.0]
+yajl_dt = Time.now - start
+puts "%d Yajl::Encoder.encode()s in %0.3f seconds or %0.1f encodes/msec" % [iter, yajl_dt, iter/yajl_dt/1000.0]
 
-puts
+puts "Oj is %0.1f times faster than YAJL at dumping." % [yajl_dt / oj_dt]

data/test/tests.rb

@@ -6,6 +6,8 @@ $: << File.join(File.dirname(__FILE__), "../ext")
 
 require 'test/unit'
 require 'stringio'
+require 'date'
+require 'bigdecimal'
 require 'oj'
 
 $ruby = RUBY_DESCRIPTION.split(' ')[0]
@@ -210,6 +212,7 @@ class Juice < ::Test::Unit::TestCase
   def test_symbol_strict
     begin
       json = Oj.dump(:abc, :mode => :strict)
+      assert(false)
     rescue Exception => e
       assert(true)
     end
@@ -234,6 +237,7 @@ class Juice < ::Test::Unit::TestCase
     t = Time.local(2012, 1, 5, 23, 58, 7)
     begin
       json = Oj.dump(t, :mode => :strict)
+      assert(false)
     rescue Exception => e
       assert(true)
     end
@@ -254,10 +258,11 @@ class Juice < ::Test::Unit::TestCase
     dump_and_load(t, false)
   end
 
-# Class
+  # Class
   def test_class_strict
     begin
       json = Oj.dump(Juice, :mode => :strict)
+      assert(false)
     rescue Exception => e
       assert(true)
     end
@@ -275,7 +280,7 @@ class Juice < ::Test::Unit::TestCase
     dump_and_load(Juice, false)
   end
 
-# Hash
+  # Hash
   def test_hash
     Oj.default_options = { :mode => :strict }
     dump_and_load({}, false)
@@ -285,6 +290,7 @@ class Juice < ::Test::Unit::TestCase
   def test_non_str_hash_strict
     begin
       json = Oj.dump({ 1 => true, 0 => false }, :mode => :strict)
+      assert(false)
     rescue Exception => e
       assert(true)
     end
@@ -292,6 +298,7 @@ class Juice < ::Test::Unit::TestCase
   def test_non_str_hash_null
     begin
       json = Oj.dump({ 1 => true, 0 => false }, :mode => :null)
+      assert(false)
     rescue Exception => e
       assert(true)
     end
@@ -299,6 +306,7 @@ class Juice < ::Test::Unit::TestCase
   def test_non_str_hash_compat
     begin
       json = Oj.dump({ 1 => true, 0 => false }, :mode => :compat)
+      assert(false)
     rescue Exception => e
       assert(e.message.include?('Fixnum'))
       assert(true)
@@ -326,6 +334,7 @@ class Juice < ::Test::Unit::TestCase
     obj = Jeez.new(true, 58)
     begin
       json = Oj.dump(obj, :mode => :strict)
+      assert(false)
     rescue Exception => e
       assert(true)
     end
@@ -371,6 +380,7 @@ class Juice < ::Test::Unit::TestCase
     obj = Jazz.new(true, 58)
     begin
       json = Oj.dump(obj, :mode => :strict)
+      assert(false)
     rescue Exception => e
       assert(true)
     end
@@ -406,6 +416,7 @@ class Juice < ::Test::Unit::TestCase
     obj = Orange.new(true, 58)
     begin
       json = Oj.dump(obj, :mode => :strict)
+      assert(false)
     rescue Exception => e
       assert(true)
     end
@@ -457,6 +468,7 @@ class Juice < ::Test::Unit::TestCase
     obj = Jam.new(true, 58)
     begin
       json = Oj.dump(obj, :mode => :strict)
+      assert(false)
     rescue Exception => e
       assert(true)
     end
@@ -496,6 +508,7 @@ class Juice < ::Test::Unit::TestCase
     err = nil
     begin
       raise StandardError.new('A Message')
+      assert(false)
     rescue Exception => e
       err = e
     end
@@ -515,6 +528,7 @@ class Juice < ::Test::Unit::TestCase
   def test_range_strict
     begin
       json = Oj.dump(1..7, :mode => :strict)
+      assert(false)
     rescue Exception => e
       assert(true)
     end
@@ -547,6 +561,112 @@ class Juice < ::Test::Unit::TestCase
     end
   end
 
+  # BigNum
+  def test_bignum_strict
+    json = Oj.dump(7 ** 55, :mode => :strict)
+    assert_equal('30226801971775055948247051683954096612865741943', json)
+  end
+  def test_bignum_null
+    json = Oj.dump(7 ** 55, :mode => :null)
+    assert_equal('30226801971775055948247051683954096612865741943', json)
+  end
+  def test_bignum_compat
+    json = Oj.dump(7 ** 55, :mode => :compat)
+    b = Oj.load(json, :mode => :strict)
+    assert_equal(30226801971775055948247051683954096612865741943, b)
+  end
+  def test_bignum_object
+    dump_and_load(7 ** 55, false)
+  end
+
+  # BigDecimal
+  def test_bigdecimal_strict
+    begin
+      json = Oj.dump(BigDecimal.new('3.14159265358979323846'), :mode => :strict)
+      assert(false)
+    rescue Exception => e
+      assert(true)
+    end
+  end
+  def test_bigdecimal_null
+    json = Oj.dump(BigDecimal.new('3.14159265358979323846'), :mode => :null)
+    assert_equal('null', json)
+  end
+  def test_bigdecimal_compat
+    orig = BigDecimal.new('3.14159265358979323846')
+    json = Oj.dump(orig, :mode => :compat)
+    bg = Oj.load(json, :mode => :compat)
+    assert_equal(orig, bg)
+  end
+  def test_bigdecimal_object
+    dump_and_load(BigDecimal.new('3.14159265358979323846'), false)
+    # Infinity is the same for Float and BigDecimal
+    json = Oj.dump(BigDecimal.new('Infinity'), :mode => :compat)
+    assert_equal('Infinity', json)
+    json = Oj.dump(BigDecimal.new('-Infinity'), :mode => :compat)
+    assert_equal('-Infinity', json)
+  end
+
+  # Date
+  def test_date_strict
+    begin
+      json = Oj.dump(Date.new(2012, 6, 19), :mode => :strict)
+      assert(false)
+    rescue Exception => e
+      assert(true)
+    end
+  end
+  def test_date_null
+    json = Oj.dump(Date.new(2012, 6, 19), :mode => :null)
+    assert_equal('null', json)
+  end
+  def test_date_compat
+    orig = Date.new(2012, 6, 19)
+    json = Oj.dump(orig, :mode => :compat)
+    x = Oj.load(json, :mode => :compat)
+    # Some Rubies implement Date as data and some as a real Object. Either are
+    # okay for the test.
+    if x.is_a?(String)
+      assert_equal(orig.to_s, x)
+    else # better be a Hash
+      assert_equal({"year" => orig.year, "month" => orig.month, "day" => orig.day, "start" => orig.start}, x)
+    end
+  end
+  def test_date_object
+    dump_and_load(Date.new(2012, 6, 19), false)
+  end
+
+  # DateTime
+  def test_datetime_strict
+    begin
+      json = Oj.dump(DateTime.new(2012, 6, 19, 20, 19, 27), :mode => :strict)
+      assert(false)
+    rescue Exception => e
+      assert(true)
+    end
+  end
+  def test_datetime_null
+    json = Oj.dump(DateTime.new(2012, 6, 19, 20, 19, 27), :mode => :null)
+    assert_equal('null', json)
+  end
+  def test_datetime_compat
+    orig = DateTime.new(2012, 6, 19, 20, 19, 27)
+    json = Oj.dump(orig, :mode => :compat)
+    x = Oj.load(json, :mode => :compat)
+    # Some Rubies implement Date as data and some as a real Object. Either are
+    # okay for the test.
+    if x.is_a?(String)
+      assert_equal(orig.to_s, x)
+    else # better be a Hash
+      assert_equal({ "year" => orig.year, "month" => orig.month, "day" => orig.day,
+                     "hour" => orig.hour, "min" => orig.min, "sec" => orig.sec,
+                     "offset" => orig.offset, "start" => orig.start}, x)
+    end
+  end
+  def test_datetime_object
+    dump_and_load(DateTime.new(2012, 6, 19), false)
+  end
+
   # autodefine Oj::Bag
   def test_bag
     json = %{{