multi_json 1.11.2 → 1.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f707a0b25f31efedaa2f454617752c42a26da368
-  data.tar.gz: ba0f28412efb90478336f515029ffa745fb7b160
+  metadata.gz: da198b4f59c9d69641161993e95453c51ea9d4b2
+  data.tar.gz: 2ca02cd8fcfc8c1a6319c8cb335bb7c2e85ed178
 SHA512:
-  metadata.gz: a442b4c8afdaad0759841b136725c28b7b4e362d29e3689e84b0a08d7b7ab7004a169843920ca5b7065d0c884158951ca119bf45e33b5c6aea741c0113f210f5
-  data.tar.gz: 3be617ef6b3008087025c01b515c76d3a0eb6d77dda033ad57f2eaa2a691033e5b7336cc3a53684d69f5656333610a6b74956e3cfe52152d637f1f3c2c4cac34
+  metadata.gz: 9bf429b82738b7bcfc3ed90ad64d46bf86531a09330de9a020fd058d23047f130b1b19450bff41baade22372de960c27fee6808688a1d2363bca5c27fbd9274c
+  data.tar.gz: b4b51d664ac7fc469003a01c0a54fad91654678f079cc71586b2481b72259988f971efa8954298f528af5cf65b60d01e23cd45985cc066b64df20061bcf3859e

data/README.md

@@ -72,7 +72,9 @@ implementations:
 * Ruby 1.9.2
 * Ruby 1.9.3
 * Ruby 2.0.0
-* Ruby 2.1.1
+* Ruby 2.1
+* Ruby 2.2.4
+* Ruby 2.3.0
 * [JRuby][]
 * [Rubinius][]
 * [MacRuby][] (not tested on Travis CI)

data/lib/multi_json.rb

@@ -8,34 +8,34 @@ module MultiJson
   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\n" \
+      'Use 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\n" \
+      'Use MultiJson.load_options or MultiJson.dump_options instead'
 
-    self.load_options
+    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'}
 
   REQUIREMENT_MAP = [
-    ['oj',           :oj],
-    ['yajl',         :yajl],
-    ['jrjackson',    :jr_jackson],
-    ['json/ext',     :json_gem],
-    ['gson',         :gson],
-    ['json/pure',    :json_pure]
+    [:oj,         'oj'],
+    [:yajl,       'yajl'],
+    [:jr_jackson, 'jrjackson'],
+    [:json_gem,   'json/ext'],
+    [:gson,       'gson'],
+    [:json_pure,  'json/pure'],
   ]
 
   # The default adapter based on what you currently
@@ -49,7 +49,7 @@ module MultiJson
     return :json_gem if defined?(::JSON::JSON_LOADED)
     return :gson if defined?(::Gson)
 
-    REQUIREMENT_MAP.each do |library, adapter|
+    REQUIREMENT_MAP.each do |adapter, library|
       begin
         require library
         return adapter
@@ -58,22 +58,22 @@ module MultiJson
       end
     end
 
-    Kernel.warn '[WARNING] MultiJson is using the default adapter (ok_json).' +
+    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 default_engine default_adapter
+  alias_method :default_engine, :default_adapter
 
   # Get the current adapter class.
   def adapter
     return @adapter if defined?(@adapter) && @adapter
 
-    self.use nil # load default adapter
+    use nil # load default adapter
 
     @adapter
   end
-  alias engine adapter
+  alias_method :engine, :adapter
 
   # Set the JSON parser utilizing a symbol, string, or class.
   # Supported by default are:
@@ -89,8 +89,8 @@ module MultiJson
   def use(new_adapter)
     @adapter = load_adapter(new_adapter)
   end
-  alias adapter= use
-  alias engine= use
+  alias_method :adapter=, :use
+  alias_method :engine=, :use
 
   def load_adapter(new_adapter)
     case new_adapter
@@ -101,7 +101,7 @@ module MultiJson
     when Class, Module
       new_adapter
     else
-      raise ::LoadError, new_adapter
+      fail ::LoadError, new_adapter
     end
   rescue ::LoadError => exception
     raise AdapterError.build(exception)
