oj 3.16.6 → 3.17.3

data/ext/oj/strict.c

@@ -19,8 +19,7 @@ VALUE oj_cstr_to_value(const char *str, size_t len, size_t cache_str) {
     if (len < cache_str) {
         rstr = oj_str_intern(str, len);
     } else {
-        rstr = rb_str_new(str, len);
-        rstr = oj_encode(rstr);
+        rstr = rb_utf8_str_new(str, len);
     }
     return rstr;
 }
@@ -35,8 +34,7 @@ VALUE oj_calc_hash_key(ParseInfo pi, Val parent) {
         if (Yes == pi->options.sym_key) {
             rkey = ID2SYM(rb_intern3(parent->key, parent->klen, oj_utf8_encoding));
         } else {
-            rkey = rb_str_new(parent->key, parent->klen);
-            rkey = oj_encode(rkey);
+            rkey = rb_utf8_str_new(parent->key, parent->klen);
             OBJ_FREEZE(rkey);  // frozen when used as a Hash key anyway
         }
         return rkey;

data/ext/oj/string_writer.c

@@ -469,22 +469,20 @@ static VALUE str_writer_reset(VALUE self) {
 static VALUE str_writer_to_s(VALUE self) {
     StrWriter sw;
     TypedData_Get_Struct(self, struct _strWriter, &oj_string_writer_type, sw);
-    VALUE rstr = rb_str_new(sw->out.buf, sw->out.cur - sw->out.buf);
-
-    return oj_encode(rstr);
+    return rb_utf8_str_new(sw->out.buf, sw->out.cur - sw->out.buf);
 }
 
 /* Document-method: as_json
- * call-seq: as_json()
+ * call-seq: as_json(*)
  *
  * Returns the contents of the writer as a JSON element. If called from inside
  * an array or hash by Oj the raw buffer will be used othersize a more
  * inefficient parse of the contents and a return of the result is
- * completed. The parse uses the strict mode.
+ * completed. The parse uses the strict mode. Optional arguments are ignored.
  *
  * *return* [_Hash_|_Array_|_String_|_Integer_|_Float_|_True_|_False_|_nil|)
  */
-static VALUE str_writer_as_json(VALUE self) {
+static VALUE str_writer_as_json(int argc, VALUE *argv, VALUE self) {
     if (string_writer_optimized) {
         return self;
     }
@@ -515,5 +513,5 @@ void oj_string_writer_init(void) {
     rb_define_method(oj_string_writer_class, "reset", str_writer_reset, 0);
     rb_define_method(oj_string_writer_class, "to_s", str_writer_to_s, 0);
     rb_define_method(oj_string_writer_class, "raw_json", str_writer_to_s, 0);
-    rb_define_method(oj_string_writer_class, "as_json", str_writer_as_json, 0);
+    rb_define_method(oj_string_writer_class, "as_json", str_writer_as_json, -1);
 }

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';
@@ -608,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);
@@ -640,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);
@@ -834,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);
@@ -1050,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/version.rb

@@ -1,4 +1,4 @@
 module Oj
   # Current version of the module.
-  VERSION = '3.16.6'
+  VERSION = '3.17.3'
 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.6
+  version: 3.17.3
 platform: ruby
 authors:
 - Peter Ohler
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-09 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bigdecimal
@@ -24,20 +23,6 @@ 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'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -86,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
@@ -159,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
@@ -200,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
@@ -303,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
@@ -322,8 +231,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
-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

data/test/_test_mimic_rails.rb

@@ -1,123 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-$LOAD_PATH << __dir__
-
-require 'helper'
-# Oj.mimic_JSON
-require 'rails/all'
-
-require 'active_model'
-require 'active_model_serializers'
-require 'active_support/json'
-require 'active_support/time'
-require 'active_support/all'
-
-require 'oj/active_support_helper'
-
-Oj.mimic_JSON
-
-class Category
-  include ActiveModel::Model
-  include ActiveModel::SerializerSupport
-
-  attr_accessor :id, :name
-
-  def initialize(id, name)
-    @id   = id
-    @name = name
-  end
-end
-
-class CategorySerializer < ActiveModel::Serializer
-  attributes :id, :name
-end
-
-class MimicRails < Minitest::Test
-
-  def test_mimic_exception
-    ActiveSupport::JSON.decode('{')
-    puts 'Failed'
-  rescue ActiveSupport::JSON.parse_error
-    assert(true)
-  rescue Exception
-    assert(false, 'Expected a JSON::ParserError')
-  end
-
-  def test_dump_string
-    Oj.default_options= {:indent => 2}
-    json = ActiveSupport::JSON.encode([1, true, nil])
-    assert_equal(%{[
-  1,
-  true,
-  null
-]
-}, json)
-  end
-
-  def test_dump_rational
-    Oj.default_options= {:indent => 2}
-    json = ActiveSupport::JSON.encode([1, true, Rational(1)])
-    assert_equal(%{[
-  1,
-  true,
-  "1/1"
-]
-}, json)
-  end
-
-  def test_dump_range
-    Oj.default_options= {:indent => 2}
-    json = ActiveSupport::JSON.encode([1, true, '01'..'12'])
-    assert_equal(%{[
-  1,
-  true,
-  "01..12"
-]
-}, json)
-  end
-
-  def test_dump_object
-    Oj.default_options= {:indent => 2}
-    category = Category.new(1, 'test')
-    serializer = CategorySerializer.new(category)
-
-    serializer.to_json()
-    puts "*** serializer.to_json() #{serializer.to_json()}"
-    serializer.as_json()
-    puts "*** serializer.as_json() #{serializer.as_json()}"
-    JSON.dump(serializer)
-    puts "*** JSON.dump(serializer) #{JSON.dump(serializer)}"
-
-    puts "*** category.to_json() #{category.to_json()}"
-    puts "*** category.as_json() #{category.as_json()}"
-    puts "*** JSON.dump(serializer) #{JSON.dump(category)}"
-    puts "*** Oj.dump(serializer) #{Oj.dump(category)}"
-  end
-
-  def test_dump_object_array
-    Oj.default_options= {:indent => 2}
-    cat1 = Category.new(1, 'test')
-    cat2 = Category.new(2, 'test')
-    a = Array.wrap([cat1, cat2])
-
-    # serializer = CategorySerializer.new(a)
-
-    puts "*** a.to_json() #{a.to_json()}"
-    puts "*** a.as_json() #{a.as_json()}"
-    puts "*** JSON.dump(a) #{JSON.dump(a)}"
-    puts "*** Oj.dump(a) #{Oj.dump(a)}"
-  end
-
-  def test_dump_time
-    Oj.default_options= {:indent => 2}
-    now = ActiveSupport::TimeZone['America/Chicago'].parse('2014-11-01 13:20:47')
-    json = Oj.dump(now, mode: :object, time_format: :xmlschema)
-    # puts "*** json: #{json}"
-
-    oj_dump = Oj.load(json, mode: :object, time_format: :xmlschema)
-    # puts "Now: #{now}\n Oj: #{oj_dump}"
-    assert_equal('2014-11-01T13:20:47-05:00', oj_dump.xmlschema)
-  end
-
-end # MimicRails