ezclient 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2eed245dc5cd1ca59aeda6408ae0b96747aa91fce6ba9770d37cb4cd68bced3b
-  data.tar.gz: 0b2503d2655fbbafa14ce64ce109aca3408fdb9fdaa92511d7627931eb5018b5
+  metadata.gz: c4f9418b8f7468e16261c321cf17ea9ee34e8c2168fda6b936a56b8c88db20ad
+  data.tar.gz: a82af3a1afcd6baa5cdc8e04521db679670b854631843fe3171714f3f4900488
 SHA512:
-  metadata.gz: 819359caed5c59b4865ec5785b8369c7f851ef8b7a313e618b52ee45d9001bc8d1e02405df2b1d846e7038eb3c8945db4ad2b72b5c2b069c4d3149bcb1ea8aaf
-  data.tar.gz: c4374e5f61f5b76aa49f1c6d03fdaa9836bb67d08157ab99a8948c3a616229a96e024378ca102eda7b3fa37888ece5cca7af34ce233561166b7e47f6fd460ab3
+  metadata.gz: b0c28a22832ce80a471d1fa16483fb0fcbab35550879e8132b6ee4849633489ce49cac1c03dc377ee0936033c9db9d144892644a598313e6d6a20efbf8eda5e4
+  data.tar.gz: 60fc3ff9026c5984d9548a9f420e65d7c3bd223efb29fd96daafbbcb3d725ac3ddd680d94d3121a60fe5b0a21c9ea8d08fa14128ca6883305e921a151360f270

data/.rubocop.yml

@@ -3,7 +3,7 @@ inherit_gem:
 
 AllCops:
   DisplayCopNames: true
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.5
   Include:
     - bin/console
     - Gemfile

data/.travis.yml

@@ -1,16 +1,17 @@
 language: ruby
 
-sudo: false
+os: linux
 
-rvm:
-  - 2.4
-  - 2.5
-  - 2.6
-  - ruby-head
+dist: xenial
 
 before_install: gem install bundler
 
-matrix:
+jobs:
   fast_finish: true
+  include:
+  - rvm: 2.5
+  - rvm: 2.6
+  - rvm: 2.7
+  - rvm: ruby-head
   allow_failures:
-    - rvm: ruby-head
+  - rvm: ruby-head

data/bin/rspec

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'rspec' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+                                           Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("bundle", __dir__)
+
+if File.file?(bundle_binstub)
+  if /This file was generated by Bundler/.match?(File.read(bundle_binstub, 300))
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rspec-core", "rspec")

data/ezclient.gemspec

@@ -5,7 +5,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "ezclient/version"
 
 Gem::Specification.new do |spec|
-  spec.required_ruby_version = ">= 2.4.0"
+  spec.required_ruby_version = ">= 2.5.0"
 
   spec.name    = "ezclient"
   spec.version = EzClient::VERSION

data/lib/ezclient.rb

@@ -1,15 +1,22 @@
 # frozen_string_literal: true
 
 require "http"
-require "ezclient/version"
-require "ezclient/client"
-require "ezclient/request"
-require "ezclient/response"
-require "ezclient/errors"
-require "ezclient/check_options"
+
+require_relative "ezclient/version"
+require_relative "ezclient/client"
+require_relative "ezclient/persistent_client"
+require_relative "ezclient/persistent_client_registry"
+require_relative "ezclient/request"
+require_relative "ezclient/response"
+require_relative "ezclient/errors"
+require_relative "ezclient/check_options"
 
 module EzClient
   def self.new(*args)
     Client.new(*args)
   end
+
+  def self.get_time
+    Process.clock_gettime(Process::CLOCK_MONOTONIC)
+  end
 end

data/lib/ezclient/client.rb

@@ -19,7 +19,6 @@ class EzClient::Client
 
   def initialize(options = {})
     self.request_options = options
