async-http-faraday 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7547186d920c58d1c3c27f9a16041cd82c670204505ec696dcc2104990e724f3
-  data.tar.gz: 32e8fd12a7d66d55059e5daaa311a2735130b6704fc5b88e6313c5c4cc782ba1
+  metadata.gz: 18cebe143b4adb98ef8c4275b23c4a0424189939be8536ea556a6766a0f32601
+  data.tar.gz: f61244ea3ac54fd86f0866410c0c1073fe95640aaac40ae15b56998b56686169
 SHA512:
-  metadata.gz: 7632d215b1a008a6462d9a9cdc56451f4894dfad2dcd649972b4bc55c4f92eb592e9253cd40ed207fbe21c752261d734b5e55c0113f81717a3a655f4233e0899
-  data.tar.gz: d3fa8fcd72045b89affe384cc4284c738e861051430544cd59fc30051fc3bad7baab4fc92ab523d6857f7f18d09404b22a576ffe6f3ccd8eea9a2d841c83df90
+  metadata.gz: '0758825d6f3e0e8048d128d682e9087f7b8d3d002811cb08604d1019ce6c820dc70274ad99e9eca6fba4d58770dbb730ffae0fdfea2e8938bbf57d848fce98ea'
+  data.tar.gz: '09b864bd39e657078f6f9a8830881243ce35de8cb3c9f31b815c68c343afc3b5d2d3b7009373cd682b84661e8e74e97b35aa4a515fac9b7c6c8369d5b666c649'

data/.travis.yml

@@ -1,5 +1,4 @@
 language: ruby
-sudo: false
 dist: trusty
 cache: bundler
 
@@ -9,6 +8,7 @@ matrix:
     - rvm: 2.4
     - rvm: 2.5
     - rvm: 2.6
+    - rvm: 2.7
     - rvm: jruby-head
       env: JRUBY_OPTS="--debug -X+O"
     - rvm: ruby-head

data/lib/async/http/faraday/adapter.rb

@@ -29,10 +29,25 @@ module Async
 			PERSISTENT = ::Faraday::Connection.instance_methods.include?(:close)
 			
 			class Adapter < ::Faraday::Adapter
+				CONNECTION_EXCEPTIONS = [
+					Errno::EADDRNOTAVAIL,
+					Errno::ECONNABORTED,
+					Errno::ECONNREFUSED,
+					Errno::ECONNRESET,
+					Errno::EHOSTUNREACH,
+					Errno::EINVAL,
+					Errno::ENETUNREACH,
+					Errno::EPIPE,
+					IOError,
+					SocketError
+				].freeze
+
 				def initialize(*arguments, **options, &block)
 					super
 					
 					@internet = Async::HTTP::Internet.new
+					@persistent = PERSISTENT && options.fetch(:persistent, true)
+					@timeout = options[:timeout]
 				end
 				
 				def close
@@ -42,14 +57,34 @@ module Async
 				def call(env)
 					super
 					
-					response = @internet.call(env[:method], env[:url].to_s, env[:request_headers], env[:body])
+					with_timeout do
+						response = @internet.call(env[:method].to_s.upcase, env[:url].to_s, env[:request_headers], env[:body] || [])
 					
-					save_response(env, response.status, response.read, response.headers)
+						save_response(env, response.status, response.read, response.headers)
+					end
 					
 					return @app.call(env)
+				rescue Errno::ETIMEDOUT => e
+					raise ::Faraday::TimeoutError, e
+				rescue OpenSSL::SSL::SSLError => e
+					raise ::Faraday::SSLError, e
+				rescue *CONNECTION_EXCEPTIONS => e
+					raise ::Faraday::ConnectionFailed, e
 				ensure
 					# Don't retain persistent connections unless they will eventually be closed:
-					@internet.close unless PERSISTENT
+					@internet.close unless @persistent
+				end
+
+				private
+
+				def with_timeout
+					if @timeout
+						Async::Task.current.with_timeout(@timeout, ::Faraday::TimeoutError) do
+							yield
+						end
+					else
+						yield
+					end
 				end
 			end
 		end

data/lib/async/http/faraday/version.rb

@@ -21,7 +21,7 @@
 module Async
 	module HTTP
 		module Faraday
-			VERSION = "0.6.0"
+			VERSION = "0.7.0"
 		end
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async-http-faraday
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-23 00:00:00.000000000 Z
+date: 2020-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-http
@@ -144,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Provides an adaptor between async-http and faraday.