multi_json 1.5.1 → 1.6.0

data/spec/json_common_shared_example.rb

@@ -0,0 +1,34 @@
+shared_examples_for 'JSON-like adapter' do |adapter|
+  before do
+    begin
+      MultiJson.use adapter
+    rescue LoadError
+      pending "Adapter #{adapter} couldn't be loaded (not installed?)"
+    end
+  end
+
+  describe '.dump' do
+    describe 'with :pretty option set to true' do
+      it 'passes default pretty options' do
+        ::JSON.should_receive(:generate).with(['foo'], JSON::PRETTY_STATE_PROTOTYPE.to_h).and_return('["foo"]')
+        MultiJson.dump('foo', :pretty => true)
+      end
+    end
+
+    describe 'with :indent option' do
+      it 'passes it on dump' do
+        ::JSON.should_receive(:generate).with(['foo'], {:indent => "\t"}).and_return('["foo"]')
+        MultiJson.dump('foo', :indent => "\t")
+      end
+    end
+  end
+
+  describe '.load' do
+    describe 'with :quirks_mode option' do
+      it 'passes it on load' do
+        ::JSON.should_receive(:parse).with('["foo"]', {:quirks_mode => true, :create_additions => false}).and_return(['foo'])
+        MultiJson.load('"foo"', :quirks_mode => true)
+      end
+    end
+  end
+end

data/spec/multi_json_spec.rb

@@ -1,24 +1,26 @@
 require 'helper'
 require 'adapter_shared_example'
+require 'json_common_shared_example'
 require 'stringio'
 
 describe 'MultiJson' do
   context 'adapters' do
-    before do
-      MultiJson.use nil
-    end
+    before{ MultiJson.use nil }
+
     context 'when no other json implementations are available' do
       before do
         @old_map = MultiJson::REQUIREMENT_MAP
         @old_json = Object.const_get :JSON if Object.const_defined?(:JSON)
         @old_oj = Object.const_get :Oj if Object.const_defined?(:Oj)
         @old_yajl = Object.const_get :Yajl if Object.const_defined?(:Yajl)
+        @old_gson = Object.const_get :Gson if Object.const_defined?(:Gson)
         MultiJson::REQUIREMENT_MAP.each_with_index do |(library, adapter), index|
           MultiJson::REQUIREMENT_MAP[index] = ["foo/#{library}", adapter]
         end
         Object.send :remove_const, :JSON if @old_json
         Object.send :remove_const, :Oj if @old_oj
         Object.send :remove_const, :Yajl if @old_yajl
+        Object.send :remove_const, :Gson if @old_gson
       end
 
       after do
@@ -28,9 +30,11 @@ describe 'MultiJson' do
         Object.const_set :JSON, @old_json if @old_json
         Object.const_set :Oj, @old_oj if @old_oj
         Object.const_set :Yajl, @old_yajl if @old_yajl
+        Object.const_set :Gson, @old_gson if @old_gson
       end
 
       it 'defaults to ok_json if no other json implementions are available' do
+        Kernel.stub(:warn)
         expect(MultiJson.default_adapter).to eq :ok_json
       end
 
@@ -52,6 +56,12 @@ describe 'MultiJson' do
       end
     end
 
+    it 'looks for adapter even if @adapter variable is nil' do
+      MultiJson.send(:instance_variable_set, :@adapter, nil)
+      MultiJson.should_receive(:default_adapter).and_return(:ok_json)
+      expect(MultiJson.adapter.name).to eq 'MultiJson::Adapters::OkJson'
+    end
+
     it 'is settable via a symbol' do
       MultiJson.use :json_gem
       expect(MultiJson.adapter.name).to eq 'MultiJson::Adapters::JsonGem'
@@ -62,18 +72,23 @@ describe 'MultiJson' do
       expect(MultiJson.adapter.name).to eq 'MockDecoder'
     end
 
-    context "using one-shot parser" do
-      before(:each) do
+    it 'is settable via a module' do
+      MultiJson.use MockModuleDecoder
+      expect(MultiJson.adapter.name).to eq 'MockModuleDecoder'
+    end
+
+    context 'using one-shot parser' do
+      before do
         require 'multi_json/adapters/json_pure'
         MultiJson::Adapters::JsonPure.should_receive(:dump).exactly(1).times.and_return('dump_something')
         MultiJson::Adapters::JsonPure.should_receive(:load).exactly(1).times.and_return('load_something')
       end
 
-      it "should use the defined parser just for the call" do
+      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.name).to eq "MultiJson::Adapters::JsonGem"
+        expect(MultiJson.adapter.name).to eq 'MultiJson::Adapters::JsonGem'
       end
     end
   end
@@ -81,38 +96,56 @@ describe 'MultiJson' do
   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.name).to eq 'MultiJson::Adapters::JsonGem'
+      end
       expect(MultiJson.adapter.name).to eq 'MultiJson::Adapters::JsonPure'
     end
-    MultiJson.with_engine(:yajl) do
-      expect(MultiJson.adapter.name).to eq 'MultiJson::Adapters::Yajl'
-    end
     expect(MultiJson.adapter.name).to eq 'MultiJson::Adapters::OkJson'
   end
 
-  it 'does not create symbols on parse' do
+  it 'JSON gem does not create symbols on parse' do
     MultiJson.with_engine(:json_gem) do
-      before = Symbol.all_symbols
-      MultiJson.load('{"json_class":"OMGOMG"}') rescue nil
-      after = Symbol.all_symbols - before
-      expect(after).to eq []
+      MultiJson.load('{"json_class":"ZOMG"}') rescue nil
+
+      expect{
+        MultiJson.load('{"json_class":"OMG"}') rescue nil
+      }.to_not change{Symbol.all_symbols.count}
     end
   end
 
-  it 'oj does not create symbols on parse' do
-    MultiJson.with_engine(:oj) do
-      before = Symbol.all_symbols
-      MultiJson.load('{"json_class":"OMGOMG"}') rescue nil
-      after = Symbol.all_symbols - before
-      expect(after).to eq []
+  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
   end
 
-  %w(json_gem json_pure nsjsonserialization oj ok_json yajl).each do |adapter|
-    next if !macruby? && adapter == 'nsjsonserialization'
+  it 'has default_options setter' do
+    MultiJson.use MockDecoder
+    MockDecoder.should_receive(:dump).with('123', :foo => 'lol', :bar => 'bar', :fizz => 'buzz')
+    MultiJson.default_options = { :foo => 'foo', :bar => 'bar' }
+    MultiJson.dump('123', :fizz => 'buzz', :foo => 'lol')
+    MultiJson.default_options = {}
+  end
+
+  %w(gson json_gem json_pure nsjsonserialization oj ok_json yajl).each do |adapter|
+    next if adapter == 'gson' && !jruby?
+    next if adapter == 'nsjsonserialization' && !macruby?
     next if jruby? && (adapter == 'oj' || adapter == 'yajl')
+    context adapter do
+      it_behaves_like 'an adapter', adapter
+    end
+  end
 
+  %w(json_gem json_pure).each do |adapter|
     context adapter do
-      it_behaves_like "an adapter", adapter
+      it_behaves_like 'JSON-like adapter', adapter
     end
   end
 end

metadata

@@ -1,82 +1,62 @@
 --- !ruby/object:Gem::Specification
 name: multi_json
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.0
   prerelease: 
 platform: ruby
 authors:
 - Michael Bleigh
 - Josh Kalderimis
 - Erik Michaels-Ober
+- Pavel Pravosud
 autorequire: 
 bindir: bin
