fetch-api 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dbef9662b23db6e0efca2b67264d6450553991b551ec94f1b7099c0b4c2eda55
-  data.tar.gz: 0456d3ff62bcceeaa780ff9cb42c3ff231d667b977ef968e22bb5b2a5578e358
+  metadata.gz: ff43ec8ec36d621acb463b7327146e89df97446714df7747626276bb51ff4c18
+  data.tar.gz: de99e42e871912c41df6a5afabb1200f662d5aeba7b6659a4483434c8ddca3c7
 SHA512:
-  metadata.gz: 516ebe663dc6f346a8acc56f7a1c8e1a3bc11f3e133f6ca0c10a8544516a6dc8a8e34efd660585de627c595ba66ed17b6df3f3415ec90a439be84e21e50d7343
-  data.tar.gz: 3b0630efe83154f9a71df06aec28b551720a6041e24ce1797626a105eedacc54a96495362e061b391018847cbfd2021e4fd750854b75a546841738f2a58d441c
+  metadata.gz: 7b56ad7b6ac2788343928c4686f48de71e1dc57491e9e13efa5cc479f4f7f57af9d4efad3e7a79cf75fd287d683bb21ec053b69de0c66cdd39a0aef571f86c7b
+  data.tar.gz: 8895b9835e6637a9d4cd845708e2a133b2f6239baab1729478f16ae9f25ea3df927d678c41ebfbcc26cb3482a43c5fb616779df89a21a8a1aa634f0e18ebe392

data/lib/fetch/client.rb

@@ -15,10 +15,6 @@ module Fetch
   class Client
     include Singleton
 
-    def initialize
-      @pool = ConnectionPool.new
-    end
-
     def fetch(resource, method: :get, headers: [], body: nil, redirect: :follow, _redirected: false)
       uri = URI.parse(resource)
       req = Net::HTTP.const_get(method.capitalize).new(uri)
@@ -45,7 +41,8 @@ module Fetch
         req.body = body
       end
 
-      res = @pool.with_connection(uri) { _1.request(req) }
+      # @type var uri: URI::HTTP
+      res = pool.with_connection(uri) { _1.request(req) }
 
       case res
       when Net::HTTPRedirection
@@ -66,6 +63,14 @@ module Fetch
 
     private
 
+    def pool
+      if pool = Thread.current.thread_variable_get(:fetch_connection_pool)
+        pool
+      else
+        Thread.current.thread_variable_set :fetch_connection_pool, ConnectionPool.new
+      end
+    end
+
     def to_response(url, res, redirected)
       Response.new(
         url:        url.to_str,

data/lib/fetch/connection_pool.rb

@@ -35,7 +35,7 @@ module Fetch
 
     def acquire(uri)
       @mutex.synchronize {
-        entry = @connections[key(uri)]
+        entry = @connections[uri.origin]
 
         if entry
           entry.in_use = true
@@ -46,7 +46,7 @@ module Fetch
             http.use_ssl            = uri.scheme == 'https'
             http.keep_alive_timeout = Fetch.config.keep_alive_timeout
 
-            @connections[key(uri)] = Entry.new(connection: http, in_use: true)
+            @connections[uri.origin] = Entry.new(connection: http, in_use: true)
 
             http.start
           }
@@ -58,7 +58,7 @@ module Fetch
 
     def release(uri)
       @mutex.synchronize do
-        if entry = @connections[key(uri)]
+        if entry = @connections[uri.origin]
           entry.in_use    = false
           entry.last_used = Time.now
         end
@@ -67,20 +67,16 @@ module Fetch
 
     def sweep
       @mutex.synchronize do
-        @connections.each do |key, entry|
+        @connections.each do |origin, entry|
           next if entry.in_use
 
           if entry.last_used + Fetch.config.connection_max_idle_time < Time.now
             entry.connection.finish
 
-            @connections.delete key
+            @connections.delete origin
           end
         end
       end
     end
-
-    def key(uri)
-      "#{Thread.current.object_id}/#{uri.origin}".freeze
-    end
   end
 end

data/lib/fetch/version.rb

@@ -1,3 +1,3 @@
 module Fetch
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

data/sig/fetch/client.rbs

@@ -14,6 +14,7 @@ module Fetch
     private
 
     def initialize: () -> void
+    def pool: () -> ConnectionPool
     def to_response: (string, Net::HTTPResponse, bool) -> Response
   end
 end

data/sig/fetch/connection_pool.rbs

@@ -16,6 +16,5 @@ module Fetch
     def acquire: (URI::HTTP) -> Net::HTTP
     def release: (URI::HTTP) -> void
     def sweep: () -> void
-    def key: (URI::HTTP) -> String
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fetch-api
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Keita Urashima