oj 3.13.5 → 3.13.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a287ba77407aab722c31cfa700b92a173015345bc619f4a95ef7baaeff4be93
-  data.tar.gz: b0286ae29d7dff1f71e5691feae47761ad6203f6bdbcf457486443c29b40c6c9
+  metadata.gz: 646e1253e68f33e284b1efa4ec5f6c3ad9de2e52a1f4ddfbb37435ceb5e23bd0
+  data.tar.gz: 775d9f0169d77a6f06990cf0d1f0e1904a530567d0939471f326e7ec5ee24c37
 SHA512:
-  metadata.gz: bd679fe51f8564ab17a24a842a7d7c31c097e6cd20b7f46c5949d19717aa24901750314426d2930752f78160bb25c157728b3ec8b1247376816b5dc2857ced27
-  data.tar.gz: 278065333f209b2ef3d10a94dc770f78ff50d9ca2090e39b522083deb1548902f81b8f9493d689401cc4106b21cf5e6d93f17f5cc8da383f86dc1a4d0418ae43
+  metadata.gz: f15a8a5dabfece0fb92ebfd2be99d567890441a2774c361646fc0ab03eba1de0070106cdc0addcc6fa75cf797dcd568b2f0129954c5debbe9ffa334ea8aa7fc4
+  data.tar.gz: 9d3d0d399610c5209a6819df7583368c14250311249ff3f42a67c868057b96fb8f89c12657aeaf36f1ef545793038aece84f8a7524f40f77ed8636fe6d9e09f5

data/CHANGELOG.md

@@ -1,5 +1,37 @@
 # CHANGELOG
 
+
+## 3.13.9 - 2021-10-06
+
+- Fix mimic JSON load so that it honors the `:symbolize_names` option.
+
+## 3.13.8 - 2021-09-27
+
+- Fix `Oj::Doc` behaviour for inexisting path.
+  ```ruby
+  Oj::Doc.open('{"foo":1}') do |doc|
+    doc.fetch('/foo/bar') # used to give `1`, now gives `nil`
+    doc.exists?('/foo/bar') # used to give `true`, now gives `false`
+  end
+  ```
+
+- Fix `Oj::Parser` handling of BigDecimal. `snprint()` does not handle `%Lg` correctly but `sprintf()` does.
+
+## 3.13.7 - 2021-09-16
+
+- The JSON gem allows invalid unicode so Oj, when mimicing JSON now
+  allows it as well. Use `:allow_invalid_unicode` to change that.
+
+## 3.13.6 - 2021-09-11
+
+- Fixed unicode UTF 8 parsing in string values.
+
+- Fixed hash key allocation issue.
+
+- The `Oj::Parser.new()` function now allows optional arguments that
+  set the allowed options for the mode. As an example
+  `Oj::Parser.new(:usual, cache_keys: true)`.
+
 ## 3.13.5 - 2021-09-08
 
 - Assure value strings of zero length are not always cached.

data/RELEASE_NOTES.md

@@ -5,6 +5,12 @@ see the See [{file:CHANGELOG.md}](CHANGELOG.md) file. In this file are
 the steps to take to aid in keeping things rolling after updating to
 the latest version.
 
+## 3.13.7
+
+The default for JSON when mimicked by Oj is now to set
+`:allow_invalid_unicode`. To change that behavior JSON.load, set that
+option to false.
+
 ## 3.13.x
 
 This release included a new cache that performs better than the

data/ext/oj/fast.c

@@ -879,6 +879,10 @@ static Leaf get_leaf(Leaf *stack, Leaf *lp, const char *path) {
             }
         } else if (NULL == leaf->elements) {
             leaf = NULL;
+        } else if (STR_VAL == leaf->value_type || RUBY_VAL == leaf->value_type) {
+            // We are trying to get a children of a leaf, which
+            // doesn't exist.
+            leaf = NULL;
         } else if (COL_VAL == leaf->value_type) {
             Leaf first = leaf->elements->next;
             Leaf e     = first;
@@ -1373,8 +1377,8 @@ static VALUE doc_fetch(int argc, VALUE *argv, VALUE self) {
  * Returns true if the value at the location identified by the path exists.
  *   @param [String] path path to the location
  * @example
- *   Oj::Doc.open('[1,2]') { |doc| doc.exists('/1') }  #=> true
- *   Oj::Doc.open('[1,2]') { |doc| doc.exists('/3') }  #=> false
+ *   Oj::Doc.open('[1,2]') { |doc| doc.exists?('/1') }  #=> true
+ *   Oj::Doc.open('[1,2]') { |doc| doc.exists?('/3') }  #=> false
  */
 static VALUE doc_exists(VALUE self, VALUE str) {
     Doc  doc;

data/ext/oj/intern.c

@@ -186,6 +186,7 @@ static VALUE resolve_classpath(ParseInfo pi, const char *name, size_t len, int a
     char *      end = class_name + sizeof(class_name) - 1;
     char *      s;
     const char *n = name;
+    size_t	nlen = len;
 
     clas = rb_cObject;
     for (s = class_name; 0 < len; n++, len--) {
@@ -208,7 +209,12 @@ static VALUE resolve_classpath(ParseInfo pi, const char *name, size_t len, int a
     }
     *s = '\0';
     if (Qundef == (clas = resolve_classname(clas, class_name, auto_define))) {
-        oj_set_error_at(pi, error_class, __FILE__, __LINE__, "class %s is not defined", name);
+	if (sizeof(class_name) <= nlen) {
+	    nlen = sizeof(class_name) - 1;
+	}
+	strncpy(class_name, name, nlen);
+	class_name[nlen] = '\0';
+        oj_set_error_at(pi, error_class, __FILE__, __LINE__, "class '%s' is not defined", class_name);
         if (Qnil != error_class) {
             pi->err_class = error_class;
         }

data/ext/oj/mimic_json.c

@@ -6,8 +6,6 @@
 #include "oj.h"
 #include "parse.h"
 
-static VALUE symbolize_names_sym = Qundef;
-
 extern const char oj_json_class[];
 
 VALUE oj_array_nl_sym;
@@ -516,7 +514,7 @@ static VALUE mimic_parse_core(int argc, VALUE *argv, VALUE self, bool bang) {
     pi.options               = oj_default_options;
     pi.options.auto_define   = No;
     pi.options.quirks_mode   = Yes;
-    pi.options.allow_invalid = No;
+    pi.options.allow_invalid = Yes;
     pi.options.empty_string  = No;
     pi.options.create_ok     = No;
     pi.options.allow_nan     = (bang ? Yes : No);
@@ -531,11 +529,7 @@ static VALUE mimic_parse_core(int argc, VALUE *argv, VALUE self, bool bang) {
         if (T_HASH != rb_type(ropts)) {
             rb_raise(rb_eArgError, "options must be a hash.");
         }
-        if (Qundef == symbolize_names_sym) {
-            symbolize_names_sym = ID2SYM(rb_intern("symbolize_names"));
-            rb_gc_register_address(&symbolize_names_sym);
-        }
-        if (Qnil != (v = rb_hash_lookup(ropts, symbolize_names_sym))) {
+        if (Qnil != (v = rb_hash_lookup(ropts, oj_symbolize_names_sym))) {
             pi.options.sym_key = (Qtrue == v) ? Yes : No;
         }
         if (Qnil != (v = rb_hash_lookup(ropts, oj_quirks_mode_sym))) {
@@ -573,8 +567,7 @@ static VALUE mimic_parse_core(int argc, VALUE *argv, VALUE self, bool bang) {
             }
         }
         if (oj_hash_has_key(ropts, oj_decimal_class_sym)) {
-            pi.options.compat_bigdec = (oj_bigdecimal_class ==
-                                        rb_hash_lookup(ropts, oj_decimal_class_sym));
+            pi.options.compat_bigdec = (oj_bigdecimal_class == rb_hash_lookup(ropts, oj_decimal_class_sym));
         }
         v = rb_hash_lookup(ropts, oj_max_nesting_sym);
         if (Qtrue == v) {
@@ -682,7 +675,7 @@ static VALUE mimic_set_create_id(VALUE self, VALUE id) {
  */
 static VALUE mimic_create_id(VALUE self) {
     if (NULL != oj_default_options.create_id) {
-        return  rb_utf8_str_new(oj_default_options.create_id, oj_default_options.create_id_len);
+        return rb_utf8_str_new(oj_default_options.create_id, oj_default_options.create_id_len);
     }
     return rb_str_new_cstr(oj_json_class);
 }
@@ -706,7 +699,7 @@ static struct _options mimic_object_to_json_options = {0,              // indent
                                                        No,             // empty_string
                                                        Yes,            // allow_gc
                                                        Yes,            // quirks_mode
-                                                       No,             // allow_invalid
+                                                       Yes,            // allow_invalid
                                                        No,             // create_ok
                                                        No,             // allow_nan
                                                        No,             // trace
@@ -853,9 +846,6 @@ void oj_mimic_json_methods(VALUE json) {
     // Pull in the JSON::State mimic file.
     state_class = rb_const_get_at(generator, rb_intern("State"));
     rb_gc_register_mark_object(state_class);
-
-    symbolize_names_sym = ID2SYM(rb_intern("symbolize_names"));
-    rb_gc_register_address(&symbolize_names_sym);
 }
 
 /* Document-module: JSON

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();
                 }
@@ -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);