oj 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ac1090fe61f4056ff0fb5c838297e76f356fe8c
-  data.tar.gz: e75c5ddbce19b8846c1cac9f5dca6994194aa9e7
+  metadata.gz: 873b6fade9db8e2c3e82c5a6329c4ceb09215d6d
+  data.tar.gz: 4f8074a9a5ac20d567c58d002323949fc08828ce
 SHA512:
-  metadata.gz: f509d7b7dfbd8b848a0ce4b388e962853e3db6b7e2c050639a559a837964f767e1e279b53ef3cd29c7a6ceb569ac10522f9f3726f892f7a0c13e586688a28540
-  data.tar.gz: f7bdb0ae179ac0e796625445447f1f0dbce85ff3b2d3af1181e16fea2128077112056c9e104b15a06e4d13b48ff630bec7fe675e316ea16500b4869edbf69287
+  metadata.gz: f82b5aedde38474ca0ddd6826f11ed4fa02bf17fbcf6a56ba14dca772c9e3000119d15d81c092f4dae9000a7dec6ca2c1a7c971a2b854a54d68a50586ab8f2d4
+  data.tar.gz: 8935ab29251ca82de0c9b770df24a0015bc6e46dc0f1cdfba6868ddc23b685306b8c4c4a1d182559ada38f654a8f9dbd199d4b68f9670a18d65fc7c45370eecf

data/README.md

@@ -21,6 +21,14 @@ 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.4.0
+
+ - Merged in a PR to again allow strings with embedded nulls.
+
+ - Implemented StreamWriter to compliment the StringWriter.
+
+ - Fixed bug in the class cache hash function that showed up with the sparc compiler.
+
 ### Current Release 2.3.0
 
  - JRuby is no longer supported.

data/ext/oj/compat.c

@@ -75,7 +75,7 @@ end_hash(struct _ParseInfo *pi) {
 	if (Qundef != clas) { // else an error
 	    parent->val = rb_funcall(clas, oj_json_create_id, 1, parent->val);
 	}
-	if (parent->classname < pi->json || pi->cur < parent->classname) {
+	if (parent->classname < pi->json || pi->end < parent->classname) {
 	    xfree((char*)parent->classname);
 	    parent->classname = 0;
 	}
@@ -96,11 +96,11 @@ oj_compat_parse(int argc, VALUE *argv, VALUE self) {
     pi.options = oj_default_options;
     oj_set_compat_callbacks(&pi);
 
-    return oj_pi_parse(argc, argv, &pi, 0);
+    return oj_pi_parse(argc, argv, &pi, 0, 0);
 }
 
 VALUE
-oj_compat_parse_cstr(int argc, VALUE *argv, char *json) {
+oj_compat_parse_cstr(int argc, VALUE *argv, char *json, size_t len) {
     struct _ParseInfo	pi;
 
     pi.options = oj_default_options;
@@ -108,5 +108,5 @@ oj_compat_parse_cstr(int argc, VALUE *argv, char *json) {
     pi.end_hash = end_hash;
     pi.hash_set_cstr = hash_set_cstr;
 
-    return oj_pi_parse(argc, argv, &pi, json);
+    return oj_pi_parse(argc, argv, &pi, json, len);
 }

data/ext/oj/dump.c

@@ -426,7 +426,7 @@ dump_bignum(VALUE obj, Out out) {
     if (out->end - out->cur <= (long)cnt) {
 	grow(out, cnt);
     }
-    memcpy(out->cur, rb_string_value_cstr((VALUE*)&rs), cnt);
+    memcpy(out->cur, rb_string_value_ptr((VALUE*)&rs), cnt);
     out->cur += cnt;
     *out->cur = '\0';
 }
@@ -554,12 +554,12 @@ dump_cstr(const char *str, size_t cnt, int is_sym, int escape1, Out out) {
 
 static void
 dump_str_comp(VALUE obj, Out out) {
-    dump_cstr(rb_string_value_cstr((VALUE*)&obj), RSTRING_LEN(obj), 0, 0, out);
+    dump_cstr(rb_string_value_ptr((VALUE*)&obj), RSTRING_LEN(obj), 0, 0, out);
 }
 
 static void
 dump_str_obj(VALUE obj, Out out) {
-    const char	*s = rb_string_value_cstr((VALUE*)&obj);
+    const char	*s = rb_string_value_ptr((VALUE*)&obj);
     size_t	len = RSTRING_LEN(obj);
     char	s1 = s[1];
 
@@ -1023,7 +1023,7 @@ static void
 dump_ruby_time(VALUE obj, Out out) {
     volatile VALUE	rstr = rb_funcall(obj, oj_to_s_id, 0);
 
-    dump_cstr(rb_string_value_cstr((VALUE*)&rstr), RSTRING_LEN(rstr), 0, 0, out);
+    dump_cstr(rb_string_value_ptr((VALUE*)&rstr), RSTRING_LEN(rstr), 0, 0, out);
 }
 
 static void
@@ -1121,7 +1121,7 @@ dump_data_strict(VALUE obj, Out out) {
     if (oj_bigdecimal_class == clas) {
 	volatile VALUE	rstr = rb_funcall(obj, oj_to_s_id, 0);
 
-	dump_raw(rb_string_value_cstr((VALUE*)&rstr), RSTRING_LEN(rstr), out);
+	dump_raw(rb_string_value_ptr((VALUE*)&rstr), RSTRING_LEN(rstr), out);
     } else {
 	raise_strict(obj);
     }
@@ -1134,7 +1134,7 @@ dump_data_null(VALUE obj, Out out) {
     if (oj_bigdecimal_class == clas) {
 	volatile VALUE	rstr = rb_funcall(obj, oj_to_s_id, 0);
 
-	dump_raw(rb_string_value_cstr((VALUE*)&rstr), RSTRING_LEN(rstr), out);
+	dump_raw(rb_string_value_ptr((VALUE*)&rstr), RSTRING_LEN(rstr), out);
     } else {
 	dump_nil(out);
     }
@@ -1161,7 +1161,7 @@ dump_data_comp(VALUE obj, int depth, Out out) {
 	last_obj = obj;
 	rs = rb_funcall(obj, oj_to_json_id, 0);
 	last_obj = Qundef;
-	s = rb_string_value_cstr((VALUE*)&rs);
+	s = rb_string_value_ptr((VALUE*)&rs);
 	len = (int)RSTRING_LEN(rs);
 
 	if (out->end - out->cur <= len + 1) {
@@ -1184,14 +1184,14 @@ dump_data_comp(VALUE obj, int depth, Out out) {
 	    volatile VALUE	rstr = rb_funcall(obj, oj_to_s_id, 0);
 
 	    if (Yes == out->opts->bigdec_as_num) {
-		dump_raw(rb_string_value_cstr((VALUE*)&rstr), RSTRING_LEN(rstr), out);
+		dump_raw(rb_string_value_ptr((VALUE*)&rstr), RSTRING_LEN(rstr), out);
 	    } else {
-		dump_cstr(rb_string_value_cstr((VALUE*)&rstr), RSTRING_LEN(rstr), 0, 0, out);
+		dump_cstr(rb_string_value_ptr((VALUE*)&rstr), RSTRING_LEN(rstr), 0, 0, out);
 	    }
 	} else {
 	    volatile VALUE	rstr = rb_funcall(obj, oj_to_s_id, 0);
 
-	    dump_cstr(rb_string_value_cstr((VALUE*)&rstr), RSTRING_LEN(rstr), 0, 0, out);
+	    dump_cstr(rb_string_value_ptr((VALUE*)&rstr), RSTRING_LEN(rstr), 0, 0, out);
 	}
     }
 }
@@ -1221,9 +1221,9 @@ dump_data_obj(VALUE obj, int depth, Out out) {
 		volatile VALUE	rstr = rb_funcall(obj, oj_to_s_id, 0);
 		
 		if (Yes == out->opts->bigdec_as_num) {
-		    dump_raw(rb_string_value_cstr((VALUE*)&rstr), RSTRING_LEN(rstr), out);
+		    dump_raw(rb_string_value_ptr((VALUE*)&rstr), RSTRING_LEN(rstr), out);
 		} else {
-		    dump_cstr(rb_string_value_cstr((VALUE*)&rstr), RSTRING_LEN(rstr), 0, 0, out);
+		    dump_cstr(rb_string_value_ptr((VALUE*)&rstr), RSTRING_LEN(rstr), 0, 0, out);
 		}
 	    } else {
 		dump_nil(out);
@@ -1244,9 +1244,7 @@ dump_obj_comp(VALUE obj, int depth, Out out) {
 	}
 	dump_hash(h, depth, out->opts->mode, out);
     } else if (rb_respond_to(obj, oj_as_json_id)) {
-	volatile VALUE	js = rb_funcall(obj, oj_as_json_id, 0);
-
-	dump_val(js, depth, out);
+	dump_val(rb_funcall(obj, oj_as_json_id, 0), depth, out);
     } else if (rb_respond_to(obj, oj_to_json_id) && (!oj_rails_hack || last_obj != obj)) {
 	volatile VALUE	rs;
 	const char	*s;
@@ -1255,7 +1253,7 @@ dump_obj_comp(VALUE obj, int depth, Out out) {
 	last_obj = obj;
 	rs = rb_funcall(obj, oj_to_json_id, 0);
 	last_obj = Qundef;
-	s = rb_string_value_cstr((VALUE*)&rs);
+	s = rb_string_value_ptr((VALUE*)&rs);
 	len = (int)RSTRING_LEN(rs);
 
 	if (out->end - out->cur <= len + 1) {
@@ -1271,14 +1269,14 @@ dump_obj_comp(VALUE obj, int depth, Out out) {
 	    volatile VALUE	rstr = rb_funcall(obj, oj_to_s_id, 0);
 
 	    if (Yes == out->opts->bigdec_as_num) {
-		dump_raw(rb_string_value_cstr((VALUE*)&rstr), RSTRING_LEN(rstr), out);
+		dump_raw(rb_string_value_ptr((VALUE*)&rstr), RSTRING_LEN(rstr), out);
 	    } else {
-		dump_cstr(rb_string_value_cstr((VALUE*)&rstr), RSTRING_LEN(rstr), 0, 0, out);
+		dump_cstr(rb_string_value_ptr((VALUE*)&rstr), RSTRING_LEN(rstr), 0, 0, out);
 	    }
 	} else if (oj_datetime_class == clas || oj_date_class == clas) {
 	    volatile VALUE	rstr = rb_funcall(obj, oj_to_s_id, 0);
 
-	    dump_cstr(rb_string_value_cstr((VALUE*)&rstr), RSTRING_LEN(rstr), 0, 0, out);
+	    dump_cstr(rb_string_value_ptr((VALUE*)&rstr), RSTRING_LEN(rstr), 0, 0, out);
 	} else {
 	    Odd	odd = oj_get_odd(clas);
 
@@ -1304,7 +1302,7 @@ dump_obj_obj(VALUE obj, int depth, Out out) {
 	    if (oj_bigdecimal_class == clas) {
 		volatile VALUE	rstr = rb_funcall(obj, oj_to_s_id, 0);
 
-		dump_raw(rb_string_value_cstr((VALUE*)&rstr), RSTRING_LEN(rstr), out);
+		dump_raw(rb_string_value_ptr((VALUE*)&rstr), RSTRING_LEN(rstr), out);
 	    } else {
 		dump_obj_attrs(obj, clas, id, depth, out);
 	    }
@@ -1496,7 +1494,7 @@ dump_struct_comp(VALUE obj, int depth, Out out) {
 	const char	*s;
 	int		len;
 
-	s = rb_string_value_cstr((VALUE*)&rs);
+	s = rb_string_value_ptr((VALUE*)&rs);
 	len = (int)RSTRING_LEN(rs);
 	if (out->end - out->cur <= len) {
 	    grow(out, len);
@@ -2035,8 +2033,6 @@ key_check(StrWriter sw, const char *key) {
 
     if (0 == key && (ObjectNew == type || ObjectType == type)) {
 	rb_raise(rb_eStandardError, "Can not push onto an Object without a key.");
-    } else if (0 != key && (ArrayNew == type || ArrayType == type)) {
-	rb_raise(rb_eStandardError, "No key is needed to push into an array.");
     }
 }
 
@@ -2155,4 +2151,3 @@ oj_str_writer_pop_all(StrWriter sw) {
 	oj_str_writer_pop(sw);
     }
 }
-

data/ext/oj/hash.c

@@ -56,27 +56,30 @@ struct _Hash	intern_hash;
 
 static uint32_t
 hash_calc(const uint8_t *key, size_t len) {
-    uint32_t	k;
-    uint32_t	*kp = (uint32_t*)key;
-    uint32_t	*end = kp + (len / 4);
-    uint32_t	h = (uint32_t)len;
-    
-    for (; kp < end; kp++) {
-        k = M * *kp;
+    const uint8_t	*end = key + len;
+    const uint8_t	*endless = key + (len / 4 * 4);
+    uint32_t		h = (uint32_t)len;
+    uint32_t		k;
+
+    while (key < endless) {
+	k = (uint32_t)*key++;
+	k |= (uint32_t)*key++ << 8;
+	k |= (uint32_t)*key++ << 16;
+	k |= (uint32_t)*key++ << 24;
+
+        k *= M;
         k ^= k >> 24;
         h *= M;
         h ^= k * M;
     }
-    len = len - (len / 4 * 4);
-    if (1 < len) {
-	h ^= *(uint16_t*)kp << 8;
-	len -= 2;
-	key = (uint8_t*)(((uint16_t*)kp) + 1);
-    } else {
-	key = (uint8_t*)kp;
+    if (1 < end - key) {
+	uint16_t	k16 = (uint16_t)*key++;
+
+	k16 |= (uint16_t)*key++ << 8;
+	h ^= k16 << 8;
     }
-    if (0 < len) {
-	h ^= key[0];
+    if (key < end) {
+	h ^= *key;
     }
     h *= M;
     h ^= h >> 13;
@@ -115,7 +118,7 @@ hash_get(Hash hash, const char *key, size_t len, VALUE **slotp, VALUE def_value)
 	
 	    b->next = 0;
 	    bucket->next = b;
-	
+	    bucket = b;
 	}
 	bucket->key = oj_strndup(key, len);
 	bucket->len = len;

data/ext/oj/hash_test.c

@@ -224,7 +224,6 @@ static struct _StrLen data[] = {
     { "StandardError", 13 },
     { "Interrupt", 9 },
     { "SignalException", 15 },
-    { "#<Class:0x007fb0510c8790>", 25 },
     { "SystemExit", 10 },
     { "Exception", 9 },
     { "Symbol", 6 },
@@ -460,6 +459,7 @@ perf() {
     VALUE	*slot = 0;
     uint64_t	dt, start;
     int		i, iter = 1000000;
+    int		dataCnt = sizeof(data) / sizeof(*data);
 
     oj_hash_init();
     start = micro_time();
@@ -476,9 +476,9 @@ perf() {
     }
     dt = micro_time() - start;
 #if IS_WINDOWS
-    printf("%d iterations took %ld msecs\n", iter, (long)(dt / 1000));
+    printf("%d iterations took %ld msecs, %ld gets/msec\n", iter, (long)(dt / 1000), (long)(iter * dataCnt / (dt / 1000)));
 #else
-    printf("%d iterations took %"PRIu64" msecs\n", iter, dt / 1000);
+    printf("%d iterations took %"PRIu64" msecs, %ld gets/msec\n", iter, dt / 1000, (long)(iter * dataCnt / (dt / 1000)));
 #endif
 }
 
@@ -490,23 +490,23 @@ oj_hash_test() {
 
     oj_hash_init();
     for (d = data; 0 != d->str; d++) {
-	/*printf("*** hash_get on %s\n", *d);*/
+	char	*s = oj_strndup(d->str, d->len);
 	v = oj_class_hash_get(d->str, d->len, &slot);
-	if (Qundef == v) {
+	if (Qnil == v) {
 	    if (0 == slot) {
-		/*printf("*** failed to get a slot for %s\n", *d); */
+		printf("*** failed to get a slot for %s\n", s);
 	    } else {
-		/*printf("*** added '%s' to hash\n", *d); */
 		v = ID2SYM(rb_intern(d->str));
 		*slot = v;
 	    }
 	} else {
 	    VALUE	rs = rb_funcall2(v, rb_intern("to_s"), 0, 0);
 
-	    printf("*** get on '%s' returned '%s' (%s)\n", d->str, StringValuePtr(rs), rb_class2name(rb_obj_class(v)));
+	    printf("*** get on '%s' returned '%s' (%s)\n", s, StringValuePtr(rs), rb_class2name(rb_obj_class(v)));
 	}
 	/*oj_hash_print(c);*/
     }
+    printf("*** ---------- hash table ------------\n");
     oj_hash_print();
     perf();
 }

data/ext/oj/object.c

@@ -511,11 +511,11 @@ oj_object_parse(int argc, VALUE *argv, VALUE self) {
     pi.add_cstr = add_cstr;
     pi.array_append_cstr = array_append_cstr;
 
-    return oj_pi_parse(argc, argv, &pi, 0);
+    return oj_pi_parse(argc, argv, &pi, 0, 0);
 }
 
 VALUE
-oj_object_parse_cstr(int argc, VALUE *argv, char *json) {
+oj_object_parse_cstr(int argc, VALUE *argv, char *json, size_t len) {
     struct _ParseInfo	pi;
 
     pi.options = oj_default_options;
@@ -528,5 +528,5 @@ oj_object_parse_cstr(int argc, VALUE *argv, char *json) {
     pi.add_cstr = add_cstr;
     pi.array_append_cstr = array_append_cstr;
 
-    return oj_pi_parse(argc, argv, &pi, json);
+    return oj_pi_parse(argc, argv, &pi, json, len);
 }

data/ext/oj/oj.c

@@ -693,15 +693,15 @@ load_file(int argc, VALUE *argv, VALUE self) {
     // The json string is freed in the parser when it is finished with it.
     switch (mode) {
     case StrictMode:
-	return oj_strict_parse_cstr(argc, argv, json);
+	return oj_strict_parse_cstr(argc, argv, json, len);
     case NullMode:
     case CompatMode:
-	return oj_compat_parse_cstr(argc, argv, json);
+	return oj_compat_parse_cstr(argc, argv, json, len);
     case ObjectMode:
     default:
 	break;
     }
-    return oj_object_parse_cstr(argc, argv, json);
+    return oj_object_parse_cstr(argc, argv, json, len);
 }
 
 /* call-seq: safe_load(doc)
@@ -725,7 +725,7 @@ safe_load(VALUE self, VALUE doc) {
     oj_set_strict_callbacks(&pi);
     *args = doc;
 
-    return oj_pi_parse(1, args, &pi, 0);
+    return oj_pi_parse(1, args, &pi, 0, 0);
 }
 
 /* call-seq: saj_parse(handler, io)
@@ -850,15 +850,8 @@ str_writer_free(void *ptr) {
  * construction is complete will return the document in it's current state.
  */
 
-/* call-seq: new(options)
- *
- * Creates a new StringWriter.
- * @param [Hash] options formating options
- */
-static VALUE
-str_writer_new(int argc, VALUE *argv, VALUE self) {
-    StrWriter	sw = ALLOC(struct _StrWriter);
-    
+static void
+str_writer_init(StrWriter sw) {
     sw->opts = oj_default_options;
     sw->depth = 0;
     sw->types = ALLOC_N(char, 256);
@@ -871,12 +864,23 @@ str_writer_new(int argc, VALUE *argv, VALUE self) {
     *sw->out.cur = '\0';
     sw->out.circ_cnt = 0;
     sw->out.hash_cnt = 0;
-    if (1 == argc) {
-	oj_parse_options(argv[0], &sw->opts);
-    }
     sw->out.opts = &sw->opts;
     sw->out.indent = sw->opts.indent;
+}
 
+/* call-seq: new(options)
+ *
+ * Creates a new StringWriter.
+ * @param [Hash] options formating options
+ */
+static VALUE
+str_writer_new(int argc, VALUE *argv, VALUE self) {
+    StrWriter	sw = ALLOC(struct _StrWriter);
+    
+    str_writer_init(sw);
+    if (1 == argc) {
+	oj_parse_options(argv[0], &sw->opts);
+    }
     return Data_Wrap_Struct(oj_string_writer_class, 0, str_writer_free, sw);
 }
 
@@ -893,8 +897,12 @@ str_writer_push_object(int argc, VALUE *argv, VALUE self) {
 	oj_str_writer_push_object((StrWriter)DATA_PTR(self), 0);
 	break;
     case 1:
-	rb_check_type(argv[0], T_STRING);
-	oj_str_writer_push_object((StrWriter)DATA_PTR(self), StringValuePtr(argv[0]));
+	if (Qnil == argv[0]) {
+	    oj_str_writer_push_object((StrWriter)DATA_PTR(self), 0);
+	} else {
+	    rb_check_type(argv[0], T_STRING);
+	    oj_str_writer_push_object((StrWriter)DATA_PTR(self), StringValuePtr(argv[0]));
+	}
 	break;
     default:
 	rb_raise(rb_eArgError, "Wrong number of argument to 'push_object'.");
@@ -916,8 +924,12 @@ str_writer_push_array(int argc, VALUE *argv, VALUE self) {
 	oj_str_writer_push_array((StrWriter)DATA_PTR(self), 0);
 	break;
     case 1:
-	rb_check_type(argv[0], T_STRING);
-	oj_str_writer_push_array((StrWriter)DATA_PTR(self), StringValuePtr(argv[0]));
+	if (Qnil == argv[0]) {
+	    oj_str_writer_push_array((StrWriter)DATA_PTR(self), 0);
+	} else {
+	    rb_check_type(argv[0], T_STRING);
+	    oj_str_writer_push_array((StrWriter)DATA_PTR(self), StringValuePtr(argv[0]));
+	}
 	break;
     default:
 	rb_raise(rb_eArgError, "Wrong number of argument to 'push_object'.");
@@ -939,8 +951,12 @@ str_writer_push_value(int argc, VALUE *argv, VALUE self) {
 	oj_str_writer_push_value((StrWriter)DATA_PTR(self), *argv, 0);
 	break;
     case 2:
-	rb_check_type(argv[1], T_STRING);
-	oj_str_writer_push_value((StrWriter)DATA_PTR(self), *argv, StringValuePtr(argv[1]));
+	if (Qnil == argv[1]) {
+	    oj_str_writer_push_value((StrWriter)DATA_PTR(self), *argv, 0);
+	} else {
+	    rb_check_type(argv[1], T_STRING);
+	    oj_str_writer_push_value((StrWriter)DATA_PTR(self), *argv, StringValuePtr(argv[1]));
+	}
 	break;
     default:
 	rb_raise(rb_eArgError, "Wrong number of argument to 'push_value'.");
@@ -1000,6 +1016,217 @@ str_writer_to_s(VALUE self) {
     return oj_encode(rstr);
 }
 
+// StreamWriter
+
+static void
+stream_writer_free(void *ptr) {
+    StreamWriter	sw;
+
+    if (0 == ptr) {
+	return;
+    }
+    sw = (StreamWriter)ptr;
+    xfree(sw->sw.out.buf);
+    xfree(sw->sw.types);
+    xfree(ptr);
+}
+
+static void
+stream_writer_write(StreamWriter sw) {
+    ssize_t	size = sw->sw.out.cur - sw->sw.out.buf;
+
+    switch (sw->type) {
+    case STRING_IO:
+	rb_funcall(sw->stream, oj_write_id, 1, rb_str_new(sw->sw.out.buf, size));
+	break;
+    case STREAM_IO:
+	rb_funcall(sw->stream, oj_write_id, 1, rb_str_new(sw->sw.out.buf, size));
+	break;
+    case FILE_IO:
+	if (size != write(sw->fd, sw->sw.out.buf, size)) {
+	    rb_raise(rb_eIOError, "Write failed. [%d:%s]\n", errno, strerror(errno));
+	}
+	break;
+    default:
+	rb_raise(rb_eArgError, "expected an IO Object.");
+    }
+}
+
+static void
+stream_writer_reset_buf(StreamWriter sw) {
+    sw->sw.out.cur = sw->sw.out.buf;
+    *sw->sw.out.cur = '\0';
+}
+
+/* call-seq: new(options)
+ *
+ * Creates a new StreamWriter.
+ * @param [Hash] options formating options
+ */
+/* call-seq: new(options)
+ *
+ * Creates a new StreamWriter.
+ * @param [Hash] options formating options
+ */
+static VALUE
+stream_writer_new(int argc, VALUE *argv, VALUE self) {
+    StreamWriterType	type = STREAM_IO;
+    int			fd = 0;
+    VALUE		stream = argv[0];
+    VALUE		clas = rb_obj_class(stream);
+    VALUE		s;
+    StreamWriter	sw;
+    
+    if (oj_stringio_class == clas) {
+	type = STRING_IO;
+#ifndef JRUBY_RUBY
+#if !IS_WINDOWS
+    } else if (rb_respond_to(stream, oj_fileno_id) && Qnil != (s = rb_funcall(stream, oj_fileno_id, 0))) {
+	type = FILE_IO;
+	fd = FIX2INT(s);
+#endif
+#endif
+    } else if (rb_respond_to(stream, oj_write_id)) {
+	type = STREAM_IO;
+    } else {
+	rb_raise(rb_eArgError, "expected an IO Object.");
+    }
+    sw = ALLOC(struct _StreamWriter);
+    str_writer_init(&sw->sw);
+    if (1 == argc) {
+	oj_parse_options(argv[0], &sw->sw.opts);
+    }
+    sw->stream = stream;
+    sw->type = type;
+    sw->fd = fd;
+
+    return Data_Wrap_Struct(oj_stream_writer_class, 0, stream_writer_free, sw);
+}
+
+/* call-seq: push_object(key=nil)
+ *
+ * Pushes an object onto the JSON document. Future pushes will be to this object
+ * until a pop() is called.
+ * @param [String] key the key if adding to an object in the JSON document
+ */
+static VALUE
+stream_writer_push_object(int argc, VALUE *argv, VALUE self) {
+    StreamWriter	sw = (StreamWriter)DATA_PTR(self);
+
+    stream_writer_reset_buf(sw);
+    switch (argc) {
+    case 0:
+	oj_str_writer_push_object(&sw->sw, 0);
+	break;
+    case 1:
+	if (Qnil == argv[0]) {
+	    oj_str_writer_push_object(&sw->sw, 0);
+	} else {
+	    rb_check_type(argv[0], T_STRING);
+	    oj_str_writer_push_object(&sw->sw, StringValuePtr(argv[0]));
+	}
+	break;
+    default:
+	rb_raise(rb_eArgError, "Wrong number of argument to 'push_object'.");
+	break;
+    }
+    stream_writer_write(sw);
+    return Qnil;
+}
+
+/* call-seq: push_array(key=nil)
+ *
+ * Pushes an array onto the JSON document. Future pushes will be to this object
+ * until a pop() is called.
+ * @param [String] key the key if adding to an object in the JSON document
+ */
+static VALUE
+stream_writer_push_array(int argc, VALUE *argv, VALUE self) {
+    StreamWriter	sw = (StreamWriter)DATA_PTR(self);
+
+    stream_writer_reset_buf(sw);
+    switch (argc) {
+    case 0:
+	oj_str_writer_push_array(&sw->sw, 0);
+	break;
+    case 1:
+	if (Qnil == argv[0]) {
+	    oj_str_writer_push_array(&sw->sw, 0);
+	} else {
+	    rb_check_type(argv[0], T_STRING);
+	    oj_str_writer_push_array(&sw->sw, StringValuePtr(argv[0]));
+	}
+	break;
+    default:
+	rb_raise(rb_eArgError, "Wrong number of argument to 'push_object'.");
+	break;
+    }
+    stream_writer_write(sw);
+    return Qnil;
+}
+
+/* call-seq: push_value(value, key=nil)
+ *
+ * Pushes a value onto the JSON document.
+ * @param [Object] value value to add to the JSON document
+ * @param [String] key the key if adding to an object in the JSON document
+ */
+static VALUE
+stream_writer_push_value(int argc, VALUE *argv, VALUE self) {
+    StreamWriter	sw = (StreamWriter)DATA_PTR(self);
+
+    stream_writer_reset_buf(sw);
+    switch (argc) {
+    case 1:
+	oj_str_writer_push_value((StrWriter)DATA_PTR(self), *argv, 0);
+	break;
+    case 2:
+	if (Qnil == argv[0]) {
+	    oj_str_writer_push_value((StrWriter)DATA_PTR(self), *argv, 0);
+	} else {
+	    rb_check_type(argv[1], T_STRING);
+	    oj_str_writer_push_value((StrWriter)DATA_PTR(self), *argv, StringValuePtr(argv[1]));
+	}
+	break;
+    default:
+	rb_raise(rb_eArgError, "Wrong number of argument to 'push_value'.");
+	break;
+    }
+    stream_writer_write(sw);
+    return Qnil;
+}
+
+/* call-seq: pop()
+ *
+ * Pops up a level in the JSON document closing the array or object that is
+ * currently open.
+ */
+static VALUE
+stream_writer_pop(VALUE self) {
+    StreamWriter	sw = (StreamWriter)DATA_PTR(self);
+
+    stream_writer_reset_buf(sw);
+    oj_str_writer_pop(&sw->sw);
+    stream_writer_write(sw);
+    return Qnil;
+}
+
+/* call-seq: pop_all()
+ *
+ * Pops all level in the JSON document closing all the array or object that is
+ * currently open.
+ */
+static VALUE
+stream_writer_pop_all(VALUE self) {
+    StreamWriter	sw = (StreamWriter)DATA_PTR(self);
+
+    stream_writer_reset_buf(sw);
+    oj_str_writer_pop_all(&sw->sw);
+    stream_writer_write(sw);
+
+    return Qnil;
+}
+
 // Mimic JSON section
 
 static VALUE
@@ -1227,7 +1454,7 @@ mimic_parse(int argc, VALUE *argv, VALUE self) {
     }
     *args = *argv;
 
-    return oj_pi_parse(1, args, &pi, 0);
+    return oj_pi_parse(1, args, &pi, 0, 0);
 }
 
 static VALUE
@@ -1351,7 +1578,6 @@ define_mimic_json(int argc, VALUE *argv, VALUE self) {
     return mimic;
 }
 
-/*
 extern void	oj_hash_test();
 
 static VALUE
@@ -1359,7 +1585,6 @@ hash_test(VALUE self) {
     oj_hash_test();
     return Qnil;
 }
-*/
 
 #if !HAS_ENCODING_SUPPORT
 static VALUE
@@ -1401,7 +1626,13 @@ void Init_oj() {
     rb_define_method(oj_string_writer_class, "reset", str_writer_reset, 0);
     rb_define_method(oj_string_writer_class, "to_s", str_writer_to_s, 0);
 
-    //oj_stream_writer_class = rb_define_class_under(Oj, "StreamWriter", rb_cObject);
+    oj_stream_writer_class = rb_define_class_under(Oj, "StreamWriter", rb_cObject);
+    rb_define_module_function(oj_stream_writer_class, "new", stream_writer_new, -1);
+    rb_define_method(oj_stream_writer_class, "push_object", stream_writer_push_object, -1);
+    rb_define_method(oj_stream_writer_class, "push_array", stream_writer_push_array, -1);
+    rb_define_method(oj_stream_writer_class, "push_value", stream_writer_push_value, -1);
+    rb_define_method(oj_stream_writer_class, "pop", stream_writer_pop, 0);
+    rb_define_method(oj_stream_writer_class, "pop_all", stream_writer_pop_all, 0);
 
     rb_require("time");
     rb_require("date");
@@ -1419,7 +1650,7 @@ void Init_oj() {
     oj_utf8_encoding = Qnil;
 #endif
 
-    //rb_define_module_function(Oj, "hash_test", hash_test, 0);
+    rb_define_module_function(Oj, "hash_test", hash_test, 0);
 
     rb_define_module_function(Oj, "default_options", get_def_opts, 0);
     rb_define_module_function(Oj, "default_options=", set_def_opts, 1);

data/ext/oj/oj.h

@@ -105,6 +105,12 @@ typedef enum {
     ObjectType	= 'o',
 } DumpType;
 
+typedef enum {
+    STRING_IO	= 'c',
+    STREAM_IO	= 's',
+    FILE_IO	= 'f',
+} StreamWriterType;
+
 typedef struct _DumpOpts {
     const char	*indent;
     const char	*before_sep;
@@ -157,6 +163,13 @@ typedef struct _StrWriter {
     char		*types_end;
 } *StrWriter;
 
+typedef struct _StreamWriter {
+    struct _StrWriter	sw;
+    StreamWriterType	type;
+    VALUE		stream;
+    int			fd;
+} *StreamWriter;
+
 enum {
     STR_VAL  = 0x00,
     COL_VAL  = 0x01,
@@ -186,9 +199,9 @@ extern VALUE	oj_strict_parse(int argc, VALUE *argv, VALUE self);
 extern VALUE	oj_compat_parse(int argc, VALUE *argv, VALUE self);
 extern VALUE	oj_object_parse(int argc, VALUE *argv, VALUE self);
 
-extern VALUE	oj_strict_parse_cstr(int argc, VALUE *argv, char *json);
-extern VALUE	oj_compat_parse_cstr(int argc, VALUE *argv, char *json);
-extern VALUE	oj_object_parse_cstr(int argc, VALUE *argv, char *json);
+extern VALUE	oj_strict_parse_cstr(int argc, VALUE *argv, char *json, size_t len);
+extern VALUE	oj_compat_parse_cstr(int argc, VALUE *argv, char *json, size_t len);
+extern VALUE	oj_object_parse_cstr(int argc, VALUE *argv, char *json, size_t len);
 
 extern void	oj_parse_options(VALUE ropts, Options copts);
 

data/ext/oj/parse.c

@@ -719,7 +719,7 @@ protect_parse(VALUE pip) {
 }
 
 VALUE
-oj_pi_parse(int argc, VALUE *argv, ParseInfo pi, char *json) {
+oj_pi_parse(int argc, VALUE *argv, ParseInfo pi, char *json, size_t len) {
     char		*buf = 0;
     volatile VALUE	input;
     volatile VALUE	wrapped_stack;
@@ -737,9 +737,11 @@ oj_pi_parse(int argc, VALUE *argv, ParseInfo pi, char *json) {
     pi->cbc = (void*)0;
     if (0 != json) {
 	pi->json = json;
+	pi->end = json + len;
 	free_json = 1;
     } else if (rb_type(input) == T_STRING) {
 	pi->json = rb_string_value_cstr((VALUE*)&input);
+	pi->end = pi->json + RSTRING_LEN(input);
     } else {
 	VALUE		clas = rb_obj_class(input);
 	volatile VALUE	s;
@@ -747,6 +749,7 @@ oj_pi_parse(int argc, VALUE *argv, ParseInfo pi, char *json) {
 	if (oj_stringio_class == clas) {
 	    s = rb_funcall2(input, oj_string_id, 0, 0);
 	    pi->json = rb_string_value_cstr((VALUE*)&s);
+	    pi->end = pi->json + RSTRING_LEN(s);
 #if !IS_WINDOWS
 	} else if (rb_respond_to(input, oj_fileno_id) && Qnil != (s = rb_funcall(input, oj_fileno_id, 0))) {
 	    int		fd = FIX2INT(s);
@@ -756,6 +759,7 @@ oj_pi_parse(int argc, VALUE *argv, ParseInfo pi, char *json) {
 	    lseek(fd, 0, SEEK_SET);
 	    buf = ALLOC_N(char, len + 1);
 	    pi->json = buf;
+	    pi->end = buf + len;
 	    if (0 >= (cnt = read(fd, (char*)pi->json, len)) || cnt != (ssize_t)len) {
 		if (0 != buf) {
 		    xfree(buf);
@@ -771,6 +775,7 @@ oj_pi_parse(int argc, VALUE *argv, ParseInfo pi, char *json) {
 	} else if (rb_respond_to(input, oj_read_id)) {
 	    s = rb_funcall2(input, oj_read_id, 0, 0);
 	    pi->json = rb_string_value_cstr((VALUE*)&s);
+	    pi->end = pi->json + RSTRING_LEN(s);
 	} else {
 	    rb_raise(rb_eArgError, "strict_parse() expected a String or IO Object.");
 	}

data/ext/oj/parse.h

@@ -56,6 +56,7 @@ typedef struct _NumInfo {
 typedef struct _ParseInfo {
     const char		*json;
     const char		*cur;
+    const char		*end;
     struct _Err		err;
     struct _Options	options;
     void		*cbc;
@@ -81,7 +82,7 @@ typedef struct _ParseInfo {
 
 extern void	oj_parse2(ParseInfo pi);
 extern void	oj_set_error_at(ParseInfo pi, VALUE err_clas, const char* file, int line, const char *format, ...);
-extern VALUE	oj_pi_parse(int argc, VALUE *argv, ParseInfo pi, char *json);
+extern VALUE	oj_pi_parse(int argc, VALUE *argv, ParseInfo pi, char *json, size_t len);
 extern VALUE	oj_num_as_value(NumInfo ni);
 
 extern void	oj_set_strict_callbacks(ParseInfo pi);

data/ext/oj/strict.c

@@ -145,15 +145,15 @@ oj_strict_parse(int argc, VALUE *argv, VALUE self) {
     pi.options = oj_default_options;
     oj_set_strict_callbacks(&pi);
 
-    return oj_pi_parse(argc, argv, &pi, 0);
+    return oj_pi_parse(argc, argv, &pi, 0, 0);
 }
 
 VALUE
-oj_strict_parse_cstr(int argc, VALUE *argv, char *json) {
+oj_strict_parse_cstr(int argc, VALUE *argv, char *json, size_t len) {
     struct _ParseInfo	pi;
 
     pi.options = oj_default_options;
     oj_set_strict_callbacks(&pi);
 
-    return oj_pi_parse(argc, argv, &pi, json);
+    return oj_pi_parse(argc, argv, &pi, json, len);
 }

data/lib/oj/version.rb

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

data/test/debian_test.rb

@@ -0,0 +1,90 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+# Ubuntu does not accept arguments to ruby when called using env. To get warnings to show up the -w options is
+# required. That can be set in the RUBYOPT environment variable.
+# export RUBYOPT=-w
+
+$VERBOSE = true
+
+$: << File.join(File.dirname(__FILE__), "../lib")
+$: << File.join(File.dirname(__FILE__), "../ext")
+
+require 'test/unit'
+require 'stringio'
+require 'date'
+require 'bigdecimal'
+require 'oj'
+
+$ruby = RUBY_DESCRIPTION.split(' ')[0]
+$ruby = 'ree' if 'ruby' == $ruby && RUBY_DESCRIPTION.include?('Ruby Enterprise Edition')
+
+def hash_eql(h1, h2)
+  return false if h1.size != h2.size
+  h1.keys.each do |k|
+    return false unless h1[k] == h2[k]
+  end
+  true
+end
+
+class Jam
+  attr_accessor :x, :y
+
+  def initialize(x, y)
+    @x = x
+    @y = y
+  end
+
+  def eql?(o)
+    self.class == o.class && @x == o.x && @y == o.y
+  end
+  alias == eql?
+
+end# Jam
+
+# contributed by sauliusg to fix as_json
+class Orange < Jam
+  def initialize(x, y)
+    super
+  end
+
+  def as_json()
+    puts "Orange.as_json called"
+    { :json_class => self.class,
+      :x => @x,
+      :y => @y }
+  end
+
+  def self.json_create(h)
+    puts "Orange.json_create"
+    self.new(h['x'], h['y'])
+  end
+end
+
+class DebJuice < ::Test::Unit::TestCase
+
+  def test_class_hash
+    Oj.hash_test()
+  end
+
+  def test_as_json_object_compat_hash_cached
+    Oj.default_options = { :mode => :compat, :class_cache => true }
+    obj = Orange.new(true, 58)
+    puts "dumping compat with cache"
+    json = Oj.dump(obj, :indent => 2)
+    assert(!json.nil?)
+    dump_and_load(obj, true)
+  end
+
+  def dump_and_load(obj, trace=false)
+    puts "dumping"
+    json = Oj.dump(obj, :indent => 2)
+    puts json if trace
+    puts "loading"
+    loaded = Oj.load(json);
+    puts "done"
+    assert_equal(obj, loaded)
+    loaded
+  end
+
+end

data/test/test_writer.rb

@@ -23,7 +23,6 @@ class OjWriter < ::Test::Unit::TestCase
     w.push_array()
     w.pop()
     assert_equal('[]', w.to_s)
-
   end
 
   def test_string_writer_nested_array
@@ -100,18 +99,6 @@ class OjWriter < ::Test::Unit::TestCase
     assert(false, "*** expected an exception")
   end
 
-  def test_string_writer_array_with_key
-    w = Oj::StringWriter.new(:indent => 0)
-    w.push_array()
-    begin
-      w.push_value(59, 'x')
-    rescue Exception
-      assert(true)
-      return
-    end
-    assert(false, "*** expected an exception")
-  end
-
   def test_string_writer_deep
     cnt = 1000
     w = Oj::StringWriter.new(:indent => 0)
@@ -145,4 +132,55 @@ class OjWriter < ::Test::Unit::TestCase
     assert_equal('', w.to_s)
   end
 
+  # Stream Writer
+
+  def test_stream_writer_empty_array
+    output = StringIO.open("", "w+")
+    w = Oj::StreamWriter.new(output, :indent => 0)
+    w.push_array()
+    w.pop()
+    assert_equal('[]', output.string())
+  end
+
+  def test_stream_writer_mixed_stringio
+    output = StringIO.open("", "w+")
+    w = Oj::StreamWriter.new(output, :indent => 0)
+    w.push_object()
+    w.push_object("a1")
+    w.pop()
+    w.push_object("a2")
+    w.push_array("b")
+    w.push_value(7)
+    w.push_value(true)
+    w.push_value("string")
+    w.pop()
+    w.pop()
+    w.push_object("a3")
+    w.pop()
+    w.pop()
+    assert_equal('{"a1":{},"a2":{"b":[7,true,"string"]},"a3":{}}', output.string())
+  end
+
+  def test_stream_writer_mixed_file
+    filename = 'open_file_writer_test.json'
+    File.open(filename, "w") do |f|
+      w = Oj::StreamWriter.new(f, :indent => 0)
+      w.push_object()
+      w.push_object("a1")
+      w.pop()
+      w.push_object("a2")
+      w.push_array("b")
+      w.push_value(7)
+      w.push_value(true)
+      w.push_value("string")
+      w.pop()
+      w.pop()
+      w.push_object("a3")
+      w.pop()
+      w.pop()
+    end
+    content = File.read(filename)
+    assert_equal('{"a1":{},"a2":{"b":[7,true,"string"]},"a3":{}}', content)
+  end
+
 end # OjWriter

data/test/tests.rb

@@ -215,6 +215,7 @@ class Juice < ::Test::Unit::TestCase
     dump_and_load('abc', false)
     dump_and_load("abc\ndef", false)
     dump_and_load("a\u0041", false)
+    assert_equal("a\u0000a", dump_and_load("a\u0000a", false))
   end
 
   def test_string_object

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-01 00:00:00.000000000 Z
+date: 2013-12-08 00:00:00.000000000 Z
 dependencies: []
 description: 'The fastest JSON parser and object serializer. '
 email: peter@ohler.com
@@ -56,6 +56,7 @@ files:
 - ext/oj/val_stack.c
 - test/a.rb
 - test/bug.rb
+- test/debian_test.rb
 - test/e.rb
 - test/files.rb
 - test/foo.rb