oj 2.0.10 → 2.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 027c673b279c8afd3bfe19993fd495522b7e7193
-  data.tar.gz: a007b49197ff05ebfa1de0b6f154cd9dbbaac632
+  metadata.gz: 451501e86625385b0362d776ad531e20f8be0aa5
+  data.tar.gz: fc691b28aba6381bec1aebe7acfe25f0483f0b82
 SHA512:
-  metadata.gz: 8a391978b9e3bd73832878cf081a532814b1ed7cb7e4ca1c6279f63d15326715c28759992eddb4e224dc59f5804957bf5c88c35b38efa6f19f810a2f68b5b0ae
-  data.tar.gz: c5db0d98e3d96cb0c2ffa0e4fe57d5cd017a38d3d991f45487669f0d86dfcbfca5f275da220dafe5622dc3467ce614f9060c1dc9cf5c7d744f153d415cd2366e
+  metadata.gz: 6f779275172ff00267a5c7d9398b831253c0582abc2eb93f1e9b1f74d7863bf0e16156a9926d5008006329bb5d78549f799e8f54bf9d4b6effa422849171d767
+  data.tar.gz: 0d971692dce841116f198fc6c190c906ce613784b647908e706d8a8e76d965b4e9d7fc16a960e776da5dbb5426a8f53dd4d5b0744aafe36a0831532f1cf97490

data/README.md

@@ -32,15 +32,15 @@ A fast JSON parser and Object marshaller as a Ruby gem.
 
 ## <a name="release">Release Notes</a>
 
-### Release 2.0.10
+### Release 2.0.11
 
- - Tweaked dump calls by reducing preallocation. Speeds are now several times faster for smaller objects.
+ - Fixed mimic issue with Debian
 
- - Fixed Windows compile error with Ruby 2.0.0.
+ - Added option to not cache classes when loading. This should be used when classes are dynamically unloaded and the redefined.
 
-### Release 2.0.9
+ - Float rounding improved by limiting decimal places to 15 places.
 
- - Fixed problem with INFINITY with CentOS and Ruby 2.0.0. There are some header file conflicts so a different INFINITY was used.
+ - Fixed xml time dumping test.
 
 ## <a name="description">Description</a>
 

data/ext/oj/dump.c

@@ -429,7 +429,7 @@ dump_float(VALUE obj, Out out) {
     } else if (d == (double)(long long int)d) {
 	cnt = sprintf(buf, "%.1f", d); // used sprintf due to bug in snprintf
     } else {
-	cnt = sprintf(buf, "%0.16g", d); // used sprintf due to bug in snprintf
+	cnt = sprintf(buf, "%0.15g", d); // used sprintf due to bug in snprintf
     }
     if (out->end - out->cur <= (long)cnt) {
 	grow(out, cnt);

data/ext/oj/load.c

@@ -158,44 +158,53 @@ classname2obj(const char *name, ParseInfo pi) {
     }
 }
 
