dor-services-client 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d1dee5577322be09cabbcbb773ac112d5ce931fd1607e77d030e6a6675aae8b
-  data.tar.gz: c7f6ce0549cd4710484d4b25538acb8f2a7924254d693cca98e5700c809bec5b
+  metadata.gz: d21a10048e6c6a968aab94efe1343d0ccd8b516aa7400e38dbf7db600cdda10c
+  data.tar.gz: e3eb26fe950f1bf8b8c4c34a2ee8b24e082bd4a8aa0938a5c856a48090f5d498
 SHA512:
-  metadata.gz: 8039ee3ee1c35d6ed5eacbf97872abe8fc01663df69e9864aad178bcac730ec6e4f4d5dd8a04d74aa79afe6fa35e9ea83cb74d0a7430c2a49dd02ecb9c2e84fe
-  data.tar.gz: 6509e01c5a243ad19da854ffbdf8e84ea75fcf6cffd81c9bf2f7b7173bd7da4a6d71e64c0a968eba5797079549d524be08ca23d7b4856aecf95b2856e6d9eb29
+  metadata.gz: 0b2580ebf1b1b536a9934248a8d55cc0d8f956f9a438befcf48042a4ca26e309a167f4f4174439e1b4866e228482a922cc9add40b99aacc7a96a3fc817a9633d
+  data.tar.gz: 5ac1721da5515fd5a42be65b2bb3e59a9c03bae2a30fd52d1b9065e143a7874d616272a190b1dd6eb5ac4563fee1f3d4ec534f758ff78390a4d3bcaa383a4b8b

data/lib/dor/services/client.rb

@@ -9,6 +9,7 @@ require 'dor/services/client/versioned_service'
 require 'dor/services/client/object'
 require 'dor/services/client/objects'
 require 'dor/services/client/workflows'
+require 'dor/services/client/error_faraday_middleware'
 
 module Dor
   module Services
@@ -25,6 +26,8 @@ module Dor
       # Error that is raised when the remote server returns some unparsable response
       class MalformedResponse < Error; end
 
+      class ConnectionFailed < Error; end
+
       DEFAULT_VERSION = 'v1'
 
       include Singleton
@@ -78,6 +81,8 @@ module Dor
 
       def connection
         @connection ||= Faraday.new(url) do |conn|
+          conn.use ErrorFaradayMiddleware
+
           # @note when username & password are nil, this line is required else
           #       the Faraday instance will be passed an empty block, which
           #       causes the adapter not to be set. Thus, everything breaks.

data/lib/dor/services/client/error_faraday_middleware.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Dor
+  module Services
+    class Client
+      # This wraps any faraday connection errors with dor-service-client errors
+      class ErrorFaradayMiddleware < Faraday::Response::Middleware
+        def call(env)
+          @app.call(env)
+        rescue Faraday::ConnectionFailed
+          raise ConnectionFailed, 'unable to reach dor-services-app'
+        end
+      end
+    end
+  end
+end

data/lib/dor/services/client/version.rb

@@ -3,7 +3,7 @@
 module Dor
   module Services
     class Client
-      VERSION = '1.6.0'
+      VERSION = '1.7.0'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-services-client
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Justin Coyne
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-13 00:00:00.000000000 Z
+date: 2019-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -178,6 +178,7 @@ files:
 - bin/setup
 - dor-services-client.gemspec
 - lib/dor/services/client.rb
+- lib/dor/services/client/error_faraday_middleware.rb
 - lib/dor/services/client/files.rb
 - lib/dor/services/client/object.rb
 - lib/dor/services/client/objects.rb