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 CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 2622dc1207e73ccef92d34558f7e48cfea352be0
4
- data.tar.gz: 6dd16a78e92871da8d96dfa30506c33d7f27abc0
3
+ metadata.gz: 7f0dba7886b660d888aad1396336217da1fbb38a
4
+ data.tar.gz: 9e4f2ddefab4fe463e42084b4bd1393768feae67
5
5
  SHA512:
6
- metadata.gz: 7c116e6d1cc8fe6ec3550b631041467f6411176cb2ab2220e8a79903f59aa8a024275876238027219f3237a091f9523772df0a408bf1fef9beaf883becb7ce66
7
- data.tar.gz: 63e1086232fbd8fe2b3cf3025c7b881c82db6d4ee5df5eb6abbb8e36dd4c7c9c3c8d52f580351c58fecdf297df2c394359d5f24117f2213b580311acf6ecbb57
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.3)
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.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.3)
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.13.6
98
+ 1.12.5
@@ -1,3 +1,3 @@
1
1
  module Maremma
2
- VERSION = "2.5.3"
2
+ VERSION = "2.5.4"
3
3
  end
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
- { "data" => parse_success_response(response.body), "headers" => response.headers }
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
- { "data" => parse_success_response(response.body), "headers" => response.headers }
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
- { "data" => parse_success_response(response.body), "headers" => response.headers }
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
- { "data" => parse_success_response(response.body), "headers" => response.headers }
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['data']
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.3
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-18 00:00:00.000000000 Z
11
+ date: 2016-11-23 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: faraday