escobar 0.3.17 → 0.3.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1eec142e7d9cc90816ab3da141a0f7b9d85743e
-  data.tar.gz: 58f817772c53002d6c1fae98ffae6b8101b3dca8
+  metadata.gz: 24611335d033aad7733d4318d652f3738bb4dcad
+  data.tar.gz: f7c820a2e3a5941255d6ff0d94c1a9b87a7dc9c4
 SHA512:
-  metadata.gz: b1e17a256feb2a81744d11f6bc236b6b629afa063ae71ed3c1ce0c80b0a716621f0053cf1335600e8f2d5750598768cdc30965f90ba3bc0cc3f897372430978e
-  data.tar.gz: 298854043def94824ccca0c8831674a84d4189f0255891faba751920cf69526bc263dd396ace99d05f1c89f2644a698635d7fd26481a25b0a8ad86747394e5c2
+  metadata.gz: f23958ca6ab4c751494409806e3f315f7e5839d4ad2e0465068f9b675ab1b2f82cc0ad0537bc2384c74c8ac662a39be3609561d2914d09bc0e636198b14d2afb
+  data.tar.gz: 92328c38318c6cf546beda7b3d81c6adf0edd9c0dd5d251c400773145c83b3aca37d8e6d54681ff01330979ff21a809f4ed1395d41cf429a2e83c9747b31eac6

data/lib/escobar/client.rb

@@ -1,15 +1,28 @@
 module Escobar
   # Top-level client for heroku
   class Client
+    # TimeoutError class when API timeouts
+    class TimeoutError < StandardError
+      def self.wrap(err)
+        new(err)
+      end
+
+      attr_reader :cause
+      def initialize(err)
+        @cause = err
+        self.set_backtrace(err.backtrace)
+      end
+    end
+
     # Class for returning API errors to escobar clients
     class HTTPError < StandardError
       attr_accessor :body, :headers, :status
-      def self.from_response(err, response)
+      def self.from_response(err)
         error = new("Error from Heroku API")
 
-        error.body    = response.body
-        error.status  = response.status
-        error.headers = response.headers
+        error.body    = err.response[:body]
+        error.headers = err.response[:headers]
+        error.status  = err.response[:status]
 
         error.set_backtrace(err.backtrace)
         error

data/lib/escobar/github/client.rb

@@ -78,8 +78,6 @@ module Escobar
       def get(path)
         response = http_method(:get, path)
         JSON.parse(response.body)
-      rescue StandardError => e
-        raise Escobar::Client::HTTPError.from_response(e, response)
       end
 
       def accept_headers
@@ -87,36 +85,46 @@ module Escobar
       end
 
       def http_method(verb, path)
-        client.send(verb) do |request|
-          request.url path
-          request.headers["Accept"] = accept_headers
-          request.headers["Content-Type"] = "application/json"
-          request.headers["Authorization"] = "token #{token}"
-          request.options.timeout = Escobar.http_timeout
-          request.options.open_timeout = Escobar.http_open_timeout
+        with_error_handling do
+          client.send(verb) do |request|
+            request.url path
+            request.headers["Accept"] = accept_headers
+            request.headers["Content-Type"] = "application/json"
+            request.headers["Authorization"] = "token #{token}"
+            request.options.timeout = Escobar.http_timeout
+            request.options.open_timeout = Escobar.http_open_timeout
+          end
         end
       end
 
       # rubocop:disable Metrics/AbcSize
       def post(path, body)
-        response = client.post do |request|
-          request.url path
-          request.headers["Accept"] = accept_headers
-          request.headers["Content-Type"] = "application/json"
-          request.headers["Authorization"] = "token #{token}"
-          request.options.timeout = Escobar.http_timeout
-          request.options.open_timeout = Escobar.http_open_timeout
-          request.body = body.to_json
+        with_error_handling do
+          response = client.post do |request|
+            request.url path
+            request.headers["Accept"] = accept_headers
+            request.headers["Content-Type"] = "application/json"
+            request.headers["Authorization"] = "token #{token}"
+            request.options.timeout = Escobar.http_timeout
+            request.options.open_timeout = Escobar.http_open_timeout
+            request.body = body.to_json
+          end
+
+          JSON.parse(response.body)
         end
-
-        JSON.parse(response.body)
-      rescue StandardError => e
-        raise Escobar::Client::HTTPError.from_response(e, response)
       end
       # rubocop:enable Metrics/AbcSize
 
       private
 
+      def with_error_handling
+        yield
+      rescue Net::OpenTimeout, Faraday::TimeoutError => e
+        raise Escobar::Client::TimeoutError.wrap(e)
+      rescue Faraday::Error::ClientError => e
+        raise Escobar::Client::HTTPError.from_response(e)
+      end
+
       def client
         @client ||= Escobar.zipkin_enabled? ? zipkin_client : default_client
       end

data/lib/escobar/heroku/client.rb

@@ -3,7 +3,7 @@ module Escobar
   module Heroku
     # Top-level client for interacting with Heroku API
     class Client
-      attr_reader :client, :token
+      attr_reader :token
       def initialize(token)
         @token = token
       end
@@ -20,56 +20,68 @@ module Escobar
       end
 
       def get(path, version = 3)
-        response = client.get do |request|
-          request.url path
-          request_defaults(request, version)
-        end
+        with_error_handling do
+          response = client.get do |request|
+            request.url path
+            request_defaults(request, version)
+          end
 
-        JSON.parse(response.body)
-      rescue StandardError => e
-        raise Escobar::Client::HTTPError.from_response(e, response)
+          JSON.parse(response.body)
+        end
       end
 
       def get_range(path, range, version = 3)
-        response = client.get do |request|
-          request.url path
-          request_defaults(request, version)
-          request.headers["Range"] = range
-        end
+        with_error_handling do
+          response = client.get do |request|
+            request.url path
+            request_defaults(request, version)
+            request.headers["Range"] = range
+          end
 
-        JSON.parse(response.body)
-      rescue StandardError => e
-        raise Escobar::Client::HTTPError.from_response(e, response)
+          JSON.parse(response.body)
+        end
       end
 
       def post(path, body)
-        response = client.post do |request|
-          request.url path
-          request_defaults(request)
-          request.body = body.to_json
-        end
+        with_error_handling do
+          response = client.post do |request|
+            request.url path
+            request_defaults(request)
+            request.body = body.to_json
+          end
 
-        JSON.parse(response.body)
-      rescue StandardError => e
-        raise Escobar::Client::HTTPError.from_response(e, response)
+          JSON.parse(response.body)
+        end
       end
 
       def put(path, second_factor = nil)
-        response = client.put do |request|
-          request.url path
-          request_defaults(request)
-          if second_factor
-            request.headers["Heroku-Two-Factor-Code"] = second_factor
+        with_error_handling do
+          response = client.put do |request|
+            request.url path
+            request_defaults(request)
+            if second_factor
+              request.headers["Heroku-Two-Factor-Code"] = second_factor
+            end
           end
-        end
 
-        JSON.parse(response.body)
-      rescue StandardError => e
-        raise Escobar::Client::HTTPError.from_response(e, response)
+          JSON.parse(response.body)
+        end
       end
 
       private
 
+      def with_error_handling
+        yield
+      rescue Net::OpenTimeout, Faraday::TimeoutError => e
+        raise Escobar::Client::TimeoutError.wrap(e)
+      rescue Faraday::Error::ClientError => e
+        raise Escobar::Client::HTTPError.from_response(e)
+      end
+
+      def client
+        @client ||= Escobar.zipkin_enabled? ? zipkin_client : default_client
+      end
+
       def request_defaults(request, version = 3)
         request.headers["Accept"]          = heroku_accept_header(version)
         request.headers["Accept-Encoding"] = ""
@@ -85,10 +97,6 @@ module Escobar
         "application/vnd.heroku+json; version=#{version}"
       end
 
-      def client
-        @client ||= Escobar.zipkin_enabled? ? zipkin_client : default_client
-      end
-
       def zipkin_client
         Faraday.new(url: "https://api.heroku.com") do |c|
           c.use :instrumentation

data/lib/escobar/version.rb

@@ -1,3 +1,3 @@
 module Escobar
-  VERSION = "0.3.17".freeze
+  VERSION = "0.3.18".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: escobar
 version: !ruby/object:Gem::Version
-  version: 0.3.17
+  version: 0.3.18
 platform: ruby
 authors:
 - Corey Donohoe
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-24 00:00:00.000000000 Z
+date: 2017-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday