pebblebed 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06261d549c1cafdbd58b7411d20ea7cc1d36becc
-  data.tar.gz: 06a49b98c431ce957e898283be7711576f5654ad
+  metadata.gz: fb66474bc41c0a30280586d8d8fe9b1482b0afc3
+  data.tar.gz: e01c0d2eb6bce7d2664be227cbd0ff498b790969
 SHA512:
-  metadata.gz: 8216dfc6d23276310622dd7c984a94a407b244c943957bc6d8c57b64a32b98c8b1be7d362b05f66267b168f93ff3832e53b35cf8eb7136338771edc05e6bacea
-  data.tar.gz: d6c8b9b1e795455fc23ed9e54f71a605973fd1f030b2261d65a7ef5eac8c9466f32dd66098af1c6ae21fdd43d08832060b89f404edc13012d78f30e9755ae02f
+  metadata.gz: c0d1a7b303ef9932e666b6faa5f03555aa428ba82d2f77ea654a41ae4650631ff67519587a3c7193598dab87740160913e9086a0a6bd2d6cd54e9f2ef96c5f17
+  data.tar.gz: e40ac5cf384fe6ad9c33713a112c8abb8f930c41a4b810533445bd367277f88bac8619d63c8b20251c4db9d546723f5639f80e41da3cced6c2408260b14f71ad

data/lib/pebblebed/http.rb

@@ -36,50 +36,53 @@ module Pebblebed
   end
 
   module Http
-    class CurlResult
-      def initialize(curl_result)
-        @curl_result = curl_result
-      end
-
-      def status
-        @curl_result.response_code
-      end
 
-      def url
-        @curl_result.url
+    class Response
+      def initialize(easy)
+        @body = easy.body_str
+        @status = easy.status.to_i
+        @url = easy.url
       end
 
-      def body
-        @curl_result.body_str
-      end
+      attr_reader :body, :status, :url
     end
 
     def self.get(url = nil, params = nil, &block)
       url, params = url_and_params_from_args(url, params, &block)
-      handle_curl_response(Curl::Easy.perform(url_with_params(url, params)))
+      return with_curl { |easy|
+        easy.url = url_with_params(url, params)
+        easy.http_get
+      }
     end
 
     def self.post(url, params, &block)
       url, params = url_and_params_from_args(url, params, &block)
       content_type, body = serialize_params(params)
-      handle_curl_response(Curl::Easy.http_post(url.to_s, body) do |curl|
-        curl.headers['Accept'] = 'application/json'
-        curl.headers['Content-Type'] = content_type
-      end)
+      return with_curl { |easy|
+        easy.url = url.to_s
+        easy.headers['Accept'] = 'application/json'
+        easy.headers['Content-Type'] = content_type
+        easy.http_post(body)
+      }
     end
 
     def self.put(url, params, &block)
       url, params = url_and_params_from_args(url, params, &block)
       content_type, body = serialize_params(params)
-      handle_curl_response(Curl::Easy.http_put(url.to_s, body) do |curl|
-        curl.headers['Accept'] = 'application/json'
-        curl.headers['Content-Type'] = content_type
-      end)
+      return with_curl { |easy|
+        easy.url = url.to_s
+        easy.headers['Accept'] = 'application/json'
+        easy.headers['Content-Type'] = content_type
+        easy.http_put(body)
+      }
     end
 
     def self.delete(url, params, &block)
       url, params = url_and_params_from_args(url, params, &block)
-      handle_curl_response(Curl::Easy.http_delete(url_with_params(url, params)))
+      return with_curl { |easy|
+        easy.url = url_with_params(url, params)
+        easy.http_delete
+      }
     end
 
     private
@@ -96,22 +99,25 @@ module Pebblebed
       return content_type, body
     end
 
-    def self.handle_http_errors(result)
-      if result.status == 404
-        errmsg = "Resource not found: '#{result.url}'"
-        errmsg << extract_error_summary(result.body)
+    def self.handle_http_errors(response)
+      if response.status == 404
+        errmsg = "Resource not found: '#{response.url}'"
+        errmsg << extract_error_summary(response.body)
         # ActiveSupport::SafeBuffer.new is the same as errmsg.html_safe in rails
-        raise HttpNotFoundError.new(ActiveSupport::SafeBuffer.new(errmsg), result.status)
-      elsif result.status >= 400
-        errmsg = "Service request to '#{result.url}' failed (#{result.status}):"
-        errmsg << extract_error_summary(result.body)
-        raise HttpError.new(ActiveSupport::SafeBuffer.new(errmsg), result.status, result)
+        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)
+        raise HttpError.new(ActiveSupport::SafeBuffer.new(errmsg), response.status, response)
       end
-      result
+      response
     end
 
-    def self.handle_curl_response(curl_response)
-      handle_http_errors(CurlResult.new(curl_response))
+    def self.with_curl(&block)
+      easy = Thread.current[:pebblebed_curb_easy] ||= Curl::Easy.new
+      easy.reset
+      yield easy
+      return handle_http_errors(Response.new(easy))
     end
 
     def self.url_with_params(url, params)

data/lib/pebblebed/version.rb

@@ -1,3 +1,3 @@
 module Pebblebed
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pebblebed
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Katrina Owen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-10 00:00:00.000000000 Z
+date: 2016-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -289,7 +289,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: pebblebed
-rubygems_version: 2.4.6
+rubygems_version: 2.2.5
 signing_key: 
 specification_version: 4
 summary: Development tools for working with Pebblebed