multi_json 1.8.2 → 1.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 405bc62d55c229a4f869fb467808e194a090c0bd
-  data.tar.gz: 5b3f079d77935c2636d284e48b46452eeb0322c0
+  metadata.gz: 7df801671d8999a51f6f424a4021fb0ba92b02f5
+  data.tar.gz: 868ed7197a1c723fa44ad4dba0933abdb21224d2
 SHA512:
-  metadata.gz: d4826c05405be5c145d35f04d26192dc83992ad6e45063dcd36423d8bf023ec8a58559c16dc0246156394272f75bed3a4227c696eee0792efae26478bab3f084
-  data.tar.gz: e9931cadf5f9195265b2e0bb91f1c5d10c76fd7ac8dd3aee4513503219e10f2a5fc1a3b1f1968ebdf7313da4387292ab11904365d4fd8edc36b113cd157cbcc0
+  metadata.gz: a256f92792b885140a950127425c9ead3c60d41fcea230ad81a9dfa053f0c7e01b55798b4b5db984ffb083a9116236c1c8dd3a0ecf5d951cca7f9f7ddc4f0c6d
+  data.tar.gz: 47be9e4bc4f779987890b995db6f5bfa5e98801e8f2e8c5c1def2fc3fdaa590bc91a42f74cb1fd4c750f4f6b44e7fa2963a43486b91cd1494be5939336bfc10d

data/.travis.yml

@@ -1,16 +1,24 @@
+before_install:
+  - gem update bundler
+  - bundle --version
+  - gem update --system 2.1.11
+  - gem --version
 bundler_args: --without development
 language: ruby
 rvm:
-  - rbx-18mode
-  - rbx-19mode
-  - jruby-18mode
-  - jruby-19mode
   - 1.8.7
   - 1.9.2
   - 1.9.3
   - 2.0.0
-
+  - 2.1.0
+  - jruby-18mode
+  - jruby-19mode
+  - jruby-head
+  - rbx
+  - ruby-head
 matrix:
   allow_failures:
