pebblebed 0.4.7 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9db9a533cd4003a5226ef344b853e5829f11a7d
-  data.tar.gz: 509e88d84a3216dadccf4f59587ae172a22b90e5
+  metadata.gz: 2c4f02f22d36e635fa1b9e4cd2ad2147e4109838
+  data.tar.gz: dccd0074c577c00bf41bab362c87d2e7160775cd
 SHA512:
-  metadata.gz: 331dab24969bf78c97e848e6b5959fe848606c557fe6331df85043aed19ae7469d52aad70e121c69347d28f321c97b60826e917091e3f3a515c88c35e8436f39
-  data.tar.gz: 61bb3e6482904ff6bda0f3a6f2cb176182d4d11a25c0529a0d8ed664025ec434d8e1b1278b472b616ad2b499e894f72a86ae5ef864007ac606ae0dff7f0bd089
+  metadata.gz: 176311055e595f13967ca1e717c5b2cefd30bcb5540ac4c8b044dd21bc0e62de4e7d65a06ac7636aec135742faad4bca937b8ccaaa1de5b3e90cd9d9fd0d02ae
+  data.tar.gz: 38df5252016a82d768f2ed22d94d59d7d43180add7ee719d7d19dff3fe7b34a1e5d827b828a739954b3009dd15066763c0f1a940e60af658d9c2d5ba4437b943

data/lib/pebblebed/http.rb

@@ -48,6 +48,7 @@ module Pebblebed
 
   module Http
 
+    DEFAULT_REQUEST_TIMEOUT = 30
     DEFAULT_CONNECT_TIMEOUT = 30
     DEFAULT_READ_TIMEOUT = 30
     DEFAULT_WRITE_TIMEOUT = 60
@@ -93,7 +94,7 @@ module Pebblebed
     def self.post(url, params, &block)
       url, params, query = url_and_params_from_args(url, params, &block)
       content_type, body = serialize_params(params)
-      return do_request(url, idempotent: false) { |connection|
+      return do_request(url) { |connection|
         connection.post(
           :host => url.host,
           :path => url.path,
@@ -153,7 +154,7 @@ module Pebblebed
 
     def self.stream_get(url = nil, params = nil, headers: {}, on_data:)
       url, params, query = url_and_params_from_args(url, params)
-      return do_request(url) { |connection|
+      return do_request(url, share: false) { |connection|
         connection.get(
           :host => url.host,
           :path => url.path,
@@ -168,8 +169,7 @@ module Pebblebed
     def self.stream_post(url, params, headers: {}, on_data:)
       url, params, query = url_and_params_from_args(url, params)
       content_type, body = serialize_params(params)
-
-      return do_request(url) { |connection|
+      return do_request(url, share: false) { |connection|
         connection.post(
           :host => url.host,
           :path => url.path,
@@ -185,13 +185,10 @@ module Pebblebed
       }
     end
 
-    def self.stream_put(url, params, options = {})
-      on_data = options[:on_data] or raise "Option :on_data must be specified"
-
+    def self.stream_put(url, params, on_data:)
       url, params, query = url_and_params_from_args(url, params)
       content_type, body = serialize_params(params)
-
-      return do_request(url) { |connection|
+      return do_request(url, share: false) { |connection|
         connection.put(
           :host => url.host,
           :path => url.path,
@@ -242,37 +239,47 @@ module Pebblebed
       response
     end
 
-    def self.do_request(url, idempotent: true, &block)
-      with_connection(url, idempotent) { |connection|
-        begin
-          request = block.call(connection)
-          response = Response.new(url, request.status, request.body)
-          return handle_http_errors(response)
-        rescue Excon::Errors::Timeout => error
-          raise HttpTimeoutError.new(error)
-        rescue Excon::Errors::SocketError => error
-          raise HttpSocketError.new(error) unless idempotent
-          # Connection failed, close the connection and try again
-          connection.reset
+    def self.do_request(url, share: true, idempotent: false, &block)
+      reset = false
+      return with_retries(timeout: (idempotent ? -1 : self.read_timeout) || DEFAULT_REQUEST_TIMEOUT) {
+        return with_connection(url, share: share) { |connection|
+          connection.reset if reset
+          reset = true  # On next retry
+
           begin
             request = block.call(connection)
             response = Response.new(url, request.status, request.body)
             return handle_http_errors(response)
+          rescue Excon::Errors::Timeout => error
+            raise HttpTimeoutError.new(error)
           rescue Excon::Errors::SocketError => error
             raise HttpSocketError.new(error)
           end
-        end
+        }
       }
     end
 
-    def self.with_connection(url, idempotent, &block)
-      connection = self.current_connection(url)
-      if connection
-        connection.reset unless idempotent
-      else
-        connection = new_connection(url)
+    def self.with_retries(timeout: 0, &block)
+      deadline = Time.now + timeout
+      interval = 0.1
+      begin
+        return yield
+      rescue HttpTimeoutError, HttpSocketError => e
+        raise if Time.now >= deadline
+        sleep(interval)
+        interval = [30, interval * 2].min
+        retry
+      end
+    end
+
+    def self.with_connection(url, share: false, &block)
+      unless share
+        return yield new_connection(url)
       end
-      self.current_connection={:url => url, :connection => connection}
+
+      connection = self.current_connection(url)
+      connection ||= new_connection(url)
+      self.current_connection = {url: url, connection: connection}
       yield connection
     end
 

data/lib/pebblebed/version.rb

@@ -1,3 +1,3 @@
 module Pebblebed
-  VERSION = "0.4.7"
+  VERSION = "0.4.8"
 end

data/spec/http_spec.rb

@@ -157,7 +157,7 @@ describe Pebblebed::Http do
       }
       Excon.stub({:method => :get}) { |params|
         run_count += 1
-        if run_count <= 2
+        if run_count <= 10
           raise Excon::Errors::SocketError.new(Exception.new "Mock Error")
         end
         {:body => params[:body], :headers => params[:headers], :status => 200}
@@ -178,7 +178,7 @@ describe Pebblebed::Http do
       expect {
         Pebblebed::Http.get(pebble_url, {hello: 'world'})
       }.to raise_error(Pebblebed::HttpSocketError)
-      expect(run_count).to equal(2)
+      expect(run_count).to be > 2
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pebblebed
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.8
 platform: ruby
 authors:
 - Katrina Owen