multi_json 1.8.4 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 631aa02f675904f755e9ffe210bf01dc1a57bc7a
-  data.tar.gz: 4e9460040fba9ffb2e8849dd7c26b4512c4fcb3c
+  metadata.gz: 9310cbdab77060e6ad1605d2f6db0ea00f1b5204
+  data.tar.gz: 7bc409de5e81b71bce457fe2f33b962ea2d3ab96
 SHA512:
-  metadata.gz: a1de940e0b4ac279e3a2cf2b7ca9e7f8a67eb18a4b7ad543a3cfd0221db01aed24bd061103a735670b87fe9975b00077fb5955aa98627c151d53347dee1241c9
-  data.tar.gz: f7d1295fa499d9b2b8a258ce91116b03ee6b135b4605c9df541a0c6e575186890c7b6b1367d59d91a6d4688eb81320a856aa46f4b3fb935760868433c154d928
+  metadata.gz: 5243b47e82a2f5f5bcc0d45a7b76ea8fdc63585b092d4acc05bfcc10fc35ebd4823a552a730e7ed112a702dc4a0e1b4de757fb23c397258ed1919fa6d1de4418
+  data.tar.gz: f4d223b885d5efa05873ffb3be1f862b130e591c838269b4651243e0661d0c40c6b59b41b682d33fea00fc50dc1e9aacf6bc80326992401432e5d97d02c80a1d

data/.travis.yml

@@ -1,8 +1,3 @@
-before_install:
-  - gem update bundler
-  - bundle --version
-  - gem update --system 2.1.11
-  - gem --version
 bundler_args: --without development
 language: ruby
 rvm:
@@ -11,14 +6,14 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.0
+  - 2.1.1
   - jruby-18mode
   - jruby-19mode
   - jruby-head
-  - rbx
+  - rbx-2
   - ruby-head
 matrix:
   allow_failures:
     - rvm: jruby-head
-    - rvm: rbx
     - rvm: ruby-head
   fast_finish: true

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+1.9.0
+----
+* [Rename LoadError to ParseError](https://github.com/intridea/multi_json/commit/4abb98fe3a90b2a7b3d1594515c8a06042b4a27d)
+* [Adapter load failure throws AdapterError instead of ArgumentError](https://github.com/intridea/multi_json/commit/4da612b617bd932bb6fa1cc4c43210327f98f271)
+
 1.8.4
 -----
 * [Make Gson adapter explicitly read StringIO object](https://github.com/intridea/multi_json/commit/b58b498747ff6e94f41488c971b2a30a98760ef2)

data/Gemfile

@@ -27,8 +27,4 @@ platforms :mingw, :mswin, :ruby do
   gem 'yajl-ruby', '~> 1.0', :require => nil
 end
 
-platforms :rbx do
-  gem 'rubysl', '~> 2.0'
-end
-
 gemspec

data/README.md

@@ -1,14 +1,15 @@
 # MultiJSON
 
-[![Gem Version](https://badge.fury.io/rb/multi_json.png)][gem]
-[![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]
+[![Gem Version](http://img.shields.io/gem/v/multi_json.svg)][gem]
+[![Build Status](http://img.shields.io/travis/intridea/multi_json.svg)][travis]
+[![Dependency Status](http://img.shields.io/gemnasium/intridea/multi_json.svg)][gemnasium]
+[![Code Climate](http://img.shields.io/codeclimate/github/intridea/multi_json.svg)][codeclimate]
 
 [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
@@ -23,16 +24,27 @@ MultiJson.dump({:abc => 'def'}) # convert Ruby back to JSON
 MultiJson.dump({:abc => 'def'}, :pretty => true) # encoded in a pretty form (if supported by the coder)
 ```
 
-When loading invalid JSON, multiJSON will throw a `MultiJson::LoadError`. `MultiJson::DecodeError` is an alias for backwards compatibility.
+When loading invalid JSON, MultiJson will throw a `MultiJson::ParseError`. `MultiJson::DecodeError` and `MultiJson::LoadError` are aliases for backwards compatibility.
 
 ```ruby
-MultiJson.load('invalid json') #=> MultiJson::LoadError
+begin
+  MultiJson.load('{invalid json}')
+rescue MultiJson::ParseError => exception
+  exception.data # => "{invalid json}"
+  exception.cause # => JSON::ParserError: 795: unexpected token at '{invalid json}'
+end
 ```
 
+`ParseError` instance has `cause` reader which contains the original exception.
+It also has `data` reader with the input that caused the problem.
+
 The `use` method, which sets the MultiJson adapter, takes either a symbol or a
 class (to allow for custom JSON parsers) that responds to both `.load` and `.dump`
 at the class level.
 
+When MultiJson fails to load the specified adapter, it'll throw `MultiJson::AdapterError`
+which inherits from `ArgumentError`.
+
 MultiJSON tries to have intelligent defaulting. That is, if you have any of the
 supported engines already loaded, it will utilize them before attempting to
 load any. When loading, libraries are ordered by speed. First Oj, then Yajl,
@@ -61,6 +73,7 @@ implementations:
 * Ruby 1.9.3
 * Ruby 2.0.0
 * Ruby 2.1.0
+* Ruby 2.1.1
 * [JRuby][]
 * [Rubinius][]
 * [MacRuby][] (not tested on Travis CI)

data/lib/multi_json.rb

@@ -1,6 +1,7 @@
 require 'multi_json/options'
 require 'multi_json/version'
-require 'multi_json/load_error'
+require 'multi_json/adapter_error'
+require 'multi_json/parse_error'
 
 module MultiJson
   include Options
@@ -102,10 +103,10 @@ module MultiJson
     when Class, Module
       new_adapter
     else
-      raise ::LoadError
+      raise ::LoadError, new_adapter
     end
-  rescue ::LoadError
-    raise ArgumentError, 'Did not recognize your adapter specification.'
+  rescue ::LoadError => exception
+    raise AdapterError.build(exception)
   end
 
   # Decode a JSON string into Ruby.
@@ -119,7 +120,7 @@ module MultiJson
     begin
       adapter.load(string, options)
     rescue adapter::ParseError => exception
-      raise LoadError.new(exception.message, exception.backtrace, string)
+      raise ParseError.build(exception, string)
     end
   end
   alias decode load

data/lib/multi_json/adapter_error.rb

@@ -0,0 +1,15 @@
+module MultiJson
+  class AdapterError < ArgumentError
+    attr_reader :cause
+
+    def self.build(original_exception)
+      message = "Did not recognize your adapter specification (#{original_exception.message})."
+      new(message).tap do |exception|
+        exception.instance_eval do
+          @cause = original_exception
+          set_backtrace original_exception.backtrace
+        end
+      end
+    end
+  end
+end

data/lib/multi_json/parse_error.rb

@@ -0,0 +1,17 @@
+module MultiJson
+  class ParseError < StandardError
+    attr_reader :data, :cause
+
+    def self.build(original_exception, data)
+      new(original_exception.message).tap do |exception|
+        exception.instance_eval do
+          @cause = original_exception
+          set_backtrace original_exception.backtrace
+          @data = data
+        end
+      end
+    end
+  end
+
+  DecodeError = LoadError = ParseError # Legacy support
+end

data/lib/multi_json/version.rb

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

data/spec/multi_json_spec.rb

@@ -89,8 +89,15 @@ describe MultiJson do
     expect(MultiJson.adapter).to eq(adapter)
   end
 
-  it 'throws ArgumentError on bad input' do
-    expect{ MultiJson.use 'bad adapter' }.to raise_error(ArgumentError)
+  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

data/spec/shared/adapter.rb

@@ -162,35 +162,39 @@ shared_examples_for 'an adapter' do |adapter|
       expect(MultiJson.load('{"abc":"def"}')).to eq('abc' => 'def')
     end
 
-    it 'raises MultiJson::LoadError on blank input or invalid input' do
+    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::LoadError)
+        expect{MultiJson.load(input)}.to raise_error(MultiJson::ParseError)
       end
     end
 
-    it 'raises MultiJson::LoadError with data on invalid JSON' do
+    it 'raises MultiJson::ParseError with data on invalid JSON' do
       data = '{invalid}'
-      begin
-        MultiJson.load(data)
-      rescue MultiJson::LoadError => le
-        expect(le.data).to eq(data)
-      end
+      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}'
-      begin
-        MultiJson.load(data)
-      rescue MultiJson::DecodeError => de
-        expect(de.data).to eq(data)
-      end
+      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)

data/spec/spec_helper.rb

@@ -70,4 +70,12 @@ def simulate_no_adapters
       yield
     end
   end
-end
+end
+
+def get_exception(exception_class = StandardError)
+  begin
+    yield
+  rescue exception_class => exception
+    exception
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: multi_json
 version: !ruby/object:Gem::Version
-  version: 1.8.4
+  version: 1.9.0
 platform: ruby
 authors:
 - Michael Bleigh
 - Josh Kalderimis
 - Erik Michaels-Ober
 - Pavel Pravosud
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain:
 - |
@@ -33,23 +33,25 @@ cert_chain:
   7BTxdlSpJZDcAK29Ni3NRCRu6Air4wfDln0Ilzeuut6cJ4/j2/RlvsccVSRaEfOa
   wM7GTK5SEdU3qelyBdc4+RRs6uU=
   -----END CERTIFICATE-----
-date: 2014-01-10 00:00:00.000000000 Z
+date: 2014-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
-  prerelease: false
-  type: :development
-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.
+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.
 email:
 - michael@intridea.com
 - josh.kalderimis@gmail.com
@@ -70,6 +72,7 @@ files:
 - Rakefile
 - lib/multi_json.rb
 - lib/multi_json/adapter.rb
+- lib/multi_json/adapter_error.rb
 - lib/multi_json/adapters/gson.rb
 - lib/multi_json/adapters/jr_jackson.rb
 - lib/multi_json/adapters/json_common.rb
@@ -82,6 +85,7 @@ files:
 - lib/multi_json/convertible_hash_keys.rb
 - lib/multi_json/load_error.rb
 - lib/multi_json/options.rb
+- lib/multi_json/parse_error.rb
 - lib/multi_json/vendor/okjson.rb
 - lib/multi_json/version.rb
 - multi_json.gemspec
@@ -102,7 +106,7 @@ homepage: http://github.com/intridea/multi_json
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -117,9 +121,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.5
 requirements: []
-rubyforge_project:
-rubygems_version: 2.2.1
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.2.2
+signing_key: 
 specification_version: 4
 summary: A common interface to multiple JSON libraries.
 test_files:
@@ -131,9 +135,9 @@ test_files:
 - spec/nsjsonserialization_adapter_spec.rb
 - spec/oj_adapter_spec.rb
 - spec/ok_json_adapter_spec.rb
-- spec/spec_helper.rb
-- spec/yajl_adapter_spec.rb
 - spec/shared/adapter.rb
 - spec/shared/json_common_adapter.rb
 - spec/shared/options.rb
-has_rdoc:
+- spec/spec_helper.rb
+- spec/yajl_adapter_spec.rb
+has_rdoc: