multi_json 1.10.0 → 1.10.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (10) hide show
  1. checksums.yaml +4 -4
  2. checksums.yaml.gz.sig +0 -0
  3. data.tar.gz.sig +0 -0
  4. data/CHANGELOG.md +5 -0
  5. data/README.md +2 -2
  6. data/lib/multi_json/adapters/gson.rb +1 -0
  7. data/lib/multi_json/adapters/jr_jackson.rb +0 -2
  8. data/lib/multi_json/version.rb +1 -1
  9. metadata +2 -2
  10. metadata.gz.sig +0 -0
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: e9e80b3da1939ae507958fa22e0212cb5156d8de
4
- data.tar.gz: 62cf542ccfea9291b606484c4b3821b04f0f4553
3
+ metadata.gz: ea3e5f54b3fbdc2ee1e49fa66dcf731b63a57b58
4
+ data.tar.gz: 65e6e1fa41c9246473cf552675418118d8469e3a
5
5
  SHA512:
6
- metadata.gz: 5be5ee5ddcf2c0227718423a55424ac679b5a031b4972106f247d5ee4c02761bac842f89cb69935f9aa493ef1a617a218894353b7ef11e8e5feb30b01977af4e
7
- data.tar.gz: 38562e8b713275e6eb7dd49217f92007a906801d32e52acb8c85c880367a547e2a15a499aa7967d806e103f3b0f3d445f07451aa7de1e87406ba7b33baa427b0
6
+ metadata.gz: 7f445fca0136fc8daef294d0494691d0e2c9d79fa0d9477c225bbbe5c90f91cfaaa4a55ea633863a38467d6a4e71313c26e4203084cc54bfa71a3539e20eddb2
7
+ data.tar.gz: a61ffb653f2985d5d19b933ef1e503c8b9ad8b3ea70fb82ec05ad05552a9052b92564e8bb0f45311665ee7723986990ce649c135d7c5d6d1c6aa5994251f7499
checksums.yaml.gz.sig CHANGED
Binary file
data.tar.gz.sig CHANGED
Binary file
data/CHANGELOG.md CHANGED
@@ -1,3 +1,8 @@
1
+ 1.10.1
2
+ ------
3
+ * [Explicitly require stringio for Gson adapter](https://github.com/intridea/multi_json/commit/623ec8142d4a212fa0db763bb71295789a119929)
4
+ * [Do not read StrignIO object before passing it to JrJackson](https://github.com/intridea/multi_json/commit/a6dc935df08e7b3d5d701fbb9298384c96df0fde)
5
+
1
6
  1.10.0
2
7
  ------
3
8
  * [Performance tweaks](https://github.com/intridea/multi_json/commit/58724acfed31866d079eaafb1cd824e341ade287)
data/README.md CHANGED
@@ -1,7 +1,7 @@
1
1
  # MultiJSON
2
2
 
3
- [![Gem Version](https://travis-ci.org/intridea/multi_json.svg)][gem]
4
- [![Build Status](http://img.shields.io/travis/intridea/multi_json.svg)][travis]
3
+ [![Gem Version](http://img.shields.io/gem/v/multi_json.svg)][gem]
4
+ [![Build Status](http://travis-ci.org/intridea/multi_json.svg)][travis]
5
5
  [![Dependency Status](http://img.shields.io/gemnasium/intridea/multi_json.svg)][gemnasium]
6
6
  [![Code Climate](http://img.shields.io/codeclimate/github/intridea/multi_json.svg)][codeclimate]
7
7
 
data/lib/multi_json/adapters/gson.rb CHANGED
@@ -1,4 +1,5 @@
1
1
  require 'gson'
2
+ require 'stringio'
2
3
  require 'multi_json/adapter'
3
4
 
4
5
  module MultiJson
data/lib/multi_json/adapters/jr_jackson.rb CHANGED
@@ -8,8 +8,6 @@ module MultiJson
8
8
  ParseError = ::JrJackson::ParseError
9
9
 
10
10
  def load(string, options={}) #:nodoc:
11
- # https://github.com/guyboertje/jrjackson/issues/20
12
- string = string.read if StringIO === string
13
11
  ::JrJackson::Json.load(string, options)
14
12
  end
15
13
 
data/lib/multi_json/version.rb CHANGED
@@ -2,7 +2,7 @@ module MultiJson
2
2
  class Version
3
3
  MAJOR = 1 unless defined? MultiJson::Version::MAJOR
4
4
  MINOR = 10 unless defined? MultiJson::Version::MINOR
5
- PATCH = 0 unless defined? MultiJson::Version::PATCH
5
+ PATCH = 1 unless defined? MultiJson::Version::PATCH
6
6
  PRE = nil unless defined? MultiJson::Version::PRE
7
7
 
8
8
  class << self
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: multi_json
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.10.0
4
+ version: 1.10.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Michael Bleigh
@@ -33,7 +33,7 @@ cert_chain:
33
33
  7BTxdlSpJZDcAK29Ni3NRCRu6Air4wfDln0Ilzeuut6cJ4/j2/RlvsccVSRaEfOa
34
34
  wM7GTK5SEdU3qelyBdc4+RRs6uU=
35
35
  -----END CERTIFICATE-----
36
- date: 2014-05-06 00:00:00.000000000 Z
36
+ date: 2014-05-20 00:00:00.000000000 Z
37
37
  dependencies:
38
38
  - !ruby/object:Gem::Dependency
39
39
  name: bundler
metadata.gz.sig CHANGED
Binary file