oj 3.12.1 → 3.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7316e25014cf4268799f3f1e4a01a74fada832b1d68bf64d82cbeb42b2caf1dd
-  data.tar.gz: a02fdb9676efeacfec86475ff35afdb88cfef33e0c94188355cad69401ee2304
+  metadata.gz: 89a87064f6668864cec4ab0c43892b4950c8ef7a9f7ea3da22f459af5bcd0083
+  data.tar.gz: bc078e8b28d710a2194e2943343db687ec15d35d2556efff2f9e46936f3bb0b0
 SHA512:
-  metadata.gz: 8f83d20545998db46a7dd0bd0e2560f47198fbb0f192bc80f17ffbce046e38727e0c143e022f8d00ba2332e2cb0be27ddda294b6a96d6f4b091ec95e282d2f01
-  data.tar.gz: e62a125cf992f510296bbe6b3eeeaaadaa8ccd2891b764a290518f785b706a797af7fbd247ac360364cd610e67ad038488d6eefb55e4dc028a3b20540995e4df
+  metadata.gz: 95cb66c13e871bf85a351348b0c458c53fe2cd4057886396a62b763386fafe5d99c97143151808eb70dd526b8f13740cd43e266805c6b3454eac1be6940897db
+  data.tar.gz: '09e24c7ec1daf2c10850b071eb4060aed265db662a92a78439eee1746b22437396f3358f82d982e040874c0916af3c38def244e03416e4971c2c5649823ff7c2'

data/ext/oj/dump.c

@@ -535,59 +535,57 @@ void oj_dump_xml_time(VALUE obj, Out out) {
     }
     if ((0 == nsec && !out->opts->sec_prec_set) || 0 == out->opts->sec_prec) {
         if (0 == tzsecs && rb_funcall2(obj, oj_utcq_id, 0, 0)) {
-            sprintf(buf,
-                    "%04d-%02d-%02dT%02d:%02d:%02dZ",
-                    ti.year,
-                    ti.mon,
-                    ti.day,
-                    ti.hour,
-                    ti.min,
-                    ti.sec);
-            oj_dump_cstr(buf, 20, 0, 0, out);
+            int len = sprintf(buf,
+                              "%04d-%02d-%02dT%02d:%02d:%02dZ",
+                              ti.year,
+                              ti.mon,
+                              ti.day,
+                              ti.hour,
+                              ti.min,
+                              ti.sec);
+            oj_dump_cstr(buf, len, 0, 0, out);
         } else {
-            sprintf(buf,
-                    "%04d-%02d-%02dT%02d:%02d:%02d%c%02d:%02d",
-                    ti.year,
-                    ti.mon,
-                    ti.day,
-                    ti.hour,
-                    ti.min,
-                    ti.sec,
-                    tzsign,
-                    tzhour,
-                    tzmin);
-            oj_dump_cstr(buf, 25, 0, 0, out);
+            int len = sprintf(buf,
+                              "%04d-%02d-%02dT%02d:%02d:%02d%c%02d:%02d",
+                              ti.year,
+                              ti.mon,
+                              ti.day,
+                              ti.hour,
+                              ti.min,
+                              ti.sec,
+                              tzsign,
+                              tzhour,
+                              tzmin);
+            oj_dump_cstr(buf, len, 0, 0, out);
         }
     } else if (0 == tzsecs && rb_funcall2(obj, oj_utcq_id, 0, 0)) {
         char format[64] = "%04d-%02d-%02dT%02d:%02d:%02d.%09ldZ";
-        int  len        = 30;
+        int  len;
 
         if (9 > out->opts->sec_prec) {
             format[32] = '0' + out->opts->sec_prec;
-            len -= 9 - out->opts->sec_prec;
         }
-        sprintf(buf, format, ti.year, ti.mon, ti.day, ti.hour, ti.min, ti.sec, (long)nsec);
+        len = sprintf(buf, format, ti.year, ti.mon, ti.day, ti.hour, ti.min, ti.sec, (long)nsec);
         oj_dump_cstr(buf, len, 0, 0, out);
     } else {
         char format[64] = "%04d-%02d-%02dT%02d:%02d:%02d.%09ld%c%02d:%02d";
-        int  len        = 35;
+        int  len;
 
         if (9 > out->opts->sec_prec) {
             format[32] = '0' + out->opts->sec_prec;
-            len -= 9 - out->opts->sec_prec;
         }
-        sprintf(buf,
-                format,
-                ti.year,
-                ti.mon,
-                ti.day,
-                ti.hour,
-                ti.min,
-                ti.sec,
-                (long)nsec,
-                tzsign,
-                tzhour,
-                tzmin);
+        len = sprintf(buf,
+                      format,
+                      ti.year,
+                      ti.mon,
+                      ti.day,
+                      ti.hour,
+                      ti.min,
+                      ti.sec,
+                      (long)nsec,
+                      tzsign,
+                      tzhour,
+                      tzmin);
         oj_dump_cstr(buf, len, 0, 0, out);
     }
 }
@@ -827,9 +825,8 @@ void oj_dump_cstr(const char *str, size_t cnt, bool is_sym, bool escape1, Out ou
         if (is_sym) {
             *out->cur++ = ':';
         }
-        for (; '\0' != *str; str++) {
-            *out->cur++ = *str;
-        }
+        memcpy(out->cur, str, cnt);
+        out->cur += cnt;
         *out->cur++ = '"';
     } else {
         const char *end         = str + cnt;
@@ -1206,7 +1203,7 @@ void oj_dump_float(VALUE obj, int depth, Out out, bool as_ok) {
         if ((int)sizeof(buf) <= cnt) {
             cnt = sizeof(buf) - 1;
         }
-        strncpy(buf, rb_string_value_ptr((VALUE *)&rstr), cnt);
+        memcpy(buf, rb_string_value_ptr((VALUE *)&rstr), cnt);
         buf[cnt] = '\0';
     } else {
         cnt = oj_dump_float_printf(buf, sizeof(buf), obj, d, out->opts->float_fmt);

data/ext/oj/dump_strict.c

@@ -98,7 +98,7 @@ static void dump_float(VALUE obj, int depth, Out out, bool as_ok) {
             if ((int)sizeof(buf) <= cnt) {
                 cnt = sizeof(buf) - 1;
             }
-            strncpy(buf, rb_string_value_ptr((VALUE *)&rstr), cnt);
+            memcpy(buf, rb_string_value_ptr((VALUE *)&rstr), cnt);
             buf[cnt] = '\0';
         } else {
             cnt = oj_dump_float_printf(buf, sizeof(buf), obj, d, out->opts->float_fmt);

data/ext/oj/object.c

@@ -433,22 +433,22 @@ void oj_set_obj_ivar(Val parent, Val kval, VALUE value) {
             char *buf = ALLOC_N(char, klen + 2);
 
             if ('~' == *key) {
-                strncpy(buf, key + 1, klen - 1);
+                memcpy(buf, key + 1, klen - 1);
                 buf[klen - 1] = '\0';
             } else {
                 *buf = '@';
-                strncpy(buf + 1, key, klen);
+                memcpy(buf + 1, key, klen);
                 buf[klen + 1] = '\0';
             }
             var_id = rb_intern(buf);
             xfree(buf);
         } else {
             if ('~' == *key) {
-                strncpy(attr, key + 1, klen - 1);
+                memcpy(attr, key + 1, klen - 1);
                 attr[klen - 1] = '\0';
             } else {
                 *attr = '@';
-                strncpy(attr + 1, key, klen);
+                memcpy(attr + 1, key, klen);
                 attr[klen + 1] = '\0';
             }
             var_id = rb_intern(attr);

data/lib/oj/version.rb

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

data/pages/Options.md

@@ -251,7 +251,13 @@ compatibility. Using just indent as an integer gives better performance.
 
 ### :symbol_keys [Boolean]
 
-Use symbols instead of strings for hash keys. :symbolize_names is an alias.
+Use symbols instead of strings for hash keys.
+
+### :symbolize_names [Boolean]
+
+Like :symbol_keys has keys are made into symbols but only when
+mimicing the JSON gem and then only as the JSON gem honors it so
+JSON.parse honors the option but JSON.load does not.
 
 ### :trace
 

data/test/foo.rb

@@ -8,13 +8,6 @@ end
 
 require 'oj'
 
-Oj.default_options = {cache_keys: false, cache_str: 0}
+p = Oj::Parser.new(:debug)
 
-[:compat, :strict, :object].each { |mode|
-  GC.start
-  t = Time.now
-  Oj.load_file('pt_lemma_lookup.json', mode: mode)
-  puts "#{mode}: #{Time.now - t}"
-}
-
-# check saj and scp
+p.parse("[true, false]")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 3.12.1
+  version: 3.12.2
 platform: ruby
 authors:
 - Peter Ohler
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-09 00:00:00.000000000 Z
+date: 2021-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -285,7 +285,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: A fast JSON parser and serializer.