oj 1.0.3 → 1.0.4

data/README.md

@@ -24,11 +24,9 @@ A fast JSON parser and Object marshaller as a Ruby gem.
 
 ## <a name="release">Release Notes</a>
 
-### Release 1.0.3
+### Release 1.0.4
 
- - Added :symbol_keys option to convert String hash keys into Symbols.
-
- - The load() method now supports IO Objects as input as well as Strings.
+ - Fixed bug that did not allow symbols as keys in :compat mode.
 
 ## <a name="description">Description</a>
 

data/ext/oj/dump.c

@@ -76,6 +76,7 @@ static void	dump_class_comp(VALUE obj, Out out);
 static void	dump_class_obj(VALUE obj, Out out);
 static void	dump_array(VALUE obj, int depth, Out out);
 static int	hash_cb_strict(VALUE key, VALUE value, Out out);
+static int	hash_cb_compat(VALUE key, VALUE value, Out out);
 static int	hash_cb_object(VALUE key, VALUE value, Out out);
 static void	dump_hash(VALUE obj, int depth, int mode, Out out);
 static void	dump_time(VALUE obj, Out out);
@@ -542,6 +543,34 @@ hash_cb_strict(VALUE key, VALUE value, Out out) {
     return ST_CONTINUE;
 }
 
+static int
+hash_cb_compat(VALUE key, VALUE value, Out out) {
+    int		depth = out->depth;
+    long	size = depth * out->indent + 1;
+
+    if (out->end - out->cur <= size) {
+	grow(out, size);
+    }
+    fill_indent(out, depth);
+    switch (rb_type(key)) {
+    case T_STRING:
+	dump_str_comp(key, out);
+	break;
+    case T_SYMBOL:
+	dump_sym_comp(key, out);
+	break;
+    default:
+	rb_raise(rb_eTypeError, "In :strict mode all Hash keys must be Strings.");
+	break;
+    }
+    *out->cur++ = ':';
+    dump_val(value, depth, out);
+    out->depth = depth;
+    *out->cur++ = ',';
+
+    return ST_CONTINUE;
+}
+
 static int
 hash_cb_object(VALUE key, VALUE value, Out out) {
     int		depth = out->depth;
@@ -639,6 +668,8 @@ dump_hash(VALUE obj, int depth, int mode, Out out) {
 	out->depth = depth + 1;
 	if (ObjectMode == mode) {
 	    rb_hash_foreach(obj, hash_cb_object, (VALUE)out);
+	} else if (CompatMode == mode) {
+	    rb_hash_foreach(obj, hash_cb_compat, (VALUE)out);
 	} else {
 	    rb_hash_foreach(obj, hash_cb_strict, (VALUE)out);
 	}

data/ext/oj/load.c

@@ -335,6 +335,7 @@ read_obj(ParseInfo pi) {
     const char	*ks;
     int		obj_type = T_NONE;
     const char	*json_class_name = 0;
+    Mode	mode = pi->options->mode;
     
     pi->s++;
     next_non_white(pi);
@@ -361,7 +362,7 @@ read_obj(ParseInfo pi) {
 	} else {
 	    ks = 0;
 	}
-	if (0 != ks && Qundef == obj && ObjectMode == pi->options->mode) {
+	if (0 != ks && Qundef == obj && ObjectMode == mode) {
 	    if ('^' == *ks && '\0' == ks[2]) { // special directions
 		switch (ks[1]) {
 		case 't': // Time
@@ -390,19 +391,6 @@ read_obj(ParseInfo pi) {
 		    obj_type = T_STRUCT;
 		    key = Qundef;
 		    break;
-		    /*
-		case 'r': // Id for circular reference
-		    val = read_next(pi, T_FIXNUM);
-		    if (T_FIXNUM == rb_type(val)) {
-			obj_type = T_FIXNUM;
-			obj = circ_array_get(pi->circ_array, NUM2ULONG(val));
-			if (Qundef == obj || Qnil == obj) {
-			    raise_error("Failed to find referenced object", pi->str, pi->s);
-			}
-			key = Qundef;
-		    }
-		    break;
-		    */
 		default:
 		    // handle later
 		    break;
@@ -417,7 +405,7 @@ read_obj(ParseInfo pi) {
 		obj = rb_hash_new();
 		obj_type = T_HASH;
 	    }
-	    if (ObjectMode == pi->options->mode && 0 != ks && '^' == *ks) {
+	    if (ObjectMode == mode && 0 != ks && '^' == *ks) {
 		int	val_type = rb_type(val);
 
 		if ('i' == ks[1] && '\0' == ks[2] && T_FIXNUM == val_type) {
@@ -457,7 +445,7 @@ read_obj(ParseInfo pi) {
 		    } else {
 			rb_hash_aset(obj, key, val);
 		    }
-		    if ((CompatMode == pi->options->mode || ObjectMode == pi->options->mode) &&
+		    if ((CompatMode == mode || ObjectMode == mode) &&
 			0 == json_class_name &&
 			0 != ks && 'j' == *ks && 0 == strcmp("json_class", ks) &&
 			T_STRING == rb_type(val)) {

data/ext/oj/oj.c

@@ -239,11 +239,10 @@ parse_options(VALUE ropts, Options copts) {
         }
         for (o = ynos; 0 != o->attr; o++) {
             if (Qnil != (v = rb_hash_lookup(ropts, o->sym))) {
-                VALUE       c = rb_obj_class(v);
 
-                if (rb_cTrueClass == c) {
+                if (Qtrue == v) {
                     *o->attr = Yes;
-                } else if (rb_cFalseClass == c) {
+                } else if (Qfalse == v) {
                     *o->attr = No;
                 } else {
                     rb_raise(rb_eArgError, "%s must be true or false.\n", StringValuePtr(o->sym));

data/lib/oj/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-15 00:00:00.000000000 Z
+date: 2012-03-16 00:00:00.000000000 Z
 dependencies: []
 description: ! 'The fastest JSON parser and object serializer. '
 email: peter@ohler.com