multi_json 1.4.0 → 1.5.0

data/README.md

@@ -65,6 +65,22 @@ implementation, you will be personally responsible for providing patches in a
 timely fashion. If critical issues for a particular implementation exist at the
 time of a major release, support for that Ruby version may be dropped.
 
+## Versioning
+
+This library aims to adhere to [Semantic Versioning 2.0.0][semver]. Violations
+of this scheme should be reported as bugs. Specifically, if a minor or patch
+version is released that breaks backward compatibility, that version should be
+immediately yanked and/or a new version should be immediately released that
+restores compatibility. Breaking changes to the public API will only be
+introduced with new major versions. As a result of this policy, you can (and
+should) specify a dependency on this gem using the [Pessimistic Version
+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 Michael Bleigh, Josh Kalderimis, Erik Michaels-Ober, and Intridea, Inc.
 See [LICENSE][] for details.

data/lib/multi_json.rb

@@ -117,6 +117,14 @@ module MultiJson
     # :nodoc:
     alias :encode :dump
 
+    def with_adapter(new_adapter)
+      old_adapter, self.adapter = adapter, new_adapter
+      yield
+    ensure
+      self.adapter = old_adapter
+    end
+    alias :with_engine :with_adapter
+
   end
 
 end

data/lib/multi_json/adapters/ok_json.rb

@@ -23,7 +23,7 @@ module MultiJson
 
       def self.stringify_keys(object) #:nodoc:
         modify_keys(object) do |key|
-          key.is_a?(Symbol) ? key.to_s : key
+          key.respond_to?(:to_s) ? key.to_s : key
         end
       end
 

data/lib/multi_json/version.rb

@@ -1,3 +1,3 @@
 module MultiJson
-  VERSION = "1.4.0" unless defined?(MultiJson::VERSION)
+  VERSION = "1.5.0" unless defined?(MultiJson::VERSION)
 end

data/multi_json.gemspec

@@ -2,10 +2,10 @@
 require File.expand_path("../lib/multi_json/version", __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.add_development_dependency 'rake', '~> 0.9'
-  gem.add_development_dependency 'rdoc', '~> 3.9'
-  gem.add_development_dependency 'rspec', '~> 2.6'
-  gem.add_development_dependency 'simplecov', '~> 0.4'
+  gem.add_development_dependency 'rake', '>= 0.9'
+  gem.add_development_dependency 'rdoc', '>= 3.9'
+  gem.add_development_dependency 'rspec', '>= 2.6'
+  gem.add_development_dependency 'simplecov', '>= 0.4'
   gem.authors = ["Michael Bleigh", "Josh Kalderimis", "Erik Michaels-Ober"]
   gem.description = %q{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.}
   gem.email = ['michael@intridea.com', 'josh.kalderimis@gmail.com', 'sferik@gmail.com']

data/spec/adapter_shared_example.rb

@@ -18,7 +18,7 @@ shared_examples_for "an adapter" do |adapter|
       end
     end
 
-    it 'dumps symbol keys as strings' do
+    it 'dumps symbol and fixnum keys as strings' do
       [
         [
           {:foo => {:bar => 'baz'}},
@@ -31,6 +31,10 @@ shared_examples_for "an adapter" do |adapter|
         [
           {:foo => [{:bar => 'baz'}]},
           {'foo' => [{'bar' => 'baz'}]},
+        ],
+        [
+          {1 => {2 => {3 => 'bar'}}},
+          {'1' => {'2' => {'3' => 'bar'}}}
         ]
       ].each do |example, expected|
         dumped_json = MultiJson.dump(example)

data/spec/multi_json_spec.rb

@@ -73,11 +73,22 @@ describe 'MultiJson' 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_s).to eq "MultiJson::Adapters::JsonGem"
+        expect(MultiJson.adapter.name).to eq "MultiJson::Adapters::JsonGem"
       end
     end
   end
 
+  it 'can set adapter for a block' do
+    MultiJson.use :ok_json
+    MultiJson.with_adapter(:json_pure) do
+      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
+
   %w(json_gem json_pure nsjsonserialization oj ok_json yajl).each do |adapter|
     next if !macruby? && adapter == 'nsjsonserialization'
     next if jruby? && (adapter == 'oj' || adapter == 'yajl')

metadata

@@ -1,98 +1,94 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: multi_json
-version: !ruby/object:Gem::Version 
-  hash: 7
+version: !ruby/object:Gem::Version
   prerelease: 
-  segments: 
-  - 1
-  - 4
-  - 0
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
-authors: 
+authors:
 - Michael Bleigh
 - Josh Kalderimis
 - Erik Michaels-Ober
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-11-30 00:00:00 -08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-12-10 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.9'
+    none: false
   name: rake
+  type: :development
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.9'
+    none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.9'
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 9
-        version: "0.9"
-  type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
   name: rdoc
+  type: :development
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.9'
+    none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.6'
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 3
-        - 9
-        version: "3.9"
-  type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
   name: rspec
+  type: :development
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.6'
+    none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.4'
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 6
-        version: "2.6"
-  type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
   name: simplecov
+  type: :development
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.4'
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        - 4
-        version: "0.4"
-  type: :development
-  version_requirements: *id004
-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: 
+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:
 - michael@intridea.com
 - josh.kalderimis@gmail.com
 - sferik@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.md
 - README.md
-files: 
+files:
 - LICENSE.md
 - README.md
 - Rakefile
@@ -114,43 +110,34 @@ files:
 - lib/multi_json/vendor/okjson.rb
 - lib/multi_json/version.rb
 - lib/multi_json.rb
-has_rdoc: true
 homepage: http://github.com/intridea/multi_json
-licenses: 
+licenses:
 - MIT
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
+  none: false
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A gem to provide swappable JSON backends.
-test_files: 
+test_files:
 - spec/adapter_shared_example.rb
 - spec/helper.rb
 - spec/multi_json_spec.rb
+has_rdoc: