multi_json 1.10.1 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea3e5f54b3fbdc2ee1e49fa66dcf731b63a57b58
-  data.tar.gz: 65e6e1fa41c9246473cf552675418118d8469e3a
+  metadata.gz: c98a15d47cdde07463c5cd6ee853d0eb6e17d27b
+  data.tar.gz: fe66e81cb3aaf716037b48e438c602cb405cb0d0
 SHA512:
-  metadata.gz: 7f445fca0136fc8daef294d0494691d0e2c9d79fa0d9477c225bbbe5c90f91cfaaa4a55ea633863a38467d6a4e71313c26e4203084cc54bfa71a3539e20eddb2
-  data.tar.gz: a61ffb653f2985d5d19b933ef1e503c8b9ad8b3ea70fb82ec05ad05552a9052b92564e8bb0f45311665ee7723986990ce649c135d7c5d6d1c6aa5994251f7499
+  metadata.gz: 853be4c2d237e50d0fc9156fe1f8cc4fadf19c55480aff5b02b7daca5cc7b08f923468291244f9706a40968d38fadaf44557af23a40aa0c232a84246dfffe220
+  data.tar.gz: b1851d3dc40055a6c8572dbc1eb0752e3dd7b97fb8519de0027b41413a9c1b6d68650df53927c86dfec9039a074505758421822d5a9f7b1866c82fac198c3cc2

data/CHANGELOG.md

@@ -1,7 +1,12 @@
+1.11.0
+------
+
+* [Make all adapters read IO object before load](https://github.com/intridea/multi_json/commit/167f559e18d4efee05e1f160a2661d16dbb215d4)
+
 1.10.1
 ------
 * [Explicitly require stringio for Gson adapter](https://github.com/intridea/multi_json/commit/623ec8142d4a212fa0db763bb71295789a119929)
-* [Do not read StrignIO object before passing it to JrJackson](https://github.com/intridea/multi_json/commit/a6dc935df08e7b3d5d701fbb9298384c96df0fde)
+* [Do not read StringIO object before passing it to JrJackson](https://github.com/intridea/multi_json/commit/a6dc935df08e7b3d5d701fbb9298384c96df0fde)
 
 1.10.0
 ------

data/lib/multi_json/adapter.rb

@@ -17,6 +17,7 @@ module MultiJson
 
       def load(string, options={})
         raise 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
 

data/lib/multi_json/adapters/gson.rb

@@ -9,7 +9,6 @@ module MultiJson
       ParseError = ::Gson::DecodeError
 
       def load(string, options={})
-        string = string.read if StringIO === string
         ::Gson::Decoder.new(options).decode(string)
       end
 

data/lib/multi_json/adapters/json_common.rb

@@ -6,8 +6,6 @@ module MultiJson
       defaults :load, :create_additions => false, :quirks_mode => true
 
       def load(string, options={})
-        string = string.read if string.respond_to?(:read)
-
         if string.respond_to?(:force_encoding)
           string = string.dup.force_encoding(::Encoding::ASCII_8BIT)
         end

data/lib/multi_json/adapters/nsjsonserialization.rb

@@ -7,7 +7,6 @@ module MultiJson
       ParseError = ::MultiJson::OkJson::Error
 
       def load(string, options={})
-        string = string.read if string.respond_to?(:read)
         data = string.dataUsingEncoding(NSUTF8StringEncoding)
         object = NSJSONSerialization.JSONObjectWithData(data, options: NSJSONReadingMutableContainers | NSJSONReadingMutableLeaves, error: nil)
         if object

data/lib/multi_json/adapters/ok_json.rb

@@ -9,7 +9,6 @@ module MultiJson
       ParseError = ::MultiJson::OkJson::Error
 
       def load(string, options={})
-        string = string.read if string.respond_to?(:read)
         result = ::MultiJson::OkJson.decode("[#{string}]").first
         options[:symbolize_keys] ? symbolize_keys(result) : result
       rescue ArgumentError # invalid byte sequence in UTF-8

data/lib/multi_json/version.rb

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

data/multi_json.gemspec

@@ -1,22 +1,20 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'multi_json/version'
+require File.expand_path("../lib/multi_json/version.rb", __FILE__)
 
 Gem::Specification.new do |spec|
-  spec.add_development_dependency 'bundler', '~> 1.0'
   spec.authors       = ["Michael Bleigh", "Josh Kalderimis", "Erik Michaels-Ober", "Pavel Pravosud"]
-  spec.cert_chain    = %w(certs/rwz.pem)
-  spec.description   = %q{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         = ['michael@intridea.com', 'josh.kalderimis@gmail.com', 'sferik@gmail.com']
-  spec.files         = Dir['.yardopts', 'CHANGELOG.md', 'CONTRIBUTING.md', 'LICENSE.md', 'README.md', 'Rakefile', 'multi_json.gemspec', 'Gemfile', '.document', '.rspec', '.travis.yml' ,'spec/**/*', 'lib/**/*']
-  spec.homepage      = 'http://github.com/intridea/multi_json'
-  spec.licenses      = ['MIT']
-  spec.name          = 'multi_json'
-  spec.require_paths = ['lib']
-  spec.required_rubygems_version = '>= 1.3.5'
+  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.summary       = %q{A common interface to multiple JSON libraries.}
-  spec.test_files    = Dir['spec/**/*']
   spec.version       = MultiJson::Version
+
+  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.10.1
+  version: 1.11.0
 platform: ruby
 authors:
 - Michael Bleigh
@@ -15,25 +15,25 @@ cert_chain:
   -----BEGIN CERTIFICATE-----
   MIIDcDCCAligAwIBAgIBATANBgkqhkiG9w0BAQUFADA/MQ4wDAYDVQQDDAVwYXZl
   bDEYMBYGCgmSJomT8ixkARkWCHByYXZvc3VkMRMwEQYKCZImiZPyLGQBGRYDY29t
-  MB4XDTEzMDgxMTE1NDYzNVoXDTE0MDgxMTE1NDYzNVowPzEOMAwGA1UEAwwFcGF2
+  MB4XDTE1MDMwNDA0MTAzNVoXDTE2MDMwMzA0MTAzNVowPzEOMAwGA1UEAwwFcGF2
   ZWwxGDAWBgoJkiaJk/IsZAEZFghwcmF2b3N1ZDETMBEGCgmSJomT8ixkARkWA2Nv
-  bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO8/eRkT0QewaGvJ4nnV
-  PejBZ50kVhQIQAdc+fdp4JyQX4Nn1FdxMe2q7BGYtSmdCLNnqO//m/HRzAyjIN5O
-  tYRcODPI4gCSJR2wlS72+PJvZv8m0FHnzO5BeQ2w5UcGifyaR/A/xOx1oFnNcDMB
-  N6yIOV7IcQrz1OaGwdr7r+1D4Y0ZM0bCJVq882UNsqlnLC3tHGMNsPEj+dgrysWp
-  c7XRxH+LZHfPVYy2JQ+DmAFZE8yjuRe/BgsAe59j7Zxtxu62BrLk2yWp44YZF0Gx
-  nwJh83W7cSmNDGKy72tIsuUAqSUunp3rJ2zkgkY3G9lFQHqIzxQJxdq8Ir0GFlUo
-  W6cCAwEAAaN3MHUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFDti
-  +zDBnPhm+3PsLqXqlFWuxiCsMB0GA1UdEQQWMBSBEnBhdmVsQHByYXZvc3VkLmNv
+  bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKgJODgg1dH3weeyKtQF
+  mhC3C8gleHSTZYAt1pMBZQ6QmRD7/kLIfLTJB/zgFUVoNoHVZ8qyFmx89reqk5Z4
+  x/rIVskzpB76MushyaEJhw5UrxEZvoCK0b+nSUR8NT0YcznkjSbALBBagny5NWHn
+  98LbVtIQYXdJTgC8xvV1u2Bix1JI/Qv1wuDKCw14XF2AFmT4nPt40FEUk4zWwbGI
+  rdKjssA43TGDjzKmzdOpJ4aOble+Zq6N7jBacMdlsqQAvQ0bbGLokp8W7Ci/UNWC
+  Q8DwDrjlbURMu729T70yuswrQHyxmh7SISMmjp44+C5ElwVbfcCQQxiwsdAcE3zD
+  ST0CAwEAAaN3MHUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFJ7X
+  Ly29ycziHHerLL3NCavLRSv5MB0GA1UdEQQWMBSBEnBhdmVsQHByYXZvc3VkLmNv
   bTAdBgNVHRIEFjAUgRJwYXZlbEBwcmF2b3N1ZC5jb20wDQYJKoZIhvcNAQEFBQAD
-  ggEBAC/fDN75QBrn+A5ERo9qlMd1DcAC3UNvjnWpHvRTva2I1PxIg2zEJphOimDo
-  hEvmruC3urPpMwEuAsRfyL6+5SRBnAfLP4Yu7SFYuMRtnZvIYVUgUmxoteISbm7g
-  FPXe8v3M5aYJ1e/VM11G+2ZwXsAx/rH4kaAhFBMQadrnamluFHX+tdTVCbEwZW/5
-  NrgsYshJ0qFLYhfktlApOAisrXZskGYAeUQSWVu5nzqQlQ3+wXNsPtATuZNtvUaB
-  7BTxdlSpJZDcAK29Ni3NRCRu6Air4wfDln0Ilzeuut6cJ4/j2/RlvsccVSRaEfOa
-  wM7GTK5SEdU3qelyBdc4+RRs6uU=
+  ggEBAJM/D4S0IHFerw9xcEKR2sehNn9deQKsS7auR3wAtxEitrPzKZb+8Uy3KVqP
+  Jt/z5WABxO2Bjd7IM+s445lZF6kDsGsYYydlEkf9yzOYrtVmISTJYrsApU8BZQfL
+  bWJg8zt1qjAKmmwULsCiYOfIGhUIhKVdVKrlkdXFFCB5v8R124FZXjo43WXZ2OCp
+  4W7nHEaaaZLxrPnZCAiaryoFUL06d78sxq9F4MYfSD4CLdwJjNb5TOrwVAXK9uE9
+  88AJhXqiqrY/cm2sh/xcGvGkhy9YOMyMZZrCAq4ruaXAB+tAkMrJ1paJDJRgErvJ
+  8Vss1khfU5E/Xig1ytdFyNPPkCA=
   -----END CERTIFICATE-----
-date: 2014-05-20 00:00:00.000000000 Z
+date: 2015-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -56,20 +56,15 @@ email:
 - michael@intridea.com
 - josh.kalderimis@gmail.com
 - sferik@gmail.com
+- pavel@pravosud.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".document"
-- ".rspec"
-- ".travis.yml"
-- ".yardopts"
 - CHANGELOG.md
 - CONTRIBUTING.md
-- Gemfile
 - LICENSE.md
 - README.md
-- Rakefile
 - lib/multi_json.rb
 - lib/multi_json/adapter.rb
 - lib/multi_json/adapter_error.rb
@@ -88,19 +83,6 @@ files:
 - lib/multi_json/vendor/okjson.rb
 - lib/multi_json/version.rb
 - multi_json.gemspec
-- spec/gson_adapter_spec.rb
-- spec/jr_jackson_adapter_spec.rb
-- spec/json_gem_adapter_spec.rb
-- spec/json_pure_adapter_spec.rb
-- spec/multi_json_spec.rb
-- spec/nsjsonserialization_adapter_spec.rb
-- spec/oj_adapter_spec.rb
-- spec/ok_json_adapter_spec.rb
-- spec/shared/adapter.rb
-- spec/shared/json_common_adapter.rb
-- spec/shared/options.rb
-- spec/spec_helper.rb
-- spec/yajl_adapter_spec.rb
 homepage: http://github.com/intridea/multi_json
 licenses:
 - MIT
@@ -121,22 +103,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.5
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: A common interface to multiple JSON libraries.
-test_files:
-- spec/gson_adapter_spec.rb
-- spec/jr_jackson_adapter_spec.rb
-- spec/json_gem_adapter_spec.rb
-- spec/json_pure_adapter_spec.rb
-- spec/multi_json_spec.rb
-- spec/nsjsonserialization_adapter_spec.rb
-- spec/oj_adapter_spec.rb
-- spec/ok_json_adapter_spec.rb
-- spec/shared/adapter.rb
-- spec/shared/json_common_adapter.rb
-- spec/shared/options.rb
-- spec/spec_helper.rb
-- spec/yajl_adapter_spec.rb
+test_files: []
 has_rdoc: 

data/.document

@@ -1,5 +0,0 @@
-LICENSE.md
-README.md
-bin/*
-features/**/*.feature
-lib/**/*.rb

data/.rspec

@@ -1,2 +0,0 @@
---color
---order random

data/.travis.yml

@@ -1,19 +0,0 @@
-bundler_args: --without development
-language: ruby
-rvm:
-  - 1.8.7-p374
-  - 1.9.2
-  - 1.9.3
-  - 2.0.0
-  - 2.1.1
-  - jruby-18mode
-  - jruby-19mode
-  - jruby-head
-  - rbx-2
-  - ruby-head
-matrix:
-  allow_failures:
-    - rvm: rbx-2
-    - rvm: jruby-head
-    - rvm: ruby-head
-  fast_finish: true

data/.yardopts

@@ -1,6 +0,0 @@
---markup markdown
--
-CHANGELOG.md
-CONTRIBUTING.md
-LICENSE.md
-README.md

data/Gemfile

@@ -1,29 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'rake', '>= 0.9'
-gem 'yard', '>= 0.8'
-
-gem 'json',      '~> 1.4', :require => nil
-gem 'json_pure', '~> 1.4', :require => nil
-
-group :development do
-  gem 'kramdown', '>= 0.14'
-  gem 'pry'
-  gem 'pry-debugger', :platforms => :mri
-end
-
-group :test do
-  gem 'rspec', '>= 2.14'
-end
-
-platforms :jruby do
-  gem 'gson', '>= 0.6', :require => nil
-  gem 'jrjackson', '~> 0.2.2', :require => nil
-end
-
-platforms :mingw, :mswin, :ruby do
-  gem 'oj', '~> 2.9', :require => nil
-  gem 'yajl-ruby', '~> 1.0', :require => nil
-end
-
-gemspec

data/Rakefile

@@ -1,25 +0,0 @@
-require 'bundler'
-Bundler::GemHelper.install_tasks
-
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:base_spec) do |task|
-  task.pattern = 'spec/multi_json_spec.rb'
-end
-
-namespace :adapters do
-  Dir['spec/*_adapter_spec.rb'].each do |adapter_spec|
-    adapter_name = adapter_spec[/(\w+)_adapter_spec/, 1]
-    desc "Run #{adapter_name} adapter specs"
-    RSpec::Core::RakeTask.new(adapter_name) do |task|
-      task.pattern = adapter_spec
-    end
-  end
-end
-
-task :spec => %w[base_spec adapters:oj adapters:yajl adapters:json_gem adapters:json_pure adapters:ok_json adapters:gson adapters:jr_jackson adapters:nsjsonserialization]
-
-task :default => :spec
-task :test => :spec
-
-require 'yard'
-YARD::Rake::YardocTask.new

data/spec/gson_adapter_spec.rb

@@ -1,10 +0,0 @@
-require 'spec_helper'
-
-exit true unless jruby?
-
-require 'shared/adapter'
-require 'multi_json/adapters/gson'
-
-describe MultiJson::Adapters::Gson do
-  it_behaves_like 'an adapter', described_class
-end

data/spec/jr_jackson_adapter_spec.rb

@@ -1,10 +0,0 @@
-require 'spec_helper'
-
-exit true unless jruby?
-
-require 'shared/adapter'
-require 'multi_json/adapters/jr_jackson'
-
-describe MultiJson::Adapters::JrJackson do
-  it_behaves_like 'an adapter', described_class
-end

data/spec/json_gem_adapter_spec.rb

@@ -1,9 +0,0 @@
-require 'spec_helper'
-require 'shared/adapter'
-require 'shared/json_common_adapter'
-require 'multi_json/adapters/json_gem'
-
-describe MultiJson::Adapters::JsonGem do
-  it_behaves_like 'an adapter', described_class
-  it_behaves_like 'JSON-like adapter', described_class
-end

data/spec/json_pure_adapter_spec.rb

@@ -1,9 +0,0 @@
-require 'spec_helper'
-require 'shared/adapter'
-require 'shared/json_common_adapter'
-require 'multi_json/adapters/json_pure'
-
-describe MultiJson::Adapters::JsonPure do
-  it_behaves_like 'an adapter', described_class
-  it_behaves_like 'JSON-like adapter', described_class
-end

data/spec/multi_json_spec.rb

@@ -1,200 +0,0 @@
-require 'spec_helper'
-require 'shared/options'
-
-describe MultiJson do
-  before(:all) do
-    # make sure all available libs are required
-    MultiJson::REQUIREMENT_MAP.each do |library, adapter|
-      begin
-        require library
-      rescue ::LoadError
-        next
-      end
-    end
-  end
-
-  context 'when no other json implementations are available' do
-    around do |example|
-      simulate_no_adapters{ example.call }
-    end
-
-    it 'defaults to ok_json if no other json implementions are available' do
-      silence_warnings do
-        expect(MultiJson.default_adapter).to eq(:ok_json)
-      end
-    end
-
-    it 'prints a warning' do
-      expect(Kernel).to receive(:warn).with(/warning/i)
-      MultiJson.default_adapter
-    end
-  end
-
-  context 'caching' do
-    before{ MultiJson.use adapter }
-    let(:adapter){ MultiJson::Adapters::JsonGem }
-    let(:json_string){ '{"abc":"def"}' }
-
-    it 'busts caches on global options change' do
-      MultiJson.load_options = { :symbolize_keys => true }
-      expect(MultiJson.load(json_string)).to eq(:abc => 'def')
-      MultiJson.load_options = nil
-      expect(MultiJson.load(json_string)).to eq('abc' => 'def')
-    end
-
-    it 'busts caches on per-adapter options change' do
-      adapter.load_options = { :symbolize_keys => true }
-      expect(MultiJson.load(json_string)).to eq(:abc => 'def')
-      adapter.load_options = nil
-      expect(MultiJson.load(json_string)).to eq('abc' => 'def')
-    end
-  end
-
-  it 'defaults to the best available gem' do
-    # Clear cache variable already set by previous tests
-    MultiJson.send(:remove_instance_variable, :@adapter) if MultiJson.instance_variable_defined?(:@adapter)
-
-    if jruby?
-      expect(MultiJson.adapter.to_s).to eq('MultiJson::Adapters::JrJackson')
-    else
-      expect(MultiJson.adapter.to_s).to eq('MultiJson::Adapters::Oj')
-    end
-  end
-
-  it 'looks for adapter even if @adapter variable is nil' do
-    MultiJson.send(:instance_variable_set, :@adapter, nil)
-    expect(MultiJson).to receive(:default_adapter).and_return(:ok_json)
-    expect(MultiJson.adapter).to eq(MultiJson::Adapters::OkJson)
-  end
-
-  it 'is settable via a symbol' do
-    MultiJson.use :json_gem
-    expect(MultiJson.adapter).to eq(MultiJson::Adapters::JsonGem)
-  end
-
-  it 'is settable via a case-insensitive string' do
-    MultiJson.use 'Json_Gem'
-    expect(MultiJson.adapter).to eq(MultiJson::Adapters::JsonGem)
-  end
-
-  it 'is settable via a class' do
-    adapter = Class.new
-    MultiJson.use adapter
-    expect(MultiJson.adapter).to eq(adapter)
-  end
-
-  it 'is settable via a module' do
-    adapter = Module.new
-    MultiJson.use adapter
-    expect(MultiJson.adapter).to eq(adapter)
-  end
-
-  it 'throws AdapterError on bad input' do
-    expect{ MultiJson.use 'bad adapter' }.to raise_error(MultiJson::AdapterError, /bad adapter/)
-  end
-
-  it 'gives access to original error when raising AdapterError' do
-    exception = get_exception(MultiJson::AdapterError){ MultiJson.use 'foobar' }
-    expect(exception.cause).to be_instance_of(::LoadError)
-    expect(exception.message).to include("-- multi_json/adapters/foobar")
-    expect(exception.message).to include("Did not recognize your adapter specification")
-  end
-
-  context 'using one-shot parser' do
-    before do
-      expect(MultiJson::Adapters::JsonPure).to receive(:dump).once.and_return('dump_something')
-      expect(MultiJson::Adapters::JsonPure).to receive(:load).once.and_return('load_something')
-    end
-
-    it 'should use the defined parser just for the call' do
-      MultiJson.use :json_gem
-      expect(MultiJson.dump('', :adapter => :json_pure)).to eq('dump_something')
-      expect(MultiJson.load('', :adapter => :json_pure)).to eq('load_something')
-      expect(MultiJson.adapter).to eq(MultiJson::Adapters::JsonGem)
-    end
-  end
-
-  it 'can set adapter for a block' do
-    MultiJson.use :ok_json
-    MultiJson.with_adapter(:json_pure) do
-      MultiJson.with_engine(:json_gem) do
-        expect(MultiJson.adapter).to eq(MultiJson::Adapters::JsonGem)
-      end
-      expect(MultiJson.adapter).to eq(MultiJson::Adapters::JsonPure)
-    end
-    expect(MultiJson.adapter).to eq(MultiJson::Adapters::OkJson)
-  end
-
-  it 'JSON gem does not create symbols on parse' do
-    MultiJson.with_engine(:json_gem) do
-      MultiJson.load('{"json_class":"ZOMG"}') rescue nil
-
-      expect{
-        MultiJson.load('{"json_class":"OMG"}') rescue nil
-      }.to_not change{Symbol.all_symbols.count}
-    end
-  end
-
-  unless jruby?
-    it 'Oj does not create symbols on parse' do
-      MultiJson.with_engine(:oj) do
-        MultiJson.load('{"json_class":"ZOMG"}') rescue nil
-
-        expect{
-          MultiJson.load('{"json_class":"OMG"}') rescue nil
-        }.to_not change{Symbol.all_symbols.count}
-      end
-    end
-
-    context 'with Oj.default_settings' do
-      around do |example|
-        options = Oj.default_options
-        Oj.default_options = { :symbol_keys => true }
-        MultiJson.with_engine(:oj){ example.call }
-        Oj.default_options = options
-      end
-
-      it 'ignores global settings' do
-        MultiJson.with_engine(:oj) do
-          example = '{"a": 1, "b": 2}'
-          expected = { 'a' => 1, 'b' => 2 }
-          expect(MultiJson.load(example)).to eq(expected)
-        end
-      end
-    end
-  end
-
-  describe 'default options' do
-    after(:all){ MultiJson.load_options = MultiJson.dump_options = nil }
-
-    it 'is deprecated' do
-      expect(Kernel).to receive(:warn).with(/deprecated/i)
-      silence_warnings{ MultiJson.default_options = {:foo => 'bar'} }
-    end
-
-    it 'sets both load and dump options' do
-      expect(MultiJson).to receive(:dump_options=).with(:foo => 'bar')
-      expect(MultiJson).to receive(:load_options=).with(:foo => 'bar')
-      silence_warnings{ MultiJson.default_options = {:foo => 'bar'} }
-    end
-  end
-
-  it_behaves_like 'has options', MultiJson
-
-  describe 'aliases' do
-    if jruby?
-      describe 'jrjackson' do
-        after{ expect(MultiJson.adapter).to eq(MultiJson::Adapters::JrJackson) }
-
-        it 'allows jrjackson alias as symbol' do
-          expect{ MultiJson.use :jrjackson }.not_to raise_error
-        end
-
-        it 'allows jrjackson alias as string' do
-          expect{ MultiJson.use 'jrjackson' }.not_to raise_error
-        end
-
-      end
-    end
-  end
-end

data/spec/nsjsonserialization_adapter_spec.rb

@@ -1,10 +0,0 @@
-require 'spec_helper'
-
-exit true unless macruby?
-
-require 'shared/adapter'
-require 'multi_json/adapters/nsjsonserialization'
-
-describe MultiJson::Adapters::Nsjsonserialization do
-  it_behaves_like 'an adapter', described_class
-end

data/spec/oj_adapter_spec.rb

@@ -1,20 +0,0 @@
-require 'spec_helper'
-
-exit true if jruby?
-
-require 'shared/adapter'
-require 'multi_json/adapters/oj'
-
-describe MultiJson::Adapters::Oj do
-  it_behaves_like 'an adapter', described_class
-
-  describe '.dump' do
-    describe '#dump_options' do
-      around{ |example| with_default_options(&example) }
-
-      it 'ensures indent is a Fixnum' do
-        expect{ MultiJson.dump(42, :indent => '')}.not_to raise_error
-      end
-    end
-  end
-end

data/spec/ok_json_adapter_spec.rb

@@ -1,7 +0,0 @@
-require 'spec_helper'
-require 'shared/adapter'
-require 'multi_json/adapters/ok_json'
-
-describe MultiJson::Adapters::OkJson do
-  it_behaves_like 'an adapter', described_class
-end

data/spec/shared/adapter.rb

@@ -1,236 +0,0 @@
-# encoding: UTF-8
-
-require 'shared/options'
-
-shared_examples_for 'an adapter' do |adapter|
-
-  before{ MultiJson.use adapter }
-
-  it_behaves_like 'has options', adapter
-
-  it 'does not modify argument hashes' do
-    options = { :symbolize_keys => true, :pretty => false, :adapter => :ok_json }
-    expect{MultiJson.load('{}', options)}.to_not change{options}
-    expect{MultiJson.dump([42], options)}.to_not change{options}
-  end
-
-  describe '.dump' do
-    describe '#dump_options' do
-      before{ MultiJson.dump_options = MultiJson.adapter.dump_options = {} }
-
-      after do
-        expect(MultiJson.adapter.instance).to receive(:dump).with(1, :foo => 'bar', :fizz => 'buzz')
-        MultiJson.dump(1, :fizz => 'buzz')
-        MultiJson.dump_options = MultiJson.adapter.dump_options = nil
-      end
-
-      it 'respects global dump options' do
-        MultiJson.dump_options = {:foo => 'bar'}
-      end
-
-      it 'respects per-adapter dump options' do
-        MultiJson.adapter.dump_options = {:foo => 'bar'}
-      end
-
-      it 'adapter-specific are overridden by global options' do
-        MultiJson.adapter.dump_options = {:foo => 'foo'}
-        MultiJson.dump_options = {:foo => 'bar'}
-      end
-    end
-
-    it 'writes decodable JSON' do
-      [
-        {'abc' => 'def'},
-        [1, 2, 3, '4', true, false, nil]
-      ].each do |example|
-        expect(MultiJson.load(MultiJson.dump(example))).to eq(example)
-      end
-    end
-
-    unless 'json_pure' == adapter || 'json_gem' == adapter
-      it 'dumps time in correct format' do
-        time = Time.at(1355218745).utc
-
-        dumped_json = MultiJson.dump(time)
-        expected = if RUBY_VERSION > '1.9'
-          '2012-12-11 09:39:05 UTC'
-        else
-          'Tue Dec 11 09:39:05 UTC 2012'
-        end
-        expect(MultiJson.load(dumped_json)).to eq(expected)
-      end
-    end
-
-    it 'dumps symbol and fixnum keys as strings' do
-      [
-        [
-          {:foo => {:bar => 'baz'}},
-          {'foo' => {'bar' => 'baz'}},
-        ],
-        [
-          [{:foo => {:bar => 'baz'}}],
-          [{'foo' => {'bar' => 'baz'}}],
-        ],
-        [
-          {:foo => [{:bar => 'baz'}]},
-          {'foo' => [{'bar' => 'baz'}]},
-        ],
-        [
-          {1 => {2 => {3 => 'bar'}}},
-          {'1' => {'2' => {'3' => 'bar'}}}
-        ]
-      ].each do |example, expected|
-        dumped_json = MultiJson.dump(example)
-        expect(MultiJson.load(dumped_json)).to eq(expected)
-      end
-    end
-
-    it 'dumps rootless JSON' do
-      expect(MultiJson.dump('random rootless string')).to eq('"random rootless string"')
-      expect(MultiJson.dump(123)).to eq('123')
-    end
-
-    it 'passes options to the adapter' do
-      expect(MultiJson.adapter).to receive(:dump).with('foo', {:bar => :baz})
-      MultiJson.dump('foo', :bar => :baz)
-    end
-
-    it 'dumps custom objects that implement to_json' do
-      pending 'not supported' if adapter.name == 'MultiJson::Adapters::Gson'
-      klass = Class.new do
-        def to_json(*)
-          '"foobar"'
-        end
-      end
-      expect(MultiJson.dump(klass.new)).to eq('"foobar"')
-    end
-
-    it 'allows to dump JSON values' do
-      expect(MultiJson.dump(42)).to eq('42')
-    end
-
-    it 'allows to dump JSON with UTF-8 characters' do
-      expect(MultiJson.dump('color' => 'żółć')).to eq('{"color":"żółć"}')
-    end
-  end
-
-  describe '.load' do
-    describe '#load_options' do
-      before{ MultiJson.load_options = MultiJson.adapter.load_options = {} }
-
-      after do
-        expect(MultiJson.adapter.instance).to receive(:load).with('1', :foo => 'bar', :fizz => 'buzz')
-        MultiJson.load('1', :fizz => 'buzz')
-        MultiJson.load_options = MultiJson.adapter.load_options = nil
-      end
-
-      it 'respects global load options' do
-        MultiJson.load_options = {:foo => 'bar'}
-      end
-
-      it 'respects per-adapter load options' do
-        MultiJson.adapter.load_options = {:foo => 'bar'}
-      end
-
-      it 'adapter-specific are overridden by global options' do
-        MultiJson.adapter.load_options = {:foo => 'foo'}
-        MultiJson.load_options = {:foo => 'bar'}
-      end
-    end
-
-    it 'does not modify input' do
-      input = %Q{\n\n  {"foo":"bar"} \n\n\t}
-      expect{
-        MultiJson.load(input)
-      }.to_not change{ input }
-    end
-
-    # Ruby 1.8 doesn't support String encodings
-    if RUBY_VERSION > '1.9'
-      it 'does not modify input encoding' do
-
-        input = '[123]'
-        input.force_encoding('iso-8859-1')
-
-        expect{
-          MultiJson.load(input)
-        }.to_not change{ input.encoding }
-      end
-    end
-
-    it 'properly loads valid JSON' do
-      expect(MultiJson.load('{"abc":"def"}')).to eq('abc' => 'def')
-    end
-
-    it 'raises MultiJson::ParseError on blank input or invalid input' do
-      [nil, '{"abc"}', ' ', "\t\t\t", "\n", "\x82\xAC\xEF"].each do |input|
-        if input == "\x82\xAC\xEF"
-          pending 'GSON bug: https://github.com/avsej/gson.rb/issues/3' if adapter.name =~ /Gson/
-          pending 'JrJackson bug: https://github.com/guyboertje/jrjackson/issues/21' if adapter.name =~ /JrJackson/
-        end
-
-        expect{MultiJson.load(input)}.to raise_error(MultiJson::ParseError)
-      end
-    end
-
-    it 'raises MultiJson::ParseError with data on invalid JSON' do
-      data = '{invalid}'
-      exception = get_exception(MultiJson::ParseError){ MultiJson.load data }
-      expect(exception.data).to eq(data)
-      expect(exception.cause).to be_kind_of(MultiJson.adapter::ParseError)
-    end
-
-    it 'catches MultiJson::DecodeError for legacy support' do
-      data = '{invalid}'
-      exception = get_exception(MultiJson::DecodeError){ MultiJson.load data }
-      expect(exception.data).to eq(data)
-      expect(exception.cause).to be_kind_of(MultiJson.adapter::ParseError)
-    end
-
-    it 'catches MultiJson::LoadError for legacy support' do
-      data = '{invalid}'
-      exception = get_exception(MultiJson::LoadError){ MultiJson.load data }
-      expect(exception.data).to eq(data)
-      expect(exception.cause).to be_kind_of(MultiJson.adapter::ParseError)
-    end
-
-
-    it 'stringifys symbol keys when encoding' do
-      dumped_json = MultiJson.dump(:a => 1, :b => {:c => 2})
-      loaded_json = MultiJson.load(dumped_json)
-      expect(loaded_json).to eq('a' => 1, 'b' => {'c' => 2})
-    end
-
-    it 'properly loads valid JSON in StringIOs' do
-      json = StringIO.new('{"abc":"def"}')
-      expect(MultiJson.load(json)).to eq('abc' => 'def')
-    end
-
-    it 'allows for symbolization of keys' do
-      [
-        [
-          '{"abc":{"def":"hgi"}}',
-          {:abc => {:def => 'hgi'}},
-        ],
-        [
-          '[{"abc":{"def":"hgi"}}]',
-          [{:abc => {:def => 'hgi'}}],
-        ],
-        [
-          '{"abc":[{"def":"hgi"}]}',
-          {:abc => [{:def => 'hgi'}]},
-        ]
-      ].each do |example, expected|
-        expect(MultiJson.load(example, :symbolize_keys => true)).to eq(expected)
-      end
-    end
-
-    it 'allows to load JSON values' do
-      expect(MultiJson.load('42')).to eq(42)
-    end
-
-    it 'allows to load JSON with UTF-8 characters' do
-      expect(MultiJson.load('{"color":"żółć"}')).to eq('color' => 'żółć')
-    end
-  end
-end

data/spec/shared/json_common_adapter.rb

@@ -1,30 +0,0 @@
-shared_examples_for 'JSON-like adapter' do |adapter|
-  before{ MultiJson.use adapter }
-
-  describe '.dump' do
-    before{ MultiJson.dump_options = MultiJson.adapter.dump_options = nil }
-
-    describe 'with :pretty option set to true' do
-      it 'passes default pretty options' do
-        object = 'foo'
-        expect(object).to receive(:to_json).with(JSON::PRETTY_STATE_PROTOTYPE.to_h)
-        MultiJson.dump(object, :pretty => true)
-      end
-    end
-
-    describe 'with :indent option' do
-      it 'passes it on dump' do
-        object = 'foo'
-        expect(object).to receive(:to_json).with(:indent => "\t")
-        MultiJson.dump(object, :indent => "\t")
-      end
-    end
-  end
-
-  describe '.load' do
-    it 'passes :quirks_mode option' do
-      expect(::JSON).to receive(:parse).with('[123]', {:quirks_mode => false, :create_additions => false})
-      MultiJson.load('[123]', :quirks_mode => false)
-    end
-  end
-end

data/spec/shared/options.rb

@@ -1,119 +0,0 @@
-shared_examples_for 'has options' do |object|
-
-  if object.respond_to?(:call)
-    subject{ object.call }
-  else
-    subject{ object }
-  end
-
-  describe "dump options" do
-
-    before do
-      subject.dump_options = nil
-    end
-
-    after do
-      subject.dump_options = nil
-    end
-
-    it 'returns default options if not set' do
-      expect(subject.dump_options).to eq(subject.default_dump_options)
-    end
-
-    it 'allows hashes' do
-      subject.dump_options = {:foo => 'bar'}
-      expect(subject.dump_options).to eq(:foo => 'bar')
-    end
-
-    it 'allows objects that implement #to_hash' do
-      value = Class.new do
-        def to_hash
-          {:foo => 'bar'}
-        end
-      end.new
-
-      subject.dump_options = value
-      expect(subject.dump_options).to eq(:foo => 'bar')
-    end
-
-    it 'evaluates lambda returning options (with args)' do
-      subject.dump_options = lambda{ |a1, a2| { a1 => a2 }}
-      expect(subject.dump_options('1', '2')).to eq('1' => '2')
-    end
-
-    it 'evaluates lambda returning options (with no args)' do
-      subject.dump_options = lambda{{:foo => 'bar'}}
-      expect(subject.dump_options).to eq(:foo => 'bar')
-    end
-
-    it 'returns empty hash in all other cases' do
-      subject.dump_options = true
-      expect(subject.dump_options).to eq(subject.default_dump_options)
-
-      subject.dump_options = false
-      expect(subject.dump_options).to eq(subject.default_dump_options)
-
-      subject.dump_options = 10
-      expect(subject.dump_options).to eq(subject.default_dump_options)
-
-      subject.dump_options = nil
-      expect(subject.dump_options).to eq(subject.default_dump_options)
-    end
-  end
-
-  describe "load options" do
-
-    before do
-      subject.load_options = nil
-    end
-
-    after do
-      subject.load_options = nil
-    end
-
-    it 'returns default options if not set' do
-      expect(subject.load_options).to eq(subject.default_load_options)
-    end
-
-    it 'allows hashes' do
-      subject.load_options = {:foo => 'bar'}
-      expect(subject.load_options).to eq(:foo => 'bar')
-    end
-
-    it 'allows objects that implement #to_hash' do
-      value = Class.new do
-        def to_hash
-          {:foo => 'bar'}
-        end
-      end.new
-
-      subject.load_options = value
-      expect(subject.load_options).to eq(:foo => 'bar')
-    end
-
-    it 'evaluates lambda returning options (with args)' do
-      subject.load_options = lambda{ |a1, a2| { a1 => a2 }}
-      expect(subject.load_options('1', '2')).to eq('1' => '2')
-    end
-
-    it 'evaluates lambda returning options (with no args)' do
-      subject.load_options = lambda{{:foo => 'bar'}}
-      expect(subject.load_options).to eq(:foo => 'bar')
-    end
-
-    it 'returns empty hash in all other cases' do
-      subject.load_options = true
-      expect(subject.load_options).to eq(subject.default_load_options)
-
-      subject.load_options = false
-      expect(subject.load_options).to eq(subject.default_load_options)
-
-      subject.load_options = 10
-      expect(subject.load_options).to eq(subject.default_load_options)
-
-      subject.load_options = nil
-      expect(subject.load_options).to eq(subject.default_load_options)
-    end
-  end
-
-end

data/spec/spec_helper.rb

@@ -1,77 +0,0 @@
-require 'multi_json'
-require 'rspec'
-
-RSpec.configure do |config|
-  config.expect_with :rspec do |c|
-    c.syntax = :expect
-  end
-end
-
-def silence_warnings
-  old_verbose, $VERBOSE = $VERBOSE, nil
-  yield
-ensure
-  $VERBOSE = old_verbose
-end
-
-def macruby?
-  defined?(RUBY_ENGINE) && RUBY_ENGINE == 'macruby'
-end
-
-def jruby?
-  defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
-end
-
-def undefine_constants(*consts)
-  values = {}
-  consts.each do |const|
-    if Object.const_defined?(const)
-      values[const] = Object.const_get(const)
-      Object.send :remove_const, const
-    end
-  end
-
-  yield
-
-ensure
-  values.each do |const, value|
-    Object.const_set const, value
-  end
-end
-
-def break_requirements
-  requirements = MultiJson::REQUIREMENT_MAP
-  MultiJson::REQUIREMENT_MAP.each_with_index do |(library, adapter), index|
-    MultiJson::REQUIREMENT_MAP[index] = ["foo/#{library}", adapter]
-  end
-
-  yield
-ensure
-  requirements.each_with_index do |(library, adapter), index|
-    MultiJson::REQUIREMENT_MAP[index] = [library, adapter]
-  end
-end
-
-def simulate_no_adapters
-  break_requirements do
-    undefine_constants :JSON, :Oj, :Yajl, :Gson, :JrJackson do
-      yield
-    end
-  end
-end
-
-def get_exception(exception_class = StandardError)
-  begin
-    yield
-  rescue exception_class => exception
-    exception
-  end
-end
-
-def with_default_options
-  adapter = MultiJson.adapter
-  adapter.load_options = adapter.dump_options = MultiJson.load_options = MultiJson.dump_options = nil
-  yield
-ensure
-  adapter.load_options = adapter.dump_options = MultiJson.load_options = MultiJson.dump_options = nil
-end

data/spec/yajl_adapter_spec.rb

@@ -1,10 +0,0 @@
-require 'spec_helper'
-
-exit true if jruby?
-
-require 'shared/adapter'
-require 'multi_json/adapters/yajl'
-
-describe MultiJson::Adapters::Yajl do
-  it_behaves_like 'an adapter', described_class
-end