fog-json 1.2.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 (14) hide show
  1. checksums.yaml +4 -4
  2. data/.github/FUNDING.yml +2 -0
  3. data/.github/dependabot.yml +10 -0
  4. data/.github/workflows/ci.yml +16 -0
  5. data/CHANGELOG.md +8 -0
  6. data/SECURITY.md +6 -0
  7. data/fog-json.gemspec +2 -2
  8. data/lib/fog/json/version.rb +1 -1
  9. data/lib/fog/json.rb +5 -5
  10. data/test/json_decode_test.rb +1 -1
  11. metadata +14 -17
  12. data/.ruby-gemset +0 -1
  13. data/.ruby-version +0 -1
  14. data/.travis.yml +0 -10
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: e3d00f347eebccec51b0ecab86f1ab8bd04ee4ac5526a2ebf761bd3ff673219f
4
- data.tar.gz: 1f873ce824f0f34c174610291287a4f3cf01ec87c47070aba8f972bc2133f26d
3
+ metadata.gz: 37ca3617cd318b1f8c2230d94d0c948b6988bb6520c31cb200f3030ef508cfc3
4
+ data.tar.gz: 779f4dbeae57facc9f3f28245fb426f097bbe1225e046448da3385dbf61b0f8d
5
5
  SHA512:
6
- metadata.gz: c2f488a596645be862ea7eae720c5fe5a5acf754374089611dbb07d1a48772d81a5953feb5dc6b198499bea50cdbd2bbc0245a1e3635ca92f538972114a7f700
7
- data.tar.gz: 8a059a619feadb79b1b7e2fdaa50c737059de3d9908b2b4f8b63308cf5108bb0963b4fea653bd33be263ca9f46a53adc6de76810a3e76bfbeff731de9e6d5bce
6
+ metadata.gz: 466707185ebd19c993a05b370170bdccde7bedec8322191660c7729327f0f2f9d18aab912923eb046a2d567f2db0cbb88775c547dfa98ec2e3e01961af82c2fb
7
+ data.tar.gz: 6f5993da58cae11a7602350b232e7b96e6e5c74914523c929da96afebc5684b35f4c202c3e164abf29ce4e58b73ef29a94cf8b04fd42588b3311946d30f71ede
data/.github/FUNDING.yml ADDED
@@ -0,0 +1,2 @@
1
+ github: geemus
2
+ tidelift: rubygems/fog-json
data/.github/dependabot.yml ADDED
@@ -0,0 +1,10 @@
1
+ version: 2
2
+ updates:
3
+ - package-ecosystem: "bundler"
4
+ directory: "/"
5
+ schedule:
6
+ interval: "weekly"
7
+ - package-ecosystem: "github-actions"
8
+ directory: "/"
9
+ schedule:
10
+ interval: "weekly"
data/.github/workflows/ci.yml ADDED
@@ -0,0 +1,16 @@
1
+ name: CI
2
+
3
+ on:
4
+ push:
5
+ branches: [ master ]
6
+ pull_request:
7
+ branches: [ master ]
8
+ schedule:
9
+ - cron: '0 0 * * 1' # At 00:00 on Monday.
10
+
11
+ permissions:
12
+ contents: read
13
+
14
+ jobs:
15
+ Shared:
16
+ uses: fog/.github/.github/workflows/ci.yml@v1.6.0
data/CHANGELOG.md CHANGED
@@ -1,3 +1,11 @@
1
+ v1.4.0
2
+
3
+ * Replace multi_json gem with standard Ruby json gem
4
+
5
+ v1.3.0
6
+
7
+ * fix deprecated multijson usage
8
+
1
9
  v1.2.0
2
10
 
3
11
  * Fix time parsing issue