-    - rvm: jruby-18mode
-    - rvm: jruby-19mode
+    - rvm: jruby-head
+    - rvm: rbx
+    - rvm: ruby-head
+  fast_finish: true

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+1.8.3
+-----
+* [Make JrJackson explicitly read StringIO objects](https://github.com/intridea/multi_json/commit/e1f162d5b668e5e4db5afa175361a601a8aa2b05)
+* [Prevent calling #downcase on alias symbols](https://github.com/intridea/multi_json/commit/c1cf075453ce0110f7decc4f906444b1233bb67c)
+
 1.8.2
 -----
 * [Downcase adapter string name for OS compatibility](https://github.com/intridea/multi_json/commit/b8e15a032247a63f1410d21a18add05035f3fa66)

data/Gemfile

@@ -6,16 +6,6 @@ gem 'yard', '>= 0.8'
 gem 'json',      '~> 1.4', :require => nil
 gem 'json_pure', '~> 1.4', :require => nil
 
-platforms :ruby, :mswin, :mingw do
-  gem 'oj', '~> 2.0', :require => nil
-  gem 'yajl-ruby', '~> 1.0', :require => nil
-end
-
-platforms :jruby do
-  gem 'gson', '>= 0.6', :require => nil
-  gem 'jrjackson', '~> 0.2.1', :require => nil
-end
-
 group :development do
   gem 'kramdown', '>= 0.14'
   gem 'pry'
@@ -27,4 +17,18 @@ group :test do
   gem 'simplecov', :require => false
 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.0', :require => nil
+  gem 'yajl-ruby', '~> 1.0', :require => nil
+end
+
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+end
+
 gemspec

data/README.md

@@ -4,13 +4,11 @@
 [![Build Status](https://secure.travis-ci.org/intridea/multi_json.png?branch=master)][travis]
 [![Dependency Status](https://gemnasium.com/intridea/multi_json.png?travis)][gemnasium]
 [![Code Climate](https://codeclimate.com/github/intridea/multi_json.png)][codeclimate]
-[![Coverage Status](https://coveralls.io/repos/intridea/multi_json/badge.png?branch=master)][coveralls]
 
 [gem]: https://rubygems.org/gems/multi_json
 [travis]: http://travis-ci.org/intridea/multi_json
 [gemnasium]: https://gemnasium.com/intridea/multi_json
 [codeclimate]: https://codeclimate.com/github/intridea/multi_json
-
 Lots of Ruby libraries parse JSON and everyone has their favorite JSON coder.
 Instead of choosing a single JSON coder and forcing users of your library to be
 stuck with it, you can use MultiJSON instead, which will simply choose the
@@ -62,6 +60,7 @@ implementations:
 * Ruby 1.9.2
 * Ruby 1.9.3
 * Ruby 2.0.0
+* Ruby 2.1.0
 * [JRuby][]
 * [Rubinius][]
 * [MacRuby][] (not tested on Travis CI)

data/lib/multi_json.rb

@@ -28,7 +28,7 @@ module MultiJson
     self.load_options = self.dump_options = value
   end
 
-  ALIASES = { 'jrjackson' => :jr_jackson }
+  ALIASES = { 'jrjackson' => 'jr_jackson' }
 
   REQUIREMENT_MAP = [
     ['oj',           :oj],

data/lib/multi_json/adapters/jr_jackson.rb

@@ -8,6 +8,8 @@ module MultiJson
       ParseError = ::JrJackson::ParseError
 
       def load(string, options={}) #:nodoc:
+        # https://github.com/guyboertje/jrjackson/issues/20
+        string = string.read if StringIO === string
         ::JrJackson::Json.load(string, options)
       end
 

data/lib/multi_json/convertible_hash_keys.rb

@@ -2,40 +2,40 @@ module MultiJson
   module ConvertibleHashKeys
     private
 
-    def symbolize_keys(object)
-      prepare_object(object) do |key|
+    def symbolize_keys(hash)
+      prepare_hash(hash) do |key|
         key.respond_to?(:to_sym) ? key.to_sym : key
       end
     end
 
-    def stringify_keys(object)
-      prepare_object(object) do |key|
+    def stringify_keys(hash)
+      prepare_hash(hash) do |key|
         key.respond_to?(:to_s) ? key.to_s : key
       end
     end
 
-    def prepare_object(object, &key_modifier)
-      return object unless block_given?
-      case object
+    def prepare_hash(hash, &key_modifier)
+      return hash unless block_given?
+      case hash
       when Array
-        object.map do |value|
-          prepare_object(value, &key_modifier)
+        hash.map do |value|
+          prepare_hash(value, &key_modifier)
         end
       when Hash
-        object.inject({}) do |result, (key, value)|
+        hash.inject({}) do |result, (key, value)|
           new_key   = key_modifier.call(key)
-          new_value = prepare_object(value, &key_modifier)
+          new_value = prepare_hash(value, &key_modifier)
           result.merge! new_key => new_value
         end
       when String, Numeric, true, false, nil
-        object
+        hash
       else
-        if object.respond_to?(:to_json)
-          object
-        elsif object.respond_to?(:to_s)
-          object.to_s
+        if hash.respond_to?(:to_json)
+          hash
+        elsif hash.respond_to?(:to_s)
+          hash.to_s
         else
-          object
+          hash
         end
       end
     end

data/lib/multi_json/version.rb

@@ -2,7 +2,7 @@ module MultiJson
   class Version
     MAJOR = 1 unless defined? MultiJson::Version::MAJOR
     MINOR = 8 unless defined? MultiJson::Version::MINOR
-    PATCH = 2 unless defined? MultiJson::Version::PATCH
+    PATCH = 3 unless defined? MultiJson::Version::PATCH
     PRE = nil unless defined? MultiJson::Version::PRE
 
     class << self

data/spec/shared/adapter.rb

@@ -43,7 +43,7 @@ shared_examples_for 'an adapter' do |adapter|
         {'abc' => 'def'},
         [1, 2, 3, '4', true, false, nil]
       ].each do |example|
-        expect(MultiJson.load(MultiJson.dump(example))).to eq example
+        expect(MultiJson.load(MultiJson.dump(example))).to eq(example)
       end
     end
 
@@ -57,7 +57,7 @@ shared_examples_for 'an adapter' do |adapter|
         else
           'Tue Dec 11 09:39:05 UTC 2012'
         end
-        expect(MultiJson.load(dumped_json)).to eq expected
+        expect(MultiJson.load(dumped_json)).to eq(expected)
       end
     end
 
@@ -81,13 +81,13 @@ shared_examples_for 'an adapter' do |adapter|
         ]
       ].each do |example, expected|
         dumped_json = MultiJson.dump(example)
-        expect(MultiJson.load(dumped_json)).to eq expected
+        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'
+      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
@@ -95,21 +95,18 @@ shared_examples_for 'an adapter' do |adapter|
       MultiJson.dump('foo', :bar => :baz)
     end
 
-    # This behavior is currently not supported by gson.rb
-    # See discussion at https://github.com/intridea/multi_json/pull/71
-    unless adapter.name == 'MultiJson::Adapters::Gson'
-      it 'dumps custom objects that implement to_json' do
-        klass = Class.new do
-          def to_json(*)
-            '"foobar"'
-          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
-        expect(MultiJson.dump(klass.new)).to eq '"foobar"'
       end
+      expect(MultiJson.dump(klass.new)).to eq('"foobar"')
     end
 
     it 'allows to dump JSON values' do
-      expect(MultiJson.dump(42)).to eq '42'
+      expect(MultiJson.dump(42)).to eq('42')
     end
 
     it 'allows to dump JSON with UTF-8 characters' do
@@ -167,6 +164,11 @@ shared_examples_for 'an adapter' do |adapter|
 
     it 'raises MultiJson::LoadError 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::LoadError)
       end
     end
@@ -176,7 +178,7 @@ shared_examples_for 'an adapter' do |adapter|
       begin
         MultiJson.load(data)
       rescue MultiJson::LoadError => le
-        expect(le.data).to eq data
+        expect(le.data).to eq(data)
       end
     end
 
@@ -185,7 +187,7 @@ shared_examples_for 'an adapter' do |adapter|
       begin
         MultiJson.load(data)
       rescue MultiJson::DecodeError => de
-        expect(de.data).to eq data
+        expect(de.data).to eq(data)
       end
     end
 
@@ -213,14 +215,14 @@ shared_examples_for 'an adapter' do |adapter|
         [
           '{"abc":[{"def":"hgi"}]}',
           {:abc => [{:def => 'hgi'}]},
-        ],
+        ]
       ].each do |example, expected|
-        expect(MultiJson.load(example, :symbolize_keys => true)).to eq 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
+      expect(MultiJson.load('42')).to eq(42)
     end
 
     it 'allows to load JSON with UTF-8 characters' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: multi_json
 version: !ruby/object:Gem::Version
-  version: 1.8.2
+  version: 1.8.3
 platform: ruby
 authors:
 - Michael Bleigh
@@ -33,7 +33,7 @@ cert_chain:
   7BTxdlSpJZDcAK29Ni3NRCRu6Air4wfDln0Ilzeuut6cJ4/j2/RlvsccVSRaEfOa
   wM7GTK5SEdU3qelyBdc4+RRs6uU=
   -----END CERTIFICATE-----
-date: 2013-10-15 00:00:00.000000000 Z
+date: 2014-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -60,30 +60,17 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .document
+- .rspec
+- .travis.yml
 - .yardopts
 - CHANGELOG.md
 - CONTRIBUTING.md
+- Gemfile
 - LICENSE.md
 - README.md
 - Rakefile
-- multi_json.gemspec
-- Gemfile
-- .document
-- .rspec
-- .travis.yml
-- 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
+- lib/multi_json.rb
 - lib/multi_json/adapter.rb
 - lib/multi_json/adapters/gson.rb
 - lib/multi_json/adapters/jr_jackson.rb
@@ -99,7 +86,20 @@ files:
 - lib/multi_json/options.rb
 - lib/multi_json/vendor/okjson.rb
 - lib/multi_json/version.rb
-- lib/multi_json.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
@@ -120,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.5
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.5
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: A common interface to multiple JSON libraries.