maremma 2.5.3 → 2.5.4
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/CHANGELOG.md +6 -0
- data/Gemfile.lock +5 -4
- data/lib/maremma/version.rb +1 -1
- data/lib/maremma.rb +8 -8
- data/spec/maremma_spec.rb +10 -5
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 7f0dba7886b660d888aad1396336217da1fbb38a
|
4
|
+
data.tar.gz: 9e4f2ddefab4fe463e42084b4bd1393768feae67
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: f618a4c3cf13f2457ad73e05a90e09e41e1e05c831d9fb5451d8a2781a00a62cfbc89d7fc375c772b255a609f5bf75eda2bed6cc5bd799c83d64ecc8efd1a003
|
7
|
+
data.tar.gz: 8ce548a82f8f108bb52ed6d30ae76df2e91987da32ee1bed9070a9f7500f6c9ce64203e2c682b6b323e79f7905777e084f4ac487ac977557c0947e573467b249
|
data/CHANGELOG.md
CHANGED
@@ -1,3 +1,9 @@
|
|
1
|
+
## v.2.5.4 (November 23, 2016)
|
2
|
+
|
3
|
+
[maremma 2.5](https://github.com/datacite/maremma/releases/tag/v.2.5.4) was released on November 23, 2016:
|
4
|
+
|
5
|
+
* fixed regression error in parsing response body
|
6
|
+
|
1
7
|
## v.2.5 (November 18, 2016)
|
2
8
|
|
3
9
|
[maremma 2.5](https://github.com/datacite/maremma/releases/tag/v.2.5) was released on November 18, 2016:
|
data/Gemfile.lock
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
PATH
|
2
2
|
remote: .
|
3
3
|
specs:
|
4
|
-
maremma (2.5.
|
4
|
+
maremma (2.5.4)
|
5
5
|
activesupport (~> 4.2, >= 4.2.5)
|
6
6
|
builder (~> 3.2, >= 3.2.2)
|
7
7
|
excon (~> 0.45.0)
|
@@ -24,7 +24,8 @@ GEM
|
|
24
24
|
addressable (2.5.0)
|
25
25
|
public_suffix (~> 2.0, >= 2.0.2)
|
26
26
|
builder (3.2.2)
|
27
|
-
codeclimate-test-reporter (1.0.
|
27
|
+
codeclimate-test-reporter (1.0.3)
|
28
|
+
simplecov
|
28
29
|
crack (0.4.3)
|
29
30
|
safe_yaml (~> 1.0.0)
|
30
31
|
diff-lcs (1.2.5)
|
@@ -46,7 +47,7 @@ GEM
|
|
46
47
|
nokogiri (1.6.8.1)
|
47
48
|
mini_portile2 (~> 2.1.0)
|
48
49
|
oj (2.13.1)
|
49
|
-
public_suffix (2.0.
|
50
|
+
public_suffix (2.0.4)
|
50
51
|
rack (2.0.1)
|
51
52
|
rack-test (0.6.3)
|
52
53
|
rack (>= 1.0)
|
@@ -94,4 +95,4 @@ DEPENDENCIES
|
|
94
95
|
webmock (~> 1.22, >= 1.22.3)
|
95
96
|
|
96
97
|
BUNDLED WITH
|
97
|
-
1.
|
98
|
+
1.12.5
|
data/lib/maremma/version.rb
CHANGED
data/lib/maremma.rb
CHANGED
@@ -30,7 +30,7 @@ module Maremma
|
|
30
30
|
response = conn.post url, {}, options[:headers] do |request|
|
31
31
|
request.body = options[:data]
|
32
32
|
end
|
33
|
-
|
33
|
+
parse_success_response(response.body).merge("headers" => response.headers)
|
34
34
|
rescue *NETWORKABLE_EXCEPTIONS => error
|
35
35
|
rescue_faraday_error(error)
|
36
36
|
end
|
@@ -46,7 +46,7 @@ module Maremma
|
|
46
46
|
response = conn.put url, {}, options[:headers] do |request|
|
47
47
|
request.body = options[:data]
|
48
48
|
end
|
49
|
-
|
49
|
+
parse_success_response(response.body).merge("headers" => response.headers)
|
50
50
|
rescue *NETWORKABLE_EXCEPTIONS => error
|
51
51
|
rescue_faraday_error(error)
|
52
52
|
end
|
@@ -61,7 +61,7 @@ module Maremma
|
|
61
61
|
|
62
62
|
response = conn.delete url, {}, options[:headers]
|
63
63
|
|
64
|
-
|
64
|
+
parse_success_response(response.body).merge("headers" => response.headers)
|
65
65
|
rescue *NETWORKABLE_EXCEPTIONS => error
|
66
66
|
rescue_faraday_error(error)
|
67
67
|
end
|
@@ -80,7 +80,7 @@ module Maremma
|
|
80
80
|
return { 'errors' => [{ 'status' => 429, 'title' => "Too many requests" }] }
|
81
81
|
end
|
82
82
|
|
83
|
-
|
83
|
+
parse_success_response(response.body).merge("headers" => response.headers)
|
84
84
|
rescue *NETWORKABLE_EXCEPTIONS => error
|
85
85
|
rescue_faraday_error(error)
|
86
86
|
end
|
@@ -181,13 +181,13 @@ module Maremma
|
|
181
181
|
string = parse_response(string)
|
182
182
|
|
183
183
|
if string == ""
|
184
|
-
nil
|
184
|
+
{ 'data' => nil }
|
185
185
|
elsif string.is_a?(Hash) && string['data']
|
186
|
-
string
|
186
|
+
string
|
187
187
|
elsif string.is_a?(Hash) && string['hash']
|
188
|
-
string['hash']
|
188
|
+
{ 'data' => string['hash'] }
|
189
189
|
else
|
190
|
-
string
|
190
|
+
{ 'data' => string }
|
191
191
|
end
|
192
192
|
end
|
193
193
|
|
data/spec/maremma_spec.rb
CHANGED
@@ -320,27 +320,32 @@ describe Maremma do
|
|
320
320
|
context 'parse_success_response' do
|
321
321
|
it 'from_json' do
|
322
322
|
string = '{ "word": "abc" }'
|
323
|
-
expect(subject.parse_success_response(string)).to eq("word"=>"abc")
|
323
|
+
expect(subject.parse_success_response(string)).to eq({"data"=>{"word"=>"abc"}})
|
324
324
|
end
|
325
325
|
|
326
326
|
it 'from_json with data' do
|
327
327
|
string = '{ "data": { "word": "abc" }}'
|
328
|
-
expect(subject.parse_success_response(string)).to eq("word"=>"abc")
|
328
|
+
expect(subject.parse_success_response(string)).to eq({"data"=>{"word"=>"abc"}})
|
329
|
+
end
|
330
|
+
|
331
|
+
it 'from_json with data and meta' do
|
332
|
+
string = '{ "data": { "word": "abc" }, "meta": { "total": 12 }}'
|
333
|
+
expect(subject.parse_success_response(string)).to eq({"data"=>{"word"=>"abc"},"meta"=>{"total"=>12}})
|
329
334
|
end
|
330
335
|
|
331
336
|
it 'from_xml' do
|
332
337
|
string = "<word>abc</word>"
|
333
|
-
expect(subject.parse_success_response(string)).to eq("word"=>"abc")
|
338
|
+
expect(subject.parse_success_response(string)).to eq("data"=>{"word"=>"abc"})
|
334
339
|
end
|
335
340
|
|
336
341
|
it 'from_string' do
|
337
342
|
string = "abc"
|
338
|
-
expect(subject.parse_success_response(string)).to eq("abc")
|
343
|
+
expect(subject.parse_success_response(string)).to eq("data"=>"abc")
|
339
344
|
end
|
340
345
|
|
341
346
|
it 'from_string with utf-8' do
|
342
347
|
string = "fön "
|
343
|
-
expect(subject.parse_success_response(string)).to eq("fön")
|
348
|
+
expect(subject.parse_success_response(string)).to eq("data"=>"fön")
|
344
349
|
end
|
345
350
|
end
|
346
351
|
|
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.5.
|
4
|
+
version: 2.5.4
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Martin Fenner
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2016-11-
|
11
|
+
date: 2016-11-23 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: faraday
|