lib/ezclient/request.rb in ezclient-0.3.0 vs lib/ezclient/request.rb in ezclient-0.4.0

@@ -8,22 +8,22 @@
     self.url = url
     self.options = options
   end
 
   def perform
-    http_response = http_client.perform(http_request, http_client.default_options)
+    http_response = perform_request
 
     EzClient::Response.new(http_response).tap do |response|
       on_complete.call(self, response, options[:metadata])
     end
   rescue => error
     on_error.call(self, error, options[:metadata])
     raise error
   end
 
   def api_auth!(*args)
-    # raise "ApiAuth gem is not loaded" unless defined?(ApiAuth)
+    raise "ApiAuth gem is not loaded" unless defined?(ApiAuth)
     ApiAuth.sign!(http_request, *args)
     self
   end
 
   def body
@@ -39,12 +39,13 @@
 
   private
 
   def http_client
     @http_client ||= begin
-      client = options.fetch(:client)
-      client.timeout(timeout) if timeout
+      client = options.fetch(:client) # TODO: dup?
+      client = client.timeout(timeout) if timeout
+      client = client.basic_auth(basic_auth) if basic_auth
       client
     end
   end
 
   def http_request
@@ -54,17 +55,62 @@
   def http_options
     # RUBY25: Hash#slice
     options.select { |key| [:params, :form, :json, :body, :headers].include?(key) }
   end
 
+  def perform_request
+    retries = 0
+
+    begin
+      retry_on_connection_error do
+        http_client.perform(http_request, http_client.default_options)
+      end
+    rescue *retried_exceptions
+      if retries < max_retries.to_i
+        retries += 1
+        retry
+      else
+        raise
+      end
+    end
+  end
+
+  def retry_on_connection_error
+    # This may result in 2 requests reaching the server so I hope HTTP fixes it
+    # https://github.com/httprb/http/issues/459
+    yield
+  rescue HTTP::ConnectionError
+    yield
+  end
+
   def timeout
     options[:timeout]&.to_f
   end
 
   def on_complete
     options[:on_complete] || proc {}
   end
 
   def on_error
     options[:on_error] || proc {}
+  end
+
+  def retried_exceptions
+    Array(options[:retry_exceptions])
+  end
+
+  def max_retries
+    options[:max_retries] || 1
+  end
+
+  def basic_auth
+    @basic_auth ||= begin
+      case options[:basic_auth]
+      when Array
+        user, password = options[:basic_auth]
+        { user: user, pass: password }
+      when Hash
+        options[:basic_auth]
+      end
+    end
   end
 end