pebblebed 0.3.25 → 0.3.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54866fbc0a14546c0debe6bf4543d6a0adea572b
-  data.tar.gz: ba9444ba7b2d6855afdde6b2e6c9d4780910cabb
+  metadata.gz: 14d1b62f07bf96068be143f86a02af3d0e9d3f86
+  data.tar.gz: 52004701d254aa4afd4855e4c0028ac9bf17bb29
 SHA512:
-  metadata.gz: 16a35634df1b2d1a1f5b5c6c2e735310d5f688636d7cd595ee13e9a391b248a8700b807301042d4c902c753c1d8f7075b9742f9374b523c1f55112a9411ccb15
-  data.tar.gz: 565c4b3095752c9154dc3416e2ac8d3de9a336587afe24b640f0e9d8d824146d41b13b6d3909d0160c6b6b62383db52d3e4b73e109a1ea2cc8e023bebbbba84b
+  metadata.gz: 24d3974b44099d97ef4dad54bfc50a7c13a4dabdd5b693a22da982e8653920c31c780644f7d2f6d9a06e3346c0794e748c15628d61566020a2d25b96ceee9a5b
+  data.tar.gz: 93b67975bc2cffb0f473f1a79a7e18e30d3dd745af5283e13b5220bafafcd9cfc68dbd21ce09cf407ea099c03c60d1467e7440f7aa1a44a4f08067190ceaab48

data/lib/pebblebed/http.rb

@@ -41,15 +41,27 @@ module Pebblebed
     DEFAULT_READ_TIMEOUT = 30
 
     class << self
-      attr_accessor :connect_timeout, :request_timeout, :read_timeout
+      attr_reader :connect_timeout, :request_timeout, :read_timeout
+      def connect_timeout=(value)
+        @connect_timeout = value
+        self.current_easy = nil
+      end
+      def request_timeout=(value)
+        @request_timeout = value
+        self.current_easy = nil
+      end
+      def read_timeout=(value)
+        @read_timeout = value
+        self.current_easy = nil
+      end
     end
 
     class Response
-      def initialize(easy)
-        @body = easy.body_str
+      def initialize(url, header, body)
+        @body = body
         # We parse it ourselves because Curl::Easy fails when there's no text message
-        @status = easy.header_str.scan(/HTTP\/\d\.\d\s(\d+)\s/).map(&:first).last.to_i
-        @url = easy.url
+        @status = header.scan(/HTTP\/\d\.\d\s(\d+)\s/).map(&:first).last.to_i
+        @url = url
       end
 
       attr_reader :body, :status, :url
@@ -94,7 +106,7 @@ module Pebblebed
     end
 
     def self.stream_get(url = nil, params = nil, options = {})
-      return do_easy { |easy|
+      return do_easy(cache: false) { |easy|
         on_data = options[:on_data] or raise "Option :on_data must be specified"
 
         url, params = url_and_params_from_args(url, params)
@@ -109,7 +121,7 @@ module Pebblebed
     end
 
     def self.stream_post(url, params, options = {})
-      return do_easy { |easy|
+      return do_easy(cache: false) { |easy|
         on_data = options[:on_data] or raise "Option :on_data must be specified"
 
         url, params = url_and_params_from_args(url, params)
@@ -127,7 +139,7 @@ module Pebblebed
     end
 
     def self.stream_put(url, params, options = {})
-      return do_easy { |easy|
+      return do_easy(cache: false) { |easy|
         on_data = options[:on_data] or raise "Option :on_data must be specified"
 
         url, params = url_and_params_from_args(url, params)
@@ -161,28 +173,54 @@ module Pebblebed
     def self.handle_http_errors(response)
       if response.status == 404
         errmsg = "Resource not found: '#{response.url}'"
-        errmsg << extract_error_summary(response.body) if response.body
+        if (summary = extract_error_summary(response.body))
+          errmsg << ": #{summary}"
+        end
         # ActiveSupport::SafeBuffer.new is the same as errmsg.html_safe in rails
         raise HttpNotFoundError.new(ActiveSupport::SafeBuffer.new(errmsg), response.status)
-      elsif response.status >= 400
-        errmsg = "Service request to '#{response.url}' failed (#{response.status}):"
-        errmsg << extract_error_summary(response.body) if response.body
+      end
+
+      if response.status >= 400
+        errmsg = "Service request to '#{response.url}' failed (#{response.status})"
+        if (summary = extract_error_summary(response.body))
+          errmsg << ": #{summary}"
+        end
         raise HttpError.new(ActiveSupport::SafeBuffer.new(errmsg), response.status, response)
       end
+
       response
     end
 
-    def self.do_easy(&block)
-      with_easy do |easy|
+    def self.do_easy(cache: true, &block)
+      with_easy(cache: cache) do |easy|
         yield easy
-        return handle_http_errors(Response.new(easy))
+        response = Response.new(easy.url, easy.header_str, easy.body_str)
+        return handle_http_errors(response)
+      end
+    end
+
+    def self.with_easy(cache: true, &block)
+      if cache
+        easy = self.current_easy ||= new_easy
+      else
+        easy = new_easy
       end
+      yield easy
     end
 
-    def self.with_easy(&block)
-      yield new_easy
+    def self.current_easy
+      Thread.current[:pebblebed_curb_easy]
     end
 
+    def self.current_easy=(value)
+      if (current = Thread.current[:pebblebed_curb_easy])
+        # Reset old instance
+        current.reset
+      end
+      Thread.current[:pebblebed_curb_easy] = value
+    end
+
+    # Returns new Easy instance from current configuration.
     def self.new_easy
       easy = Curl::Easy.new
       easy.connect_timeout = connect_timeout || DEFAULT_CONNECT_TIMEOUT
@@ -210,11 +248,15 @@ module Pebblebed
     end
 
     def self.extract_error_summary(body)
-      # Supports Sinatra error pages
-      extract = Nokogiri::HTML(body).css('#summary').text.gsub(/\s+/, ' ').strip
-      # TODO: Rails?
-      return body if extract == ''
-      extract
+      return nil unless body
+
+      # Hack to support Sinatra error pages
+      summary = Nokogiri::HTML(body).css('#summary').text.gsub(/\s+/, ' ').strip
+      return summary if summary.length > 0
+
+      summary = body
+      summary = summary[0, 500] + "..." if summary.length > 500
+      summary
     end
 
   end

data/lib/pebblebed/version.rb

@@ -1,3 +1,3 @@
 module Pebblebed
-  VERSION = "0.3.25"
+  VERSION = "0.3.26"
 end

data/spec/http_spec.rb

@@ -103,6 +103,19 @@ describe Pebblebed::Http do
         expect(result["QUERY_STRING"]).to eq "hello=world"
         expect(response.body).to eq nil
       end
+
+      it "supports multiple sequential streaming request" do
+        10.times do
+          buf = ""
+          response = Pebblebed::Http.stream_get(pebble_url, {hello: 'world'},
+            on_data: ->(data) {
+              buf << data
+            })
+          result = JSON.parse(buf)
+          expect(result["QUERY_STRING"]).to eq "hello=world"
+          expect(response.body).to eq nil
+        end
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pebblebed
 version: !ruby/object:Gem::Version
-  version: 0.3.25
+  version: 0.3.26
 platform: ruby
 authors:
 - Katrina Owen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-21 00:00:00.000000000 Z
+date: 2018-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -304,7 +304,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: pebblebed
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Development tools for working with Pebblebed