multi_json 1.21.0-java → 1.21.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15791752a46742ce0a0c67bdbe9b41039a217a8301b79484a381067a54461dd3
-  data.tar.gz: cddd5edbaf51d12f51ffa52f5b63c7039822862177813066521b841bbbf9e1ea
+  metadata.gz: f39513c79d29c5f685d446260dbb6fd4c64c98b5b0c6ca0e2878cb17459c2b96
+  data.tar.gz: b409781aca3db81b53286c8c03f5ba2fd863a369ba2486d8ad5218444a2065db
 SHA512:
-  metadata.gz: a147a3174d085bebdc15f68b4e47bc9d8c17942d53c4cb1d3b52cee877f1367ef00c8343c3139e15f92c5bf5f7da3e93a3789441714980cdb733729d0a891410
-  data.tar.gz: 4495139d702e05184c4c8273008b4303be8c842cdd19ffb490c78f60b62f440f86bb13690abb84b315231ba7a7ef57fbf63d499ec8275bcd79472a5012780bf7
+  metadata.gz: 30b775f43dcf242b98f5f950a8263dc59a3b8aee170cce3c42adcd511c310d82d3916d6a7d7b76e01085006082bf4707e59f9df0eb292e6224b17b942088ca2b
+  data.tar.gz: 6d0fb93ea606bb0275bf9627364c81b47ad9f48494cbd00fbfa7994c4802b31390bab0510451e5d882c13d2eaa566f4f63af12a325c5b2602282e3f2fdb5f444

data/README.md

@@ -179,15 +179,15 @@ MultiJSON tries to have intelligent defaulting. If any supported library is
 already loaded, MultiJSON uses it before attempting to load others. When no
 backend is preloaded, MultiJSON walks its preference list and uses the first
 one that loads successfully. The list is split per platform — JRuby's
-available adapter set differs from MRI's, and the bundled benchmark suite
-ranks `json_gem` ahead of `fast_jsonparser`/`oj`/`yajl` on Ruby 3.4+. CI
-re-runs the benchmark and fails if the observed ranking diverges from the
-table below.
+available adapter set differs from MRI's — but the bundled benchmark suite
+ranks `json_gem` first on every engine: ahead of `fast_jsonparser`/`oj`/`yajl`
+on Ruby 3.4+, and ahead of `jrjackson`/`gson` on JRuby 10. CI re-runs the
+benchmark and fails if the observed ranking diverges from the table below.
 
 | rank | MRI / TruffleRuby | JRuby           |
 | ---- | ----------------- | --------------- |
-| 1    | The JSON gem      | `jrjackson`     |
-| 2    | `fast_jsonparser` | The JSON gem    |
+| 1    | The JSON gem      | The JSON gem    |
+| 2    | `fast_jsonparser` | `jrjackson`     |
 | 3    | `oj`              | `gson`          |
 | 4    | `yajl-ruby`       | —               |
 

data/lib/multi_json/adapter_selector.rb

@@ -20,15 +20,15 @@ module MultiJSON
     #
     # The hash order is split per platform: on MRI/TruffleRuby the
     # bundled benchmark suite ranks json_gem ahead of fast_jsonparser/
-    # oj/yajl on Ruby 3.4+; on JRuby the FFI-vs-pure-Ruby tradeoff
-    # hasn't been re-benchmarked yet, so jr_jackson stays first there.
-    # CI re-runs the benchmark with ``--verify-preference`` to fail
-    # if the observed ranking diverges.
-    # :nocov:
+    # oj/yajl on Ruby 3.4+; on JRuby 10 the json gem's Java extension
+    # outperforms JrJackson across the benchmark matrix, so json_gem
+    # leads there too. CI re-runs the benchmark with
+    # ``--verify-preference`` to fail if the observed ranking diverges.
+    # simplecov:disable
     ADAPTERS = if RUBY_ENGINE == "jruby"
       {
-        jr_jackson: {require: "jrjackson", loaded: "JrJackson"},
         json_gem: {require: "json", loaded: "JSON::Ext::Parser"},
+        jr_jackson: {require: "jrjackson", loaded: "JrJackson"},
         gson: {require: "gson", loaded: "Gson"},
         fast_jsonparser: {require: "fast_jsonparser", loaded: "FastJsonparser"},
         oj: {require: "oj", loaded: "Oj"},
@@ -44,7 +44,7 @@ module MultiJSON
         gson: {require: "gson", loaded: "Gson"}
       }.freeze
     end