data/SECURITY.md ADDED
@@ -0,0 +1,6 @@
1
+ ## Security contact information
2
+
3
+ To report a security vulnerability, please contact
4
+ [Tidelift security](https://tidelift.com/security).
5
+
6
+ Tidelift will coordinate the fix and disclosure.
data/fog-json.gemspec CHANGED
@@ -20,9 +20,9 @@ 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
- spec.add_development_dependency "bundler", "~> 1.5"
25
+ spec.add_development_dependency "bundler"
26
26
  spec.add_development_dependency "rake"
27
27
  spec.add_development_dependency "minitest"
28
28
  end
data/lib/fog/json/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Fog
2
2
  module Json
3
- VERSION = "1.2.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.encode(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.decode(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
data/test/json_decode_test.rb CHANGED
@@ -15,6 +15,6 @@ class TestJSONDecoding < Minitest::Test
15
15
  end
16
16
 
17
17
  def test_decode_with_nil
18
- assert_raises(Fog::JSON::DecodeError) { Fog::JSON.decode(nil) }
18
+ assert_nil Fog::JSON.decode(nil)
19
19
  end
20
20
  end
metadata CHANGED
@@ -1,16 +1,15 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: fog-json
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.0
4
+ version: 1.4.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Wesley Beary (geemus)
8
8
  - Paul Thornthwaite (tokengeek)
9
9
  - The fog team
10
- autorequire:
11
10
  bindir: bin
12
11
  cert_chain: []
13
- date: 2018-06-22 00:00:00.000000000 Z
12
+ date: 1980-01-02 00:00:00.000000000 Z
14
13
  dependencies:
15
14
  - !ruby/object:Gem::Dependency
16
15
  name: fog-core
@@ -27,33 +26,33 @@ dependencies:
27
26
  - !ruby/object:Gem::Version
28
27
  version: '0'
29
28
  - !ruby/object:Gem::Dependency
30
- name: multi_json
29
+ name: json
31
30
  requirement: !ruby/object:Gem::Requirement
32
31
  requirements:
33
32
  - - "~>"
34
33
  - !ruby/object:Gem::Version
35
- version: '1.10'
34
+ version: '2.19'
36
35
  type: :runtime
37
36
  prerelease: false
38
37
  version_requirements: !ruby/object:Gem::Requirement
39
38
  requirements:
40
39
  - - "~>"
41
40
  - !ruby/object:Gem::Version
42
- version: '1.10'
41
+ version: '2.19'
43
42
  - !ruby/object:Gem::Dependency
44
43
  name: bundler
45
44
  requirement: !ruby/object:Gem::Requirement
46
45
  requirements:
47
- - - "~>"
46
+ - - ">="
48
47
  - !ruby/object:Gem::Version
49
- version: '1.5'
48
+ version: '0'
50
49
  type: :development
51
50
  prerelease: false
52
51
  version_requirements: !ruby/object:Gem::Requirement
53
52
  requirements:
54
- - - "~>"
53
+ - - ">="
55
54
  - !ruby/object:Gem::Version
56
- version: '1.5'
55
+ version: '0'
57
56
  - !ruby/object:Gem::Dependency
58
57
  name: rake
59
58
  requirement: !ruby/object:Gem::Requirement
@@ -92,10 +91,10 @@ executables: []
92
91
  extensions: []
93
92
  extra_rdoc_files: []
94
93
  files:
94
+ - ".github/FUNDING.yml"
95
+ - ".github/dependabot.yml"
96
+ - ".github/workflows/ci.yml"
95
97
  - ".gitignore"
96
- - ".ruby-gemset"
97
- - ".ruby-version"
98
- - ".travis.yml"
99
98
  - CHANGELOG.md
100
99
  - CONTRIBUTING.md
101
100
  - CONTRIBUTORS.md
@@ -103,6 +102,7 @@ files:
103
102
  - LICENSE.md
104
103
  - README.md
105
104
  - Rakefile
105
+ - SECURITY.md
106
106
  - fog-json.gemspec
107
107
  - lib/fog/json.rb
108
108
  - lib/fog/json/version.rb
@@ -113,7 +113,6 @@ homepage: http://github.com/fog/fog-json
113
113
  licenses:
114
114
  - MIT
115
115
  metadata: {}
116
- post_install_message:
117
116
  rdoc_options: []
118
117
  require_paths:
119
118
  - lib
@@ -128,9 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
128
127
  - !ruby/object:Gem::Version
129
128
  version: '0'
130
129
  requirements: []
131
- rubyforge_project:
132
- rubygems_version: 2.7.6
133
- signing_key:
130
+ rubygems_version: 4.0.3
134
131
  specification_version: 4
135
132
  summary: JSON parsing for fog providers
136
133
  test_files:
data/.ruby-gemset DELETED
@@ -1 +0,0 @@
1
- fog-json
data/.ruby-version DELETED
@@ -1 +0,0 @@
1
- 2.4.3
data/.travis.yml DELETED
@@ -1,10 +0,0 @@
1
- language: ruby
2
-
3
- matrix:
4
- include:
5
- - rvm: 2.0
6
- - rvm: 2.1
7
- - rvm: 2.2
8
- - rvm: 2.3
9
- - rvm: 2.4
10
- - rvm: 2.5