multi_json 1.12.2 → 1.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e41c68668d3cadb98cd4ceb6ab0b5e9cf7f6dc4c
-  data.tar.gz: b9bfdd33477711d354185017e45f08466dadeba5
+SHA256:
+  metadata.gz: ba3f1870ebd467a8356a8138d7bba83f224659a5cea2d4f9a845fa88e8d4934f
+  data.tar.gz: 89051067684a2f7f101dbc1b00e8cc4a417fdb9b829e476db6d90ea2cc4cf37b
 SHA512:
-  metadata.gz: 8a3b5227ce0fb04cc4215e83aa6fb7f7946a480a08f02befb76485d823d84f8217afdd176702e7e14d59ed652811b4d9c0acc79ec17403d31fd3c489034f1ae4
-  data.tar.gz: 79fc9ccf104b8bd2dde8e3881c7b408b48ec83c0ec84a1cd6f55dc7c10072fcaf200d8325770af8214f7f5576a907add9dedd2b3f80f490684ac126802f1eee9
+  metadata.gz: 3f317d2719838c2466a2ca066b25259a2653cf639198a9e47fc0c0365a8a02e8307feaa4392b445ae1f918c92c4cc7deb833e1c1945c4682cd3dac3d91af9789
+  data.tar.gz: 81b37aeb82f9744a93eec867a54e3a83537bedb6f29747818187b6fc27d599a6ee88f239db382f85ed840319e19452f43f09c29655ac664e9a4680bc33c335a8

data/CHANGELOG.md

@@ -1,3 +1,28 @@
+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
+------
+
+* [Fix missing stdlib set dependency in oj adapter](https://github.com/intridea/multi_json/commit/c4ff66e7bee6fb4f45e54429813d7fada1c152b8)
+
+1.13.0
+-----
+
+* [Make Oj adapter handle JSON::ParseError correctly](https://github.com/intridea/multi_json/commit/275e3ffd8169797c510d23d9ef5b8b07e64c3b42)
+
 1.12.2
 ------
 

data/README.md

@@ -2,13 +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]
-
-[gem]: https://rubygems.org/gems/multi_json
-[travis]: http://travis-ci.org/intridea/multi_json
-[gemnasium]: https://gemnasium.com/intridea/multi_json
-[codeclimate]: https://codeclimate.com/github/intridea/multi_json
+[![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
@@ -51,38 +45,31 @@ load any. When loading, libraries are ordered by speed. First Oj, then Yajl,
 then the JSON gem, then JSON pure. If no other JSON library is available,
 MultiJSON falls back to [OkJson][], a simple, vendorable JSON parser.
 
-[okjson]: https://github.com/kr/okjson
-
 ## Supported JSON Engines
 
-* [Oj](https://github.com/ohler55/oj) Optimized JSON by Peter Ohler
-* [Yajl](https://github.com/brianmario/yajl-ruby) Yet Another JSON Library by Brian Lopez
-* [JSON](https://github.com/flori/json) The default JSON gem with C-extensions (ships with Ruby 1.9)
-* [JSON Pure](https://github.com/flori/json) A Ruby variant of the JSON gem
-* [NSJSONSerialization](https://developer.apple.com/library/ios/#documentation/Foundation/Reference/NSJSONSerialization_Class/Reference/Reference.html) Wrapper for Apple's NSJSONSerialization in the Cocoa Framework (MacRuby only)
-* [gson.rb](https://github.com/avsej/gson.rb) A Ruby wrapper for google-gson library (JRuby only)
-* [JrJackson](https://github.com/guyboertje/jrjackson) JRuby wrapper for Jackson (JRuby only)
+* [Oj][oj] Optimized JSON by Peter Ohler
+* [Yajl][yajl] Yet Another JSON Library by Brian Lopez
+* [JSON][json-gem] The default JSON gem with C-extensions (ships with Ruby 1.9+)
+* [JSON Pure][json-gem] A Ruby variant of the JSON gem
+* [NSJSONSerialization][nsjson] Wrapper for Apple's NSJSONSerialization in the Cocoa Framework (MacRuby only)
+* [gson.rb][gson] A Ruby wrapper for google-gson library (JRuby only)
+* [JrJackson][jrjackson] JRuby wrapper for Jackson (JRuby only)
 * [OkJson][okjson] A simple, vendorable JSON parser
 
 ## Supported Ruby Versions
 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 1.8
+* Ruby 1.9
+* Ruby 2.0
 * Ruby 2.1
-* Ruby 2.2.4
-* Ruby 2.3.1
-* Ruby 2.4.0
+* Ruby 2.2
+* Ruby 2.4
+* Ruby 2.5
+* Ruby 2.6
+* Ruby 2.7
 * [JRuby][]
-* [Rubinius][]
-* [MacRuby][] (not tested on Travis CI)
-
-[jruby]: http://www.jruby.org/
-[rubinius]: http://rubini.us/
-[macruby]: http://www.macruby.org/
 
 If something doesn't work in one of these implementations, it's a bug.
 
@@ -112,11 +99,23 @@ Constraint][pvc] with two digits of precision. For example:
 spec.add_dependency 'multi_json', '~> 1.0'
 ```
 
-[semver]: http://semver.org/
-[pvc]: http://docs.rubygems.org/read/chapter/16#page74
-
 ## Copyright
-Copyright (c) 2010-2013 Michael Bleigh, Josh Kalderimis, Erik Michaels-Ober,
+Copyright (c) 2010-2018 Michael Bleigh, Josh Kalderimis, Erik Michaels-Ober,
 and Pavel Pravosud. See [LICENSE][] for details.
 
+[codeclimate]: https://codeclimate.com/github/intridea/multi_json
+[gem]: https://rubygems.org/gems/multi_json
+[gson]: https://github.com/avsej/gson.rb
+[jrjackson]: https://github.com/guyboertje/jrjackson
+[jruby]: http://www.jruby.org/
+[json-gem]: https://github.com/flori/json
+[json-pure]: https://github.com/flori/json
 [license]: LICENSE.md
+[macruby]: http://www.macruby.org/
+[nsjson]: https://developer.apple.com/library/ios/#documentation/Foundation/Reference/NSJSONSerialization_Class/Reference/Reference.html
+[oj]: https://github.com/ohler55/oj
+[okjson]: https://github.com/kr/okjson
+[pvc]: http://docs.rubygems.org/read/chapter/16#page74
+[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

@@ -1,3 +1,4 @@
+require 'set'
 require 'oj'
 require 'multi_json/adapter'
 
@@ -8,17 +9,54 @@ module MultiJson
       defaults :load, :mode => :strict, :symbolize_keys => false
       defaults :dump, :mode => :compat, :time_format => :ruby, :use_to_json => true
 
-      ParseError = defined?(::Oj::ParseError) ? ::Oj::ParseError : SyntaxError
+      # In certain cases OJ gem may throw JSON::ParserError exception instead
+      # of its own class. Also, we can't expect ::JSON::ParserError and
+      # ::Oj::ParseError to always be defined, since it's often not the case.
+      # Because of this, we can't reference those classes directly and have to
+      # do string comparison instead. This will not catch subclasses, but it
+      # 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
+
+        def self.===(exception)
+          case exception
+          when ::SyntaxError
+            true
+          else
+            WRAPPED_CLASSES.include?(exception.class.to_s)
+          end
+        end
+      end
 
       def load(string, options = {})
         options[:symbol_keys] = options[:symbolize_keys]
         ::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 = 12 unless defined? MultiJson::Version::MINOR
-    PATCH = 2 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.12.2
+  version: 1.15.0
 platform: ruby
 authors:
 - Michael Bleigh
@@ -10,45 +10,37 @@ authors:
 - Pavel Pravosud
 autorequire: 
 bindir: bin
-cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDcDCCAligAwIBAgIBATANBgkqhkiG9w0BAQUFADA/MQ4wDAYDVQQDDAVwYXZl
-  bDEYMBYGCgmSJomT8ixkARkWCHByYXZvc3VkMRMwEQYKCZImiZPyLGQBGRYDY29t
-  MB4XDTE3MDkwNTA0MjAxNVoXDTE4MDkwNTA0MjAxNVowPzEOMAwGA1UEAwwFcGF2
-  ZWwxGDAWBgoJkiaJk/IsZAEZFghwcmF2b3N1ZDETMBEGCgmSJomT8ixkARkWA2Nv
-  bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMBI9gFjVGizTKJZmmim
-  8zHrJmSu7NGlL7HBWRhV7e/Qp2qdKtiG7TGGi9HRc6s6LmmJ7/v1EuPDsRCY1hnO
-  6aeiJKF02f9w/o1HSK1qnSvqzvXbMYmREbJygw5EQVSPfmtGhyMHwiq4DfwK+PnW
-  dgNJYYIyf/FtWw+plgZapTZ3bj0EKswkLvFy12UyLhrLRu38JAezHfaeNs6Zf+Q1
-  YgyAiPsbLeUjP+2k6QnFMM2gOJRZZq8ZDI5yFAr7+Q2AHqzb5I+BacYnODWuadXx
-  qTbeYrgJS/20L+zoStoBpFlfSv8/BVu2ZwybxyU91WAFC5gnnNDymV6rKlza9gUJ
-  4lkCAwEAAaN3MHUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFGjY
-  4LmBKPWO2jdS5KM1uNTR/xd8MB0GA1UdEQQWMBSBEnBhdmVsQHByYXZvc3VkLmNv
-  bTAdBgNVHRIEFjAUgRJwYXZlbEBwcmF2b3N1ZC5jb20wDQYJKoZIhvcNAQEFBQAD
-  ggEBAB5ZWFOjLnT6Klcr4UFvss5oW1Wtg0BdRCS5V7v8ZvnJ3mfD7rw+J3c7ylpT
-  9F4c4JLfJsg+FFbkDSETB1LfviGKPkpfjL3Uy1z6nWOko62XpFUiBydB9hnq0Fll
-  pDshFjNeJVp6BgWXjVs9m8h1hRvGsy0WxEF/IQ+V5Dw7hvi+qg5K6eMoXvpv3OJh
-  Io9NF6vsT7YYaUl+zobpp+tMYsAST801YnAa2RSSlsRKEMtsDFtC9oTQZhAhGqHb
-  lnsOhB8m73/1c9sJkVBZl4lGniy6lnB4BIr+2+hTXDK5AjQJC1uwKG1etzwBuCkz
-  8dtH5+dv1G5BCpbYE2uIVLsl+LY=
-  -----END CERTIFICATE-----
-date: 2017-09-05 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,10 +99,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.5
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A common interface to multiple JSON libraries.
 test_files: []
-has_rdoc: