ezclient 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 804fc50fb6a68cd558d225452a129fb9e9bbc90ed92e52585adc19b4bfb69229
-  data.tar.gz: 957629df0aa314608e5437cbf522b7584252773aba6393f5d945366d31887e17
+  metadata.gz: ff7928f4cebba35f4a10b26e6cbc70610b1af5f09f15dfc681d59d8ba0f21bc6
+  data.tar.gz: 60e1dfd78d106d2b1267d6758164618833209723b321c967cc6590405a2fb9c2
 SHA512:
-  metadata.gz: bfd99f38d5ff4599e07d4377775e9a1dacf59ff72d0a7c4617eba113e451292c901227cd3a6404a7300646fd5a21b759786dafdf49789dc73cf2ac5f5658c32a
-  data.tar.gz: 18931394b14e281553ef176e436efbb424fda888eb8c674a0a5743bb2302558b9b38748a10d15d4bceea2afe568b4c452cbfa1d63d0002e2ff9aa4c17428095b
+  metadata.gz: 8c2d79e6882e9f9217b6b8e931cf4d9c153ac8e4ffb7190d738ca6d62dbc38f25ec05ecb7bdb884920933c6657762b32374a67769a7d99f7aa83e6fef449d0d6
+  data.tar.gz: eef52af42332607114392d2c6585abac380b73adca74a1e7da35f6d3f247c7cfed4bd7ea5dbdacbfdec4a090063a71d8bf54dfe0839f5293cf9a0fe500b42520

data/lib/ezclient/request.rb

@@ -47,37 +47,41 @@ class EzClient::Request
     http_request.headers.to_h
   end
 
+  def http_options
+    @http_options ||= http_client.default_options.merge(ssl_context: options[:ssl_context])
+  end
+
   private
 
+  def http_request
+    @http_request ||= begin
+      # RUBY25: Hash#slice
+      opts = options.select { |key| [:json, :body, :headers].include?(key) }
+      opts[verb == "GET" ? :params : :form] = options[:params]
+      opts[:params] = options[:query] if options[:query]
+      opts[:form] = options[:form] if options[:form]
+
+      http_client.build_request(verb, url, opts)
+    end
+  end
+
   def http_client
+    # Only used to build proper HTTP::Request and HTTP::Options instances
     @http_client ||= begin
-      client = options.fetch(:client) # TODO: dup?
+      client = options[:client].dup
       client = client.timeout(timeout) if timeout
       client = client.basic_auth(basic_auth) if basic_auth
       client
     end
   end
 
-  def http_request
-    @http_request ||= http_client.build_request(verb, url, http_options)
-  end
-
-  def http_options
-    # RUBY25: Hash#slice
-    opts = options.select { |key| [:json, :body, :headers].include?(key) }
-    opts[verb == "GET" ? :params : :form] = options[:params]
-    opts[:params] = options[:query] if options[:query]
-    opts[:form] = options[:form] if options[:form]
-    opts
-  end
-
   def perform_request
     retries = 0
-    request_options = http_client.default_options.merge(ssl_context: options[:ssl_context])
 
     begin
       retry_on_connection_error do
-        http_client.perform(http_request, request_options)
+        client = options.fetch(:client) # Use original client so that connection can be reused
+        client.perform(http_request, http_options)
       end
     rescue *retried_exceptions
       if retries < max_retries.to_i

data/lib/ezclient/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ezclient
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Yuri Smirnov