multi_json 1.13.1 → 1.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1b1089ce9b52b1a5bd0685e39d5b7ec690d181a6
-  data.tar.gz: f25d7e5f1f290a8c0b37e3346e6ea62639feb996
+SHA256:
+  metadata.gz: ba3f1870ebd467a8356a8138d7bba83f224659a5cea2d4f9a845fa88e8d4934f
+  data.tar.gz: 89051067684a2f7f101dbc1b00e8cc4a417fdb9b829e476db6d90ea2cc4cf37b
 SHA512:
-  metadata.gz: d1a31d1e0da0c28e7491e5ba64ed0a894eeae616d786f7308118031982f77712a2b03429622744700f3aef6577305190ca16c07d593cf2eaf4dd2b7978ba737f
-  data.tar.gz: c983f3a10091b727058907e2518094164937a807c2f415a32743dad2f7526efd2ede74351007a29fd25b17e7472f68e50fb1f3514e6acd285e92443318af07d8
+  metadata.gz: 3f317d2719838c2466a2ca066b25259a2653cf639198a9e47fc0c0365a8a02e8307feaa4392b445ae1f918c92c4cc7deb833e1c1945c4682cd3dac3d91af9789
+  data.tar.gz: 81b37aeb82f9744a93eec867a54e3a83537bedb6f29747818187b6fc27d599a6ee88f239db382f85ed840319e19452f43f09c29655ac664e9a4680bc33c335a8

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+1.14.2
+------
+
+* [Improve detection of json_gem adapter](https://github.com/intridea/multi_json/commit/62d54019b17ebf83b28c8deb871a02a122e7d9cf)
+
+1.14.1
+------
+
+* [Fix a warning in Ruby 2.7](https://github.com/intridea/multi_json/commit/26a94ab8c78a394cc237e2ea292c1de4f6ed30d7)
+
+1.14.0
+------
+
+* [Support Oj 3.x gem](https://github.com/intridea/multi_json/commit/5d8febdbebc428882811b90d514f3628617a61d5)
+
 1.13.1
 ------
 

data/README.md

@@ -2,8 +2,7 @@
 
 [![Gem Version](http://img.shields.io/gem/v/multi_json.svg)][gem]
 [![Build Status](http://travis-ci.org/intridea/multi_json.svg)][travis]
-[![Dependency Status](http://img.shields.io/gemnasium/intridea/multi_json.svg)][gemnasium]
-[![Code Climate](http://img.shields.io/codeclimate/github/intridea/multi_json.svg)][codeclimate]
+[![Code Climate](https://codeclimate.com/github/intridea/multi_json.svg)][codeclimate]
 
 Lots of Ruby libraries parse JSON and everyone has their favorite JSON coder.
 Instead of choosing a single JSON coder and forcing users of your library to be
@@ -61,17 +60,16 @@ MultiJSON falls back to [OkJson][], a simple, vendorable JSON parser.
 This library aims to support and is [tested against][travis] the following Ruby
 implementations:
 
-* Ruby 1.8.7
-* Ruby 1.9.2
-* Ruby 1.9.3
-* Ruby 2.0.0
-* Ruby 2.1.10
-* Ruby 2.2.9
-* Ruby 2.4.3
-* Ruby 2.5.0
+* Ruby 1.8
+* Ruby 1.9
+* Ruby 2.0
+* Ruby 2.1
+* Ruby 2.2
+* Ruby 2.4
+* Ruby 2.5
+* Ruby 2.6
+* Ruby 2.7
 * [JRuby][]
-* [Rubinius][]
-* [MacRuby][] (not tested on Travis CI)
 
 If something doesn't work in one of these implementations, it's a bug.
 
@@ -107,7 +105,6 @@ and Pavel Pravosud. See [LICENSE][] for details.
 
 [codeclimate]: https://codeclimate.com/github/intridea/multi_json
 [gem]: https://rubygems.org/gems/multi_json
-[gemnasium]: https://gemnasium.com/intridea/multi_json
 [gson]: https://github.com/avsej/gson.rb
 [jrjackson]: https://github.com/guyboertje/jrjackson
 [jruby]: http://www.jruby.org/
@@ -119,7 +116,6 @@ and Pavel Pravosud. See [LICENSE][] for details.
 [oj]: https://github.com/ohler55/oj
 [okjson]: https://github.com/kr/okjson
 [pvc]: http://docs.rubygems.org/read/chapter/16#page74
-[rubinius]: http://rubini.us/
 [semver]: http://semver.org/
 [travis]: http://travis-ci.org/intridea/multi_json
 [yajl]: https://github.com/brianmario/yajl-ruby

data/lib/multi_json.rb

@@ -47,7 +47,7 @@ module MultiJson
     return :oj if defined?(::Oj)
     return :yajl if defined?(::Yajl)
     return :jr_jackson if defined?(::JrJackson)
-    return :json_gem if defined?(::JSON::JSON_LOADED)
+    return :json_gem if defined?(::JSON::Ext::Parser)
     return :gson if defined?(::Gson)
 
     REQUIREMENT_MAP.each do |adapter, library|

data/lib/multi_json/adapters/nsjsonserialization.rb

@@ -1,3 +1,6 @@
+# This adapter is here for legacy reasons. We can't really test it, so it's hard
+# to tell if it's even working properly. If you're still using it, please
+# consider migrating to any other adapter out there.
 framework 'Foundation'
 require 'multi_json/adapters/ok_json'
 

data/lib/multi_json/adapters/oj.rb

@@ -34,10 +34,29 @@ module MultiJson
         ::Oj.load(string, options)
       end
 
-      def dump(object, options = {})
-        options.merge!(:indent => 2) if options[:pretty]
-        options[:indent] = options[:indent].to_i if options[:indent]
-        ::Oj.dump(object, options)
+      case ::Oj::VERSION
+      when /\A2\./
+        def dump(object, options = {})
+          options.merge!(:indent => 2) if options[:pretty]
+          options[:indent] = options[:indent].to_i if options[:indent]
+          ::Oj.dump(object, options)
+        end
+      when /\A3\./
+        PRETTY_STATE_PROTOTYPE = {
+          :indent                => "  ",
+          :space                 => " ",
+          :space_before          => "",
+          :object_nl             => "\n",
+          :array_nl              => "\n",
+          :ascii_only            => false,
+        }
+
+        def dump(object, options = {})
+          options.merge!(PRETTY_STATE_PROTOTYPE.dup) if options.delete(:pretty)
+          ::Oj.dump(object, options)
+        end
+      else
+        fail "Unsupported Oj version: #{::Oj::VERSION}"
       end
     end
   end

data/lib/multi_json/options_cache.rb

@@ -7,9 +7,9 @@ module MultiJson
       @load_cache = {}
     end
 
-    def fetch(type, key)
+    def fetch(type, key, &block)
       cache = instance_variable_get("@#{type}_cache")
-      cache.key?(key) ? cache[key] : write(cache, key, &Proc.new)
+      cache.key?(key) ? cache[key] : write(cache, key, &block)
     end
 
     private

data/lib/multi_json/version.rb

@@ -1,8 +1,8 @@
 module MultiJson
   class Version
     MAJOR = 1 unless defined? MultiJson::Version::MAJOR
-    MINOR = 13 unless defined? MultiJson::Version::MINOR
-    PATCH = 1 unless defined? MultiJson::Version::PATCH
+    MINOR = 15 unless defined? MultiJson::Version::MINOR
+    PATCH = 0 unless defined? MultiJson::Version::PATCH
     PRE = nil unless defined? MultiJson::Version::PRE
 
     class << self

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: multi_json
 version: !ruby/object:Gem::Version
-  version: 1.13.1
+  version: 1.15.0
 platform: ruby
 authors:
 - Michael Bleigh
@@ -10,45 +10,37 @@ authors:
 - Pavel Pravosud
 autorequire: 
 bindir: bin
-cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDYDCCAkigAwIBAgIBATANBgkqhkiG9w0BAQUFADA7MQ0wCwYDVQQDDAR5b3Vy
-  MRUwEwYKCZImiZPyLGQBGRYFZW1haWwxEzARBgoJkiaJk/IsZAEZFgNjb20wHhcN
-  MTgwMTA4MjIyOTMyWhcNMTkwMTA4MjIyOTMyWjA7MQ0wCwYDVQQDDAR5b3VyMRUw
-  EwYKCZImiZPyLGQBGRYFZW1haWwxEzARBgoJkiaJk/IsZAEZFgNjb20wggEiMA0G
-  CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDG77wIkJev2/a8aPpyEYBhj7izfPiP
-  C66ZWkPauvkV6MB2CPEH27ivgtHAxxu8R31C+ZXDL9WA+LLwrklcbAyaPynTEV/g
-  eYp6dxptxmeXoHT+CLrDaQtpEpOmljEUg7CPaSNjXw3/Qi7QndsPh88c8X97dFvb
-  +yCf9NCI1QjyES4dLEioKqk/smf54zEM508iPlsAdxKDZ12LPOxVY8+q/dWRtlCK
-  6upwAddBhiVl5uksKD26NtaQNMgPXmqYLN3A2eLtktPncF+IYK5DRIPnRd6RhNuV
-  ZCxXw6UPH0IIYp62bNAb5IneaooJ/ROlBRC1qGfLIx1IA8BkwfITUJYrAgMBAAGj
-  bzBtMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBQudQhSt5zoh7J8
-  RFSAHv5Aycm0pDAZBgNVHREEEjAQgQ55b3VyQGVtYWlsLmNvbTAZBgNVHRIEEjAQ
-  gQ55b3VyQGVtYWlsLmNvbTANBgkqhkiG9w0BAQUFAAOCAQEAuDFit+TKy6Z8i02y
-  htEeuNL9ZNVBfmv6Li6AdUKoiCgStjbH0NKaC6eTx+4glHfZS3o/vLdnHKeoWwJs
-  kVIWEQgaUVabD+bkdS9s5icM3ox2XxRJd9uDW62WvFHFZzbJiLkop9XvnnAgMlGy
-  O4oewvfU2u5E1kTY9nGnnTngKaw0Zh1VN6yexwv1FIOBXAaAYclVTfbEEzBqHLK/
-  80mUboJWH2DXpWM6JCwGR7Blt2Zsfp172JjwW75/VQwPndKZDCkjTN/7MbHgvUQR
-  X7myOZyY2pB6iYleyWB68zhOnqbtf/3ZYS8vfSd1M5qt8TzmgR4VdbogpEr4wRV6
-  KG+kpw==
-  -----END CERTIFICATE-----
-date: 2018-01-10 00:00:00.000000000 Z
+cert_chain: []
+date: 2020-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '10.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '10.5'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.9'
 description: A common interface to multiple JSON libraries, including Oj, Yajl, the
   JSON gem (with C-extensions), the pure-Ruby JSON gem, NSJSONSerialization, gson.rb,
   JrJackson, and OkJson.
@@ -83,10 +75,15 @@ files:
 - lib/multi_json/parse_error.rb
 - lib/multi_json/vendor/okjson.rb
 - lib/multi_json/version.rb
-homepage: http://github.com/intridea/multi_json
+homepage: https://github.com/intridea/multi_json
 licenses:
 - MIT
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/intridea/multi_json/issues
+  changelog_uri: https://github.com/intridea/multi_json/blob/v1.15.0/CHANGELOG.md
+  documentation_uri: https://www.rubydoc.info/gems/multi_json/1.15.0
+  source_code_uri: https://github.com/intridea/multi_json/tree/v1.15.0
+  wiki_uri: https://github.com/intridea/multi_json/wiki
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -102,8 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.5
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A common interface to multiple JSON libraries.

data.tar.gz.sig

@@ -1 +0,0 @@
-kx|�1��a��eW�V貏�a�ڏ�_P�D*���>R�%���I"]�C������W<���H%�J��7c�R�߻�HMV0�2�h32jj9W�e��ar����>;\o��p��ܬ���;ԕyC�N��

metadata.gz.sig

@@ -1,2 +0,0 @@
-R�N1-0�}�D9Ҧ��1Y-�m{v�N{���:������N.��o�w�"���P�q�����d� F�\&�In^x��o��iN`�����=�t�GU��iJ�~�L���FM�p<���������
-sEb���0���g�V�2W}