multi_json 1.16.0 → 1.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7cfed43da6fae7ff4d1ca11dc248a43fe89d00f184f2e955599467a7b45b6cbe
-  data.tar.gz: d6d16e3c6fd7c3334bf7b44b84896f6ac675dd503ccf4ffc6d2bc2ef415098c4
+  metadata.gz: e4844623fce51f6461e352b05ed0bf04712f213e33a290398c5ee46847a2fefb
+  data.tar.gz: 78985a7bae5a3c1001f19151f85ed221c8e392811edfda5ab3eb916785d6c465
 SHA512:
-  metadata.gz: 2712e385429e988fddeca64fbe93347eb3a2f6d5d4c3fa83f9ffb40e292e09f35fdf1ee0b82be7d6caa8ccd1d09995f41cb7803546b12e8f3082190bd5556625
-  data.tar.gz: bb3cd2dd7a39f1a6d7aa8b52d2786d908e2e15bc5ed94d750ef458666ef903bcccf2383883841d11795f972bf5923170d84410a1459aa14792448c6d0b583ff8
+  metadata.gz: 728727f42292c6aeb50fe442f60bd930a68aa7de9713ce109806e204b071a9ef4763b766a6860fa1407724584413ae3d298fe75cfc081aed69e4654e687dce0c
+  data.tar.gz: 54df198586a1118df89ce5467cc9ada2942842c10ed88355e5891f2b39b79a219516647a8beea2f7facfc24d78def27659e984840a5eb28388a5a1d4a689c29f

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+1.18.0
+------
+* [Fix conflict between JSON gem and ActiveSupport](https://github.com/intridea/multi_json/issues/222)
+
+1.17.0
+------
+* [Revert minimum ruby version requirement](https://github.com/sferik/multi_json/pull/16)
+
 1.16.0
 ------
 * [Remove `NSJSONSerialization`](https://github.com/sferik/multi_json/commit/0423d3b5886e93405f4c2221687b7e3329bd2940)
@@ -157,12 +165,12 @@
 
 1.6.0
 -----
-* [Add gson.rb support](https://github.com/sferik/multi_json/pull/71)
-* [Add MultiJson.default_options](https://github.com/sferik/multi_json/pull/70)
-* [Add MultiJson.with_adapter](https://github.com/sferik/multi_json/pull/67)
-* [Stringify all possible keys for ok_json](https://github.com/sferik/multi_json/pull/66)
+* [Add gson.rb support](https://github.com/intridea/multi_json/pull/71)
+* [Add MultiJson.default_options](https://github.com/intridea/multi_json/pull/70)
+* [Add MultiJson.with_adapter](https://github.com/intridea/multi_json/pull/67)
+* [Stringify all possible keys for ok_json](https://github.com/intridea/multi_json/pull/66)
 * [Use JSON.generate instead of #to_json](https://github.com/sferik/multi_json/issues/73)
-* [Alias `MultiJson::DecodeError` to `MultiJson::LoadError`](https://github.com/sferik/multi_json/pull/79)
+* [Alias `MultiJson::DecodeError` to `MultiJson::LoadError`](https://github.com/intridea/multi_json/pull/79)
 
 1.5.1
 -----

data/README.md

@@ -59,10 +59,13 @@ MultiJSON falls back to [OkJson][], a simple, vendorable JSON parser.
 This library aims to support and is [tested against](https://github.com/sferik/multi_json/actions/workflows/ci.yml) the following Ruby
 implementations:
 
+- Ruby 3.0
+- Ruby 3.1
 - Ruby 3.2
 - Ruby 3.3
 - Ruby 3.4
-- [JRuby 10][jruby]
+- [JRuby][jruby] 9.4 (targets Ruby 3.1 compatibility)
+- [JRuby][jruby] 10.0 (targets Ruby 3.4 compatibility)
 
 If something doesn't work in one of these implementations, it's a bug.
 

data/lib/multi_json/adapters/json_gem.rb

@@ -25,9 +25,14 @@ module MultiJson
       end
 
       def dump(object, options = {})
-        options.merge!(PRETTY_STATE_PROTOTYPE) if options.delete(:pretty)
+        opts = options.dup
 
-        object.to_json(options)
+        if opts.delete(:pretty)
+          opts = PRETTY_STATE_PROTOTYPE.merge(opts)
+          return ::JSON.pretty_generate(object, opts)
+        end
+
+        ::JSON.generate(object, opts)
       end
     end
   end

data/lib/multi_json/adapters/oj.rb

@@ -16,7 +16,7 @@ module MultiJson
       # shouldn't be a problem since the library is not known to be using it
       # (at least for now).
       class ParseError < ::SyntaxError
-        WRAPPED_CLASSES = %w[Oj::ParseError JSON::ParserError].to_set.freeze
+        WRAPPED_CLASSES = %w[Oj::ParseError JSON::ParserError].freeze
         private_constant :WRAPPED_CLASSES
 
         def self.===(exception)

data/lib/multi_json/adapters/ok_json.rb

@@ -6,6 +6,7 @@ module MultiJson
   module Adapters
     class OkJson < Adapter
       include ConvertibleHashKeys
+
       ParseError = ::MultiJson::OkJson::Error
 
       def load(string, options = {})

data/lib/multi_json/convertible_hash_keys.rb

@@ -17,12 +17,12 @@ module MultiJson
       end
     end
 
-    def prepare_hash(value, &)
+    def prepare_hash(value, &block)
       case value
       when Array
-        handle_array(value, &)
+        handle_array(value, &block)
       when Hash
-        handle_hash(value, &)
+        handle_hash(value, &block)
       else
         handle_simple_objects(value)
       end

data/lib/multi_json/options.rb

@@ -10,12 +10,12 @@ module MultiJson
       @dump_options = options
     end
 
-    def load_options(*)
-      (defined?(@load_options) && get_options(@load_options, *)) || default_load_options
+    def load_options(*args)
+      (defined?(@load_options) && get_options(@load_options, *args)) || default_load_options
     end
 
-    def dump_options(*)
-      (defined?(@dump_options) && get_options(@dump_options, *)) || default_dump_options
+    def dump_options(*args)
+      (defined?(@dump_options) && get_options(@dump_options, *args)) || default_dump_options
     end
 
     def default_load_options
@@ -28,8 +28,8 @@ module MultiJson
 
     private
 
-    def get_options(options, *)
-      return handle_callable_options(options, *) if options_callable?(options)
+    def get_options(options, *args)
+      return handle_callable_options(options, *args) if options_callable?(options)
 
       handle_hashable_options(options)
     end
@@ -38,8 +38,8 @@ module MultiJson
       options.respond_to?(:call)
     end
 
-    def handle_callable_options(options, *)
-      options.arity.zero? ? options.call : options.call(*)
+    def handle_callable_options(options, *args)
+      options.arity.zero? ? options.call : options.call(*args)
     end
 
     def handle_hashable_options(options)

data/lib/multi_json/options_cache.rb

@@ -20,7 +20,7 @@ module MultiJson
         end
       end
 
-      def fetch(key, &)
+      def fetch(key)
         @mutex.synchronize do
           return @cache[key] if @cache.key?(key)
         end

data/lib/multi_json/version.rb

@@ -1,7 +1,7 @@
 module MultiJson
   class Version
     MAJOR = 1 unless defined? MultiJson::Version::MAJOR
-    MINOR = 16 unless defined? MultiJson::Version::MINOR
+    MINOR = 18 unless defined? MultiJson::Version::MINOR
     PATCH = 0 unless defined? MultiJson::Version::PATCH
     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.16.0
+  version: 1.18.0
 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.16.0/CHANGELOG.md
-  documentation_uri: https://www.rubydoc.info/gems/multi_json/1.16.0
+  changelog_uri: https://github.com/sferik/multi_json/blob/v1.18.0/CHANGELOG.md
+  documentation_uri: https://www.rubydoc.info/gems/multi_json/1.18.0
   rubygems_mfa_required: 'true'
-  source_code_uri: https://github.com/sferik/multi_json/tree/v1.16.0
+  source_code_uri: https://github.com/sferik/multi_json/tree/v1.18.0
   wiki_uri: https://github.com/sferik/multi_json/wiki
 rdoc_options: []
 require_paths:
@@ -57,14 +57,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.2'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 3.7.2
 specification_version: 4
 summary: A common interface to multiple JSON libraries.
 test_files: []