maremma 3.6.1 → 3.6.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +2 -2
- data/Gemfile.lock +1 -1
- data/lib/maremma.rb +1 -1
- data/lib/maremma/version.rb +1 -1
- data/spec/maremma_spec.rb +5 -5
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: d503a29e8413b493a41bd51d9ceaf472cefcabd6848dac5d5fa6ad093229e3bf
|
4
|
+
data.tar.gz: 30784b27150b3c166ad200732342682dd6cf2d678b2772cb29a4de4dd3ec24c6
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: bdb22b2a627ef7f3bfee2293d71f2c494da6b5f9154af4133b63439ef9855fda225721ee9cf3c48ba171126337f93169a21fea6773bfc91b901dcd7a3d40743d
|
7
|
+
data.tar.gz: f764f2b19b857a78a42344e49e25788ad8586d7007a5e293b3258c599c71b3d5207f9e0a1bc3330ca56b52835871365b5ff0268bd1b96cde17eb153335f14a95
|
data/CHANGELOG.md
CHANGED
@@ -1,6 +1,6 @@
|
|
1
|
-
## v.3.6.
|
1
|
+
## v.3.6.2 (January 9, 2018)
|
2
2
|
|
3
|
-
[maremma 3.6.
|
3
|
+
[maremma 3.6.2](https://github.com/datacite/maremma/releases/tag/v.3.6.2) was released on January 9, 2018:
|
4
4
|
|
5
5
|
* correctly show 401 status and error message
|
6
6
|
|
data/Gemfile.lock
CHANGED
data/lib/maremma.rb
CHANGED
@@ -148,7 +148,7 @@ module Maremma
|
|
148
148
|
def self.rescue_faraday_error(error)
|
149
149
|
if error.is_a?(Faraday::ResourceNotFound)
|
150
150
|
{ 'errors' => [{ 'status' => 404, 'title' => "Not found" }] }
|
151
|
-
elsif error.message == "
|
151
|
+
elsif error.message == "the server responded with status 401" || error.try(:response) && error.response[:status] == 401
|
152
152
|
{ 'errors' => [{ 'status' => 401, 'title' =>"Unauthorized" }] }
|
153
153
|
elsif error.is_a?(Faraday::ConnectionFailed)
|
154
154
|
{ 'errors' => [{ 'status' => 403, 'title' => parse_error_response(error.message) }] }
|
data/lib/maremma/version.rb
CHANGED
data/spec/maremma_spec.rb
CHANGED
@@ -292,28 +292,28 @@ describe Maremma do
|
|
292
292
|
|
293
293
|
context "unauthorized" do
|
294
294
|
it "get json" do
|
295
|
-
stub = stub_request(:get, url).to_raise(Faraday::Error::ClientError.new("
|
295
|
+
stub = stub_request(:get, url).to_raise(Faraday::Error::ClientError.new("the server responded with status 401"))
|
296
296
|
response = subject.get(url)
|
297
297
|
expect(response.body).to eq("errors"=>[{"status"=>401, "title"=>"Unauthorized"}])
|
298
298
|
expect(stub).to have_been_requested
|
299
299
|
end
|
300
300
|
|
301
301
|
it "get xml" do
|
302
|
-
stub = stub_request(:get, url).to_raise(Faraday::Error::ClientError.new("
|
302
|
+
stub = stub_request(:get, url).to_raise(Faraday::Error::ClientError.new("the server responded with status 401"))
|
303
303
|
response = subject.get(url, accept: 'xml')
|
304
304
|
expect(response.body).to eq("errors"=>[{"status"=>401, "title"=>"Unauthorized"}])
|
305
305
|
expect(stub).to have_been_requested
|
306
306
|
end
|
307
307
|
|
308
308
|
it "get html" do
|
309
|
-
stub = stub_request(:get, url).to_raise(Faraday::Error::ClientError.new("
|
309
|
+
stub = stub_request(:get, url).to_raise(Faraday::Error::ClientError.new("the server responded with status 401"))
|
310
310
|
response = subject.get(url, accept: 'html')
|
311
311
|
expect(response.body).to eq("errors"=>[{"status"=>401, "title"=>"Unauthorized"}])
|
312
312
|
expect(stub).to have_been_requested
|
313
313
|
end
|
314
314
|
|
315
315
|
it "post xml" do
|
316
|
-
stub = stub_request(:post, url).with(:body => post_data.to_xml).to_raise(Faraday::Error::ClientError.new("
|
316
|
+
stub = stub_request(:post, url).with(:body => post_data.to_xml).to_raise(Faraday::Error::ClientError.new("the server responded with status 401"))
|
317
317
|
subject.post(url, accept: 'xml', data: post_data.to_xml) do |response|
|
318
318
|
expect(response.body).to be_nil
|
319
319
|
expect(response.status).to eq("errors"=>[{"status"=>401, "title"=>"Unauthorized"}])
|
@@ -322,7 +322,7 @@ describe Maremma do
|
|
322
322
|
end
|
323
323
|
|
324
324
|
it "put xml" do
|
325
|
-
stub = stub_request(:put, url).with(:body => post_data.to_xml).to_raise(Faraday::Error::ClientError.new("
|
325
|
+
stub = stub_request(:put, url).with(:body => post_data.to_xml).to_raise(Faraday::Error::ClientError.new("the server responded with status 401"))
|
326
326
|
subject.put(url, accept: 'xml', data: post_data.to_xml) do |response|
|
327
327
|
expect(response.body).to be_nil
|
328
328
|
expect(response.status).to eq("errors"=>[{"status"=>401, "title"=>"Unauthorized"}])
|