maremma 2.4.2 → 2.4.3
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.
- checksums.yaml +4 -4
- data/Gemfile.lock +10 -10
- data/lib/maremma.rb +0 -3
- data/lib/maremma/version.rb +1 -1
- data/maremma.gemspec +1 -1
- data/spec/maremma_spec.rb +0 -5
- metadata +6 -6
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 9123398e2a4985bd5cb51e8a5b4a2a32e9b49509
|
|
4
|
+
data.tar.gz: bbc8b74f4ab96d54a2829200c2e39a894477ec21
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 85c44227f161562cbe438d419a29996ade8f5b9f666bb8d2067887f824f4140b064cce410d55bf80fb1d380a476335c05d23f3c691705da8efababc8d2a2d5cb
|
|
7
|
+
data.tar.gz: b0bb553f9ec0fe8ceec0746531475a9557626c28c6eafef51d20b909335fedd6709475f12826457cf83cc966cca1cf03d8e3039aba3ac1a77c1016bf1da64744
|
data/Gemfile.lock
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
PATH
|
|
2
2
|
remote: .
|
|
3
3
|
specs:
|
|
4
|
-
maremma (2.4.
|
|
4
|
+
maremma (2.4.3)
|
|
5
5
|
activesupport (~> 4.2, >= 4.2.5)
|
|
6
6
|
builder (~> 3.2, >= 3.2.2)
|
|
7
7
|
excon (~> 0.45.0)
|
|
@@ -10,12 +10,12 @@ PATH
|
|
|
10
10
|
faraday_middleware (~> 0.10.0)
|
|
11
11
|
multi_json (~> 1.11.2)
|
|
12
12
|
nokogiri (~> 1.6.7)
|
|
13
|
-
oj (
|
|
13
|
+
oj (>= 2.18.3)
|
|
14
14
|
|
|
15
15
|
GEM
|
|
16
16
|
remote: https://rubygems.org/
|
|
17
17
|
specs:
|
|
18
|
-
activesupport (4.2.
|
|
18
|
+
activesupport (4.2.9)
|
|
19
19
|
i18n (~> 0.7)
|
|
20
20
|
minitest (~> 5.1)
|
|
21
21
|
thread_safe (~> 0.3, >= 0.3.4)
|
|
@@ -36,20 +36,20 @@ GEM
|
|
|
36
36
|
faraday
|
|
37
37
|
faraday_middleware (0.10.1)
|
|
38
38
|
faraday (>= 0.7.4, < 1.0)
|
|
39
|
-
hashdiff (0.3.
|
|
40
|
-
i18n (0.8.
|
|
39
|
+
hashdiff (0.3.5)
|
|
40
|
+
i18n (0.8.6)
|
|
41
41
|
json (2.1.0)
|
|
42
42
|
mini_portile2 (2.1.0)
|
|
43
|
-
minitest (5.10.
|
|
43
|
+
minitest (5.10.3)
|
|
44
44
|
multi_json (1.11.3)
|
|
45
45
|
multipart-post (2.0.0)
|
|
46
46
|
nokogiri (1.6.8.1)
|
|
47
47
|
mini_portile2 (~> 2.1.0)
|
|
48
|
-
oj (
|
|
48
|
+
oj (3.3.4)
|
|
49
49
|
public_suffix (2.0.5)
|
|
50
50
|
rack (2.0.3)
|
|
51
|
-
rack-test (0.
|
|
52
|
-
rack (>= 1.0)
|
|
51
|
+
rack-test (0.7.0)
|
|
52
|
+
rack (>= 1.0, < 3)
|
|
53
53
|
rake (12.0.0)
|
|
54
54
|
rspec (3.6.0)
|
|
55
55
|
rspec-core (~> 3.6.0)
|
|
@@ -94,4 +94,4 @@ DEPENDENCIES
|
|
|
94
94
|
webmock (~> 1.22, >= 1.22.3)
|
|
95
95
|
|
|
96
96
|
BUNDLED WITH
|
|
97
|
-
1.
|
|
97
|
+
1.15.3
|
data/lib/maremma.rb
CHANGED
|
@@ -107,9 +107,6 @@ module Maremma
|
|
|
107
107
|
options[:headers]['Authorization'] = "Bearer #{options[:bearer]}"
|
|
108
108
|
elsif options[:token].present?
|
|
109
109
|
options[:headers]["Authorization"] = "Token token=#{options[:token]}"
|
|
110
|
-
elsif options[:github_token].present?
|
|
111
|
-
# GitHub uses different format for token authentication
|
|
112
|
-
options[:headers]["Authorization"] = "Token #{options[:github_token]}"
|
|
113
110
|
elsif options[:username].present?
|
|
114
111
|
basic = Base64.encode64("#{options[:username]}:#{options[:password].to_s}")
|
|
115
112
|
options[:headers]["Authorization"] = "Basic #{basic}"
|
data/lib/maremma/version.rb
CHANGED
data/maremma.gemspec
CHANGED
|
@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
|
|
|
26
26
|
s.add_dependency 'nokogiri', '~> 1.6.7'
|
|
27
27
|
s.add_dependency 'builder', '~> 3.2', '>= 3.2.2'
|
|
28
28
|
s.add_dependency 'multi_json', '~> 1.11.2'
|
|
29
|
-
s.add_dependency 'oj', '
|
|
29
|
+
s.add_dependency 'oj', '>= 2.18.3'
|
|
30
30
|
s.add_dependency 'activesupport', '~> 4.2', '>= 4.2.5'
|
|
31
31
|
s.add_development_dependency 'bundler', '~> 1.0'
|
|
32
32
|
s.add_development_dependency 'rspec', '~> 3.4'
|
data/spec/maremma_spec.rb
CHANGED
|
@@ -365,11 +365,6 @@ describe Maremma do
|
|
|
365
365
|
expect(subject.set_request_headers(url, options)).to eq("User-Agent"=>"Maremma - https://github.com/datacite/maremma", "Accept"=>accept_header, "Authorization"=>"Token token=12345")
|
|
366
366
|
end
|
|
367
367
|
|
|
368
|
-
it 'github_token' do
|
|
369
|
-
options = { github_token: '12345' }
|
|
370
|
-
expect(subject.set_request_headers(url, options)).to eq("User-Agent"=>"Maremma - https://github.com/datacite/maremma", "Accept"=>accept_header, "Authorization"=>"Token 12345")
|
|
371
|
-
end
|
|
372
|
-
|
|
373
368
|
it 'basic' do
|
|
374
369
|
options = { username: 'foo', password: '12345' }
|
|
375
370
|
basic = Base64.encode64("foo:12345")
|
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: 2.4.
|
|
4
|
+
version: 2.4.3
|
|
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-08-11 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: faraday
|
|
@@ -118,16 +118,16 @@ dependencies:
|
|
|
118
118
|
name: oj
|
|
119
119
|
requirement: !ruby/object:Gem::Requirement
|
|
120
120
|
requirements:
|
|
121
|
-
- - "
|
|
121
|
+
- - ">="
|
|
122
122
|
- !ruby/object:Gem::Version
|
|
123
|
-
version: 2.
|
|
123
|
+
version: 2.18.3
|
|
124
124
|
type: :runtime
|
|
125
125
|
prerelease: false
|
|
126
126
|
version_requirements: !ruby/object:Gem::Requirement
|
|
127
127
|
requirements:
|
|
128
|
-
- - "
|
|
128
|
+
- - ">="
|
|
129
129
|
- !ruby/object:Gem::Version
|
|
130
|
-
version: 2.
|
|
130
|
+
version: 2.18.3
|
|
131
131
|
- !ruby/object:Gem::Dependency
|
|
132
132
|
name: activesupport
|
|
133
133
|
requirement: !ruby/object:Gem::Requirement
|