oj 3.13.0 → 3.13.4

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_sym_to_s(rb_ary_entry(ma, i));
+        volatile VALUE s = rb_sym2str(rb_ary_entry(ma, i));
 
         name = RSTRING_PTR(s);
         len  = (int)RSTRING_LEN(s);

data/ext/oj/rxclass.c

@@ -110,7 +110,7 @@ oj_rxclass_match(RxClass rc, const char *str, int len) {
             }
         } else if (len < (int)sizeof(buf)) {
 #if !IS_WINDOWS
-            // string is not \0 terminated so copy and atempt a match
+            // string is not \0 terminated so copy and attempt a match
             memcpy(buf, str, len);
             buf[len] = '\0';
             if (0 == regexec(&rxc->rx, buf, 0, NULL, 0)) {  // match

data/ext/oj/saj.c

@@ -628,7 +628,7 @@ static void saj_parse(VALUE handler, char *json) {
  * @param [IO|String] io IO Object to read from
  * @deprecated The sc_parse() method along with the ScHandler is the preferred
  * callback parser. It is slightly faster and handles streams while the
- * saj_parse() methos requires a complete read before parsing.
+ * saj_parse() method requires a complete read before parsing.
  * @see sc_parse
  */
 VALUE

data/ext/oj/saj2.c

@@ -158,7 +158,7 @@ static void add_str(ojParser p) {
     const char *   str = buf_str(&p->buf);
     size_t         len = buf_len(&p->buf);
 
-    if (d->cache_str <= len) {
+    if (d->cache_str < len) {
         rstr = cache_intern(d->str_cache, str, len);
     } else {
         rstr = rb_utf8_str_new(str, len);
@@ -172,7 +172,7 @@ static void add_str_key(ojParser p) {
     const char *   str = buf_str(&p->buf);
     size_t         len = buf_len(&p->buf);
 
-    if (d->cache_str <= len) {
+    if (d->cache_str < len) {
         rstr = cache_intern(d->str_cache, str, len);
     } else {
         rstr = rb_utf8_str_new(str, len);
@@ -182,8 +182,9 @@ static void add_str_key(ojParser p) {
 
 static void reset(ojParser p) {
     Funcs end = p->funcs + 3;
+    Funcs f;
 
-    for (Funcs f = p->funcs; f < end; f++) {
+    for (f = p->funcs; f < end; f++) {
         f->add_null     = noop;
         f->add_true     = noop;
         f->add_false    = noop;
@@ -312,13 +313,14 @@ static void mark(ojParser p) {
         return;
     }
     Delegate d = (Delegate)p->ctx;
+    VALUE *kp;
 
     cache_mark(d->str_cache);
     if (Qnil != d->handler) {
         rb_gc_mark(d->handler);
     }
     if (!d->cache_keys) {
-        for (VALUE *kp = d->keys; kp < d->tail; kp++) {
+        for (kp = d->keys; kp < d->tail; kp++) {
             rb_gc_mark(*kp);
         }
     }
@@ -334,7 +336,7 @@ void oj_set_parser_saj(ojParser p) {
     d->klen      = 256;
     d->keys      = ALLOC_N(VALUE, d->klen);
     d->tail      = d->keys;
-    d->str_cache = cache_create(0, form_str, true);
+    d->str_cache = cache_create(0, form_str, true, false);
 
     p->ctx = (void *)d;
     reset(p);

data/ext/oj/sparse.c

@@ -494,7 +494,7 @@ static void read_num(ParseInfo pi) {
         if ('.' == c) {
             c = reader_get(&pi->rd);
             // A trailing . is not a valid decimal but if encountered allow it
-            // except when mimicing the JSON gem.
+            // except when mimicking the JSON gem.
             if (CompatMode == pi->options.mode) {
                 if (c < '0' || '9' < c) {
                     oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "not a number");

data/ext/oj/stream_writer.c

@@ -67,7 +67,7 @@ static VALUE buffer_size_sym = Qundef;
  * should be and also a hint on when to flush.
  *
  * - *io* [_IO_] stream to write to
- * - *options* [_Hash_] formating options
+ * - *options* [_Hash_] formatting options
  */
 static VALUE stream_writer_new(int argc, VALUE *argv, VALUE self) {
     StreamWriterType type   = STREAM_IO;

data/ext/oj/strict.c

@@ -37,8 +37,8 @@ VALUE oj_calc_hash_key(ParseInfo pi, Val parent) {
         } else {
             rkey = rb_str_new(parent->key, parent->klen);
             rkey = oj_encode(rkey);
+            OBJ_FREEZE(rkey);
         }
-        OBJ_FREEZE(rkey);
         return rkey;
     }
     if (Yes == pi->options.sym_key) {
@@ -46,7 +46,6 @@ VALUE oj_calc_hash_key(ParseInfo pi, Val parent) {
     } else {
 	rkey = oj_str_intern(parent->key, parent->klen);
     }
-    OBJ_FREEZE(rkey);
     return rkey;
 }
 

data/ext/oj/string_writer.c

@@ -248,7 +248,7 @@ static void str_writer_free(void *ptr) {
  * should be.
  *
  * - *io* [_IO_] stream to write to
- * - *options* [_Hash_] formating options
+ * - *options* [_Hash_] formatting options
  */
 static VALUE str_writer_new(int argc, VALUE *argv, VALUE self) {
     StrWriter sw = ALLOC(struct _strWriter);
@@ -466,7 +466,7 @@ static VALUE str_writer_as_json(VALUE self) {
  * by pushing values into the document. Pushing an array or an object will
  * create that element in the JSON document and subsequent pushes will add the
  * elements to that array or object until a pop() is called. When complete
- * calling to_s() will return the JSON document. Note tha calling to_s() before
+ * calling to_s() will return the JSON document. Note that calling to_s() before
  * construction is complete will return the document in it's current state.
  */
 void oj_string_writer_init() {

data/ext/oj/usual.c

@@ -77,6 +77,7 @@ typedef struct _delegate {
     char *  create_id;
     uint8_t create_id_len;
     uint8_t cache_str;
+    uint8_t cache_xrate;
     uint8_t miss_class;
     bool    cache_keys;
     bool    ignore_json_create;
@@ -100,7 +101,6 @@ static VALUE form_str(const char *str, size_t len) {
 }
 
 static VALUE form_sym(const char *str, size_t len) {
-    // return ID2SYM(rb_intern3(str, len, oj_utf8_encoding));
     return rb_str_intern(rb_utf8_str_new(str, len));
 }
 
@@ -323,6 +323,7 @@ static void open_array_key(ojParser p) {
 }
 
 static void close_object(ojParser p) {
+    VALUE *  vp;
     Delegate d = (Delegate)p->ctx;
 
     d->ctail--;
@@ -333,7 +334,7 @@ static void close_object(ojParser p) {
     volatile VALUE obj  = rb_hash_new();
 
 #if HAVE_RB_HASH_BULK_INSERT
-    for (VALUE *vp = head; kp < d->ktail; kp++, vp += 2) {
+    for (vp = head; kp < d->ktail; kp++, vp += 2) {
         *vp = d->get_key(p, kp);
         if (sizeof(kp->buf) - 1 < (size_t)kp->len) {
             xfree(kp->key);
@@ -341,7 +342,7 @@ static void close_object(ojParser p) {
     }
     rb_hash_bulk_insert(d->vtail - head, head, obj);
 #else
-    for (VALUE *vp = head; kp < d->ktail; kp++, vp += 2) {
+    for (vp = head; kp < d->ktail; kp++, vp += 2) {
         rb_hash_aset(obj, d->get_key(p, kp), *(vp + 1));
         if (sizeof(kp->buf) - 1 < (size_t)kp->len) {
             xfree(kp->key);
@@ -355,6 +356,7 @@ static void close_object(ojParser p) {
 }
 
 static void close_object_class(ojParser p) {
+    VALUE *  vp;
     Delegate d = (Delegate)p->ctx;
 
     d->ctail--;
@@ -364,7 +366,7 @@ static void close_object_class(ojParser p) {
     VALUE *        head = d->vhead + c->vi + 1;
     volatile VALUE obj  = rb_class_new_instance(0, NULL, d->hash_class);
 
-    for (VALUE *vp = head; kp < d->ktail; kp++, vp += 2) {
+    for (vp = head; kp < d->ktail; kp++, vp += 2) {
         rb_funcall(obj, hset_id, 2, d->get_key(p, kp), *(vp + 1));
         if (sizeof(kp->buf) - 1 < (size_t)kp->len) {
             xfree(kp->key);
@@ -377,6 +379,7 @@ static void close_object_class(ojParser p) {
 }
 
 static void close_object_create(ojParser p) {
+    VALUE *  vp;
     Delegate d = (Delegate)p->ctx;
 
     d->ctail--;
@@ -391,7 +394,7 @@ static void close_object_create(ojParser p) {
         if (Qnil == d->hash_class) {
             obj = rb_hash_new();
 #if HAVE_RB_HASH_BULK_INSERT
-            for (VALUE *vp = head; kp < d->ktail; kp++, vp += 2) {
+            for (vp = head; kp < d->ktail; kp++, vp += 2) {
                 *vp = d->get_key(p, kp);
                 if (sizeof(kp->buf) - 1 < (size_t)kp->len) {
                     xfree(kp->key);
@@ -399,7 +402,7 @@ static void close_object_create(ojParser p) {
             }
             rb_hash_bulk_insert(d->vtail - head, head, obj);
 #else
-            for (VALUE *vp = head; kp < d->ktail; kp++, vp += 2) {
+            for (vp = head; kp < d->ktail; kp++, vp += 2) {
                 rb_hash_aset(obj, d->get_key(p, kp), *(vp + 1));
                 if (sizeof(kp->buf) - 1 < (size_t)kp->len) {
                     xfree(kp->key);
@@ -408,7 +411,7 @@ static void close_object_create(ojParser p) {
 #endif
         } else {
             obj = rb_class_new_instance(0, NULL, d->hash_class);
-            for (VALUE *vp = head; kp < d->ktail; kp++, vp += 2) {
+            for (vp = head; kp < d->ktail; kp++, vp += 2) {
                 rb_funcall(obj, hset_id, 2, d->get_key(p, kp), *(vp + 1));
                 if (sizeof(kp->buf) - 1 < (size_t)kp->len) {
                     xfree(kp->key);
@@ -423,7 +426,7 @@ static void close_object_create(ojParser p) {
             volatile VALUE arg = rb_hash_new();
 
 #if HAVE_RB_HASH_BULK_INSERT
-            for (VALUE *vp = head; kp < d->ktail; kp++, vp += 2) {
+            for (vp = head; kp < d->ktail; kp++, vp += 2) {
                 *vp = d->get_key(p, kp);
                 if (sizeof(kp->buf) - 1 < (size_t)kp->len) {
                     xfree(kp->key);
@@ -431,7 +434,7 @@ static void close_object_create(ojParser p) {
             }
             rb_hash_bulk_insert(d->vtail - head, head, arg);
 #else
-            for (VALUE *vp = head; kp < d->ktail; kp++, vp += 2) {
+            for (vp = head; kp < d->ktail; kp++, vp += 2) {
                 rb_hash_aset(arg, d->get_key(p, kp), *(vp + 1));
                 if (sizeof(kp->buf) - 1 < (size_t)kp->len) {
                     xfree(kp->key);
@@ -441,7 +444,7 @@ static void close_object_create(ojParser p) {
             obj = rb_funcall(clas, oj_json_create_id, 1, arg);
         } else {
             obj = rb_class_new_instance(0, NULL, clas);
-            for (VALUE *vp = head; kp < d->ktail; kp++, vp += 2) {
+            for (vp = head; kp < d->ktail; kp++, vp += 2) {
                 rb_ivar_set(obj, get_attr_id(p, kp), *(vp + 1));
                 if (sizeof(kp->buf) - 1 < (size_t)kp->len) {
                     xfree(kp->key);
@@ -468,13 +471,14 @@ static void close_array(ojParser p) {
 }
 
 static void close_array_class(ojParser p) {
+    VALUE *  vp;
     Delegate d = (Delegate)p->ctx;
 
     d->ctail--;
     VALUE *        head = d->vhead + d->ctail->vi + 1;
     volatile VALUE a    = rb_class_new_instance(0, NULL, d->array_class);
 
-    for (VALUE *vp = head; vp < d->vtail; vp++) {
+    for (vp = head; vp < d->vtail; vp++) {
         rb_funcall(a, ltlt_id, 1, *vp);
     }
     d->vtail = head;
@@ -682,9 +686,10 @@ static void mark(ojParser p) {
         return;
     }
     Delegate d = (Delegate)p->ctx;
+    VALUE *  vp;
 
     if (NULL == d) {
-	return;
+        return;
     }
     cache_mark(d->str_cache);
     if (NULL != d->sym_cache) {
@@ -693,7 +698,7 @@ static void mark(ojParser p) {
     if (NULL != d->class_cache) {
         cache_mark(d->class_cache);
     }
-    for (VALUE *vp = d->vhead; vp < d->vtail; vp++) {
+    for (vp = d->vhead; vp < d->vtail; vp++) {
         if (Qundef != *vp) {
             rb_gc_mark(*vp);
         }
@@ -787,6 +792,30 @@ static VALUE opt_cache_strings_set(ojParser p, VALUE value) {
     return INT2NUM((int)d->cache_str);
 }
 
+static VALUE opt_cache_expunge(ojParser p, VALUE value) {
+    Delegate d = (Delegate)p->ctx;
+
+    return INT2NUM((int)d->cache_xrate);
+}
+
+static VALUE opt_cache_expunge_set(ojParser p, VALUE value) {
+    Delegate d    = (Delegate)p->ctx;
+    int      rate = NUM2INT(value);
+
+    if (rate < 0) {
+        rate = 0;
+    } else if (3 < rate) {
+        rate = 3;
+    }
+    d->cache_xrate = (uint8_t)rate;
+    cache_set_expunge_rate(d->str_cache, rate);
+    cache_set_expunge_rate(d->attr_cache, rate);
+    if (NULL != d->sym_cache) {
+        cache_set_expunge_rate(d->sym_cache, rate);
+    }
+    return INT2NUM((int)rate);
+}
+
 static VALUE opt_capacity(ojParser p, VALUE value) {
     Delegate d = (Delegate)p->ctx;
 
@@ -825,11 +854,7 @@ static VALUE opt_class_cache_set(ojParser p, VALUE value) {
 
     if (Qtrue == value) {
         if (NULL == d->class_cache) {
-            if (MISS_AUTO == d->miss_class) {
-                d->class_cache = cache_create(0, form_class_auto, true);
-            } else {
-                d->class_cache = cache_create(0, form_class, false);
-            }
+            d->class_cache = cache_create(0, form_class_auto, MISS_AUTO == d->miss_class, false);
         }
     } else if (NULL != d->class_cache) {
         cache_free(d->class_cache);
@@ -903,7 +928,7 @@ static VALUE opt_decimal_set(ojParser p, VALUE value) {
     switch (rb_type(value)) {
     case T_STRING: mode = RSTRING_PTR(value); break;
     case T_SYMBOL:
-        s    = rb_sym_to_s(value);
+        s    = rb_sym2str(value);
         mode = RSTRING_PTR(s);
         break;
     default:
@@ -1020,7 +1045,7 @@ static VALUE opt_missing_class_set(ojParser p, VALUE value) {
     switch (rb_type(value)) {
     case T_STRING: mode = RSTRING_PTR(value); break;
     case T_SYMBOL:
-        s    = rb_sym_to_s(value);
+        s    = rb_sym2str(value);
         mode = RSTRING_PTR(s);
         break;
     default:
@@ -1073,7 +1098,8 @@ static VALUE opt_symbol_keys_set(ojParser p, VALUE value) {
     Delegate d = (Delegate)p->ctx;
 
     if (Qtrue == value) {
-        d->sym_cache = cache_create(0, form_sym, true);
+        d->sym_cache = cache_create(0, form_sym, true, false);
+        cache_set_expunge_rate(d->sym_cache, d->cache_xrate);
         d->key_cache = d->sym_cache;
         if (!d->cache_keys) {
             d->get_key = sym_key;
@@ -1091,13 +1117,16 @@ static VALUE opt_symbol_keys_set(ojParser p, VALUE value) {
 }
 
 static VALUE option(ojParser p, const char *key, VALUE value) {
-    struct opt opts[] = {
+    struct opt *op;
+    struct opt  opts[] = {
         {.name = "array_class", .func = opt_array_class},
         {.name = "array_class=", .func = opt_array_class_set},
         {.name = "cache_keys", .func = opt_cache_keys},
         {.name = "cache_keys=", .func = opt_cache_keys_set},
         {.name = "cache_strings", .func = opt_cache_strings},
         {.name = "cache_strings=", .func = opt_cache_strings_set},
+        {.name = "cache_expunge", .func = opt_cache_expunge},
+        {.name = "cache_expunge=", .func = opt_cache_expunge_set},
         {.name = "capacity", .func = opt_capacity},
         {.name = "capacity=", .func = opt_capacity_set},
         {.name = "class_cache", .func = opt_class_cache},
@@ -1119,7 +1148,7 @@ static VALUE option(ojParser p, const char *key, VALUE value) {
         {.name = NULL},
     };
 
-    for (struct opt *op = opts; NULL != op->name; op++) {
+    for (op = opts; NULL != op->name; op++) {
         if (0 == strcmp(key, op->name)) {
             return op->func(p, value);
         }
@@ -1157,6 +1186,7 @@ void oj_set_parser_usual(ojParser p) {
     d->create_id          = NULL;
     d->create_id_len      = 0;
     d->miss_class         = MISS_IGNORE;
+    d->cache_xrate        = 1;
 
     Funcs f         = &p->funcs[TOP_FUN];
     f->add_null     = add_null;
@@ -1197,8 +1227,8 @@ void oj_set_parser_usual(ojParser p) {
     f->open_object  = open_object_key;
     f->close_object = close_object;
 
-    d->str_cache   = cache_create(0, form_str, true);
-    d->attr_cache  = cache_create(0, form_attr, false);
+    d->str_cache   = cache_create(0, form_str, true, false);
+    d->attr_cache  = cache_create(0, form_attr, false, false);
     d->sym_cache   = NULL;
     d->class_cache = NULL;
     d->key_cache   = d->str_cache;

data/ext/oj/validate.c

@@ -28,8 +28,9 @@ mark(ojParser p) {
 void oj_set_parser_validator(ojParser p) {
     p->ctx = NULL;
     Funcs	end = p->funcs + 3;
+    Funcs f;
 
-    for (Funcs f = p->funcs; f < end; f++) {
+    for (f = p->funcs; f < end; f++) {
 	f->add_null = noop;
 	f->add_true = noop;
 	f->add_false = noop;

data/ext/oj/wab.c

@@ -305,11 +305,14 @@ static VALUE calc_hash_key(ParseInfo pi, Val parent) {
     if (Yes == pi->options.cache_keys) {
         rkey = oj_sym_intern(parent->key, parent->klen);
     } else {
-        rkey = rb_str_new(parent->key, parent->klen);
-        rkey = oj_encode(rkey);
+#if HAVE_RB_ENC_INTERNED_STR
+        rkey = rb_enc_interned_str(parent->key, parent->klen, oj_utf8_encoding);
+#else
+	rkey = rb_utf8_str_new(parent->key, parent->klen);
         rkey = rb_str_intern(rkey);
+        OBJ_FREEZE(rkey);
+#endif
     }
-    OBJ_FREEZE(rkey);
     return rkey;
 }
 

data/lib/oj/error.rb

@@ -16,7 +16,7 @@ module Oj
   # An Exception that is raised if a file fails to load.
   LoadError = Class.new(Error)
 
-  # An Exception that is raised if there is a conflict with mimicing JSON
+  # An Exception that is raised if there is a conflict with mimicking JSON
   MimicError = Class.new(Error)
 
 end # Oj

data/lib/oj/state.rb

@@ -1,7 +1,7 @@
 
 module JSON
   module Ext
-    module Generator 
+    module Generator
       unless defined?(::JSON::Ext::Generator::State)
         # This class exists for json gem compatibility only. While it can be
         # used as the options for other than compatibility a simple Hash is
@@ -44,11 +44,11 @@ module JSON
           def to_h()
             return @attrs.dup
           end
-          
+
           def to_hash()
             return @attrs.dup
           end
-          
+
           def allow_nan?()
             @attrs[:allow_nan]
           end
@@ -104,7 +104,7 @@ module JSON
           def has_key?(k)
             @attrs.has_key?(key.to_sym)
           end
-          
+
           # Handles requests for Hash values. Others cause an Exception to be raised.
           # @param [Symbol|String] m method symbol
           # @return [Boolean] the value of the specified instance variable.
@@ -116,11 +116,12 @@ module JSON
               m = m.to_s[0..-2]
               m = m.to_sym
               return @attrs.store(m, args[0])
-            else
+	    end
+	    if @attrs.has_key?(m.to_sym)
               raise ArgumentError.new("wrong number of arguments (#{args.size} for 0 with #{m}) to method #{m}") unless args.nil? or args.empty?
               return @attrs[m.to_sym]
-            end
-            raise NoMethodError.new("undefined method #{m}", m)
+	    end
+	    return @attrs.send(m, *args, &block)
           end
 
         end # State