async-http-faraday 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c109996bf4e1ac263d36167d2f090404defde07adf3be7471f175f5bdd279d22
-  data.tar.gz: 7cdaaad412d469ac673dc85cf149ffdf7fcd593b859a2c891c23bde36c065e6b
+  metadata.gz: 6754e975558fbf1480ebf74ec990e82a8537751de269b054c7b7aea23b8a80db
+  data.tar.gz: bc0b9afcea1f32460f44dc45170c4de556a0549898ff8d80215cafbb47838856
 SHA512:
-  metadata.gz: 40b5496840bec8a74b60adfb807e84c1f863b1dd6719c6406018617d57c4c9313b45e492e88a2e2d224c15abf7c19b7fd5c0a7ed75280622193850942b0f86c0
-  data.tar.gz: 1d326fe89303b9e64ba5824d72d29bf063e5124a314238dce919c1ff75fb3f56926a633c00d2ce0d6f6fd5b656596febdb4e4670789593b8d9fd1e44395801b3
+  metadata.gz: 548a1b223ff55ee0e79a84004185c829ca9f1704da97ef62e0cb2345c82d83d324ca8eddc5f469b976a8ee3c5bf301bef94ad8564379e214b65fc103fba27bee
+  data.tar.gz: 8b70b6e79e179d6defcdeeb128e14ad90180aed8b15a0e6fedd831612e9221923ee092cb5b67d8b46327189ec4f2415c75e63747b3656eda0758ca31d982c2ab

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

@@ -20,8 +20,11 @@
 
 require 'faraday'
 require 'faraday/adapter'
+require 'kernel/sync'
 require 'async/http/internet'
 
+require_relative 'agent'
+
 module Async
 	module HTTP
 		module Faraday
@@ -57,10 +60,20 @@ module Async
 				def call(env)
 					super
 					
-					with_timeout do
-						response = @internet.call(env[:method].to_s.upcase, env[:url].to_s, env[:request_headers], env[:body] || [])
+					parent = Async::Task.current?
 					
-						save_response(env, response.status, response.read, response.headers)
+					Sync do
+						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)
+						end
+					ensure
+						# If we are the top level task, even if we are persistent, we must close the connection:
+						if parent.nil? || !@persistent
+							Async.logger.debug(self) {"Closing persistent connections."}
+							@internet.close
+						end
 					end
 					
 					return @app.call(env)
@@ -70,9 +83,6 @@ module Async
 					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
 				end
 
 				private

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

@@ -0,0 +1,34 @@
+# Copyright, 2020, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+begin
+	require 'sawyer/agent'
+	
+	# This is a nasty hack until https://github.com/lostisland/sawyer/pull/67 is resolved:
+	unless Sawyer::Agent.instance_methods.include?(:close)
+		class Sawyer::Agent
+			def close
+				@conn.close if @conn.respond_to?(:close)
+			end
+		end
+	end
+rescue LoadError
+	# Ignore.
+end

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

@@ -21,7 +21,7 @@
 module Async
 	module HTTP
 		module Faraday
-			VERSION = "0.7.1"
+			VERSION = "0.8.0"
 		end
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async-http-faraday
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-30 00:00:00.000000000 Z
+date: 2020-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-http
@@ -125,6 +125,7 @@ files:
 - examples/topics.rb
 - lib/async/http/faraday.rb
 - lib/async/http/faraday/adapter.rb
+- lib/async/http/faraday/agent.rb
 - lib/async/http/faraday/version.rb
 homepage: https://github.com/socketry/async-http
 licenses: []