oj 2.8.1 → 2.9.0

checksums.yaml

@@ -0,0 +1,7 @@
+--- 
+SHA1: 
+  metadata.gz: b9dd0aba891fc55691f3a56dfeebb3a9b429a3e9
+  data.tar.gz: df3fc2acd752b893079e08bad70b7bcafee0df15
+SHA512: 
+  metadata.gz: 9e0c17e03b86f6e6b495ee3c75cfac64a400e04cd6c3fac52e444d2f48af44d4f69ea327a1ef4db39692fec5e16ca2270c80b4bcc8d66ba80da22a27d492d443
+  data.tar.gz: 91a9dc1eafd5182a4c1d6d930a9b673b88a3151cb9dff09580943f04eff7a323bb4c4fe25de1df34e427dab08afdc9dd587fd7a6b61d43d2ffe29e6f648ad949

data/README.md

@@ -26,11 +26,12 @@ Follow [@peterohler on Twitter](http://twitter.com/#!/peterohler) for announceme
 
 [![Build Status](https://secure.travis-ci.org/ohler55/oj.png?branch=master)](http://travis-ci.org/ohler55/oj)
 
-### Current Release 2.8.1
+### Current Release 2.9.0
 
- - Added additional argument to the register_odd function.
+ - Added support for detection and handling of String, Array, and Hash subclasses.
 
- - Fixed bug that failed to load on some uses of STDIN.
+ - Oj.load() can now take a block which will be yielded to on every object
+   parsed when used with a file or string with multiple JSON entries.
 
 [Older release notes](http://www.ohler.com/dev/oj_misc/release_notes.html).
 

data/ext/oj/dump.c

@@ -70,16 +70,16 @@ static void	dump_raw(const char *str, size_t cnt, Out out);
 static void	dump_cstr(const char *str, size_t cnt, int is_sym, int escape1, Out out);
 static void	dump_hex(uint8_t c, Out out);
 static void	dump_str_comp(VALUE obj, Out out);
-static void	dump_str_obj(VALUE obj, int depth, Out out);
+static void	dump_str_obj(VALUE obj, VALUE clas, int depth, Out out);
 static void	dump_sym_comp(VALUE obj, Out out);
 static void	dump_sym_obj(VALUE obj, Out out);
 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 void	dump_array(VALUE obj, VALUE clas, 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_hash(VALUE obj, VALUE clas, int depth, int mode, Out out);
 static void	dump_time(VALUE obj, Out out);
 static void	dump_ruby_time(VALUE obj, Out out);
 static void	dump_xml_time(VALUE obj, Out out);
@@ -545,12 +545,9 @@ dump_str_comp(VALUE obj, Out out) {
 }
 
 static void
-dump_str_obj(VALUE obj, int depth, Out out) {
-    VALUE	clas = rb_obj_class(obj);
-    Odd		odd;
-    
-    if (rb_cString != clas && 0 != (odd = oj_get_odd(clas))) {
-	dump_odd(obj, odd, clas, depth + 1, out);
+dump_str_obj(VALUE obj, VALUE clas, int depth, Out out) {
+    if (Qundef != clas && rb_cString != clas) {
+	dump_obj_attrs(obj, clas, 0, depth, out);
     } else {
 	const char	*s = rb_string_value_ptr((VALUE*)&obj);
 	size_t		len = RSTRING_LEN(obj);
@@ -602,7 +599,7 @@ dump_class_obj(VALUE obj, Out out) {
 }
 
 static void
-dump_array(VALUE a, int depth, Out out) {
+dump_array(VALUE a, VALUE clas, int depth, Out out) {
     size_t	size;
     int		i, cnt;
     int		d2 = depth + 1;
@@ -611,6 +608,10 @@ dump_array(VALUE a, int depth, Out out) {
     if (id < 0) {
 	return;
     }
+    if (Qundef != clas && rb_cArray != clas) {
+	dump_obj_attrs(a, clas, 0, depth, out);
+	return;
+    }
     cnt = (int)RARRAY_LEN(a);
     *out->cur++ = '[';
     if (0 < id) {
@@ -819,7 +820,7 @@ hash_cb_object(VALUE key, VALUE value, Out out) {
     }
     fill_indent(out, depth);
     if (rb_type(key) == T_STRING) {
-	dump_str_obj(key, depth, out);
+	dump_str_obj(key, Qundef, depth, out);
 	*out->cur++ = ':';
 	dump_val(value, depth, out);
     } else if (rb_type(key) == T_SYMBOL) {
@@ -873,10 +874,16 @@ hash_cb_object(VALUE key, VALUE value, Out out) {
 }
 
 static void
-dump_hash(VALUE obj, int depth, int mode, Out out) {
-    int		cnt = (int)RHASH_SIZE(obj);
-    size_t	size = depth * out->indent + 2;
+dump_hash(VALUE obj, VALUE clas, int depth, int mode, Out out) {
+    int		cnt;
+    size_t	size;
 
+    if (Qundef != clas && rb_cHash != clas && ObjectMode == mode) {
+	dump_obj_attrs(obj, clas, 0, depth, out);
+	return;
+    }
+    cnt = (int)RHASH_SIZE(obj);
+    size = depth * out->indent + 2;
     if (out->end - out->cur <= 2) {
 	grow(out, 2);
     }
@@ -1144,7 +1151,7 @@ dump_data_comp(VALUE obj, int depth, Out out) {
 	if (T_HASH != rb_type(h)) {
 	    rb_raise(rb_eTypeError, "%s.to_hash() did not return a Hash.\n", rb_class2name(rb_obj_class(obj)));
 	}
-	dump_hash(h, depth, out->opts->mode, out);
+	dump_hash(h, Qundef, depth, out->opts->mode, out);
     } else if (rb_respond_to(obj, oj_as_json_id) && obj != (o2 = rb_funcall(obj, oj_as_json_id, 0))) {
 	dump_val(o2, depth, out);
     } else if (Yes == out->opts->to_json && rb_respond_to(obj, oj_to_json_id)) {
@@ -1206,22 +1213,16 @@ dump_data_obj(VALUE obj, int depth, Out out) {
 	*out->cur++ = '}';
 	*out->cur = '\0';
     } else {
-	Odd	odd = oj_get_odd(clas);
-
-	if (0 == odd) {
-	    if (oj_bigdecimal_class == clas) {
-		volatile VALUE	rstr = rb_funcall(obj, oj_to_s_id, 0);
+	if (oj_bigdecimal_class == clas) {
+	    volatile VALUE	rstr = rb_funcall(obj, oj_to_s_id, 0);
 		
-		if (Yes == out->opts->bigdec_as_num) {
-		    dump_raw(rb_string_value_ptr((VALUE*)&rstr), RSTRING_LEN(rstr), out);
-		} else {
-		    dump_cstr(rb_string_value_ptr((VALUE*)&rstr), RSTRING_LEN(rstr), 0, 0, out);
-		}
+	    if (Yes == out->opts->bigdec_as_num) {
+		dump_raw(rb_string_value_ptr((VALUE*)&rstr), RSTRING_LEN(rstr), out);
 	    } else {
-		dump_nil(out);
+		dump_cstr(rb_string_value_ptr((VALUE*)&rstr), RSTRING_LEN(rstr), 0, 0, out);
 	    }
 	} else {
-	    dump_odd(obj, odd, clas, depth + 1, out);
+	    dump_nil(out);
 	}
     }
 }
@@ -1234,7 +1235,7 @@ dump_obj_comp(VALUE obj, int depth, Out out) {
 	if (T_HASH != rb_type(h)) {
 	    rb_raise(rb_eTypeError, "%s.to_hash() did not return a Hash.\n", rb_class2name(rb_obj_class(obj)));
 	}
-	dump_hash(h, depth, out->opts->mode, out);
+	dump_hash(h, Qundef, depth, out->opts->mode, out);
     } else if (rb_respond_to(obj, oj_as_json_id)) {
 	dump_val(rb_funcall(obj, oj_as_json_id, 0), depth, out);
     } else if (Yes == out->opts->to_json && rb_respond_to(obj, oj_to_json_id)) {
@@ -1268,13 +1269,7 @@ dump_obj_comp(VALUE obj, int depth, Out out) {
 
 	    dump_cstr(rb_string_value_ptr((VALUE*)&rstr), RSTRING_LEN(rstr), 0, 0, out);
 	} else {
-	    Odd	odd = oj_get_odd(clas);
-
-	    if (0 == odd) {
-		dump_obj_attrs(obj, 0, 0, depth, out);
-	    } else {
-		dump_odd(obj, odd, 0, depth + 1, out);
-	    }
+	    dump_obj_attrs(obj, Qundef, 0, depth, out);
 	}
     }
     *out->cur = '\0';
@@ -1286,22 +1281,39 @@ dump_obj_obj(VALUE obj, int depth, Out out) {
 
     if (0 <= id) {
 	VALUE	clas = rb_obj_class(obj);
-	Odd	odd = oj_get_odd(clas);
 
-	if (0 == odd) {
-	    if (oj_bigdecimal_class == clas) {
-		volatile VALUE	rstr = rb_funcall(obj, oj_to_s_id, 0);
+	if (oj_bigdecimal_class == clas) {
+	    volatile VALUE	rstr = rb_funcall(obj, oj_to_s_id, 0);
 
-		dump_raw(rb_string_value_ptr((VALUE*)&rstr), RSTRING_LEN(rstr), out);
-	    } else {
-		dump_obj_attrs(obj, clas, id, depth, out);
-	    }
+	    dump_raw(rb_string_value_ptr((VALUE*)&rstr), RSTRING_LEN(rstr), out);
 	} else {
-	    dump_odd(obj, odd, clas, depth + 1, out);
+	    dump_obj_attrs(obj, clas, id, depth, out);
 	}
     }
 }
 
+#ifdef RUBINIUS_RUBY
+static int
+isRbxHashAttr(const char *attr) {
+    const char	*hashAttrs[] = {
+	"@capacity",
+	"@max_entries",
+	"@state",
+	"@mask",
+	"@size",
+	"@entries",
+	0 };
+    const char	**ap;
+
+    for (ap = hashAttrs; 0 != *ap; ap++) {
+	if (0 == strcmp(attr, *ap)) {
+	    return 1;
+	}
+    }
+    return 0;
+}
+#endif
+
 #if HAS_IVAR_HELPERS
 static int
 dump_attr_cb(ID key, VALUE value, Out out) {
@@ -1342,12 +1354,13 @@ static void
 dump_obj_attrs(VALUE obj, VALUE clas, slot_t id, int depth, Out out) {
     size_t	size = 0;
     int		d2 = depth + 1;
+    int		type = rb_type(obj);
 
     if (out->end - out->cur <= 2) {
 	grow(out, 2);
     }
     *out->cur++ = '{';
-    if (0 != clas) {
+    if (Qundef != clas) {
 	const char	*class_name = rb_class2name(clas);
 	int		clen = (int)strlen(class_name);
 
@@ -1377,6 +1390,58 @@ dump_obj_attrs(VALUE obj, VALUE clas, slot_t id, int depth, Out out) {
 	*out->cur++ = ':';
 	dump_ulong(id, out);
     }
+    switch (type) {
+    case T_STRING:
+	size = d2 * out->indent + 14;
+	if (out->end - out->cur <= (long)size) {
+	    grow(out, size);
+	}
+	*out->cur++ = ',';
+	fill_indent(out, d2);
+	*out->cur++ = '"';
+	*out->cur++ = 's';
+	*out->cur++ = 'e';
+	*out->cur++ = 'l';
+	*out->cur++ = 'f';
+	*out->cur++ = '"';
+	*out->cur++ = ':';
+	dump_cstr(rb_string_value_ptr((VALUE*)&obj), RSTRING_LEN(obj), 0, 0, out);
+	break;
+    case T_ARRAY:
+	size = d2 * out->indent + 14;
+	if (out->end - out->cur <= (long)size) {
+	    grow(out, size);
+	}
+	*out->cur++ = ',';
+	fill_indent(out, d2);
+	*out->cur++ = '"';
+	*out->cur++ = 's';
+	*out->cur++ = 'e';
+	*out->cur++ = 'l';
+	*out->cur++ = 'f';
+	*out->cur++ = '"';
+	*out->cur++ = ':';
+	dump_array(obj, Qundef, depth + 1, out);
+	break;
+    case T_HASH:
+	size = d2 * out->indent + 14;
+	if (out->end - out->cur <= (long)size) {
+	    grow(out, size);
+	}
+	*out->cur++ = ',';
+	fill_indent(out, d2);
+	*out->cur++ = '"';
+	*out->cur++ = 's';
+	*out->cur++ = 'e';
+	*out->cur++ = 'l';
+	*out->cur++ = 'f';
+	*out->cur++ = '"';
+	*out->cur++ = ':';
+	dump_hash(obj, Qundef, depth + 1, out->opts->mode, out);
+	break;
+    default:
+	break;
+    }
     {
 	int	cnt;
 #if HAS_IVAR_HELPERS
@@ -1390,7 +1455,7 @@ dump_obj_attrs(VALUE obj, VALUE clas, slot_t id, int depth, Out out) {
 
 	cnt = (int)RARRAY_LEN(vars);
 #endif
-	if (0 != clas && 0 < cnt) {
+	if (Qundef != clas && 0 < cnt) {
 	    *out->cur++ = ',';
 	}
 	out->depth = depth + 1;
@@ -1402,12 +1467,17 @@ dump_obj_attrs(VALUE obj, VALUE clas, slot_t id, int depth, Out out) {
 #else
 	size = d2 * out->indent + 1;
 	for (i = cnt; 0 < i; i--, np++) {
+	    vid = rb_to_id(*np);
+	    attr = rb_id2name(vid);
+#ifdef RUBINIUS_RUBY
+	    if (T_HASH == type && isRbxHashAttr(attr)) {
+		continue;
+	    }
+#endif
 	    if (out->end - out->cur <= (long)size) {
 		grow(out, size);
 	    }
-	    vid = rb_to_id(*np);
 	    fill_indent(out, d2);
-	    attr = rb_id2name(vid);
 	    if ('@' == *attr) {
 		attr++;
 		dump_cstr(attr, strlen(attr), 0, 0, out);
@@ -1478,7 +1548,7 @@ dump_struct_comp(VALUE obj, int depth, Out out) {
 	if (T_HASH != rb_type(h)) {
 	    rb_raise(rb_eTypeError, "%s.to_hash() did not return a Hash.\n", rb_class2name(rb_obj_class(obj)));
 	}
-	dump_hash(h, depth, out->opts->mode, out);
+	dump_hash(h, Qundef, depth, out->opts->mode, out);
     } else if (rb_respond_to(obj, oj_to_json_id)) {
 	volatile VALUE	rs = rb_funcall(obj, oj_to_json_id, 0);
 	const char	*s;
@@ -1571,7 +1641,7 @@ dump_odd(VALUE obj, Odd odd, VALUE clas, int depth, Out out) {
 	grow(out, 2);
     }
     *out->cur++ = '{';
-    if (0 != clas) {
+    if (Qundef != clas) {
 	const char	*class_name = rb_class2name(clas);
 	int		clen = (int)strlen(class_name);
 
@@ -1674,11 +1744,11 @@ dump_val(VALUE obj, int depth, Out out) {
 		case NullMode:
 		case CompatMode:	dump_str_comp(obj, out);	break;
 		case ObjectMode:
-		default:		dump_str_obj(obj, depth, out);	break;
+		default:		dump_str_obj(obj, clas, depth, out);	break;
 		}
 		break;
-	    case T_ARRAY:		dump_array(obj, depth, out);	break;
-	    case T_HASH:		dump_hash(obj, depth, out->opts->mode, out);	break;
+	    case T_ARRAY:		dump_array(obj, clas, depth, out);	break;
+	    case T_HASH:		dump_hash(obj, clas, depth, out->opts->mode, out);	break;
 #if (defined T_RATIONAL && defined RRATIONAL)
 	    case T_RATIONAL:
 #endif

data/ext/oj/object.c

@@ -330,6 +330,13 @@ hash_set_cstr(ParseInfo pi, const char *key, size_t klen, const char *str, size_
     case T_HASH:
 	rb_hash_aset(parent->val, hash_key(pi, key, klen, parent->k1), str_to_value(pi, str, len, orig));
 	break;
+    case T_STRING:
+	if (4 == klen && 's' == *key && 'e' == key[1] && 'l' == key[2] && 'f' == key[3]) {
+	    rb_funcall(parent->val, oj_replace_id, 1, str_to_value(pi, str, len, orig));
+	} else {
+	    set_obj_ivar(parent, key, klen, str_to_value(pi, str, len, orig));
+	}
+	break;
     case T_OBJECT:
 	set_obj_ivar(parent, key, klen, str_to_value(pi, str, len, orig));
 	break;
@@ -413,19 +420,36 @@ hash_set_value(ParseInfo pi, const char *key, size_t klen, VALUE value) {
 	}
 	break;
     case T_HASH:
-	if (3 <= klen && '#' == key[1] && T_ARRAY == rb_type(value)) {
-	    long	len = RARRAY_LEN(value);
-	    VALUE	*a = RARRAY_PTR(value);
+
+	if (rb_cHash != rb_obj_class(parent->val)) {
+	    if (4 == klen && 's' == *key && 'e' == key[1] && 'l' == key[2] && 'f' == key[3]) {
+		rb_funcall(parent->val, oj_replace_id, 1, value);
+	    } else {
+		set_obj_ivar(parent, key, klen, value);
+	    }
+	} else {
+	    if (3 <= klen && '#' == key[1] && T_ARRAY == rb_type(value)) {
+		long	len = RARRAY_LEN(value);
+		VALUE	*a = RARRAY_PTR(value);
 	
-	    if (2 != len) {
-		oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "invalid hash pair");
-		return;
+		if (2 != len) {
+		    oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "invalid hash pair");
+		    return;
+		}
+		rb_hash_aset(parent->val, *a, a[1]);
+	    } else {
+		rb_hash_aset(parent->val, hash_key(pi, key, klen, parent->k1), value);
 	    }
-	    rb_hash_aset(parent->val, *a, a[1]);
+	}
+	break;
+    case T_ARRAY:
+	if (4 == klen && 's' == *key && 'e' == key[1] && 'l' == key[2] && 'f' == key[3]) {
+	    rb_funcall(parent->val, oj_replace_id, 1, value);
 	} else {
-	    rb_hash_aset(parent->val, hash_key(pi, key, klen, parent->k1), value);
+	    set_obj_ivar(parent, key, klen, value);
 	}
 	break;
+    case T_STRING: // for subclassed strings
     case T_OBJECT:
 	set_obj_ivar(parent, key, klen, value);
 	break;
@@ -450,7 +474,6 @@ hash_set_value(ParseInfo pi, const char *key, size_t klen, VALUE value) {
     }
 }
 
-
 static VALUE
 start_hash(ParseInfo pi) {
     return Qnil;

data/ext/oj/oj.c

@@ -67,6 +67,7 @@ ID	oj_json_create_id;
 ID	oj_length_id;
 ID	oj_new_id;
 ID	oj_read_id;
+ID	oj_replace_id;
 ID	oj_string_id;
 ID	oj_to_hash_id;
 ID	oj_to_json_id;
@@ -536,6 +537,10 @@ oj_parse_options(VALUE ropts, Options copts) {
  * Object type. These two are not the same since the JSON Object type can have
  * repeating entries with the same key and Ruby Hash can not.
  *
+ * When used with a document that has multiple JSON elements the block, if
+ * any, will be yielded to. If no block then the last element read will be
+ * returned.
+ *
  * Raises an exception if the JSON is malformed or the classes specified are not
  * valid. If the input is not a valid JSON document (an empty string is not a
  * valid JSON document) an exception is raised.
@@ -553,6 +558,10 @@ oj_parse_options(VALUE ropts, Options copts) {
  * on the :create_id value. It is not compatible in every way to every other
  * parser though as each parser has it's own variations.
  *
+ * When used with a document that has multiple JSON elements the block, if
+ * any, will be yielded to. If no block then the last element read will be
+ * returned.
+ *
  * Raises an exception if the JSON is malformed or the classes specified are not
  * valid. If the input is not a valid JSON document (an empty string is not a
  * valid JSON document) an exception is raised.
@@ -570,6 +579,10 @@ oj_parse_options(VALUE ropts, Options copts) {
  * or dumped Object. The :auto_define and :circular options have meaning with
  * this parsing mode.
  *
+ * When used with a document that has multiple JSON elements the block, if
+ * any, will be yielded to. If no block then the last element read will be
+ * returned.
+ *
  * Raises an exception if the JSON is malformed or the classes specified are not
  * valid. If the input is not a valid JSON document (an empty string is not a
  * valid JSON document) an exception is raised.
@@ -602,6 +615,10 @@ oj_parse_options(VALUE ropts, Options copts) {
  * specified are not valid. If the string input is not a valid JSON document (an
  * empty string is not a valid JSON document) an exception is raised.
  *
+ * When used with a document that has multiple JSON elements the block, if
+ * any, will be yielded to. If no block then the last element read will be
+ * returned.
+ *
  * @param [String|IO] json JSON String or an Object that responds to read()
  * @param [Hash] options load options (same as default_options)
  */
@@ -652,6 +669,10 @@ load(int argc, VALUE *argv, VALUE self) {
  * specified are not valid. If the string input is not a valid JSON document (an
  * empty string is not a valid JSON document) an exception is raised.
  *
+ * When used with a document that has multiple JSON elements the block, if
+ * any, will be yielded to. If no block then the last element read will be
+ * returned.
+ *
  * If the input file is not a valid JSON document (an empty file is not a valid
  * JSON document) an exception is raised.
  *
@@ -1857,6 +1878,7 @@ void Init_oj() {
     oj_length_id = rb_intern("length");
     oj_new_id = rb_intern("new");
     oj_read_id = rb_intern("read");
+    oj_replace_id = rb_intern("replace");
     oj_string_id = rb_intern("string");
     oj_to_hash_id = rb_intern("to_hash");
     oj_to_json_id = rb_intern("to_json");

data/ext/oj/oj.h

@@ -262,6 +262,7 @@ extern ID	oj_json_create_id;
 extern ID	oj_length_id;
 extern ID	oj_new_id;
 extern ID	oj_read_id;
+extern ID	oj_replace_id;
 extern ID	oj_string_id;
 extern ID	oj_to_hash_id;
 extern ID	oj_to_json_id;

data/ext/oj/parse.c

@@ -640,6 +640,20 @@ oj_parse2(ParseInfo pi) {
 	if (err_has(&pi->err)) {
 	    return;
 	}
+	if (Qundef != pi->proc && stack_empty(&pi->stack)) {
+	    if (Qnil == pi->proc) {
+		rb_yield(stack_head_val(&pi->stack));
+	    } else {
+#if HAS_PROC_WITH_BLOCK
+		VALUE	args[1];
+
+		*args = stack_head_val(&pi->stack);
+		rb_proc_call_with_block(pi->proc, 1, args, Qnil);
+#else
+		rb_raise(rb_eNotImpError, "Calling a Proc with a block not supported in this version. Use func() {|x| } syntax instead.");
+#endif
+	    }
+	}
     }
 }
 
@@ -734,6 +748,11 @@ oj_pi_parse(int argc, VALUE *argv, ParseInfo pi, char *json, size_t len) {
     if (2 == argc) {
 	oj_parse_options(argv[1], &pi->options);
     }
+    if (rb_block_given_p()) {
+	pi->proc = Qnil;
+    } else {
+	pi->proc = Qundef;
+    }
     pi->cbc = (void*)0;
     if (0 != json) {
 	pi->json = json;
@@ -803,7 +822,7 @@ oj_pi_parse(int argc, VALUE *argv, ParseInfo pi, char *json, size_t len) {
     if (No == pi->options.allow_gc) {
 	rb_gc_enable();
     }
-    {
+    if (!err_has(&pi->err)) {
 	// If the stack is not empty then the JSON terminated early.
 	Val	v;
 

data/ext/oj/parse.h

@@ -63,6 +63,7 @@ typedef struct _ParseInfo {
     struct _ValStack	stack;
     CircArray		circ_array;
     int			expect_value;
+    VALUE		proc;
     VALUE		(*start_hash)(struct _ParseInfo *pi);
     void		(*end_hash)(struct _ParseInfo *pi);
     void		(*hash_set_cstr)(struct _ParseInfo *pi, const char *key, size_t klen, const char *str, size_t len, const char *orig);

data/ext/oj/saj.c

@@ -1,4 +1,4 @@
-/* sajkey.c
+/* saj.c
  * Copyright (c) 2012, Peter Ohler
  * All rights reserved.
  * 
@@ -644,7 +644,7 @@ respond_to(VALUE obj, ID method) {
 }
 
 static void
-sajkey_parse(VALUE handler, char *json) {
+saj_parse(VALUE handler, char *json) {
     volatile VALUE	obj = Qnil;
     struct _ParseInfo	pi;
 
@@ -692,11 +692,11 @@ sajkey_parse(VALUE handler, char *json) {
     }
 }
 
-/* call-seq: sajkey_parse(handler, io)
+/* call-seq: saj_parse(handler, io)
  *
  * Parses an IO stream or file containing an JSON document. Raises an exception
  * if the JSON is malformed.
- * @param [Oj::SajKey] handler SajKey (responds to Oj::SajKey methods) like handler
+ * @param [Oj::Saj] handler Saj (responds to Oj::Saj methods) like handler
  * @param [IO|String] io IO Object to read from
  */
 VALUE
@@ -749,7 +749,7 @@ oj_saj_parse(int argc, VALUE *argv, VALUE self) {
 	    rb_raise(rb_eArgError, "saj_parse() expected a String or IO Object.");
 	}
     }
-    sajkey_parse(*argv, json);
+    saj_parse(*argv, json);
     xfree(json);
 
     return Qnil;

data/ext/oj/scp.c

@@ -211,6 +211,11 @@ oj_sc_parse(int argc, VALUE *argv, VALUE self) {
     if (3 == argc) {
 	oj_parse_options(argv[2], &pi.options);
     }
+    if (rb_block_given_p()) {
+	pi.proc = Qnil;
+    } else {
+	pi.proc = Qundef;
+    }
     pi.cbc = (void*)handler;
 
     pi.start_hash = respond_to(handler, oj_hash_start_id) ? start_hash : noop_start;
@@ -255,6 +260,7 @@ oj_sc_parse(int argc, VALUE *argv, VALUE self) {
     } else {
 	VALUE		clas = rb_obj_class(input);
 	volatile VALUE	s;
+	int		fd;
 
 	if (oj_stringio_class == clas) {
 	    s = rb_funcall2(input, oj_string_id, 0, 0);
@@ -262,8 +268,9 @@ oj_sc_parse(int argc, VALUE *argv, VALUE self) {
 #ifndef JRUBY_RUBY
 #if !IS_WINDOWS
 	    // JRuby gets confused with what is the real fileno.
-	} else if (rb_respond_to(input, oj_fileno_id) && Qnil != (s = rb_funcall(input, oj_fileno_id, 0))) {
-	    int		fd = FIX2INT(s);
+	} else if (rb_respond_to(input, oj_fileno_id) &&
+		   Qnil != (s = rb_funcall(input, oj_fileno_id, 0)) &&
+		   0 != (fd = FIX2INT(s))) {
 	    ssize_t	cnt;
 	    size_t	len = lseek(fd, 0, SEEK_END);
 

data/lib/oj/version.rb

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

data/test/test_object.rb

@@ -102,6 +102,48 @@ class Strung < String
   end
 end
 
+class AutoStrung < String
+  attr_accessor :safe
+
+  def initialize(str, safe)
+    super(str)
+    @safe = safe
+  end
+
+  def eql?(o)
+    self.class == o.class && super(o) && @safe == o.safe
+  end
+  alias == eql?
+end
+
+class AutoArray < Array
+  attr_accessor :safe
+
+  def initialize(a, safe)
+    super(a)
+    @safe = safe
+  end
+
+  def eql?(o)
+    self.class == o.class && super(o) && @safe == o.safe
+  end
+  alias == eql?
+end
+
+class AutoHash < Hash
+  attr_accessor :safe
+
+  def initialize(h, safe)
+    super(h)
+    @safe = safe
+  end
+
+  def eql?(o)
+    self.class == o.class && super(o) && @safe == o.safe
+  end
+  alias == eql?
+end
+
 def hash_eql(h1, h2)
   return false if h1.size != h2.size
   h1.keys.each do |k|
@@ -418,7 +460,24 @@ class ObjectJuice < ::Test::Unit::TestCase
   def test_odd_string
     Oj.register_odd(Strung, Strung, :create, :to_s, 'safe?')
     s = Strung.new("Pete", true)
-    dump_and_load(Strung.new("Pete", true), false)
+    dump_and_load(s, false)
+  end
+
+  def test_auto_string
+    s = AutoStrung.new("Pete", true)
+    dump_and_load(s, false)
+  end
+
+  def test_auto_array
+    a = AutoArray.new([1, 'abc', nil], true)
+    dump_and_load(a, false)
+  end
+
+  def test_auto_hash
+    h = AutoHash.new(nil, true)
+    h['a'] = 1
+    h['b'] = 2
+    dump_and_load(h, false)
   end
 
   def dump_and_load(obj, trace=false)

data/test/test_scp.rb

@@ -206,6 +206,22 @@ class ScpTest < ::Test::Unit::TestCase
                   [:add_value, {}]], handler.calls)
   end
 
+  def test_double
+    handler = AllHandler.new()
+    json = %{{"one":true,"two":false}{"three":true,"four":false}}
+    Oj.sc_parse(handler, json)
+    assert_equal([[:hash_start],
+                  [:hash_set, 'one', true],
+                  [:hash_set, 'two', false],
+                  [:hash_end],
+                  [:add_value, {}],
+                  [:hash_start],
+                  [:hash_set, 'three', true],
+                  [:hash_set, 'four', false],
+                  [:hash_end],
+                  [:add_value, {}]], handler.calls)
+  end
+
   def test_none
     handler = NoHandler.new()
     Oj.sc_parse(handler, $json)

data/test/test_strict.rb

@@ -247,6 +247,13 @@ class StrictJuice < ::Test::Unit::TestCase
     assert_equal({ 'x' => true, 'y' => 58, 'z' => [1, 2, 3]}, obj)
   end
 
+  def test_double
+    json = %{{ "x": 1}{ "y": 2}}
+    results = []
+    Oj.load(json, :mode => :strict) { |x| results << x }
+
+    assert_equal([{ 'x' => 1 }, { 'y' => 2 }], results)
+  end
 
   def dump_and_load(obj, trace=false)
     json = Oj.dump(obj, :indent => 2)

metadata

@@ -1,60 +1,64 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: oj
-version: !ruby/object:Gem::Version
-  version: 2.8.1
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  version: 2.9.0
 platform: ruby
-authors:
+authors: 
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-22 00:00:00.000000000 Z
+
+date: 2014-05-01 00:00:00 Z
 dependencies: []
-description: ! 'The fastest JSON parser and object serializer. '
+
+description: "The fastest JSON parser and object serializer. "
 email: peter@ohler.com
 executables: []
-extensions:
+
+extensions: 
 - ext/oj/extconf.rb
-extra_rdoc_files:
+extra_rdoc_files: 
+- README.md
+files: 
+- LICENSE
 - README.md
-files:
-- lib/oj/bag.rb
-- lib/oj/error.rb
-- lib/oj/mimic.rb
-- lib/oj/saj.rb
-- lib/oj/schandler.rb
-- lib/oj/version.rb
-- lib/oj.rb
-- ext/oj/extconf.rb
 - ext/oj/buf.h
-- ext/oj/cache8.h
-- ext/oj/circarray.h
-- ext/oj/encode.h
-- ext/oj/err.h
-- ext/oj/hash.h
-- ext/oj/odd.h
-- ext/oj/oj.h
-- ext/oj/parse.h
-- ext/oj/resolve.h
-- ext/oj/val_stack.h
 - ext/oj/cache8.c
+- ext/oj/cache8.h
 - ext/oj/circarray.c
+- ext/oj/circarray.h
 - ext/oj/compat.c
 - ext/oj/dump.c
+- ext/oj/encode.h
 - ext/oj/err.c
+- ext/oj/err.h
+- ext/oj/extconf.rb
 - ext/oj/fast.c
 - ext/oj/hash.c
+- ext/oj/hash.h
 - ext/oj/hash_test.c
 - ext/oj/object.c
 - ext/oj/odd.c
+- ext/oj/odd.h
 - ext/oj/oj.c
+- ext/oj/oj.h
 - ext/oj/parse.c
+- ext/oj/parse.h
 - ext/oj/resolve.c
+- ext/oj/resolve.h
 - ext/oj/saj.c
 - ext/oj/scp.c
 - ext/oj/strict.c
 - ext/oj/val_stack.c
+- ext/oj/val_stack.h
+- lib/oj.rb
+- lib/oj/bag.rb
+- lib/oj/error.rb
+- lib/oj/mimic.rb
+- lib/oj/saj.rb
+- lib/oj/schandler.rb
+- lib/oj/version.rb
 - test/debian_test.rb
 - test/files.rb
 - test/perf.rb
@@ -68,6 +72,7 @@ files:
 - test/perf_scp.rb
 - test/perf_simple.rb
 - test/perf_strict.rb
+- test/sample.rb
 - test/sample/change.rb
 - test/sample/dir.rb
 - test/sample/doc.rb
@@ -80,7 +85,6 @@ files:
 - test/sample/rect.rb
 - test/sample/shape.rb
 - test/sample/text.rb
-- test/sample.rb
 - test/sample_json.rb
 - test/test_compat.rb
 - test/test_fast.rb
@@ -93,36 +97,34 @@ files:
 - test/test_strict.rb
 - test/test_writer.rb
 - test/tests.rb
-- LICENSE
-- README.md
 homepage: http://www.ohler.com/oj
-licenses:
+licenses: 
 - MIT
 - GPL-3.0
+metadata: {}
+
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - --main
 - README.md
-require_paths:
+require_paths: 
 - lib
 - ext
-required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - &id001 
+    - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - *id001
 requirements: []
+
 rubyforge_project: oj
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A fast JSON parser and serializer.
 test_files: []
-has_rdoc: true
+