multi_json 1.15.0 → 1.16.0

data/lib/multi_json/version.rb

@@ -1,14 +1,14 @@
 module MultiJson
   class Version
     MAJOR = 1 unless defined? MultiJson::Version::MAJOR
-    MINOR = 15 unless defined? MultiJson::Version::MINOR
+    MINOR = 16 unless defined? MultiJson::Version::MINOR
     PATCH = 0 unless defined? MultiJson::Version::PATCH
     PRE = nil unless defined? MultiJson::Version::PRE
 
     class << self
       # @return [String]
       def to_s
-        [MAJOR, MINOR, PATCH, PRE].compact.join('.')
+        [MAJOR, MINOR, PATCH, PRE].compact.join(".")
       end
     end
   end

data/lib/multi_json.rb

@@ -1,69 +1,59 @@
-require 'multi_json/options'
-require 'multi_json/version'
-require 'multi_json/adapter_error'
-require 'multi_json/parse_error'
-require 'multi_json/options_cache'
+require_relative "multi_json/options"
+require_relative "multi_json/version"
+require_relative "multi_json/adapter_error"
+require_relative "multi_json/parse_error"
+require_relative "multi_json/options_cache"
 
 module MultiJson
   include Options
   extend self
 
   def default_options=(value)
-    Kernel.warn "MultiJson.default_options setter is deprecated\n" \
-      'Use MultiJson.load_options and MultiJson.dump_options instead'
+    Kernel.warn "MultiJson.default_options setter is deprecated\nUse MultiJson.load_options and MultiJson.dump_options instead"
 
     self.load_options = self.dump_options = value
   end
 
   def default_options
-    Kernel.warn "MultiJson.default_options is deprecated\n" \
-      'Use MultiJson.load_options or MultiJson.dump_options instead'
+    Kernel.warn "MultiJson.default_options is deprecated\nUse MultiJson.load_options or MultiJson.dump_options instead"
 
     load_options
   end
 
-  %w(cached_options reset_cached_options!).each do |method_name|
+  %w[cached_options reset_cached_options!].each do |method_name|
     define_method method_name do |*|
       Kernel.warn "MultiJson.#{method_name} method is deprecated and no longer used."
     end
   end
 
-  ALIASES = {'jrjackson' => 'jr_jackson'}
+  ALIASES = {"jrjackson" => "jr_jackson"}.freeze
 
-  REQUIREMENT_MAP = [
-    [:oj,         'oj'],
-    [:yajl,       'yajl'],
-    [:jr_jackson, 'jrjackson'],
-    [:json_gem,   'json/ext'],
-    [:gson,       'gson'],
-    [:json_pure,  'json/pure'],
-  ]
+  REQUIREMENT_MAP = {
+    oj: "oj",
+    yajl: "yajl",
+    jr_jackson: "jrjackson",
+    json_gem: "json",
+    gson: "gson",
+    json_pure: "json"
+  }.freeze
 
   # The default adapter based on what you currently
-  # have loaded and installed. First checks to see
-  # if any adapters are already loaded, then checks
-  # to see which are installed if none are loaded.
+  # have loaded and installed.
   def default_adapter
-    return :oj if defined?(::Oj)
-    return :yajl if defined?(::Yajl)
-    return :jr_jackson if defined?(::JrJackson)
-    return :json_gem if defined?(::JSON::Ext::Parser)
-    return :gson if defined?(::Gson)
-
-    REQUIREMENT_MAP.each do |adapter, library|
-      begin
-        require library
-        return adapter
-      rescue ::LoadError
-        next
-      end
+    adapter = loaded_adapter || installable_adapter
+    return adapter if adapter
+
+    @default_adapter_warning_shown ||= begin
+      Kernel.warn(
+        "[WARNING] MultiJson is using the default adapter (ok_json). " \
+        "We recommend loading a different JSON library to improve performance."
+      )
+      true
     end
 
-    Kernel.warn '[WARNING] MultiJson is using the default adapter (ok_json). ' \
-      'We recommend loading a different JSON library to improve performance.'
-
     :ok_json
   end
+
   alias_method :default_engine, :default_adapter
 
   # Get the current adapter class.
@@ -84,7 +74,6 @@ module MultiJson
   # * <tt>:json_pure</tt>
   # * <tt>:ok_json</tt>
   # * <tt>:yajl</tt>
-  # * <tt>:nsjsonserialization</tt> (MacRuby only)
   # * <tt>:gson</tt> (JRuby only)
   # * <tt>:jr_jackson</tt> (JRuby only)
   def use(new_adapter)
@@ -104,10 +93,10 @@ module MultiJson
     when Class, Module
       new_adapter
     else
-      fail ::LoadError, new_adapter
+      raise ::LoadError, new_adapter
     end
-  rescue ::LoadError => exception
-    raise AdapterError.build(exception)
+  rescue ::LoadError => e
+    raise(AdapterError.build(e), cause: e)
   end
 
   # Decode a JSON string into Ruby.
@@ -120,8 +109,8 @@ module MultiJson
     adapter = current_adapter(options)
     begin
       adapter.load(string, options)
-    rescue adapter::ParseError => exception
-      raise ParseError.build(exception, string)
+    rescue adapter::ParseError => e
+      raise(ParseError.build(e, string), cause: e)
     end
   end
   alias_method :decode, :load
@@ -150,12 +139,34 @@ module MultiJson
   end
   alias_method :with_engine, :with_adapter
 
-private
+  private
+
+  # Checks for already loaded adapters and returns the first match
+  def loaded_adapter
+    return :oj if defined?(::Oj)
+    return :yajl if defined?(::Yajl)
+    return :jr_jackson if defined?(::JrJackson)
+    return :json_gem if defined?(::JSON::Ext::Parser)
+    return :gson if defined?(::Gson)
+
+    nil
+  end
+
+  # Attempts to load and return the first installable adapter
+  def installable_adapter
+    REQUIREMENT_MAP.each do |adapter, library|
+      require library
+      return adapter
+    rescue ::LoadError
+      next
+    end
+    nil
+  end
 
   def load_adapter_from_string_name(name)
-    name = ALIASES.fetch(name, name)
-    require "multi_json/adapters/#{name.downcase}"
-    klass_name = name.to_s.split('_').map(&:capitalize) * ''
+    normalized_name = ALIASES.fetch(name, name).to_s
+    require "multi_json/adapters/#{normalized_name.downcase}"
+    klass_name = normalized_name.split("_").map(&:capitalize).join
     MultiJson::Adapters.const_get(klass_name)
   end
 end

metadata

@@ -1,54 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: multi_json
 version: !ruby/object:Gem::Version
-  version: 1.15.0
+  version: 1.16.0
 platform: ruby
 authors:
 - Michael Bleigh
 - Josh Kalderimis
-- Erik Michaels-Ober
+- Erik Berlin
 - Pavel Pravosud
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-10 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        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'
+date: 1980-01-02 00:00:00.000000000 Z
+dependencies: []
 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.
+  JSON gem (with C-extensions), gson, JrJackson, and OkJson.
 email:
-- michael@intridea.com
-- josh.kalderimis@gmail.com
 - sferik@gmail.com
-- pavel@pravosud.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -62,10 +29,8 @@ files:
 - lib/multi_json/adapter_error.rb
 - lib/multi_json/adapters/gson.rb
 - lib/multi_json/adapters/jr_jackson.rb
-- lib/multi_json/adapters/json_common.rb
 - lib/multi_json/adapters/json_gem.rb
 - lib/multi_json/adapters/json_pure.rb
-- lib/multi_json/adapters/nsjsonserialization.rb
 - lib/multi_json/adapters/oj.rb
 - lib/multi_json/adapters/ok_json.rb
 - lib/multi_json/adapters/yajl.rb
@@ -75,16 +40,16 @@ files:
 - lib/multi_json/parse_error.rb
 - lib/multi_json/vendor/okjson.rb
 - lib/multi_json/version.rb
-homepage: https://github.com/intridea/multi_json
+homepage: https://github.com/sferik/multi_json
 licenses:
 - MIT
 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: 
+  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
+  rubygems_mfa_required: 'true'
+  source_code_uri: https://github.com/sferik/multi_json/tree/v1.16.0
+  wiki_uri: https://github.com/sferik/multi_json/wiki
 rdoc_options: []
 require_paths:
 - lib
@@ -92,15 +57,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.5
+      version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: A common interface to multiple JSON libraries.
 test_files: []

data/lib/multi_json/adapters/json_common.rb

@@ -1,23 +0,0 @@
-require 'multi_json/adapter'
-
-module MultiJson
-  module Adapters
-    class JsonCommon < Adapter
-      defaults :load, :create_additions => false, :quirks_mode => true
-
-      def load(string, options = {})
-        if string.respond_to?(:force_encoding)
-          string = string.dup.force_encoding(::Encoding::ASCII_8BIT)
-        end
-
-        options[:symbolize_names] = true if options.delete(:symbolize_keys)
-        ::JSON.parse(string, options)
-      end
-
-      def dump(object, options = {})
-        options.merge!(::JSON::PRETTY_STATE_PROTOTYPE.to_h) if options.delete(:pretty)
-        object.to_json(options)
-      end
-    end
-  end
-end

data/lib/multi_json/adapters/nsjsonserialization.rb

@@ -1,35 +0,0 @@
-# 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'
-
-module MultiJson
-  module Adapters
-    class Nsjsonserialization < MultiJson::Adapters::OkJson
-      ParseError = ::MultiJson::OkJson::Error
-
-      def load(string, options = {})
-        data = string.dataUsingEncoding(NSUTF8StringEncoding)
-        object = NSJSONSerialization.JSONObjectWithData(data, :options => NSJSONReadingMutableContainers | NSJSONReadingMutableLeaves, :error => nil)
-        if object
-          object = symbolize_keys(object) if options[:symbolize_keys]
-          object
-        else
-          super(string, options)
-        end
-      end
-
-      def dump(object, options = {})
-        pretty = options[:pretty] ? NSJSONWritingPrettyPrinted : 0
-        object = object.as_json if object.respond_to?(:as_json)
-        if NSJSONSerialization.isValidJSONObject(object)
-          data = NSJSONSerialization.dataWithJSONObject(object, :options => pretty, :error => nil)
-          NSMutableString.alloc.initWithData(data, :encoding => NSUTF8StringEncoding)
-        else
-          super(object, options)
-        end
-      end
-    end
-  end
-end