@@ -113,7 +113,7 @@ module MultiJson
   #
   # <tt>:symbolize_keys</tt> :: If true, will use symbols instead of strings for the keys.
   # <tt>:adapter</tt> :: If set, the selected adapter will be used for this call.
-  def load(string, options={})
+  def load(string, options = {})
     adapter = current_adapter(options)
     begin
       adapter.load(string, options)
@@ -121,10 +121,10 @@ module MultiJson
       raise ParseError.build(exception, string)
     end
   end
-  alias decode load
+  alias_method :decode, :load
 
-  def current_adapter(options={})
-    if new_adapter = options[:adapter]
+  def current_adapter(options = {})
+    if (new_adapter = options[:adapter])
       load_adapter(new_adapter)
     else
       adapter
@@ -132,21 +132,22 @@ module MultiJson
   end
 
   # Encodes a Ruby object as JSON.
-  def dump(object, options={})
+  def dump(object, options = {})
     current_adapter(options).dump(object, options)
   end
-  alias encode dump
+  alias_method :encode, :dump
 
   #  Executes passed block using specified adapter.
   def with_adapter(new_adapter)
-    old_adapter, self.adapter = adapter, new_adapter
+    old_adapter = adapter
+    self.adapter = new_adapter
     yield
   ensure
     self.adapter = old_adapter
   end
-  alias with_engine with_adapter
+  alias_method :with_engine, :with_adapter
 
-  private
+private
 
   def load_adapter_from_string_name(name)
     name = ALIASES.fetch(name, name)
@@ -154,5 +155,4 @@ module MultiJson
     klass_name = name.to_s.split('_').map(&:capitalize) * ''
     MultiJson::Adapters.const_get(klass_name)
   end
-
 end

data/lib/multi_json/adapter.rb

@@ -6,22 +6,21 @@ module MultiJson
     extend Options
     include Singleton
     class << self
-
       def defaults(action, value)
         metaclass = class << self; self; end
 
         metaclass.instance_eval do
-          define_method("default_#{action}_options"){ value }
+          define_method("default_#{action}_options") { value }
         end
       end
 
-      def load(string, options={})
-        raise self::ParseError if blank?(string)
+      def load(string, options = {})
+        fail self::ParseError if blank?(string)
         string = string.read if string.respond_to?(:read)
         instance.load(string, load_options(options).merge(MultiJson.load_options(options)).merge!(options))
       end
 
-      def dump(object, options={})
+      def dump(object, options = {})
         instance.dump(object, dump_options(options).merge(MultiJson.dump_options(options)).merge!(options))
       end
 
@@ -32,7 +31,6 @@ module MultiJson
       rescue ArgumentError # invalid byte sequence in UTF-8
         false
       end
-
     end
   end
 end

data/lib/multi_json/adapters/gson.rb

@@ -8,11 +8,11 @@ module MultiJson
     class Gson < Adapter
       ParseError = ::Gson::DecodeError
 
-      def load(string, options={})
+      def load(string, options = {})
         ::Gson::Decoder.new(options).decode(string)
       end
 
-      def dump(object, options={})
+      def dump(object, options = {})
         ::Gson::Encoder.new(options).encode(object)
       end
     end

data/lib/multi_json/adapters/jr_jackson.rb

@@ -7,7 +7,7 @@ module MultiJson
     class JrJackson < Adapter
       ParseError = ::JrJackson::ParseError
 
-      def load(string, options={}) #:nodoc:
+      def load(string, options = {}) #:nodoc:
         ::JrJackson::Json.load(string, options)
       end
 
@@ -16,7 +16,7 @@ module MultiJson
           ::JrJackson::Json.dump(object)
         end
       else
-        def dump(object, options={})
+        def dump(object, options = {})
           ::JrJackson::Json.dump(object, options)
         end
       end

data/lib/multi_json/adapters/json_common.rb

@@ -5,7 +5,7 @@ module MultiJson
     class JsonCommon < Adapter
       defaults :load, :create_additions => false, :quirks_mode => true
 
-      def load(string, options={})
+      def load(string, options = {})
         if string.respond_to?(:force_encoding)
           string = string.dup.force_encoding(::Encoding::ASCII_8BIT)
         end
@@ -14,7 +14,7 @@ module MultiJson
         ::JSON.parse(string, options)
       end
 
-      def dump(object, options={})
+      def dump(object, options = {})
         options.merge!(::JSON::PRETTY_STATE_PROTOTYPE.to_h) if options.delete(:pretty)
         object.to_json(options)
       end

data/lib/multi_json/adapters/nsjsonserialization.rb

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

data/lib/multi_json/adapters/oj.rb

@@ -10,12 +10,12 @@ module MultiJson
 
       ParseError = defined?(::Oj::ParseError) ? ::Oj::ParseError : SyntaxError
 
-      def load(string, options={})
+      def load(string, options = {})
         options[:symbol_keys] = options.delete(:symbolize_keys)
         ::Oj.load(string, options)
       end
 
-      def dump(object, options={})
+      def dump(object, options = {})
         options.merge!(:indent => 2) if options[:pretty]
         options[:indent] = options[:indent].to_i if options[:indent]
         ::Oj.dump(object, options)

data/lib/multi_json/adapters/ok_json.rb

@@ -8,14 +8,14 @@ module MultiJson
       include ConvertibleHashKeys
       ParseError = ::MultiJson::OkJson::Error
 
-      def load(string, options={})
+      def load(string, options = {})
         result = ::MultiJson::OkJson.decode("[#{string}]").first
         options[:symbolize_keys] ? symbolize_keys(result) : result
       rescue ArgumentError # invalid byte sequence in UTF-8
         raise ParseError
       end
 
-      def dump(object, options={})
+      def dump(object, _ = {})
         ::MultiJson::OkJson.valenc(stringify_keys(object))
       end
     end

data/lib/multi_json/adapters/yajl.rb

@@ -7,11 +7,11 @@ module MultiJson
     class Yajl < Adapter
       ParseError = ::Yajl::ParseError
 
-      def load(string, options={})
+      def load(string, options = {})
         ::Yajl::Parser.new(:symbolize_keys => options[:symbolize_keys]).parse(string)
       end
 
-      def dump(object, options={})
+      def dump(object, options = {})
         ::Yajl::Encoder.encode(object, options)
       end
     end

data/lib/multi_json/convertible_hash_keys.rb

@@ -1,6 +1,6 @@
 module MultiJson
   module ConvertibleHashKeys
-    private
+  private
 
     def symbolize_keys(hash)
       prepare_hash(hash) do |key|

data/lib/multi_json/options.rb

@@ -1,6 +1,5 @@
 module MultiJson
   module Options
-
     def load_options=(options)
       @load_options = options
     end
@@ -25,12 +24,12 @@ module MultiJson
       @default_dump_options ||= {}
     end
 
-    private
+  private
 
     def get_options(options, *args)
-      if options.respond_to?(:call) and options.arity
+      if options.respond_to?(:call) && options.arity
         options.arity == 0 ? options[] : options[*args]
-      elsif Hash === options or options.respond_to?(:to_hash)
+      elsif options.respond_to?(:to_hash)
         options.to_hash
       end
     end

data/lib/multi_json/vendor/okjson.rb

@@ -26,10 +26,10 @@ require 'stringio'
 
 module MultiJson
   # Some parts adapted from
-  # http://golang.org/src/pkg/json/decode.go and
-  # http://golang.org/src/pkg/utf8/utf8.go
+  # https://golang.org/src/encoding/json/decode.go and
+  # https://golang.org/src/unicode/utf8/utf8.go
   module OkJson
-    Upstream = '43'
+    Upstream = '45'
     extend self
 
 
@@ -266,14 +266,14 @@ module MultiJson
 
 
     def numtok(s)
-      m = /-?([1-9][0-9]+|[0-9])([.][0-9]+)?([eE][+-]?[0-9]+)?/.match(s)
+      m = /(-?(?:[1-9][0-9]+|[0-9]))([.][0-9]+)?([eE][+-]?[0-9]+)?/.match(s)
       if m && m.begin(0) == 0
         if !m[2] && !m[3]
           [:val, m[0], Integer(m[0])]
         elsif m[2]
           [:val, m[0], Float(m[0])]
         else
-          [:val, m[0], Integer(m[1])*(10**Integer(m[3][1..-1]))]
+          [:val, m[0], Integer(m[1])*(10**m[3][1..-1].to_i(10))]
         end
       else
         []

data/lib/multi_json/version.rb

@@ -1,19 +1,16 @@
 module MultiJson
   class Version
-    MAJOR =  1 unless defined? MultiJson::Version::MAJOR
+    MAJOR = 1 unless defined? MultiJson::Version::MAJOR
     MINOR = 11 unless defined? MultiJson::Version::MINOR
-    PATCH =  2 unless defined? MultiJson::Version::PATCH
-    PRE =  nil unless defined? MultiJson::Version::PRE
+    PATCH = 3 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('.')
       end
-
     end
-
   end
 
   VERSION = Version.to_s.freeze

data/multi_json.gemspec

@@ -1,20 +1,20 @@
 # coding: utf-8
-require File.expand_path("../lib/multi_json/version.rb", __FILE__)
+require File.expand_path('../lib/multi_json/version.rb', __FILE__)
 
 Gem::Specification.new do |spec|
-  spec.authors       = ["Michael Bleigh", "Josh Kalderimis", "Erik Michaels-Ober", "Pavel Pravosud"]
-  spec.cert_chain    = %w[certs/rwz.pem]
-  spec.summary       = "A common interface to multiple JSON libraries."
-  spec.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."
-  spec.email         = %w[michael@intridea.com josh.kalderimis@gmail.com sferik@gmail.com pavel@pravosud.com]
-  spec.files         = Dir["CHANGELOG.md", "CONTRIBUTING.md", "LICENSE.md", "README.md", "multi_json.gemspec", "lib/**/*"]
-  spec.homepage      = "http://github.com/intridea/multi_json"
-  spec.license       = "MIT"
-  spec.name          = "multi_json"
-  spec.require_path  = "lib"
-  spec.signing_key   = File.expand_path("~/.gem/private_key.pem") if $0 =~ /gem\z/
+  spec.authors       = ['Michael Bleigh', 'Josh Kalderimis', 'Erik Michaels-Ober', 'Pavel Pravosud']
+  spec.cert_chain    = %w(certs/rwz.pem)
+  spec.summary       = 'A common interface to multiple JSON libraries.'
+  spec.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.'
+  spec.email         = %w(michael@intridea.com josh.kalderimis@gmail.com sferik@gmail.com pavel@pravosud.com)
+  spec.files         = Dir['CHANGELOG.md', 'CONTRIBUTING.md', 'LICENSE.md', 'README.md', 'multi_json.gemspec', 'lib/**/*']
+  spec.homepage      = 'http://github.com/intridea/multi_json'
+  spec.license       = 'MIT'
+  spec.name          = 'multi_json'
+  spec.require_path  = 'lib'
+  spec.signing_key   = File.expand_path('~/.ssh/gem-private_key.pem') if $PROGRAM_NAME =~ /gem\z/
   spec.version       = MultiJson::Version
 
-  spec.required_rubygems_version = ">= 1.3.5"
-  spec.add_development_dependency "bundler", "~> 1.0"
+  spec.required_rubygems_version = '>= 1.3.5'
+  spec.add_development_dependency 'bundler', '~> 1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: multi_json
 version: !ruby/object:Gem::Version
-  version: 1.11.2
+  version: 1.11.3
 platform: ruby
 authors:
 - Michael Bleigh
@@ -15,25 +15,25 @@ cert_chain:
   -----BEGIN CERTIFICATE-----
   MIIDcDCCAligAwIBAgIBATANBgkqhkiG9w0BAQUFADA/MQ4wDAYDVQQDDAVwYXZl
   bDEYMBYGCgmSJomT8ixkARkWCHByYXZvc3VkMRMwEQYKCZImiZPyLGQBGRYDY29t
-  MB4XDTE1MDMwNDA0MTAzNVoXDTE2MDMwMzA0MTAzNVowPzEOMAwGA1UEAwwFcGF2
+  MB4XDTE2MDQyNDIyMDk1MVoXDTE3MDQyNDIyMDk1MVowPzEOMAwGA1UEAwwFcGF2
   ZWwxGDAWBgoJkiaJk/IsZAEZFghwcmF2b3N1ZDETMBEGCgmSJomT8ixkARkWA2Nv
-  bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKgJODgg1dH3weeyKtQF
-  mhC3C8gleHSTZYAt1pMBZQ6QmRD7/kLIfLTJB/zgFUVoNoHVZ8qyFmx89reqk5Z4
-  x/rIVskzpB76MushyaEJhw5UrxEZvoCK0b+nSUR8NT0YcznkjSbALBBagny5NWHn
-  98LbVtIQYXdJTgC8xvV1u2Bix1JI/Qv1wuDKCw14XF2AFmT4nPt40FEUk4zWwbGI
-  rdKjssA43TGDjzKmzdOpJ4aOble+Zq6N7jBacMdlsqQAvQ0bbGLokp8W7Ci/UNWC
-  Q8DwDrjlbURMu729T70yuswrQHyxmh7SISMmjp44+C5ElwVbfcCQQxiwsdAcE3zD
-  ST0CAwEAAaN3MHUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFJ7X
-  Ly29ycziHHerLL3NCavLRSv5MB0GA1UdEQQWMBSBEnBhdmVsQHByYXZvc3VkLmNv
+  bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK+YCSpSUOeZvxOyp0Zm
+  DhlQ9Kc8ZxgaB3ekCS6lp7hV+eE6nZ84j4RLEqhfx0Vffx+yCmSx0lWum6eY9aOy
+  rr+uCtiSiL+HR7t6KHqQ5myXwIvT7B+SqMYw8223fMFZMUit73PfTaMlIon+EsZB
+  9TWzVU7MSRIHLr8P92/kExOuDhVcqFgmz+pWLeZjCk7r0JI0vxacFEK+ONjXThHk
+  W1IRwy8qaFNiUdnIfTRgZV45T/PHzuLttdkgySTDQkZp198t9Y0m0eEDhpPjHNlr
+  KoXtqUIqk1lmgsKKrOj4vsSX004v869GT45C4qR4/Oa2OyUsWiPf8N3GCYDBnK9C
+  RDcCAwEAAaN3MHUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFKm/
+  jUdmc0kO/erio7IwB4zhYGmxMB0GA1UdEQQWMBSBEnBhdmVsQHByYXZvc3VkLmNv
   bTAdBgNVHRIEFjAUgRJwYXZlbEBwcmF2b3N1ZC5jb20wDQYJKoZIhvcNAQEFBQAD
-  ggEBAJM/D4S0IHFerw9xcEKR2sehNn9deQKsS7auR3wAtxEitrPzKZb+8Uy3KVqP
-  Jt/z5WABxO2Bjd7IM+s445lZF6kDsGsYYydlEkf9yzOYrtVmISTJYrsApU8BZQfL
-  bWJg8zt1qjAKmmwULsCiYOfIGhUIhKVdVKrlkdXFFCB5v8R124FZXjo43WXZ2OCp
-  4W7nHEaaaZLxrPnZCAiaryoFUL06d78sxq9F4MYfSD4CLdwJjNb5TOrwVAXK9uE9
-  88AJhXqiqrY/cm2sh/xcGvGkhy9YOMyMZZrCAq4ruaXAB+tAkMrJ1paJDJRgErvJ
-  8Vss1khfU5E/Xig1ytdFyNPPkCA=
+  ggEBAGZprwh9PfxTaukluduGO2NWJpI5NC7A/OpoVFrtLTlMKDeoPvCgmNdSejS3
+  6CyH8P3SI3OEkymRnLtQiJeQ//WDb7QPPQDPG0ZuxAylc35ITz7jTPAFC41AoTWM
+  eSDWXP6yq0Gi6vlcvyIoBrvfFRPsg/gGhUp5DYKDLYzaEjNE30bME9fwDvlab7XR
+  v4so5Zmmcof+9apAoaXDtj7HijhJWJcia8GWN5ycuDX38qMcpSU9/PF84s567W6e
+  De8xFEGqLG8vclcTv7gGjDJH5FJTXuwLg41wc8p4ONXEBgLiaC7+S/DVDXWpYxuB
+  akI17ua4eRKTFNvBtzP1802SP1k=
   -----END CERTIFICATE-----
-date: 2015-07-04 00:00:00.000000000 Z
+date: 2016-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.5
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: A common interface to multiple JSON libraries.