multi_json 1.20.0 → 1.20.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7434adbc42e671d9cb36e8500c202d5eb77923ab73ff46923784e053a4ec5fd
-  data.tar.gz: ae28df601c2270adbd05cd054b8ce061b10ff7acb5e149007659ce2aefd9bb7b
+  metadata.gz: fbba8097011550d30c5962bdd828a95b431ab54cc9a6d831844e78c78f2ddc74
+  data.tar.gz: 767ba488de4f71c7503d69126130b88d904f656ec12cd2b0c039a1d66c39e594
 SHA512:
-  metadata.gz: 7fb85ed5314a37402596bf67afdcf86e670d0db8b1babe9c4492c8d7041219a8370d37e5c46241117cb8a068e9a95dbc4f99f3d8b79113d3925e1507c8368ba9
-  data.tar.gz: 0724b94f4fcbcd7a5e4f08d2cc820084b9a1afa7bd286549ac0b9105782d7fed1e4fd62ec8b3ad5d77f218936351b2d5b4d396445ba62425f6477e72a3861026
+  metadata.gz: a0e46b45475da5fa524fdfc00c02b10bf9a3c677d3702bf81fa1bfaef278dc219a7720f082cc1a8edbc5fe07e2aa83e92a87ec2a7057a42edabd90a211fde34e
+  data.tar.gz: 650953b9efc5ba89c84cb751c206972e8d95923c5b466558a97c340666a31b71645943e83b0186076cbf9a843da3dd306c3fdb654911873797bedf89e763e7d7

data/CHANGELOG.md

@@ -1,6 +1,9 @@
 # Changelog
 
-## Unreleased
+## 1.20.1
+* Fix `JsonGem#load` raising `ParseError` on ASCII-8BIT strings that contain valid UTF-8 bytes ([#64](https://github.com/sferik/multi_json/issues/64)). Ruby HTTP clients tag response bodies as ASCII-8BIT by default; the 1.20.0 change from `force_encoding` to `encode` broke the dominant real-world case by trying to transcode each byte individually. Switch back to `force_encoding` followed by a `valid_encoding?` guard so genuinely invalid byte sequences still surface as `ParseError`.
+* Validate custom adapters during `MultiJson.use` and `MultiJson.load`/`dump` with an `:adapter` option, raising `MultiJson::AdapterError` immediately if the adapter does not respond to `.load`, `.dump`, or define a `ParseError` constant.
+* Validate `OptionsCache.max_cache_size=` to reject `nil`, zero, negative, and non-integer values with a clear `ArgumentError`.
 
 ## 1.20.0
 * Drop the `UnannotatedEmptyCollection` Steep diagnostic override by inline-annotating `Options::EMPTY_OPTIONS` with `#: options` and routing `MultiJson.current_adapter`'s `||=` fallback through that constant. Also enable rubocop's `Layout/LeadingCommentSpace` `AllowSteepAnnotation` / `AllowRBSInlineAnnotation` so future inline `#:` casts don't need a per-line disable.

data/README.md

@@ -55,6 +55,9 @@ can raise the ceiling at runtime:
 MultiJson::OptionsCache.max_cache_size = 5000
 ```
 
+`max_cache_size` must be a positive integer; `0`, negative values, and
+non-integers raise `ArgumentError`.
+
 Lowering the limit only takes effect for *new* inserts; existing cache
 entries are left in place until normal eviction trims them below the
 new ceiling. Call `MultiJson::OptionsCache.reset` if you want to evict

data/lib/multi_json/adapter_selector.rb

@@ -142,13 +142,14 @@ module MultiJson
     # @param adapter_spec [Symbol, String, Module, nil, false] adapter specification
     # @return [Class] the adapter class
     def load_adapter(adapter_spec)
-      case adapter_spec
+      adapter = case adapter_spec
       when ::String then load_adapter_by_name(adapter_spec)
       when ::Symbol then load_adapter_by_name(adapter_spec.to_s)
       when nil, false then load_adapter(default_adapter)
       when ::Module then adapter_spec
       else raise ::LoadError, "expected adapter to be a Symbol, String, or Module, got #{adapter_spec.inspect}"
       end
+      validate_adapter!(adapter)
     rescue ::LoadError => e
       raise AdapterError.build(e)
     end
@@ -170,5 +171,24 @@ module MultiJson
       class_name = normalized.split("_").map(&:capitalize).join
       ::MultiJson::Adapters.const_get(class_name)
     end
+
+    # Validate that an adapter satisfies the documented contract
+    #
+    # Custom adapters are accepted as modules/classes, so fail fast
+    # during adapter resolution rather than later on the first load or
+    # dump call.
+    #
+    # @api private
+    # @param adapter [Module] adapter class or module
+    # @return [Module] the validated adapter
+    # @raise [AdapterError] when the adapter is missing a required class method
+    #   or ParseError constant
+    def validate_adapter!(adapter)
+      raise AdapterError, "Adapter #{adapter} must respond to .load" unless adapter.respond_to?(:load)
+      raise AdapterError, "Adapter #{adapter} must respond to .dump" unless adapter.respond_to?(:dump)
+
+      MultiJson.parse_error_class_for(adapter)
+      adapter
+    end
   end
 end

data/lib/multi_json/adapters/json_gem.rb

@@ -22,22 +22,26 @@ 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))

data/lib/multi_json/options_cache.rb

@@ -41,7 +41,21 @@ module MultiJson
       # @example
       #   MultiJson::OptionsCache.max_cache_size = 5000
       #   MultiJson::OptionsCache.max_cache_size  #=> 5000
-      attr_accessor :max_cache_size
+      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
       #

data/lib/multi_json/version.rb

@@ -10,7 +10,7 @@ module MultiJson
     # Minor version number
     MINOR = 20 unless defined? MultiJson::Version::MINOR
     # Patch version number
-    PATCH = 0 unless defined? MultiJson::Version::PATCH
+    PATCH = 1 unless defined? MultiJson::Version::PATCH
     # Pre-release version suffix
     PRE = nil unless defined? MultiJson::Version::PRE
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: multi_json
 version: !ruby/object:Gem::Version
-  version: 1.20.0
+  version: 1.20.1
 platform: ruby
 authors:
 - Michael Bleigh
@@ -45,10 +45,10 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/sferik/multi_json/issues
-  changelog_uri: https://github.com/sferik/multi_json/blob/v1.20.0/CHANGELOG.md
-  documentation_uri: https://www.rubydoc.info/gems/multi_json/1.20.0
+  changelog_uri: https://github.com/sferik/multi_json/blob/v1.20.1/CHANGELOG.md
+  documentation_uri: https://www.rubydoc.info/gems/multi_json/1.20.1
   rubygems_mfa_required: 'true'
-  source_code_uri: https://github.com/sferik/multi_json/tree/v1.20.0
+  source_code_uri: https://github.com/sferik/multi_json/tree/v1.20.1
   wiki_uri: https://github.com/sferik/multi_json/wiki
 rdoc_options: []
 require_paths: