multi_json 1.17.0 → 1.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8391f158a04fe4c56abc8c880ff370642f80e2311c870d51f7f393db946b53df
-  data.tar.gz: 9677ed8bdaa4c4f03717767544c1cd8bc5f1a55510adbd42ac38fd898b85087b
+  metadata.gz: e4844623fce51f6461e352b05ed0bf04712f213e33a290398c5ee46847a2fefb
+  data.tar.gz: 78985a7bae5a3c1001f19151f85ed221c8e392811edfda5ab3eb916785d6c465
 SHA512:
-  metadata.gz: c8812d112eae4f61445ed679551ef0e73a075673be3676b85b1c748397559c48447b781be6297ca66007107676ceee757c1fe6774b77baf34f1fc5744a9f02ec
-  data.tar.gz: a3852e7e36a07428b466ee6a64edafd67f72552556164c851e44a237e2d745625302955c445a67169997d86525a49cec117153523bae03d52b2b8fd56d4a49de
+  metadata.gz: 728727f42292c6aeb50fe442f60bd930a68aa7de9713ce109806e204b071a9ef4763b766a6860fa1407724584413ae3d298fe75cfc081aed69e4654e687dce0c
+  data.tar.gz: 54df198586a1118df89ce5467cc9ada2942842c10ed88355e5891f2b39b79a219516647a8beea2f7facfc24d78def27659e984840a5eb28388a5a1d4a689c29f

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+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)
@@ -161,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/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/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/options_cache.rb

@@ -20,7 +20,7 @@ module MultiJson
         end
       end
 
-      def fetch(key, &block)
+      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 = 17 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.17.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.17.0/CHANGELOG.md
-  documentation_uri: https://www.rubydoc.info/gems/multi_json/1.17.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.17.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:
@@ -64,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.0
+rubygems_version: 3.7.2
 specification_version: 4
 summary: A common interface to multiple JSON libraries.
 test_files: []