maremma 3.5.8 → 3.5.9
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile.lock +13 -13
- data/lib/maremma.rb +17 -1
- data/lib/maremma/version.rb +1 -1
- data/maremma.gemspec +4 -4
- data/spec/maremma_spec.rb +6 -1
- metadata +24 -12
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 761979827b9a4878829a6d4f7cde1d12fddfbc62
|
4
|
+
data.tar.gz: f9166b84cc4b3596472749d18461b0f64378e084
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: b57761a4876bf741ca2e9615187a24bbc627b36d31cd877477a719c3ea2a36ac600becb9eddde396fca2f89e6f67378a60656fc3b639a9333a1abfd8483f4f1a
|
7
|
+
data.tar.gz: b95b8bb38076976f803d8d50d600adda356bbbc144d32e8311ca709c11ca4bc5b638915913b9d021d762adb69b6b317f41c0999a0f575975b245c8681586f8f5
|
data/Gemfile.lock
CHANGED
@@ -1,8 +1,8 @@
|
|
1
1
|
PATH
|
2
2
|
remote: .
|
3
3
|
specs:
|
4
|
-
maremma (3.5.
|
5
|
-
activesupport (>= 4.2.5)
|
4
|
+
maremma (3.5.9)
|
5
|
+
activesupport (>= 4.2.5, < 6)
|
6
6
|
addressable (>= 2.3.6)
|
7
7
|
builder (~> 3.2, >= 3.2.2)
|
8
8
|
excon (~> 0.45.0)
|
@@ -11,12 +11,12 @@ PATH
|
|
11
11
|
faraday_middleware (~> 0.10.0)
|
12
12
|
multi_json (~> 1.12)
|
13
13
|
nokogiri (~> 1.6, >= 1.6.8)
|
14
|
-
oj (~>
|
14
|
+
oj (~> 3.3, >= 3.3.0)
|
15
15
|
|
16
16
|
GEM
|
17
17
|
remote: https://rubygems.org/
|
18
18
|
specs:
|
19
|
-
activesupport (5.1.
|
19
|
+
activesupport (5.1.2)
|
20
20
|
concurrent-ruby (~> 1.0, >= 1.0.2)
|
21
21
|
i18n (~> 0.7)
|
22
22
|
minitest (~> 5.1)
|
@@ -39,19 +39,19 @@ GEM
|
|
39
39
|
faraday_middleware (0.10.1)
|
40
40
|
faraday (>= 0.7.4, < 1.0)
|
41
41
|
hashdiff (0.3.4)
|
42
|
-
i18n (0.8.
|
42
|
+
i18n (0.8.6)
|
43
43
|
json (2.1.0)
|
44
44
|
mini_portile2 (2.2.0)
|
45
|
-
minitest (5.10.
|
45
|
+
minitest (5.10.3)
|
46
46
|
multi_json (1.12.1)
|
47
47
|
multipart-post (2.0.0)
|
48
48
|
nokogiri (1.8.0)
|
49
49
|
mini_portile2 (~> 2.2.0)
|
50
|
-
oj (
|
50
|
+
oj (3.3.2)
|
51
51
|
public_suffix (2.0.5)
|
52
52
|
rack (2.0.3)
|
53
|
-
rack-test (0.
|
54
|
-
rack (>= 1.0)
|
53
|
+
rack-test (0.7.0)
|
54
|
+
rack (>= 1.0, < 3)
|
55
55
|
rake (12.0.0)
|
56
56
|
rspec (3.6.0)
|
57
57
|
rspec-core (~> 3.6.0)
|
@@ -76,7 +76,7 @@ GEM
|
|
76
76
|
tzinfo (1.2.3)
|
77
77
|
thread_safe (~> 0.1)
|
78
78
|
vcr (3.0.3)
|
79
|
-
webmock (
|
79
|
+
webmock (3.0.1)
|
80
80
|
addressable (>= 2.3.6)
|
81
81
|
crack (>= 0.3.2)
|
82
82
|
hashdiff
|
@@ -92,8 +92,8 @@ DEPENDENCIES
|
|
92
92
|
rake
|
93
93
|
rspec (~> 3.4)
|
94
94
|
simplecov
|
95
|
-
vcr
|
96
|
-
webmock (~>
|
95
|
+
vcr (~> 3.0, >= 3.0.3)
|
96
|
+
webmock (~> 3.0, >= 3.0.1)
|
97
97
|
|
98
98
|
BUNDLED WITH
|
99
|
-
1.
|
99
|
+
1.15.3
|
data/lib/maremma.rb
CHANGED
@@ -33,6 +33,22 @@ module Maremma
|
|
33
33
|
self.method(url, options.merge(method: "delete"))
|
34
34
|
end
|
35
35
|
|
36
|
+
def self.put(url, options={})
|
37
|
+
options[:data] ||= {}
|
38
|
+
options[:headers] = set_request_headers(url, options)
|
39
|
+
|
40
|
+
conn = faraday_conn(options)
|
41
|
+
|
42
|
+
conn.options[:timeout] = options[:timeout] || DEFAULT_TIMEOUT
|
43
|
+
|
44
|
+
response = conn.put url, {}, options[:headers] do |request|
|
45
|
+
request.body = options[:data]
|
46
|
+
end
|
47
|
+
parse_success_response(response.body)
|
48
|
+
rescue *NETWORKABLE_EXCEPTIONS => error
|
49
|
+
rescue_faraday_error(error)
|
50
|
+
end
|
51
|
+
|
36
52
|
def self.get(url, options={})
|
37
53
|
self.method(url, options.merge(method: "get"))
|
38
54
|
end
|
@@ -133,7 +149,7 @@ module Maremma
|
|
133
149
|
# GitHub uses different format for token authentication
|
134
150
|
headers["Authorization"] = "Token #{options[:github_token]}"
|
135
151
|
elsif options[:username].present?
|
136
|
-
basic = Base64.
|
152
|
+
basic = Base64.strict_encode64("#{options[:username]}:#{options[:password]}")
|
137
153
|
headers["Authorization"] = "Basic #{basic}"
|
138
154
|
end
|
139
155
|
|
data/lib/maremma/version.rb
CHANGED
data/maremma.gemspec
CHANGED
@@ -26,15 +26,15 @@ Gem::Specification.new do |s|
|
|
26
26
|
s.add_dependency 'nokogiri', '~> 1.6', '>= 1.6.8'
|
27
27
|
s.add_dependency 'builder', '~> 3.2', '>= 3.2.2'
|
28
28
|
s.add_dependency 'multi_json', '~> 1.12'
|
29
|
-
s.add_dependency 'oj', '~>
|
30
|
-
s.add_dependency 'activesupport', '>= 4.2.5'
|
29
|
+
s.add_dependency 'oj', '~> 3.3', '>= 3.3.0'
|
30
|
+
s.add_dependency 'activesupport', '>= 4.2.5', '< 6'
|
31
31
|
s.add_dependency 'addressable', '>= 2.3.6'
|
32
32
|
s.add_development_dependency 'bundler', '~> 1.0'
|
33
33
|
s.add_development_dependency 'rspec', '~> 3.4'
|
34
34
|
s.add_development_dependency 'rake'
|
35
35
|
s.add_development_dependency 'rack-test', '~> 0'
|
36
|
-
s.add_development_dependency 'vcr'
|
37
|
-
s.add_development_dependency 'webmock', '~>
|
36
|
+
s.add_development_dependency 'vcr', '~> 3.0', '>= 3.0.3'
|
37
|
+
s.add_development_dependency 'webmock', '~> 3.0', '>= 3.0.1'
|
38
38
|
s.add_development_dependency 'codeclimate-test-reporter', "~> 1.0"
|
39
39
|
s.add_development_dependency 'simplecov'
|
40
40
|
end
|
data/spec/maremma_spec.rb
CHANGED
@@ -528,9 +528,14 @@ describe Maremma do
|
|
528
528
|
expect(subject.set_request_headers(url, options)["Authorization"]).to eq("Token 12345")
|
529
529
|
end
|
530
530
|
|
531
|
+
it 'github_token' do
|
532
|
+
options = { github_token: '12345' }
|
533
|
+
expect(subject.set_request_headers(url, options)).to eq("User-Agent"=>"Maremma - https://github.com/datacite/maremma", "Accept"=>accept_header, "Authorization"=>"Token 12345")
|
534
|
+
end
|
535
|
+
|
531
536
|
it 'basic' do
|
532
537
|
options = { username: 'foo', password: '12345' }
|
533
|
-
basic = Base64.
|
538
|
+
basic = Base64.strict_encode64("foo:12345")
|
534
539
|
expect(subject.set_request_headers(url, options)["Authorization"]).to eq("Basic #{basic}")
|
535
540
|
end
|
536
541
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: maremma
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 3.5.
|
4
|
+
version: 3.5.9
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Martin Fenner
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2017-
|
11
|
+
date: 2017-07-29 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: faraday
|
@@ -126,20 +126,20 @@ dependencies:
|
|
126
126
|
requirements:
|
127
127
|
- - "~>"
|
128
128
|
- !ruby/object:Gem::Version
|
129
|
-
version: '
|
129
|
+
version: '3.3'
|
130
130
|
- - ">="
|
131
131
|
- !ruby/object:Gem::Version
|
132
|
-
version:
|
132
|
+
version: 3.3.0
|
133
133
|
type: :runtime
|
134
134
|
prerelease: false
|
135
135
|
version_requirements: !ruby/object:Gem::Requirement
|
136
136
|
requirements:
|
137
137
|
- - "~>"
|
138
138
|
- !ruby/object:Gem::Version
|
139
|
-
version: '
|
139
|
+
version: '3.3'
|
140
140
|
- - ">="
|
141
141
|
- !ruby/object:Gem::Version
|
142
|
-
version:
|
142
|
+
version: 3.3.0
|
143
143
|
- !ruby/object:Gem::Dependency
|
144
144
|
name: activesupport
|
145
145
|
requirement: !ruby/object:Gem::Requirement
|
@@ -147,6 +147,9 @@ dependencies:
|
|
147
147
|
- - ">="
|
148
148
|
- !ruby/object:Gem::Version
|
149
149
|
version: 4.2.5
|
150
|
+
- - "<"
|
151
|
+
- !ruby/object:Gem::Version
|
152
|
+
version: '6'
|
150
153
|
type: :runtime
|
151
154
|
prerelease: false
|
152
155
|
version_requirements: !ruby/object:Gem::Requirement
|
@@ -154,6 +157,9 @@ dependencies:
|
|
154
157
|
- - ">="
|
155
158
|
- !ruby/object:Gem::Version
|
156
159
|
version: 4.2.5
|
160
|
+
- - "<"
|
161
|
+
- !ruby/object:Gem::Version
|
162
|
+
version: '6'
|
157
163
|
- !ruby/object:Gem::Dependency
|
158
164
|
name: addressable
|
159
165
|
requirement: !ruby/object:Gem::Requirement
|
@@ -228,36 +234,42 @@ dependencies:
|
|
228
234
|
name: vcr
|
229
235
|
requirement: !ruby/object:Gem::Requirement
|
230
236
|
requirements:
|
237
|
+
- - "~>"
|
238
|
+
- !ruby/object:Gem::Version
|
239
|
+
version: '3.0'
|
231
240
|
- - ">="
|
232
241
|
- !ruby/object:Gem::Version
|
233
|
-
version:
|
242
|
+
version: 3.0.3
|
234
243
|
type: :development
|
235
244
|
prerelease: false
|
236
245
|
version_requirements: !ruby/object:Gem::Requirement
|
237
246
|
requirements:
|
247
|
+
- - "~>"
|
248
|
+
- !ruby/object:Gem::Version
|
249
|
+
version: '3.0'
|
238
250
|
- - ">="
|
239
251
|
- !ruby/object:Gem::Version
|
240
|
-
version:
|
252
|
+
version: 3.0.3
|
241
253
|
- !ruby/object:Gem::Dependency
|
242
254
|
name: webmock
|
243
255
|
requirement: !ruby/object:Gem::Requirement
|
244
256
|
requirements:
|
245
257
|
- - "~>"
|
246
258
|
- !ruby/object:Gem::Version
|
247
|
-
version: '
|
259
|
+
version: '3.0'
|
248
260
|
- - ">="
|
249
261
|
- !ruby/object:Gem::Version
|
250
|
-
version:
|
262
|
+
version: 3.0.1
|
251
263
|
type: :development
|
252
264
|
prerelease: false
|
253
265
|
version_requirements: !ruby/object:Gem::Requirement
|
254
266
|
requirements:
|
255
267
|
- - "~>"
|
256
268
|
- !ruby/object:Gem::Version
|
257
|
-
version: '
|
269
|
+
version: '3.0'
|
258
270
|
- - ">="
|
259
271
|
- !ruby/object:Gem::Version
|
260
|
-
version:
|
272
|
+
version: 3.0.1
|
261
273
|
- !ruby/object:Gem::Dependency
|
262
274
|
name: codeclimate-test-reporter
|
263
275
|
requirement: !ruby/object:Gem::Requirement
|