-    # :nocov:
+    # simplecov:enable
     private_constant :ADAPTERS
 
     # Backwards-compatible view of {ADAPTERS} that exposes only the

data/lib/multi_json/adapters/json_gem.rb

@@ -10,7 +10,7 @@ module MultiJSON
       # Exception raised when JSON parsing fails
       ParseError = ::JSON::ParserError
 
-      defaults :load, create_additions: false, quirks_mode: true
+      defaults :load, create_additions: false, quirks_mode: true if JSON::VERSION.to_i < 3 # simplecov:disable
 
       PRETTY_STATE_PROTOTYPE = {
         indent: "  ",
@@ -44,7 +44,7 @@ module MultiJSON
           raise ::JSON::ParserError, "Invalid UTF-8 byte sequence in JSON input" unless string.valid_encoding?
         end
 
-        ::JSON.parse(string, options)
+        ::JSON.parse(string, **options)
       end
 
       # Serialize a Ruby object to JSON
@@ -61,11 +61,43 @@ module MultiJSON
         return ::JSON.dump(json_object) if options.empty?
         return ::JSON.generate(json_object, options) unless options.key?(:pretty)
 
+        # ``:pretty`` is MultiJSON's own option, not one the JSON gem's
+        # generator understands, so it's stripped rather than passed
+        # through. A falsy value asks for compact output, which is what
+        # the generator produces with no pretty state at all.
+        rest = options.except(:pretty)
+        return generate_compact(json_object, rest) unless options[:pretty]
+
         # Common case: ``pretty: true`` is the only option, so the merge
         # would just produce a copy of PRETTY_STATE_PROTOTYPE.
-        return ::JSON.pretty_generate(json_object, PRETTY_STATE_PROTOTYPE) if options.size == 1
+        return ::JSON.pretty_generate(json_object, PRETTY_STATE_PROTOTYPE) if rest.empty?
+
+        ::JSON.pretty_generate(json_object, PRETTY_STATE_PROTOTYPE.merge(rest))
+      end
+
+      private
+
+      # Serialize a Ruby object to compact JSON
+      #
+      # Routes through ``::JSON.dump`` when no options remain so that
+      # ``pretty: false`` behaves exactly like passing no options at
+      # all. ``dump`` applies the permissive ``max_nesting: false`` /
+      # ``allow_nan: true`` defaults that ``generate`` does not, so
+      # sending the empty-options case to ``generate`` would make
+      # ``pretty: false`` raise on deeply nested input that
+      # ``MultiJSON.dump(object)`` serializes without complaint.
+      #
+      # @api private
+      # @param json_object [Object] object to serialize
+      # @param options [Hash] serialization options, without ``:pretty``
+      # @return [String] JSON string
+      #
+      # @example Serialize without pretty state
+      #   adapter.send(:generate_compact, {key: "value"}, {}) #=> '{"key":"value"}'
+      def generate_compact(json_object, options)
+        return ::JSON.dump(json_object) if options.empty?
 
-        ::JSON.pretty_generate(json_object, PRETTY_STATE_PROTOTYPE.merge(options.except(:pretty)))
+        ::JSON.generate(json_object, options)
       end
     end
   end

data/lib/multi_json/adapters/oj_common.rb

@@ -37,7 +37,13 @@ module MultiJSON
       def prepare_dump_options(options)
         return options unless options.key?(:pretty)
 
-        options.except(:pretty).merge(PRETTY_STATE_PROTOTYPE)
+        # ``:pretty`` is MultiJSON's own option, so it's dropped either
+        # way. A falsy value asks for compact output, which is Oj's
+        # behavior without the pretty state merged in.
+        rest = options.except(:pretty)
+        return rest unless options[:pretty]
+
+        rest.merge(PRETTY_STATE_PROTOTYPE)
       end
     end
   end

data/lib/multi_json/legacy_constant.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+# Backward-compatible alias for the legacy ``MultiJson`` constant name
+#
+# Downstream code that still writes ``MultiJson.parse(...)`` or
+# ``rescue MultiJson::ParseError`` continues to work, but emits a
+# one-time deprecation warning pointing at ``MultiJSON``. Each public
+# method on {MultiJSON} gets an explicit forwarder defined on this
+# module, and constant access resolves via {.const_missing}, so both
+# dotted calls and ``::`` constant lookups (including rescue clauses)
+# route through the canonical module.
+#
+# This file is loaded last by the ``multi_json`` entry point so the
+# forwarder snapshot below sees the complete {MultiJSON} public API,
+# including the deprecated aliases defined in ``deprecated.rb``.
+#
+# @api public
+# @deprecated Use {MultiJSON} (all-caps) instead. Will be removed in v2.0.
+module MultiJson
+  # Forward every public method MultiJSON exposes through an explicit
+  # singleton method on the legacy MultiJson module, so callers that
+  # capture the method as a Method object (``MultiJson.method(:load)``)
+  # find this forwarder instead of falling back to inherited methods like
+  # ``Kernel#load``. The earlier ``method_missing``-based shim left
+  # ``MultiJson.method(:load)`` resolving to ``Kernel#load`` (because
+  # ``Module#method`` doesn't consult ``method_missing``) and broke
+  # libraries (Sawyer, Octokit, Danger) that capture decoders as Method
+  # objects. Forwarding eagerly fixes the capture path while preserving
+  # the one-time deprecation warning each call emits.
+  (::MultiJSON.public_methods - ::Module.public_methods).each do |forwarded|
+    define_singleton_method(forwarded) do |*args, **kwargs, &block|
+      ::MultiJSON.warn_deprecation_once(:multi_json_constant,
+        "The MultiJson constant is deprecated and will be removed in v2.0. Use MultiJSON instead.")
+      ::MultiJSON.public_send(forwarded, *args, **kwargs, &block)
+    end
+  end
+
+  class << self
+    # Resolve missing constants to their {MultiJSON} counterparts
+    #
+    # Enables ``rescue MultiJson::ParseError`` and
+    # ``MultiJson::Adapters::Oj`` to keep working during the
+    # deprecation cycle.
+    #
+    # @api public
+    # @param name [Symbol] constant name
+    # @return [Object] the resolved constant from {MultiJSON}
+    # @example
+    #   MultiJson::ParseError  # returns MultiJSON::ParseError
+    def const_missing(name)
+      ::MultiJSON.warn_deprecation_once(:multi_json_constant,
+        "The MultiJson constant is deprecated and will be removed in v2.0. Use MultiJSON instead.")
+      ::MultiJSON.const_get(name)
+    end
+  end
+end

data/lib/multi_json/options_cache.rb

@@ -17,6 +17,13 @@ module MultiJSON
     # via {.max_cache_size=}.
     DEFAULT_MAX_CACHE_SIZE = 1000
 
+    # Dynamic require path so MRI (mutex_store) and JRuby
+    # (concurrent_store) execute the same physical line, avoiding a
+    # dead-branch ``require_relative`` that would otherwise drop
+    # JRuby's line coverage below 100%.
+    BACKENDS = {"jruby" => "concurrent_store"}.freeze
+    private_constant :BACKENDS
+
     class << self
       # Get the dump options cache
       #
@@ -71,16 +78,5 @@ module MultiJSON
   end
 end
 
-module MultiJSON
-  module OptionsCache
-    # Dynamic require path so MRI (mutex_store) and JRuby
-    # (concurrent_store) execute the same physical line, avoiding a
-    # dead-branch ``require_relative`` that would otherwise drop
-    # JRuby's line coverage below 100%.
-    BACKENDS = {"jruby" => "concurrent_store"}.freeze
-    private_constant :BACKENDS
-  end
-end
-
 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

@@ -87,14 +87,19 @@ module MultiJSON
     # match can proceed. Strings in binary (ASCII-8BIT) or any valid
     # encoding pass through scrub untouched.
     #
+    # The parameter is deliberately not named ``message``: that would
+    # shadow ``Exception#message``, which holds the same string once
+    # ``super`` has run, and mutation testing could not tell the two
+    # apart.
+    #
     # @api private
-    # @param message [String, nil] the adapter's error message
+    # @param text [String, nil] the adapter's error message
     # @return [MatchData, nil] the regex match, or nil if no message or
     #   no location fragment was found
-    def location_match(message)
-      return unless message
+    def location_match(text)
+      return unless text
 
-      LOCATION_PATTERN.match(message.scrub)
+      LOCATION_PATTERN.match(text.scrub)
     end
   end
 

data/lib/multi_json/version.rb

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

data/lib/multi_json.rb

@@ -267,72 +267,4 @@ module MultiJSON
 end
 
 require_relative "multi_json/deprecated"
-
-# Backward-compatible alias for the legacy ``MultiJson`` constant name
-#
-# Downstream code that still writes ``MultiJson.parse(...)`` or
-# ``rescue MultiJson::ParseError`` continues to work, but emits a
-# one-time deprecation warning pointing at ``MultiJSON``. The module
-# forwards every method call to {MultiJSON} via {.method_missing} and
-# resolves constant access via {.const_missing}, so both dotted calls
-# and ``::`` constant lookups (including rescue clauses) route through
-# the canonical module.
-#
-# @api public
-# @deprecated Use {MultiJSON} (all-caps) instead. Will be removed in v2.0.
-module MultiJson
-  class << self
-    # Forward method calls to {MultiJSON}, emitting a one-time warning
-    #
-    # Uses explicit ``*args, **kwargs, &block`` forwarding because
-    # mutant's AST structure table on the current parser version does
-    # not yet recognize ``...`` forwarding nodes, so the module would
-    # crash mutation analysis. The rubocop exclusions below document
-    # that intent.
-    #
-    # @api public
-    # @return [Object] the delegated call's return value
-    # @example
-    #   MultiJson.parse('{"a":1}')   # delegates to MultiJSON.parse
-    # rubocop:disable Naming/BlockForwarding, Style/ArgumentsForwarding
-    def method_missing(name, *args, **kwargs, &block)
-      ::MultiJSON.warn_deprecation_once(:multi_json_constant,
-        "The MultiJson constant is deprecated and will be removed in v2.0. Use MultiJSON instead.")
-      if ::MultiJSON.respond_to?(name)
-        ::MultiJSON.public_send(name, *args, **kwargs, &block)
-      else
-        super
-      end
-    end
-    # rubocop:enable Naming/BlockForwarding, Style/ArgumentsForwarding
-
-    # Respond to any method {MultiJSON} responds to
-    #
-    # @api public
-    # @param name [Symbol] method name
-    # @param include_private [Boolean] include private methods
-    # @return [Boolean] true if {MultiJSON} responds to the method
-    # @example
-    #   MultiJson.respond_to?(:parse)  #=> true
-    def respond_to_missing?(name, include_private)
-      ::MultiJSON.respond_to?(name, include_private)
-    end
-
-    # Resolve missing constants to their {MultiJSON} counterparts
-    #
-    # Enables ``rescue MultiJson::ParseError`` and
-    # ``MultiJson::Adapters::Oj`` to keep working during the
-    # deprecation cycle.
-    #
-    # @api public
-    # @param name [Symbol] constant name
-    # @return [Object] the resolved constant from {MultiJSON}
-    # @example
-    #   MultiJson::ParseError  # returns MultiJSON::ParseError
-    def const_missing(name)
-      ::MultiJSON.warn_deprecation_once(:multi_json_constant,
-        "The MultiJson constant is deprecated and will be removed in v2.0. Use MultiJSON instead.")
-      ::MultiJSON.const_get(name)
-    end
-  end
-end
+require_relative "multi_json/legacy_constant"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: multi_json
 version: !ruby/object:Gem::Version
-  version: 1.21.0
+  version: 1.21.2
 platform: java
 authors:
 - Michael Bleigh
@@ -49,6 +49,7 @@ files:
 - lib/multi_json/adapters/yajl.rb
 - lib/multi_json/concurrency.rb
 - lib/multi_json/deprecated.rb
+- lib/multi_json/legacy_constant.rb
 - lib/multi_json/options.rb
 - lib/multi_json/options_cache.rb
 - lib/multi_json/options_cache/concurrent_store.rb
@@ -59,10 +60,10 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/sferik/multi_json/issues
-  changelog_uri: https://github.com/sferik/multi_json/blob/v1.21.0/CHANGELOG.md
-  documentation_uri: https://www.rubydoc.info/gems/multi_json/1.21.0
+  changelog_uri: https://github.com/sferik/multi_json/blob/v1.21.2/CHANGELOG.md
+  documentation_uri: https://www.rubydoc.info/gems/multi_json/1.21.2
   rubygems_mfa_required: 'true'
-  source_code_uri: https://github.com/sferik/multi_json/tree/v1.21.0
+  source_code_uri: https://github.com/sferik/multi_json/tree/v1.21.2
   wiki_uri: https://github.com/sferik/multi_json/wiki
 rdoc_options: []
 require_paths:
@@ -78,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.11
+rubygems_version: 4.0.20
 specification_version: 4
 summary: A common interface to multiple JSON libraries.
 test_files: []