oj 3.13.6 → 3.13.10

data/ext/oj/object.c

@@ -35,7 +35,7 @@ static VALUE calc_hash_key(ParseInfo pi, Val kval, char k1) {
         return ID2SYM(rb_intern3(kval->key + 1, kval->klen - 1, oj_utf8_encoding));
     }
     if (Yes == pi->options.sym_key) {
-	return ID2SYM(rb_intern3(kval->key, kval->klen, oj_utf8_encoding));
+        return ID2SYM(rb_intern3(kval->key, kval->klen, oj_utf8_encoding));
     }
 #if HAVE_RB_ENC_INTERNED_STR
     rkey = rb_enc_interned_str(kval->key, kval->klen, oj_utf8_encoding);
@@ -60,21 +60,16 @@ static VALUE str_to_value(ParseInfo pi, const char *str, size_t len, const char
         }
         rstr = oj_circ_array_get(pi->circ_array, i);
     } else {
-	rstr = rb_utf8_str_new(str, len);
+        rstr = rb_utf8_str_new(str, len);
     }
     return rstr;
 }
 
-#if (RUBY_VERSION_MAJOR == 1 && RUBY_VERSION_MINOR == 8)
-static VALUE oj_parse_xml_time(const char *str, int len) {
-    return rb_funcall(rb_cTime, oj_parse_id, 1, rb_str_new(str, len));
-}
-#else
 // The much faster approach (4x faster)
 static int parse_num(const char *str, const char *end, int cnt) {
-    int  n = 0;
+    int n = 0;
     char c;
-    int  i;
+    int i;
 
     for (i = cnt; 0 < i; i--, str++) {
         c = *str;
@@ -88,9 +83,9 @@ static int parse_num(const char *str, const char *end, int cnt) {
 
 VALUE
 oj_parse_xml_time(const char *str, int len) {
-    VALUE       args[8];
+    VALUE args[8];
     const char *end = str + len;
-    int         n;
+    int n;
 
     // year
     if (0 > (n = parse_num(str, end, 4))) {
@@ -201,7 +196,6 @@ oj_parse_xml_time(const char *str, int len) {
     }
     return rb_funcall2(rb_cTime, oj_new_id, 7, args);
 }
-#endif
 
 static int hat_cstr(ParseInfo pi, Val parent, Val kval, const char *str, size_t len) {
     const char *key  = kval->key;
@@ -226,13 +220,10 @@ static int hat_cstr(ParseInfo pi, Val parent, Val kval, const char *str, size_t
             }
             parent->val      = odd->clas;
             parent->odd_args = oj_odd_alloc_args(odd);
-        } break;
-        case 'm':
-            parent->val = ID2SYM(rb_intern3(str + 1, len - 1, oj_utf8_encoding));
-            break;
-        case 's':
-	    parent->val = rb_utf8_str_new(str, len);
             break;
+        }
+        case 'm': parent->val = ID2SYM(rb_intern3(str + 1, len - 1, oj_utf8_encoding)); break;
+        case 's': parent->val = rb_utf8_str_new(str, len); break;
         case 'c':  // class
         {
             VALUE clas = oj_name2class(pi, str, len, Yes == pi->options.auto_define, rb_eArgError);
@@ -242,7 +233,8 @@ static int hat_cstr(ParseInfo pi, Val parent, Val kval, const char *str, size_t
             } else {
                 parent->val = clas;
             }
-        } break;
+            break;
+        }
         case 't':  // time
             parent->val = oj_parse_xml_time(str, (int)len);
             break;
@@ -282,22 +274,21 @@ static int hat_num(ParseInfo pi, Val parent, Val kval, NumInfo ni) {
                     VALUE            args[8];
 
                     sec_as_time(t, &ti);
-                    args[0] = LONG2NUM((long)(ti.year));
-                    args[1] = LONG2NUM(ti.mon);
-                    args[2] = LONG2NUM(ti.day);
-                    args[3] = LONG2NUM(ti.hour);
-                    args[4] = LONG2NUM(ti.min);
-                    args[5] = rb_float_new((double)ti.sec + ((double)nsec + 0.5) / 1000000000.0);
-                    args[6] = LONG2NUM(ni->exp);
+                    args[0]     = LONG2NUM((long)(ti.year));
+                    args[1]     = LONG2NUM(ti.mon);
+                    args[2]     = LONG2NUM(ti.day);
+                    args[3]     = LONG2NUM(ti.hour);
+                    args[4]     = LONG2NUM(ti.min);
+                    args[5]     = rb_float_new((double)ti.sec + ((double)nsec + 0.5) / 1000000000.0);
+                    args[6]     = LONG2NUM(ni->exp);
                     parent->val = rb_funcall2(rb_cTime, oj_new_id, 7, args);
                 } else {
                     parent->val = rb_time_nano_new(ni->i, (long)nsec);
                 }
             }
             break;
-        case 'i':  // circular index
-            if (!ni->infinity && !ni->neg && 1 == ni->div && 0 == ni->exp &&
-                0 != pi->circ_array) {  // fixnum
+        case 'i':                                                                                    // circular index
+            if (!ni->infinity && !ni->neg && 1 == ni->div && 0 == ni->exp && 0 != pi->circ_array) {  // fixnum
                 if (Qnil == parent->val) {
                     parent->val = rb_hash_new();
                 }
@@ -334,7 +325,7 @@ static int hat_value(ParseInfo pi, Val parent, const char *key, size_t klen, vol
                 int            i, cnt = (int)RARRAY_LEN(e1);
 
                 for (i = 0; i < cnt; i++) {
-                    rstr    = rb_ary_entry(e1, i);
+                    rstr    = RARRAY_AREF(e1, i);
                     args[i] = rb_funcall(rstr, oj_to_sym_id, 0);
                 }
                 sc = rb_funcall2(rb_cStruct, oj_new_id, cnt, args);
@@ -402,9 +393,7 @@ WHICH_TYPE:
         }
         break;
     case T_HASH:
-        rb_hash_aset(parent->val,
-                     calc_hash_key(pi, kval, parent->k1),
-                     str_to_value(pi, str, len, orig));
+        rb_hash_aset(parent->val, calc_hash_key(pi, kval, parent->k1), str_to_value(pi, str, len, orig));
         break;
     case T_STRING:
         rval = str_to_value(pi, str, len, orig);
@@ -481,8 +470,8 @@ WHICH_TYPE:
         rb_hash_aset(parent->val, calc_hash_key(pi, kval, parent->k1), rval);
         break;
     case T_OBJECT:
-        if (2 == klen && '^' == *key && 'i' == key[1] && !ni->infinity && !ni->neg &&
-            1 == ni->div && 0 == ni->exp && 0 != pi->circ_array) {  // fixnum
+        if (2 == klen && '^' == *key && 'i' == key[1] && !ni->infinity && !ni->neg && 1 == ni->div && 0 == ni->exp &&
+            0 != pi->circ_array) {  // fixnum
             oj_circ_array_set(pi->circ_array, parent->val, ni->i);
         } else {
             rval = oj_num_as_value(ni);
@@ -559,11 +548,7 @@ WHICH_TYPE:
                 volatile VALUE *a   = RARRAY_PTR(value);
 
                 if (2 != len) {
-                    oj_set_error_at(pi,
-                                    oj_parse_error_class,
-                                    __FILE__,
-                                    __LINE__,
-                                    "invalid hash pair");
+                    oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "invalid hash pair");
                     return;
                 }
                 rb_hash_aset(parent->val, *a, a[1]);
@@ -637,10 +622,7 @@ static void end_hash(ParseInfo pi) {
     } else if (NULL != parent->odd_args) {
         OddArgs oa = parent->odd_args;
 
-        parent->val = rb_funcall2(oa->odd->create_obj,
-                                  oa->odd->create_op,
-                                  oa->odd->attr_cnt,
-                                  oa->args);
+        parent->val = rb_funcall2(oa->odd->create_obj, oa->odd->create_op, oa->odd->attr_cnt, oa->args);
         oj_odd_free(oa);
         parent->odd_args = NULL;
     }
@@ -653,8 +635,7 @@ static void array_append_cstr(ParseInfo pi, const char *str, size_t len, const c
     volatile VALUE rval = Qnil;
 
     // orig lets us know whether the string was ^r1 or \u005er1
-    if (3 <= len && 0 != pi->circ_array && '^' == orig[0] &&
-        0 == rb_array_len(stack_peek(&pi->stack)->val)) {
+    if (3 <= len && 0 != pi->circ_array && '^' == orig[0] && 0 == rb_array_len(stack_peek(&pi->stack)->val)) {
         if ('i' == str[1]) {
             long i = read_long(str + 2, len - 2);
 

data/ext/oj/oj.c

@@ -94,6 +94,7 @@ VALUE oj_indent_sym;
 VALUE oj_object_class_sym;
 VALUE oj_quirks_mode_sym;
 VALUE oj_safe_sym;
+VALUE oj_symbolize_names_sym;
 VALUE oj_trace_sym;
 
 static VALUE allow_blank_sym;
@@ -308,106 +309,76 @@ static VALUE get_def_opts(VALUE self) {
     rb_hash_aset(opts, sec_prec_sym, INT2FIX(oj_default_options.sec_prec));
     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));
+                 (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,
                  symbol_keys_sym,
-                 (Yes == oj_default_options.sym_key)
-                     ? Qtrue
-                     : ((No == oj_default_options.sym_key) ? Qfalse : Qnil));
-    rb_hash_aset(opts,
-                 bigdecimal_as_decimal_sym,
-                 (Yes == oj_default_options.bigdec_as_num)
-                     ? Qtrue
-                     : ((No == oj_default_options.bigdec_as_num) ? Qfalse : Qnil));
-    rb_hash_aset(opts,
-                 oj_create_additions_sym,
-                 (Yes == oj_default_options.create_ok)
-                     ? Qtrue
-                     : ((No == oj_default_options.create_ok) ? Qfalse : Qnil));
+                 (Yes == oj_default_options.sym_key) ? Qtrue : ((No == oj_default_options.sym_key) ? Qfalse : Qnil));
+    rb_hash_aset(
+        opts,
+        bigdecimal_as_decimal_sym,
+        (Yes == oj_default_options.bigdec_as_num) ? Qtrue : ((No == oj_default_options.bigdec_as_num) ? Qfalse : Qnil));
+    rb_hash_aset(
+        opts,
+        oj_create_additions_sym,
+        (Yes == oj_default_options.create_ok) ? Qtrue : ((No == oj_default_options.create_ok) ? Qfalse : Qnil));
     rb_hash_aset(opts,
                  use_to_json_sym,
-                 (Yes == oj_default_options.to_json)
-                     ? Qtrue
-                     : ((No == oj_default_options.to_json) ? Qfalse : Qnil));
+                 (Yes == oj_default_options.to_json) ? Qtrue : ((No == oj_default_options.to_json) ? Qfalse : Qnil));
     rb_hash_aset(opts,
                  use_to_hash_sym,
-                 (Yes == oj_default_options.to_hash)
-                     ? Qtrue
-                     : ((No == oj_default_options.to_hash) ? Qfalse : Qnil));
+                 (Yes == oj_default_options.to_hash) ? Qtrue : ((No == oj_default_options.to_hash) ? Qfalse : Qnil));
     rb_hash_aset(opts,
                  use_as_json_sym,
-                 (Yes == oj_default_options.as_json)
-                     ? Qtrue
-                     : ((No == oj_default_options.as_json) ? Qfalse : Qnil));
+                 (Yes == oj_default_options.as_json) ? Qtrue : ((No == oj_default_options.as_json) ? Qfalse : Qnil));
     rb_hash_aset(opts,
                  use_raw_json_sym,
-                 (Yes == oj_default_options.raw_json)
-                     ? Qtrue
-                     : ((No == oj_default_options.raw_json) ? Qfalse : Qnil));
+                 (Yes == oj_default_options.raw_json) ? Qtrue : ((No == oj_default_options.raw_json) ? Qfalse : Qnil));
     rb_hash_aset(opts,
                  nilnil_sym,
-                 (Yes == oj_default_options.nilnil)
-                     ? Qtrue
-                     : ((No == oj_default_options.nilnil) ? Qfalse : Qnil));
-    rb_hash_aset(opts,
-                 empty_string_sym,
-                 (Yes == oj_default_options.empty_string)
-                     ? Qtrue
-                     : ((No == oj_default_options.empty_string) ? Qfalse : Qnil));
+                 (Yes == oj_default_options.nilnil) ? Qtrue : ((No == oj_default_options.nilnil) ? Qfalse : Qnil));
+    rb_hash_aset(
+        opts,
+        empty_string_sym,
+        (Yes == oj_default_options.empty_string) ? Qtrue : ((No == oj_default_options.empty_string) ? Qfalse : Qnil));
     rb_hash_aset(opts,
                  allow_gc_sym,
-                 (Yes == oj_default_options.allow_gc)
-                     ? Qtrue
-                     : ((No == oj_default_options.allow_gc) ? Qfalse : Qnil));
-    rb_hash_aset(opts,
-                 oj_quirks_mode_sym,
-                 (Yes == oj_default_options.quirks_mode)
-                     ? Qtrue
-                     : ((No == oj_default_options.quirks_mode) ? Qfalse : Qnil));
-    rb_hash_aset(opts,
-                 allow_invalid_unicode_sym,
-                 (Yes == oj_default_options.allow_invalid)
-                     ? Qtrue
-                     : ((No == oj_default_options.allow_invalid) ? Qfalse : Qnil));
-    rb_hash_aset(opts,
-                 oj_allow_nan_sym,
-                 (Yes == oj_default_options.allow_nan)
-                     ? Qtrue
-                     : ((No == oj_default_options.allow_nan) ? Qfalse : Qnil));
+                 (Yes == oj_default_options.allow_gc) ? Qtrue : ((No == oj_default_options.allow_gc) ? Qfalse : Qnil));
+    rb_hash_aset(
+        opts,
+        oj_quirks_mode_sym,
+        (Yes == oj_default_options.quirks_mode) ? Qtrue : ((No == oj_default_options.quirks_mode) ? Qfalse : Qnil));
+    rb_hash_aset(
+        opts,
+        allow_invalid_unicode_sym,
+        (Yes == oj_default_options.allow_invalid) ? Qtrue : ((No == oj_default_options.allow_invalid) ? Qfalse : Qnil));
+    rb_hash_aset(
+        opts,
+        oj_allow_nan_sym,
+        (Yes == oj_default_options.allow_nan) ? Qtrue : ((No == oj_default_options.allow_nan) ? Qfalse : Qnil));
     rb_hash_aset(opts,
                  oj_trace_sym,
-                 (Yes == oj_default_options.trace)
-                     ? Qtrue
-                     : ((No == oj_default_options.trace) ? Qfalse : Qnil));
+                 (Yes == oj_default_options.trace) ? Qtrue : ((No == oj_default_options.trace) ? Qfalse : Qnil));
     rb_hash_aset(opts,
                  oj_safe_sym,
-                 (Yes == oj_default_options.safe)
-                     ? Qtrue
-                     : ((No == oj_default_options.safe) ? Qfalse : Qnil));
+                 (Yes == oj_default_options.safe) ? Qtrue : ((No == oj_default_options.safe) ? Qfalse : Qnil));
     rb_hash_aset(opts, float_prec_sym, INT2FIX(oj_default_options.float_prec));
     rb_hash_aset(opts, cache_str_sym, INT2FIX(oj_default_options.cache_str));
-    rb_hash_aset(opts,
-                 ignore_under_sym,
-                 (Yes == oj_default_options.ignore_under)
-                     ? Qtrue
-                     : ((No == oj_default_options.ignore_under) ? Qfalse : Qnil));
-    rb_hash_aset(opts,
-                 cache_keys_sym,
-                 (Yes == oj_default_options.cache_keys)
-                     ? Qtrue
-                     : ((No == oj_default_options.cache_keys) ? Qfalse : Qnil));
+    rb_hash_aset(
+        opts,
+        ignore_under_sym,
+        (Yes == oj_default_options.ignore_under) ? Qtrue : ((No == oj_default_options.ignore_under) ? Qfalse : Qnil));
+    rb_hash_aset(
+        opts,
+        cache_keys_sym,
+        (Yes == oj_default_options.cache_keys) ? Qtrue : ((No == oj_default_options.cache_keys) ? Qfalse : Qnil));
     switch (oj_default_options.mode) {
     case StrictMode: rb_hash_aset(opts, mode_sym, strict_sym); break;
     case CompatMode: rb_hash_aset(opts, mode_sym, compat_sym); break;
@@ -453,30 +424,25 @@ static VALUE get_def_opts(VALUE self) {
     default: rb_hash_aset(opts, bigdecimal_load_sym, auto_sym); break;
     }
     rb_hash_aset(opts, compat_bigdecimal_sym, oj_default_options.compat_bigdec ? Qtrue : Qfalse);
+    rb_hash_aset(opts,
+                 create_id_sym,
+                 (NULL == oj_default_options.create_id) ? Qnil : rb_str_new2(oj_default_options.create_id));
     rb_hash_aset(
         opts,
-        create_id_sym,
-        (NULL == oj_default_options.create_id) ? Qnil : rb_str_new2(oj_default_options.create_id));
-    rb_hash_aset(opts,
-                 oj_space_sym,
-                 (0 == oj_default_options.dump_opts.after_size)
-                     ? Qnil
-                     : rb_str_new2(oj_default_options.dump_opts.after_sep));
-    rb_hash_aset(opts,
-                 oj_space_before_sym,
-                 (0 == oj_default_options.dump_opts.before_size)
-                     ? Qnil
-                     : rb_str_new2(oj_default_options.dump_opts.before_sep));
-    rb_hash_aset(opts,
-                 oj_object_nl_sym,
-                 (0 == oj_default_options.dump_opts.hash_size)
-                     ? Qnil
-                     : rb_str_new2(oj_default_options.dump_opts.hash_nl));
-    rb_hash_aset(opts,
-                 oj_array_nl_sym,
-                 (0 == oj_default_options.dump_opts.array_size)
-                     ? Qnil
-                     : rb_str_new2(oj_default_options.dump_opts.array_nl));
+        oj_space_sym,
+        (0 == oj_default_options.dump_opts.after_size) ? Qnil : rb_str_new2(oj_default_options.dump_opts.after_sep));
+    rb_hash_aset(
+        opts,
+        oj_space_before_sym,
+        (0 == oj_default_options.dump_opts.before_size) ? Qnil : rb_str_new2(oj_default_options.dump_opts.before_sep));
+    rb_hash_aset(
+        opts,
+        oj_object_nl_sym,
+        (0 == oj_default_options.dump_opts.hash_size) ? Qnil : rb_str_new2(oj_default_options.dump_opts.hash_nl));
+    rb_hash_aset(
+        opts,
+        oj_array_nl_sym,
+        (0 == oj_default_options.dump_opts.array_size) ? Qnil : rb_str_new2(oj_default_options.dump_opts.array_nl));
 
     switch (oj_default_options.dump_opts.nan_dump) {
     case NullNan: rb_hash_aset(opts, nan_sym, null_sym); break;
@@ -584,16 +550,14 @@ static VALUE set_def_opts(VALUE self, VALUE opts) {
     return Qnil;
 }
 
-bool oj_hash_has_key(VALUE hash, VALUE key)
-{
+bool oj_hash_has_key(VALUE hash, VALUE key) {
     if (Qundef == rb_hash_lookup2(hash, key, Qundef)) {
         return false;
     }
     return true;
 }
 
-bool set_yesno_options(VALUE key, VALUE value, Options copts)
-{
+bool set_yesno_options(VALUE key, VALUE value, Options copts) {
     struct _yesNoOpt ynos[] = {{circular_sym, &copts->circular},
                                {auto_define_sym, &copts->auto_define},
                                {symbol_keys_sym, &copts->sym_key},
@@ -616,29 +580,26 @@ bool set_yesno_options(VALUE key, VALUE value, Options copts)
                                {oj_create_additions_sym, &copts->create_ok},
                                {cache_keys_sym, &copts->cache_keys},
                                {Qnil, 0}};
-    YesNoOpt o;
-
-     for (o = ynos; 0 != o->attr; o++) {
-         if (key == o->sym) {
-             if (Qnil == value) {
-                 *o->attr = NotSet;
-             } else if (Qtrue == value) {
-                 *o->attr = Yes;
-             } else if (Qfalse == value) {
-                 *o->attr = No;
-             } else {
-                 rb_raise(rb_eArgError,
-                          "%s must be true, false, or nil.",
-                          rb_id2name(key));
-             }
-             return true;
-         }
-     }
+    YesNoOpt         o;
+
+    for (o = ynos; 0 != o->attr; o++) {
+        if (key == o->sym) {
+            if (Qnil == value) {
+                *o->attr = NotSet;
+            } else if (Qtrue == value) {
+                *o->attr = Yes;
+            } else if (Qfalse == value) {
+                *o->attr = No;
+            } else {
+                rb_raise(rb_eArgError, "%s must be true, false, or nil.", rb_id2name(key));
+            }
+            return true;
+        }
+    }
     return false;
 }
 
-static int parse_options_cb(VALUE k, VALUE v, VALUE opts)
-{
+static int parse_options_cb(VALUE k, VALUE v, VALUE opts) {
     Options copts = (Options)opts;
     size_t  len;
 
@@ -753,8 +714,7 @@ static int parse_options_cb(VALUE k, VALUE v, VALUE opts)
         } else if (rails_sym == v) {
             copts->mode = RailsMode;
         } else {
-            rb_raise(rb_eArgError,
-                     ":mode must be :object, :strict, :compat, :null, :custom, :rails, or :wab.");
+            rb_raise(rb_eArgError, ":mode must be :object, :strict, :compat, :null, :custom, :rails, or :wab.");
         }
     } else if (time_format_sym == k) {
         if (unix_sym == v) {
@@ -780,8 +740,7 @@ static int parse_options_cb(VALUE k, VALUE v, VALUE opts)
         } else if (unicode_xss_sym == v) {
             copts->escape_mode = JXEsc;
         } else {
-            rb_raise(rb_eArgError,
-                     ":encoding must be :newline, :json, :xss_safe, :unicode_xss, or :ascii.");
+            rb_raise(rb_eArgError, ":encoding must be :newline, :json, :xss_safe, :unicode_xss, or :ascii.");
         }
     } else if (bigdecimal_load_sym == k) {
         if (Qnil == v) {
@@ -892,7 +851,6 @@ static int parse_options_cb(VALUE k, VALUE v, VALUE opts)
         if (Qnil == v) {
             return ST_CONTINUE;
         }
-
         if (null_sym == v) {
             copts->dump_opts.nan_dump = NullNan;
         } else if (huge_sym == v) {
@@ -910,7 +868,6 @@ static int parse_options_cb(VALUE k, VALUE v, VALUE opts)
         if (Qnil == v) {
             return ST_CONTINUE;
         }
-
         if (Qtrue == v) {
             copts->dump_opts.omit_nil = true;
         } else if (Qfalse == v) {
@@ -918,7 +875,7 @@ static int parse_options_cb(VALUE k, VALUE v, VALUE opts)
         } else {
             rb_raise(rb_eArgError, ":omit_nil must be true or false.");
         }
-    } else if(oj_ascii_only_sym == k) {
+    } else if (oj_ascii_only_sym == k) {
         // This is here only for backwards compatibility with the original Oj.
         if (Qtrue == v) {
             copts->escape_mode = ASCIIEsc;
@@ -959,7 +916,7 @@ static int parse_options_cb(VALUE k, VALUE v, VALUE opts)
 
                 copts->ignore = ALLOC_N(VALUE, cnt + 1);
                 for (i = 0; i < cnt; i++) {
-                    copts->ignore[i] = rb_ary_entry(v, i);
+                    copts->ignore[i] = RARRAY_AREF(v, i);
                 }
                 copts->ignore[i] = Qnil;
             }
@@ -968,7 +925,6 @@ static int parse_options_cb(VALUE k, VALUE v, VALUE opts)
         if (Qnil == v) {
             return ST_CONTINUE;
         }
-
         if (TYPE(v) == T_STRUCT && rb_obj_class(v) == rb_cRange) {
             VALUE min = rb_funcall(v, oj_begin_id, 0);
             VALUE max = rb_funcall(v, oj_end_id, 0);
@@ -982,8 +938,12 @@ static int parse_options_cb(VALUE k, VALUE v, VALUE opts)
         } else if (Qfalse != v) {
             rb_raise(rb_eArgError, ":integer_range must be a range of Fixnum.");
         }
+    } else if (symbol_keys_sym == k || oj_symbolize_names_sym == k) {
+        if (Qnil == v) {
+            return ST_CONTINUE;
+        }
+	copts->sym_key = (Qtrue == v) ? Yes : No;
     }
-
     return ST_CONTINUE;
 }
 
@@ -1014,9 +974,7 @@ static int match_string_cb(VALUE key, VALUE value, VALUE rx) {
             rb_raise(rb_eArgError, "%s", rc->err);
         }
         break;
-    default:
-        rb_raise(rb_eArgError, "for :match_string, keys must either a String or RegExp.");
-        break;
+    default: rb_raise(rb_eArgError, "for :match_string, keys must either a String or RegExp."); break;
     }
     return ST_CONTINUE;
 }
@@ -1184,9 +1142,7 @@ static VALUE load_file(int argc, VALUE *argv, VALUE self) {
             } else if (wab_sym == v) {
                 mode = WabMode;
             } else {
-                rb_raise(
-                    rb_eArgError,
-                    ":mode must be :object, :strict, :compat, :null, :custom, :rails, or :wab.");
+                rb_raise(rb_eArgError, ":mode must be :object, :strict, :compat, :null, :custom, :rails, or :wab.");
             }
         }
     }
@@ -1264,16 +1220,15 @@ static VALUE safe_load(VALUE self, VALUE doc) {
  */
 
 struct dump_arg {
-    struct _out     *out;
+    struct _out *    out;
     struct _options *copts;
-    int    argc;
-    VALUE *argv;
+    int              argc;
+    VALUE *          argv;
 };
 
-static VALUE dump_body(VALUE a)
-{
+static VALUE dump_body(VALUE a) {
     volatile struct dump_arg *arg = (void *)a;
-    VALUE           rstr;
+    VALUE                     rstr;
 
     oj_dump_obj_to_json_using_params(*arg->argv, arg->copts, arg->out, arg->argc - 1, arg->argv + 1);
     if (0 == arg->out->buf) {
@@ -1285,8 +1240,7 @@ static VALUE dump_body(VALUE a)
     return rstr;
 }
 
-static VALUE dump_ensure(VALUE a)
-{
+static VALUE dump_ensure(VALUE a) {
     volatile struct dump_arg *arg = (void *)a;
 
     if (arg->out->allocated) {
@@ -1320,10 +1274,10 @@ static VALUE dump(int argc, VALUE *argv, VALUE self) {
     if (CompatMode == copts.mode && copts.escape_mode != ASCIIEsc) {
         copts.escape_mode = JSONEsc;
     }
-    arg.out = &out;
+    arg.out   = &out;
     arg.copts = &copts;
-    arg.argc = argc;
-    arg.argv = argv;
+    arg.argc  = argc;
+    arg.argv  = argv;
 
     arg.out->buf       = buf;
     arg.out->end       = buf + sizeof(buf) - 10;
@@ -2015,6 +1969,8 @@ void Init_oj() {
     rb_gc_register_address(&strict_sym);
     symbol_keys_sym = ID2SYM(rb_intern("symbol_keys"));
     rb_gc_register_address(&symbol_keys_sym);
+    oj_symbolize_names_sym = ID2SYM(rb_intern("symbolize_names"));
+    rb_gc_register_address(&oj_symbolize_names_sym);
     time_format_sym = ID2SYM(rb_intern("time_format"));
     rb_gc_register_address(&time_format_sym);
     unicode_xss_sym = ID2SYM(rb_intern("unicode_xss"));

data/ext/oj/oj.h

@@ -311,6 +311,7 @@ extern VALUE oj_object_nl_sym;
 extern VALUE oj_quirks_mode_sym;
 extern VALUE oj_space_before_sym;
 extern VALUE oj_space_sym;
+extern VALUE oj_symbolize_names_sym;
 extern VALUE oj_trace_sym;
 
 extern VALUE oj_slash_string;

data/ext/oj/parse.c

@@ -904,9 +904,17 @@ void oj_set_error_at(ParseInfo   pi,
     char *  end = p + sizeof(msg) - 2;
     char *  start;
     Val     vp;
+    int	mlen;
 
     va_start(ap, format);
-    p += vsnprintf(msg, sizeof(msg) - 1, format, ap);
+    mlen = vsnprintf(msg, sizeof(msg) - 1, format, ap);
+    if (0 < mlen) {
+	if (sizeof(msg) - 2 < (size_t)mlen) {
+	    p = end - 2;
+	} else {
+	    p += mlen;
+	}
+    }
     va_end(ap);
     pi->err.clas = err_clas;
     if (p + 3 < end) {

data/ext/oj/rails.c

@@ -157,7 +157,7 @@ static void dump_struct(VALUE obj, int depth, Out out, bool as_ok) {
     assure_size(out, 2);
     *out->cur++ = '{';
     for (i = 0; i < cnt; i++) {
-        volatile VALUE s = rb_sym2str(rb_ary_entry(ma, i));
+        volatile VALUE s = rb_sym2str(RARRAY_AREF(ma, i));
 
         name = RSTRING_PTR(s);
         len  = (int)RSTRING_LEN(s);
@@ -383,7 +383,7 @@ static StrLen columns_array(VALUE rcols, int *ccnt) {
     *ccnt = cnt;
     cols  = ALLOC_N(struct _strLen, cnt);
     for (i = 0, cp = cols; i < cnt; i++, cp++) {
-        v = rb_ary_entry(rcols, i);
+        v = RARRAY_AREF(rcols, i);
         if (T_STRING != rb_type(v)) {
             v = rb_funcall(v, oj_to_s_id, 0);
         }
@@ -420,7 +420,7 @@ static void dump_row(VALUE row, StrLen cols, int ccnt, int depth, Out out) {
         }
         oj_dump_cstr(cols->str, cols->len, 0, 0, out);
         *out->cur++ = ':';
-        dump_rails_val(rb_ary_entry(row, i), depth, out, true);
+        dump_rails_val(RARRAY_AREF(row, i), depth, out, true);
         if (i < ccnt - 1) {
             *out->cur++ = ',';
         }
@@ -490,7 +490,7 @@ static void dump_activerecord_result(VALUE obj, int depth, Out out, bool as_ok)
         } else {
             fill_indent(out, d2);
         }
-        dump_row(rb_ary_entry(rows, i), cols, ccnt, d2, out);
+        dump_row(RARRAY_AREF(rows, i), cols, ccnt, d2, out);
         if (i < rcnt - 1) {
             *out->cur++ = ',';
         }
@@ -1281,7 +1281,7 @@ static void dump_array(VALUE a, int depth, Out out, bool as_ok) {
             } else {
                 fill_indent(out, d2);
             }
-            dump_rails_val(rb_ary_entry(a, i), d2, out, true);
+            dump_rails_val(RARRAY_AREF(a, i), d2, out, true);
             if (i < cnt) {
                 *out->cur++ = ',';
             }