fog-json 1.3.0 → 1.4.0

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 (6) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +4 -0
  3. data/fog-json.gemspec +1 -1
  4. data/lib/fog/json/version.rb +1 -1
  5. data/lib/fog/json.rb +5 -5
  6. metadata +4 -4
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: c9b7cc355f6ffbb4c2416177c547952da1222bf9517e0e56014601b0a86659b1
4
- data.tar.gz: 187e11b64808bb008c8486865565dc1adb7a2a06c5490864aa2052b35edd89bd
3
+ metadata.gz: 37ca3617cd318b1f8c2230d94d0c948b6988bb6520c31cb200f3030ef508cfc3
4
+ data.tar.gz: 779f4dbeae57facc9f3f28245fb426f097bbe1225e046448da3385dbf61b0f8d
5
5
  SHA512:
6
- metadata.gz: 90cc93266b9f15a6cb308c839a25bf11bd2b6772cd48b004048de3dd79259222743429cbf37424f4aa9fb580ad7583090c63ec4c7d07388a6bed52c3e42be882
7
- data.tar.gz: 41223f3cca7aa167c7ff4476e51fe71113eb29789b40f1f13befa0afb635a585c1f172a3db1f15fe98e1f84330e08f512df999209093f59f3ad17032b40f9a09
6
+ metadata.gz: 466707185ebd19c993a05b370170bdccde7bedec8322191660c7729327f0f2f9d18aab912923eb046a2d567f2db0cbb88775c547dfa98ec2e3e01961af82c2fb
7
+ data.tar.gz: 6f5993da58cae11a7602350b232e7b96e6e5c74914523c929da96afebc5684b35f4c202c3e164abf29ce4e58b73ef29a94cf8b04fd42588b3311946d30f71ede
data/CHANGELOG.md CHANGED
@@ -1,3 +1,7 @@
1
+ v1.4.0
2
+
3
+ * Replace multi_json gem with standard Ruby json gem
4
+
1
5
  v1.3.0
2
6
 
3
7
  * fix deprecated multijson usage
data/fog-json.gemspec CHANGED
@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
20
20
  spec.require_paths = ["lib"]
21
21
 
22
22
  spec.add_dependency "fog-core"
23
- spec.add_dependency "multi_json", "~> 1.10"
23
+ spec.add_dependency "json", "~> 2.19"
24
24
 
25
25
  spec.add_development_dependency "bundler"
26
26
  spec.add_development_dependency "rake"
data/lib/fog/json/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Fog
2
2
  module Json
3
- VERSION = "1.3.0"
3
+ VERSION = "1.4.0"
4
4
  end
5
5
  end
data/lib/fog/json.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  require "fog/core"
2
- require "multi_json"
2
+ require "json"
3
3
  require File.expand_path("../json/version", __FILE__)
4
4
 
5
5
  module Fog
@@ -28,16 +28,16 @@ module Fog
28
28
  end
29
29
  end
30
30
 
31
- # Do the MultiJson introspection at this level so we can define our encode/decode methods and
32
- # perform the introspection only once rather than once per call.
33
31
  def self.encode(obj)
34
- MultiJson.dump(obj)
32
+ ::JSON.dump(obj)
35
33
  rescue => err
36
34
  raise EncodeError.slurp(err)
37
35
  end
38
36
 
39
37
  def self.decode(obj)
40
- MultiJson.load(obj)
38
+ obj = obj.read if obj.respond_to?(:read)
39
+ return if obj.nil? || obj.empty?
40
+ ::JSON.parse(obj)
41
41
  rescue => err
42
42
  raise DecodeError.slurp(err)
43
43
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: fog-json
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.3.0
4
+ version: 1.4.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Wesley Beary (geemus)
@@ -26,19 +26,19 @@ dependencies:
26
26
  - !ruby/object:Gem::Version
27
27
  version: '0'
28
28
  - !ruby/object:Gem::Dependency
29
- name: multi_json
29
+ name: json
30
30
  requirement: !ruby/object:Gem::Requirement
31
31
  requirements:
32
32
  - - "~>"
33
33
  - !ruby/object:Gem::Version
34
- version: '1.10'
34
+ version: '2.19'
35
35
  type: :runtime
36
36
  prerelease: false
37
37
  version_requirements: !ruby/object:Gem::Requirement
38
38
  requirements:
39
39
  - - "~>"
40
40
  - !ruby/object:Gem::Version
41
- version: '1.10'
41
+ version: '2.19'
42
42
  - !ruby/object:Gem::Dependency
43
43
  name: bundler
44
44
  requirement: !ruby/object:Gem::Requirement