-cert_chain: []
-date: 2013-02-11 00:00:00.000000000 Z
+cert_chain:
+- !binary |-
+  LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURMakNDQWhhZ0F3SUJB
+  Z0lCQURBTkJna3Foa2lHOXcwQkFRVUZBREE5TVE4d0RRWURWUVFEREFaelpt
+  VnkKYVdzeEZUQVRCZ29Ka2lhSmsvSXNaQUVaRmdWbmJXRnBiREVUTUJFR0Nn
+  bVNKb21UOGl4a0FSa1dBMk52YlRBZQpGdzB4TXpBeU1ETXhNREF5TWpkYUZ3
+  MHhOREF5TURNeE1EQXlNamRhTUQweER6QU5CZ05WQkFNTUJuTm1aWEpwCmF6
+  RVZNQk1HQ2dtU0pvbVQ4aXhrQVJrV0JXZHRZV2xzTVJNd0VRWUtDWkltaVpQ
+  eUxHUUJHUllEWTI5dE1JSUIKSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4
+  QU1JSUJDZ0tDQVFFQWwweDVkeDh1S3hpN1Rrckl1eUJVVEpWQgp2MW85M25V
+  QjlqL3k0TTk2Z1Yycll3QWNpMUpQQnNlTmQ2RnliempvM1lHdUhsN0VRSHVT
+  SE5hZjFwMmx4ZXcvCnk2MEpYSUpCQmdQY0RLL0tDUDROVUhvZm0wamZvWUQr
+  SDV1TkpmSENOcTcvWnNUeE90RTNSYTkyczBCQ01UcG0Kd0JNTWxXUjVNdGRF
+  aElZdUJPNFhobmVqWWdIMEwvN0JMMmx5bW50Vm5zci9hZ2RRb29qUUNOMUlR
+  bXNSSnZyUgpkdVpSTzN0WnZvSW8xcEJjNEpFZWhEdXFDZXlCZ1BMT3FNb0t0
+  UWxvbGQxVFFzMWtXVUJLN0tXTUZFaEtDL0tnCnp5ektSSFFvOXlEWXdPdllu
+  Z29CTFkrVC9sd0NUNGR5c3NkaHpSYmZueEFoYUt1NFNBc3NJd2FDMDF5Vm93
+  SUQKQVFBQm96a3dOekFKQmdOVkhSTUVBakFBTUIwR0ExVWREZ1FXQkJTMHJ1
+  RGZSYWs1Y2kxT3BETlgvWmRERWtJcwppVEFMQmdOVkhROEVCQU1DQkxBd0RR
+  WUpLb1pJaHZjTkFRRUZCUUFEZ2dFQkFISFNNcy9NUDBzT2FMa0V2NEpvCnp2
+  a20zcW41QTZ0MHZhSHg3NzRjbWVqeU1VKzV3eVN4UmV6c3BMN1VMaDlOZXVL
+  Mk9oVStPZTNUcHFyQWc1VEsKUjhHUUlMblZ1MkZlbUdBNnNBa1BEbGNQdGdB
+  NmllSTE5UFpPRjZIVkxtYy9JRC9kUC9OZ1pXV3pFZXFRS21jSwoyK0hNK1NF
+  RURoWmtTY1lla3c0Wk9lMTY0WnRaRzgxNm9BdjV4MHBHaXRTSWt1bVVwN1Y4
+  aUVaLzZlaHI3WTllClhPZzRlZXVuNUwvSmptakFSb1cya05kdmtSRDNjMkVl
+  U0xxV3ZRUnNCbHlwSGZoczZKSnVMbHlaUEdoVTNSL3YKU2YzbFZLcEJDV2dS
+  cEdUdnk0NVhWcEIrNTl5MzNQSm1FdVExUFRFT1l2UXlhbzlVS01BQWFBTi83
+  cVdRdGpsMApobHc9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
+date: 2013-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '3.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '3.9'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '2.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '2.6'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '1.0'
 description: A gem to provide easy switching between different JSON backends, including
   Oj, Yajl, the JSON gem (with C-extensions), the pure-Ruby JSON gem, and OkJson.
 email:
@@ -85,10 +65,11 @@ email:
 - sferik@gmail.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- LICENSE.md
-- README.md
+extra_rdoc_files: []
 files:
+- .yardopts
+- CHANGELOG.md
+- CONTRIBUTING.md
 - LICENSE.md
 - README.md
 - Rakefile
@@ -99,7 +80,9 @@ files:
 - .travis.yml
 - spec/adapter_shared_example.rb
 - spec/helper.rb
+- spec/json_common_shared_example.rb
 - spec/multi_json_spec.rb
+- lib/multi_json/adapters/gson.rb
 - lib/multi_json/adapters/json_common.rb
 - lib/multi_json/adapters/json_gem.rb
 - lib/multi_json/adapters/json_pure.rb
@@ -114,8 +97,7 @@ homepage: http://github.com/intridea/multi_json
 licenses:
 - MIT
 post_install_message: 
-rdoc_options:
-- --charset=UTF-8
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -139,5 +121,6 @@ summary: A gem to provide swappable JSON backends.
 test_files:
 - spec/adapter_shared_example.rb
 - spec/helper.rb
+- spec/json_common_shared_example.rb
 - spec/multi_json_spec.rb
 has_rdoc: