multi_json 1.8.0 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e00d526cbb34886c88f45e632e8db48145cbc669
-  data.tar.gz: c00f7ad76fdb6f0dd5fcd07751a916106c3a9d1c
+  metadata.gz: 3c7bf44cc16efece231078942a86b6a5f4403205
+  data.tar.gz: 72033c9d66380bbb86f54cf97a9aa2a1bfcb3a9a
 SHA512:
-  metadata.gz: 5d940eb443ad93097a97cf55816fb469fc74a840629b7e9bd32551a93ee307d2ca742f60f75bd6776d176224782c2a1ec69ee56d85de12fef68bc2cff51a8b3c
-  data.tar.gz: 11c12f6352b79f87d2150183473b9a5829eeadd619217e8a6b1aed5389a44ec1295104eca8f49e09c65c8e168aa8cc8b93fd87050fa4e340e78208cf3b2be0ee
+  metadata.gz: d7f57462a5cab82e55419698f43ab35d57cb0e2af12dd7b671acfb21515f62c21bdb5d69c0bb9785562a1efc15f39af19b044ab8108e8824b614012e054e9038
+  data.tar.gz: d51223b32e9ba6f53b7260126b0d5a13b793be281ac4e376feda73335f7b87fe4dd5c9deff58b7abfde592e38ef1f63d1d139f1b56ca018fb86bf4419dbfd2a5

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+1.8.0
+-----
+* [Raise MultiJson::LoadError on blank input](https://github.com/intridea/multi_json/commit/c44f9c928bb25fe672246ad394b3e5b991be32e6)
+
+1.7.9
+-----
+* [Explicitly require json gem code even when constant is defined](https://github.com/intridea/multi_json/commit/36f7906c66477eb4b55b7afeaa3684b6db69eff2)
+
 1.7.8
 -----
 * [Reorder JrJackson before json_gem](https://github.com/intridea/multi_json/commit/315b6e460b6e4dcdb6c82e04e4be8ee975d395da)

data/Gemfile

@@ -13,7 +13,7 @@ end
 
 platforms :jruby do
   gem 'gson', '>= 0.6', :require => nil
-  gem 'jrjackson', '~> 0.1.1', :require => nil
+  gem 'jrjackson', '~> 0.2.0', :require => nil
 end
 
 group :development do

data/lib/multi_json/adapter.rb

@@ -48,6 +48,8 @@ module MultiJson
 
       def blank?(input)
         input.nil? || /\A\s*\z/ === input
+      rescue ArgumentError # invalid byte sequence in UTF-8
+        false
       end
 
     end

data/lib/multi_json/adapters/ok_json.rb

@@ -12,6 +12,8 @@ module MultiJson
         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
+        raise ParseError
       end
 
       def dump(object, options={})

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 = 0 unless defined? MultiJson::Version::PATCH
+    PATCH = 1 unless defined? MultiJson::Version::PATCH
     PRE = nil unless defined? MultiJson::Version::PRE
 
     class << self

data/spec/shared/adapter.rb

@@ -113,7 +113,7 @@ shared_examples_for 'an adapter' do |adapter|
     end
 
     it 'allows to dump JSON with UTF-8 characters' do
-      expect(MultiJson.dump({'color' => 'żółć'})).to eq('{"color":"żółć"}')
+      expect(MultiJson.dump('color' => 'żółć')).to eq('{"color":"żółć"}')
     end
   end
 
@@ -162,15 +162,11 @@ shared_examples_for 'an adapter' do |adapter|
     end
 
     it 'properly loads valid JSON' do
-      expect(MultiJson.load('{"abc":"def"}')).to eq({'abc' => 'def'})
+      expect(MultiJson.load('{"abc":"def"}')).to eq('abc' => 'def')
     end
 
-    it 'raises MultiJson::LoadError on invalid JSON' do
-      expect{MultiJson.load('{"abc"}')}.to raise_error(MultiJson::LoadError)
-    end
-
-    it 'raises MultiJson::LoadError on blank input' do
-      [nil, ' ', "\t\t\t", "\n"].each do |input|
+    it 'raises MultiJson::LoadError on blank input or invalid input' do
+      [nil, '{"abc"}', ' ', "\t\t\t", "\n", "\x82\xAC\xEF"].each do |input|
         expect{MultiJson.load(input)}.to raise_error(MultiJson::LoadError)
       end
     end
@@ -196,12 +192,12 @@ shared_examples_for 'an adapter' do |adapter|
     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}})
+      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'})
+      expect(MultiJson.load(json)).to eq('abc' => 'def')
     end
 
     it 'allows for symbolization of keys' do
@@ -228,7 +224,7 @@ shared_examples_for 'an adapter' do |adapter|
     end
 
     it 'allows to load JSON with UTF-8 characters' do
-      expect(MultiJson.load('{"color":"żółć"}')).to eq({'color' => 'żółć'})
+      expect(MultiJson.load('{"color":"żółć"}')).to eq('color' => 'żółć')
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: multi_json
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.1
 platform: ruby
 authors:
 - Michael Bleigh
@@ -33,7 +33,7 @@ cert_chain:
   7BTxdlSpJZDcAK29Ni3NRCRu6Air4wfDln0Ilzeuut6cJ4/j2/RlvsccVSRaEfOa
   wM7GTK5SEdU3qelyBdc4+RRs6uU=
   -----END CERTIFICATE-----
-date: 2013-09-08 00:00:00.000000000 Z
+date: 2013-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -120,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.5
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.1.0
 signing_key: 
 specification_version: 4
 summary: A common interface to multiple JSON libraries.