oj 3.16.3 → 3.17.4

data/ext/oj/usual.c

@@ -63,7 +63,7 @@ static VALUE form_attr(const char *str, size_t len) {
         memcpy(b + 1, str, len);
         b[len + 1] = '\0';
 
-        id = rb_intern3(buf, len + 1, oj_utf8_encoding);
+        id = rb_intern3(b, len + 1, oj_utf8_encoding);
         OJ_R_FREE(b);
         return id;
     }
@@ -200,7 +200,10 @@ static void push_key(ojParser p) {
         d->ktail = d->khead + pos;
         d->kend  = d->khead + cap;
     }
-    d->ktail->len = klen;
+    if (32000 < klen) {
+        rb_raise(oj_json_parser_error_class, "Key too long. Keys are limited to 32,000 bytes.");
+    }
+    d->ktail->len = (int16_t)klen;
     if (klen < sizeof(d->ktail->buf)) {
         memcpy(d->ktail->buf, key, klen);
         d->ktail->buf[klen] = '\0';
@@ -281,7 +284,6 @@ static void close_object(ojParser p) {
     VALUE         *head = d->vhead + c->vi + 1;
     volatile VALUE obj  = rb_hash_new();
 
-#if HAVE_RB_HASH_BULK_INSERT
     for (vp = head; kp < d->ktail; kp++, vp += 2) {
         *vp = d->get_key(p, kp);
         if (sizeof(kp->buf) <= (size_t)kp->len) {
@@ -289,18 +291,15 @@ static void close_object(ojParser p) {
         }
     }
     rb_hash_bulk_insert(d->vtail - head, head, obj);
-#else
-    for (vp = head; kp < d->ktail; kp++, vp += 2) {
-        rb_hash_aset(obj, d->get_key(p, kp), *(vp + 1));
-        if (sizeof(kp->buf) <= (size_t)kp->len) {
-            OJ_R_FREE(kp->key);
-        }
-    }
-#endif
     d->ktail = d->khead + c->ki;
+
     d->vtail = head;
     head--;
     *head = obj;
+    if (1 == d->vtail - d->vhead && rb_block_given_p()) {
+        d->vtail = d->vhead;
+        rb_yield(obj);
+    }
 }
 
 static void close_object_class(ojParser p) {
@@ -341,7 +340,6 @@ static void close_object_create(ojParser p) {
         head++;
         if (Qnil == d->hash_class) {
             obj = rb_hash_new();
-#if HAVE_RB_HASH_BULK_INSERT
             for (vp = head; kp < d->ktail; kp++, vp += 2) {
                 *vp = d->get_key(p, kp);
                 if (sizeof(kp->buf) <= (size_t)kp->len) {
@@ -349,14 +347,6 @@ static void close_object_create(ojParser p) {
                 }
             }
             rb_hash_bulk_insert(d->vtail - head, head, obj);
-#else
-            for (vp = head; kp < d->ktail; kp++, vp += 2) {
-                rb_hash_aset(obj, d->get_key(p, kp), *(vp + 1));
-                if (sizeof(kp->buf) <= (size_t)kp->len) {
-                    OJ_R_FREE(kp->key);
-                }
-            }
-#endif
         } else {
             obj = rb_class_new_instance(0, NULL, d->hash_class);
             for (vp = head; kp < d->ktail; kp++, vp += 2) {
@@ -373,7 +363,6 @@ static void close_object_create(ojParser p) {
         if (!d->ignore_json_create && rb_respond_to(clas, oj_json_create_id)) {
             volatile VALUE arg = rb_hash_new();
 
-#if HAVE_RB_HASH_BULK_INSERT
             for (vp = head; kp < d->ktail; kp++, vp += 2) {
                 *vp = d->get_key(p, kp);
                 if (sizeof(kp->buf) <= (size_t)kp->len) {
@@ -381,14 +370,6 @@ static void close_object_create(ojParser p) {
                 }
             }
             rb_hash_bulk_insert(d->vtail - head, head, arg);
-#else
-            for (vp = head; kp < d->ktail; kp++, vp += 2) {
-                rb_hash_aset(arg, d->get_key(p, kp), *(vp + 1));
-                if (sizeof(kp->buf) <= (size_t)kp->len) {
-                    OJ_R_FREE(kp->key);
-                }
-            }
-#endif
             obj = rb_funcall(clas, oj_json_create_id, 1, arg);
         } else {
             obj = rb_class_new_instance(0, NULL, clas);
@@ -599,7 +580,18 @@ static VALUE result(ojParser p) {
     Usual d = (Usual)p->ctx;
 
     if (d->vhead < d->vtail) {
-        return *d->vhead;
+        long            cnt = d->vtail - d->vhead;
+        volatile VALUE  ary;
+        volatile VALUE *vp;
+
+        if (1 == cnt) {
+            return *d->vhead;
+        }
+        ary = rb_ary_new();
+        for (vp = d->vhead; vp < d->vtail; vp++) {
+            rb_ary_push(ary, *vp);
+        }
+        return ary;
     }
     if (d->raise_on_empty) {
         rb_raise(oj_parse_error_class, "empty string");
@@ -619,12 +611,16 @@ static void dfree(ojParser p) {
     Usual d = (Usual)p->ctx;
 
     cache_free(d->str_cache);
+    d->str_cache = NULL;
     cache_free(d->attr_cache);
+    d->attr_cache = NULL;
     if (NULL != d->sym_cache) {
         cache_free(d->sym_cache);
+        d->sym_cache = NULL;
     }
     if (NULL != d->class_cache) {
         cache_free(d->class_cache);
+        d->class_cache = NULL;
     }
     OJ_R_FREE(d->vhead);
     OJ_R_FREE(d->chead);
@@ -651,6 +647,12 @@ static void mark(ojParser p) {
     if (NULL != d->class_cache) {
         cache_mark(d->class_cache);
     }
+    if (Qnil != d->hash_class) {
+        rb_gc_mark(d->hash_class);
+    }
+    if (Qnil != d->array_class) {
+        rb_gc_mark(d->array_class);
+    }
     for (vp = d->vhead; vp < d->vtail; vp++) {
         if (Qundef != *vp) {
             rb_gc_mark(*vp);
@@ -845,8 +847,8 @@ static VALUE opt_create_id_set(ojParser p, VALUE value) {
         rb_check_type(value, T_STRING);
         size_t len = RSTRING_LEN(value);
 
-        if (1 << sizeof(d->create_id_len) <= len) {
-            rb_raise(rb_eArgError, "The create_id values is limited to %d bytes.", 1 << sizeof(d->create_id_len));
+        if (1 << (8 * sizeof(d->create_id_len)) <= len) {
+            rb_raise(rb_eArgError, "The create_id values is limited to %d bytes.", 1 << (8 * sizeof(d->create_id_len)));
         }
         d->create_id_len                  = (uint8_t)len;
         d->create_id                      = str_dup(RSTRING_PTR(value), len);
@@ -1061,10 +1063,10 @@ static VALUE opt_symbol_keys_set(ojParser p, VALUE value) {
         if (NULL != d->sym_cache) {
             cache_free(d->sym_cache);
             d->sym_cache = NULL;
+            d->key_cache = NULL;
         }
-        if (!d->cache_keys) {
-            d->get_key = str_key;
-        }
+        d->cache_keys = false;
+        d->get_key    = str_key;
     }
     return (NULL != d->sym_cache) ? Qtrue : Qfalse;
 }

data/ext/oj/wab.c

@@ -19,7 +19,7 @@
 // Workaround in case INFINITY is not defined in math.h or if the OS is CentOS
 #define OJ_INFINITY (1.0 / 0.0)
 
-static char hex_chars[256] = "\
+static char hex_chars[257] = "\
 ................................\
 ................xxxxxxxxxx......\
 .xxxxxx.........................\
@@ -111,10 +111,11 @@ static void dump_float(VALUE obj, int depth, Out out, bool as_ok) {
 
 static void dump_array(VALUE a, int depth, Out out, bool as_ok) {
     size_t size;
-    int    i, cnt;
+    size_t i;
+    size_t cnt;
     int    d2 = depth + 1;
 
-    cnt         = (int)RARRAY_LEN(a);
+    cnt         = RARRAY_LEN(a);
     *out->cur++ = '[';
     size        = 2;
     assure_size(out, size);
@@ -226,7 +227,7 @@ static void dump_obj(VALUE obj, int depth, Out out, bool as_ok) {
     } else if (oj_bigdecimal_class == clas) {
         volatile VALUE rstr = oj_safe_string_convert(obj);
 
-        oj_dump_raw(RSTRING_PTR(rstr), (int)RSTRING_LEN(rstr), out);
+        oj_dump_raw(RSTRING_PTR(rstr), RSTRING_LEN(rstr), out);
     } else if (resolve_wab_uuid_class() == clas) {
         oj_dump_str(oj_safe_string_convert(obj), depth, out, false);
     } else if (resolve_uri_http_class() == clas) {

data/lib/oj/mimic.rb

@@ -1,11 +1,7 @@
 # frozen_string_literal: false
 
 require 'bigdecimal'
-begin
-  require 'ostruct'
-rescue Exception
-  # ignore
-end
+require 'ostruct'
 
 module Oj
 

data/lib/oj/schandler.rb

@@ -64,13 +64,14 @@ module Oj
   #
   #    hash_end
   #
-  # When a hash key is encountered the hash_key method is called with the parsed
-  # hash value key. The return value from the call is then used as the key in
-  # the key-value pair that follows.
+  #  At the end of a JSON object element the hash_end() callback is called if
+  #  public.
   #
   #    hash_key
   #
-  # At the end of a JSON object element the hash_end() callback is called if public.
+  # When a hash key is encountered the hash_key() method is called with the
+  # parsed hash value key. The return value from the call is then used as the
+  # key in the key-value pair that follows.
   #
   #    hash_set
   #

data/lib/oj/version.rb

@@ -1,4 +1,4 @@
 module Oj
   # Current version of the module.
-  VERSION = '3.16.3'
+  VERSION = '3.17.4'
 end

data/pages/Encoding.md

@@ -15,7 +15,7 @@ in a JSON document. The formatting follows these rules.
  * The `'^'` character denotes a special key value when in a JSON Object sequence.
 
  * A Ruby String that starts with `':'`or the sequence `'^i'` or `'^r'` are
-   encoded by excaping the first character so that it appears as `'\u005e'` or
+   encoded by escaping the first character so that it appears as `'\u005e'` or
    `'\u003a'` instead of `':'` or `'^'`.
 
  * A `"^c"` JSON Object key indicates the value should be converted to a Ruby

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 3.16.3
+  version: 3.17.4
 platform: ruby
 authors:
 - Peter Ohler
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-11 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bigdecimal
@@ -72,15 +71,29 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.2'
 description: The fastest JSON parser and object serializer.
 email: peter@ohler.com
 executables: []
 extensions:
 - ext/oj/extconf.rb
 extra_rdoc_files:
-- README.md
-- LICENSE
 - CHANGELOG.md
+- LICENSE
+- README.md
 - RELEASE_NOTES.md
 - pages/Advanced.md
 - pages/Compatibility.md
@@ -145,10 +158,13 @@ files:
 - ext/oj/resolve.h
 - ext/oj/rxclass.c
 - ext/oj/rxclass.h
+- ext/oj/safe.c
+- ext/oj/safe.h
 - ext/oj/saj.c
 - ext/oj/saj2.c
 - ext/oj/saj2.h
 - ext/oj/scp.c
+- ext/oj/simd.h
 - ext/oj/sparse.c
 - ext/oj/stream_writer.c
 - ext/oj/strict.c
@@ -186,98 +202,6 @@ files:
 - pages/Rails.md
 - pages/Security.md
 - pages/WAB.md
-- test/_test_active.rb
-- test/_test_active_mimic.rb
-- test/_test_mimic_rails.rb
-- test/activerecord/result_test.rb
-- test/activesupport6/abstract_unit.rb
-- test/activesupport6/decoding_test.rb
-- test/activesupport6/encoding_test.rb
-- test/activesupport6/encoding_test_cases.rb
-- test/activesupport6/test_common.rb
-- test/activesupport6/test_helper.rb
-- test/activesupport6/time_zone_test_helpers.rb
-- test/activesupport7/abstract_unit.rb
-- test/activesupport7/decoding_test.rb
-- test/activesupport7/encoding_test.rb
-- test/activesupport7/encoding_test_cases.rb
-- test/activesupport7/time_zone_test_helpers.rb
-- test/files.rb
-- test/foo.rb
-- test/helper.rb
-- test/isolated/shared.rb
-- test/isolated/test_mimic_after.rb
-- test/isolated/test_mimic_alone.rb
-- test/isolated/test_mimic_as_json.rb
-- test/isolated/test_mimic_before.rb
-- test/isolated/test_mimic_define.rb
-- test/isolated/test_mimic_rails_after.rb
-- test/isolated/test_mimic_rails_before.rb
-- test/isolated/test_mimic_redefine.rb
-- test/json_gem/json_addition_test.rb
-- test/json_gem/json_common_interface_test.rb
-- test/json_gem/json_encoding_test.rb
-- test/json_gem/json_ext_parser_test.rb
-- test/json_gem/json_fixtures_test.rb
-- test/json_gem/json_generator_test.rb
-- test/json_gem/json_generic_object_test.rb
-- test/json_gem/json_parser_test.rb
-- test/json_gem/json_string_matching_test.rb
-- test/json_gem/test_helper.rb
-- test/mem.rb
-- test/perf.rb
-- test/perf_compat.rb
-- test/perf_dump.rb
-- test/perf_fast.rb
-- test/perf_file.rb
-- test/perf_object.rb
-- test/perf_once.rb
-- test/perf_parser.rb
-- test/perf_saj.rb
-- test/perf_scp.rb
-- test/perf_simple.rb
-- test/perf_strict.rb
-- test/perf_wab.rb
-- test/prec.rb
-- test/sample.rb
-- test/sample/change.rb
-- test/sample/dir.rb
-- test/sample/doc.rb
-- test/sample/file.rb
-- test/sample/group.rb
-- test/sample/hasprops.rb
-- test/sample/layer.rb
-- test/sample/line.rb
-- test/sample/oval.rb
-- test/sample/rect.rb
-- test/sample/shape.rb
-- test/sample/text.rb
-- test/sample_json.rb
-- test/test_compat.rb
-- test/test_custom.rb
-- test/test_debian.rb
-- test/test_fast.rb
-- test/test_file.rb
-- test/test_gc.rb
-- test/test_generate.rb
-- test/test_hash.rb
-- test/test_integer_range.rb
-- test/test_null.rb
-- test/test_object.rb
-- test/test_parser.rb
-- test/test_parser_debug.rb
-- test/test_parser_saj.rb
-- test/test_parser_usual.rb
-- test/test_rails.rb
-- test/test_saj.rb
-- test/test_scp.rb
-- test/test_strict.rb
-- test/test_various.rb
-- test/test_wab.rb
-- test/test_writer.rb
-- test/tests.rb
-- test/tests_mimic.rb
-- test/tests_mimic_addition.rb
 homepage: http://www.ohler.com/oj
 licenses:
 - MIT
@@ -289,7 +213,6 @@ metadata:
   source_code_uri: https://github.com/ohler55/oj
   wiki_uri: https://github.com/ohler55/oj/wiki
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options:
 - "--title"
 - Oj
@@ -308,8 +231,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key:
+rubygems_version: 4.0.3
 specification_version: 4
 summary: A fast JSON parser and serializer.
 test_files: []

data/test/_test_active.rb

@@ -1,75 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-$LOAD_PATH << __dir__
-%w(lib ext test).each do |dir|
-  $LOAD_PATH.unshift File.expand_path("../../#{dir}", __FILE__)
-end
-
-require 'minitest'
-require 'minitest/autorun'
-
-require 'sqlite3'
-require 'active_record'
-require 'oj'
-
-# Oj.mimic_JSON()
-Oj.default_options = {mode: :compat, indent: 2}
-
-# ActiveRecord::Base.logger = Logger.new(STDERR)
-
-ActiveRecord::Base.establish_connection(
-  :adapter => 'sqlite3',
-  :database => ':memory:'
-)
-
-ActiveRecord::Schema.define do
-  create_table :users do |table|
-    table.column :first_name, :string
-    table.column :last_name, :string
-    table.column :email, :string
-  end
-end
-
-class User < ActiveRecord::Base
-end
-
-class ActiveTest < Minitest::Test
-
-  def test_active
-    User.find_or_create_by(first_name: 'John', last_name: 'Smith', email: 'john@example.com')
-    User.find_or_create_by(first_name: 'Joan', last_name: 'Smith', email: 'joan@example.com')
-
-    # Single instance.
-    assert_equal(%|{
-  "id":1,
-  "first_name":"John",
-  "last_name":"Smith",
-  "email":"john@example.com"
-}
-|, Oj.dump(User.first))
-
-    # Array of instances.
-    assert_equal(%|[
-  {
-    "id":1,
-    "first_name":"John",
-    "last_name":"Smith",
-    "email":"john@example.com"
-  },
-  {
-    "id":2,
-    "first_name":"Joan",
-    "last_name":"Smith",
-    "email":"joan@example.com"
-  }
-]
-|, Oj.dump(User.all))
-
-    # Single instance as json. (not Oj)
-    assert_equal(%|{"id":1,"first_name":"John","last_name":"Smith","email":"john@example.com"}|, User.first.to_json)
-
-    # Array of instances as json. (not Oj)
-    assert_equal(%|[{"id":1,"first_name":"John","last_name":"Smith","email":"john@example.com"},{"id":2,"first_name":"Joan","last_name":"Smith","email":"joan@example.com"}]|, User.all.to_json)
-  end
-end

data/test/_test_active_mimic.rb

@@ -1,95 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-$LOAD_PATH << __dir__
-%w(lib ext test).each do |dir|
-  $LOAD_PATH.unshift File.expand_path("../../#{dir}", __FILE__)
-end
-
-require 'minitest'
-require 'minitest/autorun'
-
-require 'sqlite3'
-require 'active_record'
-require 'oj'
-
-Oj.mimic_JSON()
-Oj.default_options = {mode: :compat, indent: 2}
-
-# ActiveRecord::Base.logger = Logger.new(STDERR)
-
-ActiveRecord::Base.establish_connection(
-  :adapter => 'sqlite3',
-  :database => ':memory:'
-)
-
-ActiveRecord::Schema.define do
-  create_table :users do |table|
-    table.column :first_name, :string
-    table.column :last_name, :string
-    table.column :email, :string
-  end
-end
-
-class User < ActiveRecord::Base
-end
-
-class ActiveTest < Minitest::Test
-
-  def test_active
-    User.find_or_create_by(first_name: 'John', last_name: 'Smith', email: 'john@example.com')
-    User.find_or_create_by(first_name: 'Joan', last_name: 'Smith', email: 'joan@example.com')
-
-    # Single instance.
-    assert_equal(%|{
-  "id":1,
-  "first_name":"John",
-  "last_name":"Smith",
-  "email":"john@example.com"
-}
-|, Oj.dump(User.first))
-
-    # Array of instances.
-    assert_equal(%|[
-  {
-    "id":1,
-    "first_name":"John",
-    "last_name":"Smith",
-    "email":"john@example.com"
-  },
-  {
-    "id":2,
-    "first_name":"Joan",
-    "last_name":"Smith",
-    "email":"joan@example.com"
-  }
-]
-|, Oj.dump(User.all))
-
-    # Single instance as json. (not Oj)
-    assert_equal(%|{
-  "id":1,
-  "first_name":"John",
-  "last_name":"Smith",
-  "email":"john@example.com"
-}
-|, User.first.to_json)
-
-    # Array of instances as json. (not Oj)
-    assert_equal(%|[
-  {
-    "id":1,
-    "first_name":"John",
-    "last_name":"Smith",
-    "email":"john@example.com"
-  },
-  {
-    "id":2,
-    "first_name":"Joan",
-    "last_name":"Smith",
-    "email":"joan@example.com"
-  }
-]
-|, User.all.to_json)
-  end
-end