maremma 2.3 → 2.3.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzgwMGIxMjdiNDg1MWRjNmU0ZWQxMGRjZDBmNWRjNGQ4YmZlMDllNw==
+    ZjQ3OGFkNDYzZDQ2NGE1NzFiOWY0NWViZDYxNzRkMjViYTMxYTFlNA==
   data.tar.gz: !binary |-
-    OWUyOTYwYWUyMTllNzkzNGZiOWU0YjM1MzE1NmVjMTY3YjZkNzhlNg==
+    YTAyZGI5NzNhMWJjYmU0YTA3ZGMzYzQyZGEwYzFlMzkxZGY2MWY2OA==
 SHA512:
   metadata.gz: !binary |-
-    MTE1MDU3YTRmN2Y3MWQ0Mzg4NzA5MWJiZWJiNDBhNTRlMWRlY2Y5YWM4ODQw
-    YzFiNGJmYTcwNWRiOGI4ZjkzZTgxYThkMjk4OWZiZWYyNDE1MDFhOTAxNzVi
-    OTk1YTJiOWYyOTNjOWFlNDA3OGEyN2ZiNDk5NTFhYTMwMGZmNTE=
+    NWZiY2Y0NGQzNTViY2JkMDE1N2I1MjA2NjVlOTg1NDI4MTZhN2YwODE0ZWNh
+    ODUxZDg5NDY2OWNlYjAxOTI3ZWU4MTBkNDUyYTEyMjg3NDFiN2MwM2NlOThm
+    ZjcyZjc0NzA2MTU0NmZmYjc2YjE2MGRmMDU1M2YxMjJmYzlmMDQ=
   data.tar.gz: !binary |-
-    NDI4NTliODQ4NzE5ZWIyYWU1ZWIzN2NjZDAyYmQwMzRmNjkyOGQ3YmMwMGU2
-    M2IxNjI4ZDkxZWMwMzVjMzMzNjVkZGZiN2EwNTA3N2VhNDA2ZGUyYzkyNTZi
-    NmNlZjMzNmY4MmI0MmJlNTg2OTU2MDNkZGI0MTY4MGZmNWJmZjU=
+    ZDRiM2E0M2ZjYjBmZTNlYjljODMzNDlkYjZmMjE1NzY1ZDkyMzFjYjhkODYx
+    ZDY0NjViNTE4NmQzNTE0NDI3ZGU5MDkzNzA5ZGM5ZDQ3YjhmMzJlZGQ1NzZh
+    ZWIwZmQxMGQ3NjRlMzJkMDJhYzY5NjE2Y2QxOGZmMWUxYjliMzA=

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## v.2.3.1 (September 2, 2016)
+
+[maremma 2.3.1](https://github.com/datacite/maremma/releases/tag/v.2.3.1) was released on September 2, 2016:
+
+* handle `Faraday::ConnectionFailed` errors with an appropriate error message
+
 ## v.2.3 (August 16, 2016)
 
 [maremma 2.3](https://github.com/datacite/maremma/releases/tag/v.2.3) was released on August 16, 2016:

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    maremma (2.3)
+    maremma (2.3.1)
       activesupport (~> 4.2, >= 4.2.5)
       builder (~> 3.2, >= 3.2.2)
       excon (~> 0.45.0)

data/lib/maremma.rb

@@ -109,7 +109,9 @@ module Maremma
   def self.rescue_faraday_error(error)
     if error.is_a?(Faraday::ResourceNotFound)
       { 'errors' => [{ 'status' => 404, 'title' => "Not found" }] }
-    elsif error.is_a?(Faraday::TimeoutError) || error.is_a?(Faraday::ConnectionFailed) || (error.try(:response) && error.response[:status] == 408)
+    elsif error.is_a?(Faraday::ConnectionFailed)
+      { 'errors' => [{ 'status' => "403", 'title' => parse_error_response(error.message) }] }
+    elsif error.is_a?(Faraday::TimeoutError) || (error.try(:response) && error.response[:status] == 408)
       { 'errors' => [{ 'status' => 408, 'title' =>"Request timeout" }] }
     else
       { 'errors' => [{ 'status' => 400, 'title' => parse_error_response(error.message) }] }

data/lib/maremma/version.rb

@@ -1,3 +1,3 @@
 module Maremma
-  VERSION = "2.3"
+  VERSION = "2.3.1"
 end

data/spec/maremma_spec.rb

@@ -140,6 +140,35 @@ describe Maremma do
     end
   end
 
+  context "connection failed" do
+    it "get json" do
+      stub = stub_request(:get, url).to_raise(Faraday::ConnectionFailed.new("Connection refused - connect(2)"))
+      response = subject.get(url)
+      expect(response).to eq("errors"=>[{"status"=>"403", "title"=>"Connection refused - connect(2)"}])
+      expect(stub).to have_been_requested
+    end
+
+    it "get xml" do
+      stub = stub_request(:get, url).to_raise(Faraday::ConnectionFailed.new("Connection refused - connect(2)"))
+      response = subject.get(url, content_type: 'xml')
+      expect(response).to eq("errors"=>[{"status"=>"403", "title"=>"Connection refused - connect(2)"}])
+      expect(stub).to have_been_requested
+    end
+
+    it "get html" do
+      stub = stub_request(:get, url).to_raise(Faraday::ConnectionFailed.new("Connection refused - connect(2)"))
+      response = subject.get(url, content_type: 'html')
+      expect(response).to eq("errors"=>[{"status"=>"403", "title"=>"Connection refused - connect(2)"}])
+      expect(stub).to have_been_requested
+    end
+
+    it "post xml" do
+      stub = stub_request(:post, url).with(:body => post_data.to_xml).to_raise(Faraday::ConnectionFailed.new("Connection refused - connect(2)"))
+      subject.post(url, content_type: 'xml', data: post_data.to_xml) { |response| expect(response).to be_nil }
+      expect(stub).to have_been_requested
+    end
+  end
+
   context "request timeout internal" do
     it "get json" do
       stub = stub_request(:get, url).to_timeout

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maremma
 version: !ruby/object:Gem::Version
-  version: '2.3'
+  version: 2.3.1
 platform: ruby
 authors:
 - Martin Fenner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-16 00:00:00.000000000 Z
+date: 2016-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday