pebblebed 0.3.22 → 0.3.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d6cc9e91f2cc09da6e335cceeb464b2587e13f6
-  data.tar.gz: 6bdf45e966352b2b75fb9f86c665a578e439e209
+  metadata.gz: 08c5433c73871b5f51b25a26056ce1fd53728451
+  data.tar.gz: b0f9a69395146a1809d9c0384a1de420cc797f05
 SHA512:
-  metadata.gz: 9b96f0a8865ddde136b66bc93be02e27cbaaf60b88ddfe9548dfbaf35a19c056387e84b53106897139e0f6d343905b981d0ac4ff47fd41d4783178bbc3f6caaa
-  data.tar.gz: 0d1d0a8376de9876073f8fab97deac8b9ce82959f7a5aae1a42f2d02d924cfddd45ff242cbb6995207387ff82f97e0785818003272fa8cc6a282c96b9ba79156
+  metadata.gz: 82ce8666be3e634e26e0bec2e07e88d56feca7603bae7029adb782b57c1b6d4ef534a391d81dfd62ba42f400b6d199f2ac9d25e89b1e26d4adc562f9fcaabdd6
+  data.tar.gz: 29c042e7f0466976ae79e15401d617e909b7b08da5578283fd9187cefe131417a1b89d4739ef5abbb2f1cb209846463d3d9177976bb141991b3172fcf377f89f

data/lib/pebblebed/http.rb

@@ -9,6 +9,7 @@ require 'pathbuilder'
 require 'active_support'
 
 module Pebblebed
+
   class HttpError < StandardError
     attr_reader :status, :message, :response
 
@@ -31,12 +32,18 @@ module Pebblebed
     end
   end
 
-  class HttpNotFoundError < HttpError
-
-  end
+  class HttpNotFoundError < HttpError; end
 
   module Http
 
+    DEFAULT_CONNECT_TIMEOUT = 30
+    DEFAULT_REQUEST_TIMEOUT = nil
+    DEFAULT_READ_TIMEOUT = 30
+
+    class << self
+      attr_accessor :connect_timeout, :request_timeout, :read_timeout
+    end
+
     class Response
       def initialize(easy)
         @body = easy.body_str
@@ -173,16 +180,16 @@ module Pebblebed
     end
 
     def self.with_easy(&block)
-      easy = Thread.current[:pebblebed_curb_easy] ||= Curl::Easy.new
-      begin
-        easy.reset
-      rescue RuntimeError => e
-        # This can happen if previous streaming isn't finished
-        raise unless e.to_s =~ /^Cannot close an active curl handle within a callback/
-        easy.close rescue nil
-        easy = Thread.current[:pebblebed_curb_easy] = Curl::Easy.new
-      end
-      yield easy
+      yield new_easy
+    end
+
+    def self.new_easy
+      easy = Curl::Easy.new
+      easy.connect_timeout = connect_timeout || DEFAULT_CONNECT_TIMEOUT
+      easy.timeout = request_timeout || DEFAULT_REQUEST_TIMEOUT
+      easy.low_speed_time = read_timeout || DEFAULT_READ_TIMEOUT
+      easy.low_speed_limit = 1
+      easy
     end
 
     def self.url_with_params(url, params)

data/lib/pebblebed/version.rb

@@ -1,3 +1,3 @@
 module Pebblebed
-  VERSION = "0.3.22"
+  VERSION = "0.3.23"
 end

data/spec/http_spec.rb

@@ -21,6 +21,10 @@ describe Pebblebed::Http do
   end
 
   before :all do
+    Pebblebed::Http.connect_timeout = nil
+    Pebblebed::Http.request_timeout = nil
+    Pebblebed::Http.read_timeout = nil
+
     # Starts the mock pebble at localhost:8666/api/mock/v1
     mock_pebble.start
   end
@@ -102,4 +106,25 @@ describe Pebblebed::Http do
     end
   end
 
+  it "enforces request timeout" do
+    Pebblebed::Http.request_timeout = 1
+    expect {
+      Pebblebed::Http.get(pebble_url, {slow: '2'})
+    }.to raise_error(Curl::Err::TimeoutError)
+    expect {
+      Pebblebed::Http.get(pebble_url, {slow: '0.5'})
+    }.not_to raise_error
+  end
+
+  it "enforces read timeout" do
+    Pebblebed::Http.request_timeout = 1000
+    Pebblebed::Http.read_timeout = 1
+    expect {
+      Pebblebed::Http.get(pebble_url, {slow: '30'})
+    }.to raise_error(Curl::Err::TimeoutError)
+    expect {
+      Pebblebed::Http.get(pebble_url, {slow: '0.5'})
+    }.not_to raise_error
+  end
+
 end

data/spec/mock_pebble.rb

@@ -41,6 +41,10 @@ class MockPebble
     end
 
     def do_stuff_with(request)
+      if request.request_uri.to_s =~ /slow=(\d+)/
+        delay = $1.to_i
+        sleep(delay)
+      end
       return 200, "application/json", request.meta_vars.merge("BODY" => request.body).to_json
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pebblebed
 version: !ruby/object:Gem::Version
-  version: 0.3.22
+  version: 0.3.23
 platform: ruby
 authors:
 - Katrina Owen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-24 00:00:00.000000000 Z
+date: 2017-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec