oj 3.16.9 → 3.16.11

data/ext/oj/saj.c

@@ -94,8 +94,7 @@ inline static void call_add_value(VALUE handler, VALUE value, const char *key) {
     if (0 == key) {
         k = Qnil;
     } else {
-        k = rb_str_new2(key);
-        k = oj_encode(k);
+        k = rb_utf8_str_new_cstr(key);
     }
     rb_funcall(handler, oj_add_value_id, 2, value, k);
 }
@@ -106,8 +105,7 @@ inline static void call_no_value(VALUE handler, ID method, const char *key) {
     if (0 == key) {
         k = Qnil;
     } else {
-        k = rb_str_new2(key);
-        k = oj_encode(k);
+        k = rb_utf8_str_new_cstr(key);
     }
     rb_funcall(handler, method, 1, k);
 }
@@ -257,9 +255,8 @@ static void read_str(ParseInfo pi, const char *key) {
 
     text = read_quoted_value(pi);
     if (pi->has_add_value) {
-        VALUE s = rb_str_new2(text);
+        VALUE s = rb_utf8_str_new_cstr(text);
 
-        s = oj_encode(s);
         call_add_value(pi->handler, s, key);
     }
 }

data/ext/oj/scp.c

@@ -56,9 +56,8 @@ static void add_value(ParseInfo pi, VALUE val) {
 }
 
 static void add_cstr(ParseInfo pi, const char *str, size_t len, const char *orig) {
-    volatile VALUE rstr = rb_str_new(str, len);
+    volatile VALUE rstr = rb_utf8_str_new(str, len);
 
-    rstr = oj_encode(rstr);
     rb_funcall(pi->handler, oj_add_value_id, 1, rstr);
 }
 
@@ -87,9 +86,8 @@ static VALUE hash_key(ParseInfo pi, const char *key, size_t klen) {
 }
 
 static void hash_set_cstr(ParseInfo pi, Val kval, const char *str, size_t len, const char *orig) {
-    volatile VALUE rstr = rb_str_new(str, len);
+    volatile VALUE rstr = rb_utf8_str_new(str, len);
 
-    rstr = oj_encode(rstr);
     rb_funcall(pi->handler, oj_hash_set_id, 3, stack_peek(&pi->stack)->val, oj_calc_hash_key(pi, kval), rstr);
 }
 
@@ -107,9 +105,8 @@ static void hash_set_value(ParseInfo pi, Val kval, VALUE value) {
 }
 
 static void array_append_cstr(ParseInfo pi, const char *str, size_t len, const char *orig) {
-    volatile VALUE rstr = rb_str_new(str, len);
+    volatile VALUE rstr = rb_utf8_str_new(str, len);
 
-    rstr = oj_encode(rstr);
     rb_funcall(pi->handler, oj_array_append_id, 2, stack_peek(&pi->stack)->val, rstr);
 }
 

data/ext/oj/simd.h

@@ -0,0 +1,10 @@
+#ifndef OJ_SIMD_H
+#define OJ_SIMD_H
+
+#if defined(__ARM_NEON) || defined(__ARM_NEON__) || defined(__aarch64__) || defined(_M_ARM64)
+#define HAVE_SIMD_NEON 1
+#define SIMD_MINIMUM_THRESHOLD 6
+#include <arm_neon.h>
+#endif
+
+#endif /* OJ_SIMD_H */

data/ext/oj/stream_writer.c

@@ -44,13 +44,7 @@ static void stream_writer_write(StreamWriter sw) {
     case STRING_IO:
     case STREAM_IO:
     case FILE_IO: {
-        volatile VALUE rs = rb_str_new(sw->sw.out.buf, size);
-
-        // Oddly enough, when pushing ASCII characters with UTF-8 encoding or
-        // even ASCII-8BIT does not change the output encoding. Pushing any
-        // non-ASCII no matter what the encoding changes the output encoding
-        // to ASCII-8BIT if it the string is not forced to UTF-8 here.
-        rs = oj_encode(rs);
+        volatile VALUE rs = rb_utf8_str_new(sw->sw.out.buf, size);
         rb_funcall(sw->stream, oj_write_id, 1, rs);
         break;
     }

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,9 +469,7 @@ 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

data/ext/oj/wab.c

@@ -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.9'
+  VERSION = '3.16.11'
 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.9
+  version: 3.16.11
 platform: ruby
 authors:
 - Peter Ohler
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-28 00:00:00.000000000 Z
+date: 2025-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bigdecimal
@@ -163,6 +162,7 @@ files:
 - 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 +200,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 +211,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 +229,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
-signing_key:
+rubygems_version: 3.6.2
 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

data/test/activerecord/result_test.rb

@@ -1,31 +0,0 @@
-#!/usr/bin/env ruby
-
-$: << File.dirname(__FILE__)
-$: << File.dirname(File.dirname(__FILE__))
-
-require 'helper'
-require "rails/all"
-
-Oj::Rails.set_encoder()
-Oj::Rails.optimize()
-
-Oj.default_options = { mode: :rails }
-
-class ActiveRecordResultTest < Minitest::Test
-  def test_hash_rows
-    result = ActiveRecord::Result.new(["one", "two"],
-                                      [
-                                        ["row 1 col 1", "row 1 col 2"],
-                                        ["row 2 col 1", "row 2 col 2"],
-                                        ["row 3 col 1", "row 3 col 2"],
-                                      ])
-    #puts "*** result: #{Oj.dump(result, indent: 2)}"
-    json_result = if ActiveRecord.version >= Gem::Version.new("6")
-                    result.to_a
-                  else
-                    result.to_hash
-                  end
-
-    assert_equal Oj.dump(result, mode: :rails), Oj.dump(json_result)
-  end
-end

data/test/activesupport6/abstract_unit.rb

@@ -1,44 +0,0 @@
-# frozen_string_literal: true
-
-ORIG_ARGV = ARGV.dup
-
-require "active_support/core_ext/kernel/reporting"
-
-silence_warnings do
-  Encoding.default_internal = Encoding::UTF_8
-  Encoding.default_external = Encoding::UTF_8
-end
-
-require "active_support/testing/autorun"
-require "active_support/testing/method_call_assertions"
-
-ENV["NO_RELOAD"] = "1"
-require "active_support"
-
-Thread.abort_on_exception = true
-
-# Show backtraces for deprecated behavior for quicker cleanup.
-ActiveSupport::Deprecation.debug = true
-
-# Default to old to_time behavior but allow running tests with new behavior
-ActiveSupport.to_time_preserves_timezone = ENV["PRESERVE_TIMEZONES"] == "1"
-
-# Disable available locale checks to avoid warnings running the test suite.
-I18n.enforce_available_locales = false
-
-class ActiveSupport::TestCase
-  include ActiveSupport::Testing::MethodCallAssertions
-
-  private
-    # Skips the current run on Rubinius using Minitest::Assertions#skip
-    def rubinius_skip(message = "")
-      skip message if RUBY_ENGINE == "rbx"
-    end
-
-    # Skips the current run on JRuby using Minitest::Assertions#skip
-    def jruby_skip(message = "")
-      skip message if defined?(JRUBY_VERSION)
-    end
-end
-
-require_relative "test_common"