oj 2.1.3 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f2645663d6b76de56402dc004a41b2299c3eb09
-  data.tar.gz: 2df5a5fdca36bb28f69130f249500cbe7ea9a148
+  metadata.gz: e9c84fb3930bef0021b22138c0e4ee9b42785b1a
+  data.tar.gz: cba9e1d4cd91413a80b7ff6521ccb6b4c41927d9
 SHA512:
-  metadata.gz: b8b3d8d7a4437b06cb2b7c509042bcd83f5ad6af6dba92e05b40af29b49d89b98608ffcb0668807201ce152b13ca702276bcf8492afe04adb2a8594bafcfecc0
-  data.tar.gz: 3daeb161d0402dcdbffd7aad76551ae39203e9b797fcff261d32c8b38a63d175c270e1f0ad7f9e2db6fbd86af5de81f564cac5e9415a74a7f84e2f2f29a6c01c
+  metadata.gz: 8a6741639d1ba3a7bd3292980ac7819aa6497c8c14621beefc4a1b151c7b8735f787460a02fd0edc8d4fd8c884cf66a453ac5439be7ecb58bf73f85bea21fe7b
+  data.tar.gz: 7e822754689d760c7e35b648d601f641e33edc1922e747051046abf2f9785f69a6fd0643b24951de6f2fc0e1352689780d64aeb595375c6181d143080bf18075

data/README.md

@@ -20,11 +20,9 @@ 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.1.3
+### Current Release 2.1.4
 
- - Fixed bug that did not deserialize all attributes in an Exception subclass.
-
- - Added a sample to demonstrate how to write Exception subclasses that will automatically serialize and deserialize.
+ - Fixed Linux 32 bit rounding bug.
 
 [Older release notes](http://www.ohler.com/dev/oj_misc/release_notes.html).
 

data/ext/oj/compat.c

@@ -35,6 +35,7 @@
 #include "parse.h"
 #include "resolve.h"
 #include "hash.h"
+#include "encode.h"
 
 static void
 hash_set_cstr(ParseInfo pi, const char *key, size_t klen, const char *str, size_t len, const char *orig) {
@@ -54,10 +55,8 @@ hash_set_cstr(ParseInfo pi, const char *key, size_t klen, const char *str, size_
 	VALUE	rstr = rb_str_new(str, len);
 	VALUE	rkey = rb_str_new(key, klen);
 
-#if HAS_ENCODING_SUPPORT
-	rb_enc_associate(rstr, oj_utf8_encoding);
-	rb_enc_associate(rkey, oj_utf8_encoding);
-#endif
+	rstr = oj_encode(rstr);
+	rkey = oj_encode(rkey);
 	if (Yes == pi->options.sym_key) {
 	    rkey = rb_str_intern(rkey);
 	}

data/ext/oj/encode.h

@@ -0,0 +1,51 @@
+/* encode.h
+ * Copyright (c) 2011, Peter Ohler
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ *  - Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following disclaimer.
+ * 
+ *  - Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 
+ *  - Neither the name of Peter Ohler nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software without
+ *    specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef __OJ_ENCODE_H__
+#define __OJ_ENCODE_H__
+
+#include "ruby.h"
+#if HAS_ENCODING_SUPPORT
+#include "ruby/encoding.h"
+#endif
+
+static inline VALUE
+oj_encode(VALUE rstr) {
+#if HAS_ENCODING_SUPPORT
+    rb_enc_associate(rstr, oj_utf8_encoding);
+#else
+    if (Qnil != oj_utf8_encoding) {
+	rstr = rb_funcall(oj_utf8_encoding, oj_iconv_id, 1, rstr);
+    }
+#endif
+    return rstr;
+}
+
+#endif /* __OJ_ENCODE_H__ */

data/ext/oj/fast.c

@@ -38,6 +38,7 @@
 #include <errno.h>
 
 #include "oj.h"
+#include "encode.h"
 
 // maximum to allocate on the stack, arbitrary limit
 #define SMALL_XML	65536
@@ -266,9 +267,7 @@ leaf_value(Doc doc, Leaf leaf) {
 	    break;
 	case T_STRING:
 	    leaf->value = rb_str_new2(leaf->str);
-#if HAS_ENCODING_SUPPORT
-	    rb_enc_associate(leaf->value, oj_utf8_encoding);
-#endif
+	    leaf->value = oj_encode(leaf->value);
 	    leaf->value_type = RUBY_VAL;
 	    break;
 	case T_ARRAY:
@@ -467,9 +466,7 @@ leaf_hash_value(Doc doc, Leaf leaf) {
 
 	do {
 	    key = rb_str_new2(e->key);
-#if HAS_ENCODING_SUPPORT
-	    rb_enc_associate(key, oj_utf8_encoding);
-#endif
+	    key = oj_encode(key);
 	    rb_hash_aset(h, key, leaf_value(doc, e));
 	    e = e->next;
 	} while (e != first);
@@ -1275,9 +1272,7 @@ doc_local_key(VALUE self) {
 
     if (T_HASH == leaf->parent_type) {
 	key = rb_str_new2(leaf->key);
-#if HAS_ENCODING_SUPPORT
-	rb_enc_associate(key, oj_utf8_encoding);
-#endif
+	key = oj_encode(key);
     } else if (T_ARRAY == leaf->parent_type) {
 	key = LONG2NUM(leaf->index);
     }

data/ext/oj/object.c

@@ -36,6 +36,7 @@
 #include "resolve.h"
 #include "hash.h"
 #include "odd.h"
+#include "encode.h"
 
 inline static long
 read_long(const char *str, size_t len) {
@@ -57,16 +58,11 @@ hash_key(ParseInfo pi, const char *key, size_t klen, char k1) {
 
     if (':' == k1) {
 	rkey = rb_str_new(key + 1, klen - 1);
-#if HAS_ENCODING_SUPPORT
-	rb_enc_associate(rkey, oj_utf8_encoding);
-#endif
+	rkey = oj_encode(rkey);
 	rkey = rb_funcall(rkey, oj_to_sym_id, 0);
     } else {
 	rkey = rb_str_new(key, klen);
-
-#if HAS_ENCODING_SUPPORT
-	rb_enc_associate(rkey, oj_utf8_encoding);
-#endif
+	rkey = oj_encode(rkey);
 	if (Yes == pi->options.sym_key) {
 	    rkey = rb_str_intern(rkey);
 	}
@@ -80,9 +76,7 @@ str_to_value(ParseInfo pi, const char *str, size_t len, const char *orig) {
 
     if (':' == *orig && 0 < len) {
 	rstr = rb_str_new(str + 1, len - 1);
-#if HAS_ENCODING_SUPPORT
-	rb_enc_associate(rstr, oj_utf8_encoding);
-#endif
+	rstr = oj_encode(rstr);
 	rstr = rb_funcall(rstr, oj_to_sym_id, 0);
     } else if (pi->circ_array && 3 <= len && '^' == *orig && 'r' == orig[1]) {
 	long	i = read_long(str + 2, len - 2);
@@ -94,9 +88,7 @@ str_to_value(ParseInfo pi, const char *str, size_t len, const char *orig) {
 	rstr = oj_circ_array_get(pi->circ_array, i);
     } else {
 	rstr = rb_str_new(str, len);
-#if HAS_ENCODING_SUPPORT
-	rb_enc_associate(rstr, oj_utf8_encoding);
-#endif
+	rstr = oj_encode(rstr);
     }
     return rstr;
 }
@@ -127,16 +119,12 @@ hat_cstr(ParseInfo pi, Val parent, const char *key, size_t klen, const char *str
 	    break;
 	case 'm':
 	    parent->val = rb_str_new(str + 1, len - 1);
-#if HAS_ENCODING_SUPPORT
-	    rb_enc_associate(parent->val, oj_utf8_encoding);
-#endif
+	    parent->val = oj_encode(parent->val);
 	    parent->val = rb_funcall(parent->val, oj_to_sym_id, 0);
 	    break;
 	case 's':
 	    parent->val = rb_str_new(str, len);
-#if HAS_ENCODING_SUPPORT
-	    rb_enc_associate(parent->val, oj_utf8_encoding);
-#endif
+	    parent->val = oj_encode(parent->val);
 	    break;
 	case 'c': // class
 	    parent->val = oj_name2class(pi, str, len, Yes == pi->options.auto_define);

data/ext/oj/oj.c

@@ -40,6 +40,7 @@
 #include "parse.h"
 #include "hash.h"
 #include "odd.h"
+#include "encode.h"
 
 typedef struct _YesNoOpt {
     VALUE	sym;
@@ -60,6 +61,7 @@ ID	oj_fileno_id;
 ID	oj_hash_end_id;
 ID	oj_hash_set_id;
 ID	oj_hash_start_id;
+ID	oj_iconv_id;
 ID	oj_instance_variables_id;
 ID	oj_json_create_id;
 ID	oj_new_id;
@@ -118,6 +120,8 @@ static VALUE	mimic = Qnil;
 
 #if HAS_ENCODING_SUPPORT
 rb_encoding	*oj_utf8_encoding = 0;
+#else
+VALUE		oj_utf8_encoding = Qnil;
 #endif
 
 #if SAFE_CACHE
@@ -678,9 +682,7 @@ dump(int argc, VALUE *argv, VALUE self) {
 	rb_raise(rb_eNoMemError, "Not enough memory.");
     }
     rstr = rb_str_new2(out.buf);
-#if HAS_ENCODING_SUPPORT
-    rb_enc_associate(rstr, oj_utf8_encoding);
-#endif
+    rstr = oj_encode(rstr);
     if (out.allocated) {
 	xfree(out.buf);
     }
@@ -727,9 +729,7 @@ mimic_dump(int argc, VALUE *argv, VALUE self) {
 	rb_raise(rb_eNoMemError, "Not enough memory.");
     }
     rstr = rb_str_new2(out.buf);
-#if HAS_ENCODING_SUPPORT
-    rb_enc_associate(rstr, oj_utf8_encoding);
-#endif
+    rstr = oj_encode(rstr);
     if (2 <= argc && Qnil != argv[1]) {
 	VALUE	io = argv[1];
 	VALUE	args[1];
@@ -872,9 +872,7 @@ mimic_generate_core(int argc, VALUE *argv, Options copts) {
 	rb_raise(rb_eNoMemError, "Not enough memory.");
     }
     rstr = rb_str_new2(out.buf);
-#if HAS_ENCODING_SUPPORT
-    rb_enc_associate(rstr, oj_utf8_encoding);
-#endif
+    rstr = oj_encode(rstr);
     if (out.allocated) {
 	xfree(out.buf);
     }
@@ -1072,6 +1070,23 @@ hash_test(VALUE self) {
 }
 */
 
+#if !HAS_ENCODING_SUPPORT
+static VALUE
+iconv_encoder(VALUE x) {
+    VALUE	iconv;
+
+    rb_require("iconv");
+    iconv = rb_const_get(rb_cObject, rb_intern("Iconv"));
+
+    return rb_funcall(iconv, rb_intern("new"), 2, rb_str_new2("ASCII//TRANSLIT"), rb_str_new2("UTF-8"));
+}
+
+static VALUE
+iconv_rescue(VALUE x) {
+    return Qnil;
+}
+#endif
+
 void Init_oj() {
     Oj = rb_define_module("Oj");
 
@@ -1079,6 +1094,13 @@ void Init_oj() {
     rb_require("date");
     rb_require("bigdecimal");
     rb_require("stringio");
+#if HAS_ENCODING_SUPPORT
+    oj_utf8_encoding = rb_enc_find("UTF-8");
+#else
+    // need an option to turn this on
+    oj_utf8_encoding = rb_rescue(iconv_encoder, Qnil, iconv_rescue, Qnil);
+    oj_utf8_encoding = Qnil;
+#endif
 
     //rb_define_module_function(Oj, "hash_test", hash_test, 0);
 
@@ -1109,6 +1131,7 @@ void Init_oj() {
     oj_hash_end_id = rb_intern("hash_end");
     oj_hash_set_id = rb_intern("hash_set");
     oj_hash_start_id = rb_intern("hash_start");
+    oj_iconv_id = rb_intern("iconv");
     oj_instance_variables_id = rb_intern("instance_variables");
     oj_json_create_id = rb_intern("json_create");
     oj_new_id = rb_intern("new");
@@ -1157,9 +1180,6 @@ void Init_oj() {
     oj_slash_string = rb_str_new2("/");			rb_gc_register_address(&oj_slash_string);
 
     oj_default_options.mode = ObjectMode;
-#if HAS_ENCODING_SUPPORT
-    oj_utf8_encoding = rb_enc_find("UTF-8");
-#endif
 
     oj_hash_init();
     oj_odd_init();

data/ext/oj/oj.h

@@ -174,6 +174,8 @@ extern VALUE	Oj;
 extern struct _Options	oj_default_options;
 #if HAS_ENCODING_SUPPORT
 extern rb_encoding	*oj_utf8_encoding;
+#else
+extern VALUE		oj_utf8_encoding;
 #endif
 
 extern VALUE	oj_bag_class;
@@ -197,6 +199,7 @@ extern ID	oj_fileno_id;
 extern ID	oj_hash_end_id;
 extern ID	oj_hash_set_id;
 extern ID	oj_hash_start_id;
+extern ID	oj_iconv_id;
 extern ID	oj_instance_variables_id;
 extern ID	oj_json_create_id;
 extern ID	oj_new_id;

data/ext/oj/parse.c

@@ -48,7 +48,6 @@
 #define NUM_MAX		(FIXNUM_MAX >> 8)
 #endif
 #define EXP_MAX		1023
-#define I64_MAX		0x7FFFFFFFFFFFFFFFLL
 #define DEC_MAX		14
 
 static void
@@ -418,7 +417,7 @@ read_num(ParseInfo pi) {
 		zero_cnt = 0;
 	    }
 	    ni.i = ni.i * 10 + d;
-	    if (I64_MAX <= ni.i || DEC_MAX < ni.dec_cnt - zero_cnt) {
+	    if (LONG_MAX <= ni.i || DEC_MAX < ni.dec_cnt - zero_cnt) {
 		ni.big = 1;
 	    }
 	}
@@ -436,7 +435,7 @@ read_num(ParseInfo pi) {
 	    ni.dec_cnt++;
 	    ni.num = ni.num * 10 + d;
 	    ni.div *= 10;
-	    if (I64_MAX <= ni.div || DEC_MAX < ni.dec_cnt - zero_cnt) {
+	    if (LONG_MAX <= ni.div || DEC_MAX < ni.dec_cnt - zero_cnt) {
 		ni.big = 1;
 	    }
 	}

data/ext/oj/saj.c

@@ -42,6 +42,7 @@
 #define OJ_INFINITY (1.0/0.0)
 
 #include "oj.h"
+#include "encode.h"
 
 typedef struct _CX {
     VALUE	*cur;
@@ -150,9 +151,7 @@ call_add_value(VALUE handler, VALUE value, const char *key) {
 	k = Qnil;
     } else {
 	k = rb_str_new2(key);
-#if HAS_ENCODING_SUPPORT
-	rb_enc_associate(k, oj_utf8_encoding);
-#endif
+	k = oj_encode(k);
     }
     rb_funcall(handler, oj_add_value_id, 2, value, k);
 }
@@ -165,9 +164,7 @@ call_no_value(VALUE handler, ID method, const char *key) {
 	k = Qnil;
     } else {
 	k = rb_str_new2(key);
-#if HAS_ENCODING_SUPPORT
-	rb_enc_associate(k, oj_utf8_encoding);
-#endif
+	k = oj_encode(k);
     }
     rb_funcall(handler, method, 1, k);
 }
@@ -344,9 +341,7 @@ read_str(ParseInfo pi, const char *key) {
     if (pi->has_add_value) {
 	VALUE	s = rb_str_new2(text);
 
-#if HAS_ENCODING_SUPPORT
-	rb_enc_associate(s, oj_utf8_encoding);
-#endif
+	s = oj_encode(s);
 	call_add_value(pi->handler, s, key);
     }
 }

data/ext/oj/scp.c

@@ -37,6 +37,7 @@
 
 #include "oj.h"
 #include "parse.h"
+#include "encode.h"
 
 inline static int
 respond_to(VALUE obj, ID method) {
@@ -108,9 +109,7 @@ static void
 add_cstr(ParseInfo pi, const char *str, size_t len, const char *orig) {
     VALUE	rstr = rb_str_new(str, len);
 
-#if HAS_ENCODING_SUPPORT
-    rb_enc_associate(rstr, oj_utf8_encoding);
-#endif
+    rstr = oj_encode(rstr);
      rb_funcall((VALUE)pi->cbc, oj_add_value_id, 1, rstr);
 }
 
@@ -143,9 +142,7 @@ static VALUE
 hash_key(ParseInfo pi, const char *key, size_t klen) {
     VALUE	rkey = rb_str_new(key, klen);
 
-#if HAS_ENCODING_SUPPORT
-    rb_enc_associate(rkey, oj_utf8_encoding);
-#endif
+    rkey = oj_encode(rkey);
     if (Yes == pi->options.sym_key) {
 	rkey = rb_str_intern(rkey);
     }
@@ -156,9 +153,7 @@ static void
 hash_set_cstr(ParseInfo pi, const char *key, size_t klen, const char *str, size_t len, const char *orig) {
     VALUE	rstr = rb_str_new(str, len);
 
-#if HAS_ENCODING_SUPPORT
-    rb_enc_associate(rstr, oj_utf8_encoding);
-#endif
+    rstr = oj_encode(rstr);
     rb_funcall((VALUE)pi->cbc, oj_hash_set_id, 3, stack_peek(&pi->stack)->val, hash_key(pi, key, klen), rstr);
 }
 
@@ -176,9 +171,7 @@ static void
 array_append_cstr(ParseInfo pi, const char *str, size_t len, const char *orig) {
     VALUE	rstr = rb_str_new(str, len);
 
-#if HAS_ENCODING_SUPPORT
-    rb_enc_associate(rstr, oj_utf8_encoding);
-#endif
+    rstr = oj_encode(rstr);
     rb_funcall((VALUE)pi->cbc, oj_array_append_id, 2, stack_peek(&pi->stack)->val, rstr);
 }