+static VALUE
+resolve_classpath(const char *name, ParseInfo pi) {
+    char	class_name[1024];
+    VALUE	clas;
+    int		auto_define = (Yes == pi->options->auto_define);
+    char	*end = class_name + sizeof(class_name) - 1;
+    char	*s;
+    const char	*n = name;
+
+    clas = rb_cObject;
+    for (s = class_name; '\0' != *n; n++) {
+	if (':' == *n) {
+	    *s = '\0';
+	    n++;
+	    if (':' != *n) {
+		raise_error("Invalid classname, expected another ':'", pi->str, pi->s);
+	    }
+	    if (Qundef == (clas = resolve_classname(clas, class_name, auto_define))) {
+		char	buf[1024];
+
+		snprintf(buf, sizeof(buf) - 1, "Class %s not defined", class_name);
+		raise_error(buf, pi->str, pi->s);
+	    }
+	    s = class_name;
+	} else if (end <= s) {
+	    raise_error("Invalid classname, limit is 1024 characters", pi->str, pi->s);
+	} else {
+	    *s++ = *n;
+	}
+    }
+    *s = '\0';
+    return resolve_classname(clas, class_name, auto_define);
+}
+
 static VALUE
 classname2class(const char *name, ParseInfo pi) {
     VALUE	clas;
     VALUE	*slot;
-    int		auto_define = (Yes == pi->options->auto_define);
 
+    if (No == pi->options->class_cache) {
+	return resolve_classpath(name, pi);
+    }
 #if SAFE_CACHE
     pthread_mutex_lock(&oj_cache_mutex);
 #endif
     if (Qundef == (clas = oj_cache_get(oj_class_cache, name, &slot))) {
-	char		class_name[1024];
-	char		*end = class_name + sizeof(class_name) - 1;
-	char		*s;
-	const char	*n = name;
-
-	clas = rb_cObject;
-	for (s = class_name; '\0' != *n; n++) {
-	    if (':' == *n) {
-		*s = '\0';
-		n++;
-		if (':' != *n) {
-		    raise_error("Invalid classname, expected another ':'", pi->str, pi->s);
-		}
-		if (Qundef == (clas = resolve_classname(clas, class_name, auto_define))) {
-		    char	buf[1024];
-
-		    snprintf(buf, sizeof(buf) - 1, "Class %s not defined", class_name);
-		    raise_error(buf, pi->str, pi->s);
-		}
-		s = class_name;
-	    } else if (end <= s) {
-		raise_error("Invalid classname, limit is 1024 characters", pi->str, pi->s);
-	    } else {
-		*s++ = *n;
-	    }
-	}
-	*s = '\0';
-	if (Qundef != (clas = resolve_classname(clas, class_name, auto_define))) {
+	if (Qundef != (clas = resolve_classpath(name, pi))) {
 	    *slot = clas;
 	}
     }

data/ext/oj/oj.c

@@ -87,6 +87,7 @@ static VALUE	auto_define_sym;
 static VALUE	bigdecimal_as_decimal_sym;
 static VALUE	bigdecimal_load_sym;
 static VALUE	circular_sym;
+static VALUE	class_cache_sym;
 static VALUE	compat_sym;
 static VALUE	create_id_sym;
 static VALUE	indent_sym;
@@ -130,6 +131,7 @@ struct _Options	oj_default_options = {
     No,			// sym_key
     No,			// ascii_only
     ObjectMode,		// mode
+    Yes,		// class_cache
     UnixTime,		// time_format
     Yes,		// bigdec_as_num
     No,			// bigdec_load
@@ -161,6 +163,7 @@ oj_get_odd(VALUE clas) {
  * - 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
+ * - class_cache: [true|false|nil] cache classes for faster parsing (if dynamically modifying classes or reloading classes then don't use this)
  * - mode: [:object|:strict|:compat|:null] load and dump modes to use for JSON
  * - time_format: [:unix|:xmlschema|:ruby] time format when dumping in :compat mode
  * - bigdecimal_as_decimal: [true|false|nil] dump BigDecimal as a decimal number or as a String
@@ -178,6 +181,7 @@ get_def_opts(VALUE self) {
     rb_hash_aset(opts, sec_prec_sym, INT2FIX(oj_default_options.sec_prec));
     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, class_cache_sym, (Yes == oj_default_options.class_cache) ? Qtrue : ((No == oj_default_options.class_cache) ? 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));
     rb_hash_aset(opts, symbol_keys_sym, (Yes == oj_default_options.sym_key) ? Qtrue : ((No == oj_default_options.sym_key) ? Qfalse : Qnil));
@@ -209,6 +213,7 @@ get_def_opts(VALUE self) {
  * @param [true|false|nil] :circular support circular references while dumping
  * @param [true|false|nil] :auto_define automatically define classes if they do not exist
  * @param [true|false|nil] :symbol_keys convert hash keys to symbols
+ * @param [true|false|nil] :class_cache cache classes for faster parsing
  * @param [true|false|nil] :ascii_only encode all high-bit characters as escaped sequences if true
  * @param [true|false|nil] :bigdecimal_as_decimal dump BigDecimal as a decimal number or as a String
  * @param [true|false|nil] :bigdecimal_load load decimals as a BigDecimal instead of as a Float
@@ -235,6 +240,7 @@ set_def_opts(VALUE self, VALUE opts) {
 	{ circular_sym, &oj_default_options.circular },
 	{ auto_define_sym, &oj_default_options.auto_define },
 	{ symbol_keys_sym, &oj_default_options.sym_key },
+	{ class_cache_sym, &oj_default_options.class_cache },
 	{ ascii_only_sym, &oj_default_options.ascii_only },
 	{ bigdecimal_as_decimal_sym, &oj_default_options.bigdec_as_num },
 	{ bigdecimal_load_sym, &oj_default_options.bigdec_load },
@@ -341,6 +347,7 @@ parse_options(VALUE ropts, Options copts) {
 	{ circular_sym, &copts->circular },
 	{ auto_define_sym, &copts->auto_define },
 	{ symbol_keys_sym, &copts->sym_key },
+	{ class_cache_sym, &copts->class_cache },
 	{ ascii_only_sym, &copts->ascii_only },
 	{ bigdecimal_as_decimal_sym, &copts->bigdec_as_num },
 	{ bigdecimal_load_sym, &copts->bigdec_load },
@@ -1090,6 +1097,7 @@ void Init_oj() {
     bigdecimal_as_decimal_sym = ID2SYM(rb_intern("bigdecimal_as_decimal"));rb_gc_register_address(&bigdecimal_as_decimal_sym);
     bigdecimal_load_sym = ID2SYM(rb_intern("bigdecimal_load"));rb_gc_register_address(&bigdecimal_load_sym);
     circular_sym = ID2SYM(rb_intern("circular"));	rb_gc_register_address(&circular_sym);
+    class_cache_sym = ID2SYM(rb_intern("class_cache"));	rb_gc_register_address(&class_cache_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);

data/ext/oj/oj.h

@@ -108,6 +108,7 @@ typedef struct _Options {
     char	sym_key;	// YesNo
     char	ascii_only;	// YesNo
     char	mode;		// Mode
+    char	class_cache;	// YesNo
     char	time_format;	// TimeFormat
     char	bigdec_as_num;	// YesNo
     char	bigdec_load;	// YesNo

data/lib/oj/mimic.rb

@@ -7,6 +7,14 @@ module Oj
       next unless (gem.start_with?('json-') || gem.start_with?('json_pure'))
       $LOADED_FEATURES << File.join(gems_dir, gem, 'lib', 'json.rb')
     end
+    # and another approach in case the first did not get all
+    $LOAD_PATH.each do |d|
+      next unless File.exist?(d)
+      Dir.entries(d) do |file|
+        next unless file.ends_with?('jsob.rb')
+        $LOADED_FEATURES << file unless $LOADED_FEATURES.include?(file)
+      end
+    end
     mimic_paths.each { |p| $LOADED_FEATURES << p }
   end
 end

data/lib/oj/version.rb

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

data/test/tests.rb

@@ -114,6 +114,7 @@ class Juice < ::Test::Unit::TestCase
                    :circular=>false,
                    :auto_define=>false,
                    :symbol_keys=>false,
+                   :class_cache=>true,
                    :ascii_only=>false,
                    :mode=>:object,
                    :time_format=>:unix,
@@ -130,6 +131,7 @@ class Juice < ::Test::Unit::TestCase
       :circular=>false,
       :auto_define=>false,
       :symbol_keys=>false,
+      :class_cache=>true,
       :ascii_only=>false,
       :mode=>:object,
       :time_format=>:unix,
@@ -143,6 +145,7 @@ class Juice < ::Test::Unit::TestCase
       :circular=>true,
       :auto_define=>true,
       :symbol_keys=>true,
+      :class_cache=>false,
       :ascii_only=>true,
       :mode=>:compat,
       :time_format=>:ruby,
@@ -180,6 +183,7 @@ class Juice < ::Test::Unit::TestCase
   def test_float
     dump_and_load(0.0, false)
     dump_and_load(12345.6789, false)
+    dump_and_load(70.35, false)
     dump_and_load(-54321.012, false)
     dump_and_load(2.48e16, false)
     dump_and_load(2.48e100 * 1.0e10, false)
@@ -360,7 +364,7 @@ class Juice < ::Test::Unit::TestCase
     begin
       t = Time.new(2012, 1, 5, 23, 58, 7.9996, 32400)
       json = Oj.dump(t, :mode => :compat, :time_format => :xmlschema, :second_precision => 3)
-      assert_equal(%{"2012-01-05T23:58:08.000+09:00"}, json)
+      assert_equal(%{"2012-01-05T23:58:08+09:00"}, json)
     rescue Exception
       # some Rubies (1.8.7) do not allow the timezome to be set
       t = Time.local(2012, 1, 5, 23, 58, 7, 999600)
@@ -641,6 +645,21 @@ class Juice < ::Test::Unit::TestCase
     assert_equal(obj, obj2)
   end
 
+  def test_object_object_no_cache
+    obj = Jam.new(true, 58)
+    json = Oj.dump(obj, :mode => :object, :indent => 2)
+    assert(%{{
+  "^o":"Jam",
+  "x":true,
+  "y":58}} == json ||
+%{{
+  "^o":"Jam",
+  "y":58,
+  "x":true}} == json)
+    obj2 = Oj.load(json, :mode => :object, :class_cache => false)
+    assert_equal(obj, obj2)
+  end
+
   # Exception
   def test_exception
     err = nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 2.0.10
+  version: 2.0.11
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-10 00:00:00.000000000 Z
+date: 2013-04-23 00:00:00.000000000 Z
 dependencies: []
 description: 'The fastest JSON parser and object serializer. '
 email: peter@ohler.com