multi_json 1.20.0-java → 1.21.0-java

data/lib/multi_json/adapters/json_gem.rb

@@ -3,7 +3,7 @@
 require_relative "../adapter"
 require "json"
 
-module MultiJson
+module MultiJSON
   module Adapters
     # Use the JSON gem to dump/load.
     class JsonGem < Adapter
@@ -22,25 +22,29 @@ module MultiJson
 
       # Parse a JSON string into a Ruby object
       #
+      # Non-UTF-8 strings are re-labeled via ``force_encoding`` (not
+      # transcoded) and then validated. This handles the dominant
+      # real-world case: Ruby HTTP libraries return response bodies
+      # tagged as ``ASCII-8BIT`` even when the bytes are valid UTF-8.
+      # ``encode(Encoding::UTF_8)`` would raise on any multi-byte
+      # sequence in that scenario because it tries to transcode each
+      # byte individually from ASCII-8BIT to UTF-8.
+      #
       # @api private
       # @param string [String] JSON string to parse
       # @param options [Hash] parsing options
       # @return [Object] parsed Ruby object
-      # @raise [::JSON::ParserError] when input contains invalid bytes that
-      #   cannot be transcoded to UTF-8
+      # @raise [::JSON::ParserError] when the input is not valid UTF-8
       #
       # @example Parse JSON string
       #   adapter.load('{"key":"value"}') #=> {"key" => "value"}
       def load(string, options = {})
         if string.encoding != Encoding::UTF_8
-          begin
-            string = string.encode(Encoding::UTF_8)
-          rescue Encoding::UndefinedConversionError, Encoding::InvalidByteSequenceError => e
-            raise ::JSON::ParserError, e.message
-          end
+          string = string.dup.force_encoding(Encoding::UTF_8)
+          raise ::JSON::ParserError, "Invalid UTF-8 byte sequence in JSON input" unless string.valid_encoding?
         end
 
-        ::JSON.parse(string, translate_load_options(options))
+        ::JSON.parse(string, options)
       end
 
       # Serialize a Ruby object to JSON
@@ -63,23 +67,6 @@ module MultiJson
 
         ::JSON.pretty_generate(json_object, PRETTY_STATE_PROTOTYPE.merge(options.except(:pretty)))
       end
-
-      private
-
-      # Translate ``:symbolize_keys`` into JSON gem's ``:symbolize_names``
-      #
-      # Returns a new hash without mutating the input. ``options`` is the
-      # cached hash returned from {Adapter.merged_load_options}, so in-place
-      # edits would pollute the cache and corrupt subsequent calls.
-      #
-      # @api private
-      # @param options [Hash] merged load options
-      # @return [Hash] options with ``:symbolize_keys`` translated
-      def translate_load_options(options)
-        return options unless options[:symbolize_keys]
-
-        options.except(:symbolize_keys).merge(symbolize_names: true)
-      end
     end
   end
 end

data/lib/multi_json/adapters/oj.rb

@@ -4,7 +4,7 @@ require "oj"
 require_relative "../adapter"
 require_relative "oj_common"
 
-module MultiJson
+module MultiJSON
   # Namespace for JSON adapter implementations
   #
   # Each adapter wraps a specific JSON library and provides a consistent
@@ -14,7 +14,7 @@ module MultiJson
     class Oj < Adapter
       include OjCommon
 
-      defaults :load, mode: :strict, symbolize_keys: false
+      defaults :load, mode: :strict, symbolize_names: false
       defaults :dump, mode: :compat, time_format: :ruby, use_to_json: true
 
       # In certain cases the Oj gem may throw a ``JSON::ParserError``
@@ -69,10 +69,10 @@ module MultiJson
 
       private
 
-      # Translate ``:symbolize_keys`` into Oj's ``:symbol_keys``
+      # Translate ``:symbolize_names`` into Oj's ``:symbol_keys``
       #
       # Returns a new hash without mutating the input.
-      # ``:symbol_keys`` is always set (true or false) so MultiJson's
+      # ``:symbol_keys`` is always set (true or false) so MultiJSON's
       # behavior is independent of any global ``Oj.default_options``
       # the host application may have set. The input is the cached hash
       # returned from {Adapter.merged_load_options}, so in-place edits
@@ -80,9 +80,9 @@ module MultiJson
       #
       # @api private
       # @param options [Hash] merged load options
-      # @return [Hash] options with ``:symbolize_keys`` translated
+      # @return [Hash] options with ``:symbolize_names`` translated
       def translate_load_options(options)
-        options.except(:symbolize_keys).merge(symbol_keys: options[:symbolize_keys] == true)
+        options.except(:symbolize_names).merge(symbol_keys: options[:symbolize_names] == true)
       end
     end
   end

data/lib/multi_json/adapters/oj_common.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module MultiJson
+module MultiJSON
   module Adapters
     # Shared functionality for the Oj adapter
     #

data/lib/multi_json/adapters/yajl.rb

@@ -3,7 +3,7 @@
 require "yajl"
 require_relative "../adapter"
 
-module MultiJson
+module MultiJSON
   module Adapters
     # Use the Yajl-Ruby library to dump/load.
     class Yajl < Adapter

data/lib/multi_json/concurrency.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-module MultiJson
-  # Catalog of process-wide mutexes used to serialize MultiJson's lazy
+module MultiJSON
+  # Catalog of process-wide mutexes used to serialize MultiJSON's lazy
   # initializers and adapter swaps. Each mutex protects a distinct
   # piece of mutable state. Callers go through {.synchronize} rather
   # than touching the mutex constants directly so the constants
@@ -15,10 +15,10 @@ module MultiJson
     # instance. The names are documented inline so callers can find
     # what each mutex protects without leaving this file.
     MUTEXES = {
-      # Guards the {DEPRECATION_WARNINGS_SHOWN} set in `MultiJson` so the
+      # Guards the {DEPRECATION_WARNINGS_SHOWN} set in `MultiJSON` so the
       # check-then-add pair in `warn_deprecation_once` doesn't race.
       deprecation_warnings: Mutex.new,
-      # Guards the process-wide `@adapter` swap in `MultiJson.use` so two
+      # Guards the process-wide `@adapter` swap in `MultiJSON.use` so two
       # threads can't interleave their `OptionsCache.reset` and adapter
       # assignment.
       adapter: Mutex.new,
@@ -28,10 +28,10 @@ module MultiJson
       # warning fires at most once.
       default_adapter: Mutex.new,
       # Guards the lazy `default_load_options` / `default_dump_options`
-      # initializers in `MultiJson::Options`.
+      # initializers in `MultiJSON::Options`.
       default_options: Mutex.new,
       # Guards the lazy dump-delegate resolution in
-      # `MultiJson::Adapters::FastJsonparser`.
+      # `MultiJSON::Adapters::FastJsonparser`.
       dump_delegate: Mutex.new
     }.freeze
     private_constant :MUTEXES
@@ -49,7 +49,7 @@ module MultiJson
     # @return [Object] the block's return value
     # @raise [KeyError] when ``name`` does not match a known mutex
     # @example
-    #   MultiJson::Concurrency.synchronize(:adapter) { ... }
+    #   MultiJSON::Concurrency.synchronize(:adapter) { ... }
     def self.synchronize(name, &)
       MUTEXES.fetch(name).synchronize(&)
     end

data/lib/multi_json/deprecated.rb

@@ -4,11 +4,11 @@
 #
 # Each method here emits a one-time deprecation warning on first call and
 # delegates to its current-API counterpart. The whole file is loaded by
-# {MultiJson} so the deprecation surface stays out of the main module
+# {MultiJSON} so the deprecation surface stays out of the main module
 # definition.
 #
 # @api private
-module MultiJson
+module MultiJSON
   class << self
     private
 
@@ -17,17 +17,18 @@ module MultiJson
     # The generated singleton method emits a one-time deprecation
     # warning naming the replacement, then forwards all positional and
     # keyword arguments plus any block to ``replacement``. Used for the
-    # ``decode`` / ``encode`` / ``engine*`` / ``with_engine`` /
-    # ``default_engine`` aliases that are scheduled for removal in v2.0.
+    # ``load`` / ``dump`` / ``decode`` / ``encode`` / ``engine*`` /
+    # ``with_engine`` / ``default_engine`` aliases that are scheduled
+    # for removal in v2.0.
     #
     # @api private
     # @param name [Symbol] deprecated method name
     # @param replacement [Symbol] current-API method to delegate to
     # @return [Symbol] the defined method name
     # @example
-    #   deprecate_alias :decode, :load
+    #   deprecate_alias :load, :parse
     def deprecate_alias(name, replacement)
-      message = "MultiJson.#{name} is deprecated and will be removed in v2.0. Use MultiJson.#{replacement} instead."
+      message = "MultiJSON.#{name} is deprecated and will be removed in v2.0. Use MultiJSON.#{replacement} instead."
       define_singleton_method(name) do |*args, **kwargs, &block|
         warn_deprecation_once(name, message)
         public_send(replacement, *args, **kwargs, &block)
@@ -40,8 +41,8 @@ module MultiJson
     # whose body fans out to multiple replacement methods, and for the
     # ``cached_options`` / ``reset_cached_options!`` no-op stubs that
     # have no current-API counterpart at all. The block runs in its
-    # own lexical ``self``, which is the ``MultiJson`` module since
-    # every call site sits inside ``module MultiJson`` below.
+    # own lexical ``self``, which is the ``MultiJSON`` module since
+    # every call site sits inside ``module MultiJSON`` below.
     #
     # @api private
     # @param name [Symbol] deprecated method name
@@ -58,8 +59,10 @@ module MultiJson
     end
   end
 
-  deprecate_alias :decode, :load
-  deprecate_alias :encode, :dump
+  deprecate_alias :load, :parse
+  deprecate_alias :dump, :generate
+  deprecate_alias :decode, :parse
+  deprecate_alias :encode, :generate
   deprecate_alias :engine, :adapter
   deprecate_alias :engine=, :adapter=
   deprecate_alias :default_engine, :default_adapter
@@ -67,18 +70,18 @@ module MultiJson
 
   deprecate_method(
     :default_options=,
-    "MultiJson.default_options setter is deprecated\n" \
-    "Use MultiJson.load_options and MultiJson.dump_options instead"
-  ) { |value| self.load_options = self.dump_options = value }
+    "MultiJSON.default_options setter is deprecated\n" \
+    "Use MultiJSON.parse_options and MultiJSON.generate_options instead"
+  ) { |value| self.parse_options = self.generate_options = value }
 
   deprecate_method(
     :default_options,
-    "MultiJson.default_options is deprecated\n" \
-    "Use MultiJson.load_options or MultiJson.dump_options instead"
-  ) { load_options }
+    "MultiJSON.default_options is deprecated\n" \
+    "Use MultiJSON.parse_options or MultiJSON.generate_options instead"
+  ) { parse_options }
 
   %i[cached_options reset_cached_options!].each do |name|
-    deprecate_method(name, "MultiJson.#{name} method is deprecated and no longer used.") { nil }
+    deprecate_method(name, "MultiJSON.#{name} method is deprecated and no longer used.") { nil }
   end
 
   private
@@ -86,25 +89,25 @@ module MultiJson
   # Instance-method delegate for the deprecated default_options setter
   #
   # @api private
-  # @deprecated Use {MultiJson.load_options=} and {MultiJson.dump_options=} instead
+  # @deprecated Use {MultiJSON.load_options=} and {MultiJSON.dump_options=} instead
   # @param value [Hash] options hash
   # @return [Hash] the options hash
   # @example
-  #   class Foo; include MultiJson; end
+  #   class Foo; include MultiJSON; end
   #   Foo.new.send(:default_options=, symbolize_keys: true)
   def default_options=(value)
-    MultiJson.default_options = value
+    MultiJSON.default_options = value
   end
 
   # Instance-method delegate for the deprecated default_options getter
   #
   # @api private
-  # @deprecated Use {MultiJson.load_options} or {MultiJson.dump_options} instead
+  # @deprecated Use {MultiJSON.load_options} or {MultiJSON.dump_options} instead
   # @return [Hash] the current load options
   # @example
-  #   class Foo; include MultiJson; end
+  #   class Foo; include MultiJSON; end
   #   Foo.new.send(:default_options)
   def default_options
-    MultiJson.default_options
+    MultiJSON.default_options
   end
 end

data/lib/multi_json/options.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-module MultiJson
-  # Mixin providing configurable load/dump options
+module MultiJSON
+  # Mixin providing configurable parse/generate options
   #
   # Supports static hashes or dynamic callables (procs/lambdas).
-  # Extended by both MultiJson (global options) and Adapter classes.
+  # Extended by both MultiJSON (global options) and Adapter classes.
   #
   # @api private
   module Options
@@ -15,71 +15,145 @@ module MultiJson
     # because the `#:` cast only applies to method-call results.
     EMPTY_OPTIONS = Hash.new.freeze #: options # rubocop:disable Style/EmptyLiteral
 
-    # Set options for load operations
+    # Set options for parse operations
     #
     # @api public
     # @param options [Hash, Proc] options hash or callable
     # @return [Hash, Proc] the options
     # @example
-    #   MultiJson.load_options = {symbolize_keys: true}
-    def load_options=(options)
+    #   MultiJSON.parse_options = {symbolize_keys: true}
+    def parse_options=(options)
       OptionsCache.reset
-      @load_options = options
+      @parse_options = options
     end
 
-    # Set options for dump operations
+    # Set options for generate operations
     #
     # @api public
     # @param options [Hash, Proc] options hash or callable
     # @return [Hash, Proc] the options
     # @example
-    #   MultiJson.dump_options = {pretty: true}
-    def dump_options=(options)
+    #   MultiJSON.generate_options = {pretty: true}
+    def generate_options=(options)
       OptionsCache.reset
-      @dump_options = options
+      @generate_options = options
     end
 
-    # Get options for load operations
+    # Get options for parse operations
     #
-    # When `@load_options` is a callable (proc/lambda), it's invoked
+    # When `@parse_options` is a callable (proc/lambda), it's invoked
     # with `args` as positional arguments — typically the merged
-    # options hash from `Adapter.merged_load_options`. When it's a
+    # options hash from `Adapter.merged_parse_options`. When it's a
     # plain hash, `args` is ignored.
     #
     # @api public
     # @param args [Array<Object>] forwarded to the callable, ignored otherwise
     # @return [Hash] resolved options hash
     # @example
-    #   MultiJson.load_options  #=> {}
+    #   MultiJSON.parse_options  #=> {}
+    def parse_options(*args)
+      resolve_options(@parse_options, *args) || default_parse_options
+    end
+
+    # Get options for generate operations
+    #
+    # @api public
+    # @param args [Array<Object>] forwarded to the callable, ignored otherwise
+    # @return [Hash] resolved options hash
+    # @example
+    #   MultiJSON.generate_options  #=> {}
+    def generate_options(*args)
+      resolve_options(@generate_options, *args) || default_generate_options
+    end
+
+    # Get default parse options
+    #
+    # @api private
+    # @return [Hash] frozen empty hash
+    def default_parse_options
+      Concurrency.synchronize(:default_options) { @default_parse_options ||= EMPTY_OPTIONS }
+    end
+
+    # Get default generate options
+    #
+    # @api private
+    # @return [Hash] frozen empty hash
+    def default_generate_options
+      Concurrency.synchronize(:default_options) { @default_generate_options ||= EMPTY_OPTIONS }
+    end
+
+    # Set options for parse operations
+    #
+    # @api public
+    # @deprecated Use {#parse_options=} instead. Will be removed in v2.0.
+    # @param options [Hash, Proc] options hash or callable
+    # @return [Hash, Proc] the options
+    # @example
+    #   MultiJSON.load_options = {symbolize_keys: true}
+    def load_options=(options)
+      MultiJSON.warn_deprecation_once(:load_options=,
+        "MultiJSON.load_options= is deprecated and will be removed in v2.0. Use MultiJSON.parse_options= instead.")
+      self.parse_options = options
+    end
+
+    # Set options for generate operations
+    #
+    # @api public
+    # @deprecated Use {#generate_options=} instead. Will be removed in v2.0.
+    # @param options [Hash, Proc] options hash or callable
+    # @return [Hash, Proc] the options
+    # @example
+    #   MultiJSON.dump_options = {pretty: true}
+    def dump_options=(options)
+      MultiJSON.warn_deprecation_once(:dump_options=,
+        "MultiJSON.dump_options= is deprecated and will be removed in v2.0. Use MultiJSON.generate_options= instead.")
+      self.generate_options = options
+    end
+
+    # Get options for parse operations
+    #
+    # @api public
+    # @deprecated Use {#parse_options} instead. Will be removed in v2.0.
+    # @param args [Array<Object>] forwarded to the callable, ignored otherwise
+    # @return [Hash] resolved options hash
+    # @example
+    #   MultiJSON.load_options  #=> {}
     def load_options(*args)
-      resolve_options(@load_options, *args) || default_load_options
+      MultiJSON.warn_deprecation_once(:load_options,
+        "MultiJSON.load_options is deprecated and will be removed in v2.0. Use MultiJSON.parse_options instead.")
+      parse_options(*args)
     end
 
-    # Get options for dump operations
+    # Get options for generate operations
     #
     # @api public
+    # @deprecated Use {#generate_options} instead. Will be removed in v2.0.
     # @param args [Array<Object>] forwarded to the callable, ignored otherwise
     # @return [Hash] resolved options hash
     # @example
-    #   MultiJson.dump_options  #=> {}
+    #   MultiJSON.dump_options  #=> {}
     def dump_options(*args)
-      resolve_options(@dump_options, *args) || default_dump_options
+      MultiJSON.warn_deprecation_once(:dump_options,
+        "MultiJSON.dump_options is deprecated and will be removed in v2.0. Use MultiJSON.generate_options instead.")
+      generate_options(*args)
     end
 
-    # Get default load options
+    # Get default parse options
     #
     # @api private
+    # @deprecated Use {#default_parse_options} instead. Will be removed in v2.0.
     # @return [Hash] frozen empty hash
     def default_load_options
-      Concurrency.synchronize(:default_options) { @default_load_options ||= EMPTY_OPTIONS }
+      default_parse_options
     end
 
-    # Get default dump options
+    # Get default generate options
     #
     # @api private
+    # @deprecated Use {#default_generate_options} instead. Will be removed in v2.0.
     # @return [Hash] frozen empty hash
     def default_dump_options
-      Concurrency.synchronize(:default_options) { @default_dump_options ||= EMPTY_OPTIONS }
+      default_generate_options
     end
 
     private

data/lib/multi_json/options_cache/concurrent_store.rb

@@ -2,7 +2,7 @@
 
 require "concurrent/map"
 
-module MultiJson
+module MultiJSON
   module OptionsCache
     # Thread-safe cache store backed by Concurrent::Map
     #

data/lib/multi_json/options_cache.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module MultiJson
+module MultiJSON
   # Thread-safe bounded cache for merged options hashes
   #
   # Caches are separated for load and dump operations. Each cache is
@@ -39,9 +39,23 @@ module MultiJson
       # @api public
       # @return [Integer] current cache size limit
       # @example
-      #   MultiJson::OptionsCache.max_cache_size = 5000
-      #   MultiJson::OptionsCache.max_cache_size  #=> 5000
-      attr_accessor :max_cache_size
+      #   MultiJSON::OptionsCache.max_cache_size = 5000
+      #   MultiJSON::OptionsCache.max_cache_size  #=> 5000
+      attr_reader :max_cache_size
+
+      # Set the maximum number of entries per cache store
+      #
+      # @api public
+      # @param value [Integer] positive entry cap
+      # @return [Integer] the validated value
+      # @raise [ArgumentError] when value is not a positive Integer
+      # @example
+      #   MultiJSON::OptionsCache.max_cache_size = 5000
+      def max_cache_size=(value)
+        raise ArgumentError, "max_cache_size must be a positive Integer, got #{value.inspect}" unless Integer === value && value.positive? # rubocop:disable Style/CaseEquality
+
+        @max_cache_size = value
+      end
 
       # Reset both caches
       #
@@ -57,7 +71,7 @@ module MultiJson
   end
 end
 
-module MultiJson
+module MultiJSON
   module OptionsCache
     # Dynamic require path so MRI (mutex_store) and JRuby
     # (concurrent_store) execute the same physical line, avoiding a
@@ -68,5 +82,5 @@ module MultiJson
   end
 end
 
-require_relative "options_cache/#{MultiJson::OptionsCache.send(:const_get, :BACKENDS).fetch(RUBY_ENGINE, "mutex_store")}"
-MultiJson::OptionsCache.reset
+require_relative "options_cache/#{MultiJSON::OptionsCache.send(:const_get, :BACKENDS).fetch(RUBY_ENGINE, "mutex_store")}"
+MultiJSON::OptionsCache.reset

data/lib/multi_json/parse_error.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module MultiJson
+module MultiJSON
   # Raised when JSON parsing fails
   #
   # Wraps the underlying adapter's parse error with the original input

data/lib/multi_json/version.rb

@@ -1,18 +1,18 @@
 # frozen_string_literal: true
 
-module MultiJson
-  # Version information for MultiJson
+module MultiJSON
+  # Version information for MultiJSON
   #
   # @api private
   class Version
     # Major version number
-    MAJOR = 1 unless defined? MultiJson::Version::MAJOR
+    MAJOR = 1 unless defined? MultiJSON::Version::MAJOR
     # Minor version number
-    MINOR = 20 unless defined? MultiJson::Version::MINOR
+    MINOR = 21 unless defined? MultiJSON::Version::MINOR
     # Patch version number
-    PATCH = 0 unless defined? MultiJson::Version::PATCH
+    PATCH = 0 unless defined? MultiJSON::Version::PATCH
     # Pre-release version suffix
-    PRE = nil unless defined? MultiJson::Version::PRE
+    PRE = nil unless defined? MultiJSON::Version::PRE
 
     class << self
       # Return the version string