-    self.clients = {}
     EzClient::CheckOptions.call(options, REQUEST_OPTION_KEYS)
   end
 
@@ -30,7 +29,7 @@ class EzClient::Client
     api_auth = options.delete(:api_auth)
 
     if keep_alive_timeout
-      client = persistent_client_for(url, timeout: keep_alive_timeout)
+      client = persistent_client_registry.for(url, timeout: keep_alive_timeout)
     else
       client = HTTP::Client.new
     end
@@ -40,20 +39,19 @@ class EzClient::Client
     end
   end
 
-  def perform(*args)
-    request(*args).perform
+  def perform(*args, **kwargs)
+    request(*args, **kwargs).perform
   end
 
-  def perform!(*args)
-    request(*args).perform!
+  def perform!(*args, **kwargs)
+    request(*args, **kwargs).perform!
   end
 
   private
 
-  attr_accessor :request_options, :clients
+  attr_accessor :request_options
 
-  def persistent_client_for(url, timeout: 600)
-    uri = HTTP::URI.parse(url)
-    clients[uri.origin] ||= HTTP.persistent(uri.origin, timeout: timeout)
+  def persistent_client_registry
+    @persistent_client_registry ||= EzClient::PersistentClientRegistry.new
   end
 end

data/lib/ezclient/persistent_client.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+class EzClient::PersistentClient
+  extend Forwardable
+
+  def_delegators :http_client, :build_request, :default_options, :timeout
+
+  attr_accessor :origin, :keep_alive_timeout, :last_request_at
+
+  def initialize(origin, keep_alive_timeout)
+    self.origin = origin
+    self.keep_alive_timeout = keep_alive_timeout
+    self.last_request_at = nil
+  end
+
+  def perform(*args)
+    http_client.perform(*args).tap do
+      self.last_request_at = EzClient.get_time
+    end
+  end
+
+  private
+
+  def http_client
+    @http_client ||= HTTP.persistent(origin, timeout: keep_alive_timeout)
+  end
+end

data/lib/ezclient/persistent_client_registry.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+class EzClient::PersistentClientRegistry
+  def initialize
+    self.registry = {}
+  end
+
+  def for(url, timeout:)
+    cleanup_registry!
+    uri = HTTP::URI.parse(url)
+    registry[uri.origin] ||= EzClient::PersistentClient.new(uri.origin, timeout)
+  end
+
+  private
+
+  attr_accessor :registry
+
+  def cleanup_registry!
+    registry.delete_if do |_key, value|
+      EzClient.get_time - value.last_request_at >= value.keep_alive_timeout
+    end
+  end
+end

data/lib/ezclient/request.rb

@@ -103,7 +103,6 @@ class EzClient::Request
   def perform_request
     with_retry do
       # Use original client so that connection can be reused
-      # client.perform(http_request, http_options)
       res = client.perform(http_request, http_options)
       return res unless follow
 

data/lib/ezclient/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EzClient
-  VERSION = "1.4.0"
+  VERSION = "1.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ezclient
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Yuri Smirnov
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-10-28 00:00:00.000000000 Z
+date: 2020-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -136,7 +136,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - tycooon@yandex.ru
 - oss@umbrellio.biz
@@ -153,12 +153,15 @@ files:
 - README.md
 - Rakefile
 - bin/console
+- bin/rspec
 - ezclient.gemspec
 - gemfiles/http3.gemfile
 - lib/ezclient.rb
 - lib/ezclient/check_options.rb
 - lib/ezclient/client.rb
 - lib/ezclient/errors.rb
+- lib/ezclient/persistent_client.rb
+- lib/ezclient/persistent_client_registry.rb
 - lib/ezclient/request.rb
 - lib/ezclient/response.rb
 - lib/ezclient/version.rb
@@ -166,7 +169,7 @@ homepage: https://github.com/umbrellio/ezclient
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -174,15 +177,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: An HTTP gem wrapper for easy persistent connections and more.
 test_files: []