escobar 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3de4d9b9090a4cedcb4c3822efe163925809f276
-  data.tar.gz: 883a89ab8a4ea26d63a4e60f213908886edeb79d
+  metadata.gz: 9cf510419da9806b312267095c9a1780be832918
+  data.tar.gz: 9e8104ffa527eec4ca0628878ad91038a050e5d7
 SHA512:
-  metadata.gz: 3ffbd8af7c8c6e193193edf32a1d64e49f26c97713c10decfd95d8d64da78cc653f536d72961bd5a3201fcc699c972e8113687d5bcbd9e930a1def1edd0a028a
-  data.tar.gz: ce7e27095ae21f8eb53f20528025d64f45550e4bfe1e9742fd4125377c89b2cfce0eccd69037b5eacbd08e8d51a8273296043e956210c3a71b235821209cbad9
+  metadata.gz: d422da6b2361bcc8a5981b6a4b5ca57b5d9502d652278772c27ebc341e427735236a9a4716e92400f779d24a37f12a82aefa99e94c1ea4da0a79de69ae2b9721
+  data.tar.gz: f4721c234939135286edf1703b6381e9d50dc9645c493a73c2b16ef1f4992222f090d9f2d3a02db7ead5cc59e65b5e7361f8aa9db4344e9b3155ec40b06132a4

data/lib/escobar/client.rb

@@ -17,7 +17,7 @@ module Escobar
     # Class for returning API errors to escobar clients
     class HTTPError < StandardError
       attr_accessor :body, :headers, :status
-      def self.from_response(err)
+      def self.from_error(err)
         error = new("Error from Heroku API")
 
         error.body    = err.response[:body]
@@ -27,6 +27,20 @@ module Escobar
         error.set_backtrace(err.backtrace)
         error
       end
+
+      def self.from_response(resp)
+        error = new("Error from Heroku API")
+
+        error.body    = resp.body
+        error.headers = resp.headers
+        error.status  = resp.status
+
+        error
+      end
+    end
+
+    module Error
+      class Unauthorized < HTTPError; end
     end
 
     def self.from_environment

data/lib/escobar/github/client.rb

@@ -122,7 +122,7 @@ module Escobar
       rescue Net::OpenTimeout, Faraday::TimeoutError => e
         raise Escobar::Client::TimeoutError.wrap(e)
       rescue Faraday::Error::ClientError => e
-        raise Escobar::Client::HTTPError.from_response(e)
+        raise Escobar::Client::HTTPError.from_error(e)
       end
 
       def client

data/lib/escobar/heroku/client.rb

@@ -20,31 +20,29 @@ module Escobar
       end
 
       def get(path, version = 3)
-        with_error_handling do
-          response = client.get do |request|
+        response = with_error_handling do
+          client.get do |request|
             request.url path
             request_defaults(request, version)
           end
-
-          JSON.parse(response.body)
         end
+        JSON.parse(response.body)
       end
 
       def get_range(path, range, version = 3)
-        with_error_handling do
-          response = client.get do |request|
+        response = with_error_handling do
+          client.get do |request|
             request.url path
             request_defaults(request, version)
             request.headers["Range"] = range
           end
-
-          JSON.parse(response.body)
         end
+        JSON.parse(response.body)
       end
 
       def post(path, body, second_factor = nil)
-        with_error_handling do
-          response = client.post do |request|
+        response = with_error_handling do
+          client.post do |request|
             request.url path
             request_defaults(request)
             if second_factor
@@ -52,33 +50,40 @@ module Escobar
             end
             request.body = body.to_json
           end
-
-          JSON.parse(response.body)
         end
+        JSON.parse(response.body)
       end
 
       def put(path, second_factor = nil)
-        with_error_handling do
-          response = client.put do |request|
+        response = with_error_handling do
+          client.put do |request|
             request.url path
             request_defaults(request)
             if second_factor
               request.headers["Heroku-Two-Factor-Code"] = second_factor
             end
           end
-
-          JSON.parse(response.body)
         end
+        JSON.parse(response.body)
       end
 
       private
 
       def with_error_handling
-        yield
+        resp = yield
+        raise_on_status(resp)
+        resp
       rescue Net::OpenTimeout, Faraday::TimeoutError => e
         raise Escobar::Client::TimeoutError.wrap(e)
       rescue Faraday::Error::ClientError => e
-        raise Escobar::Client::HTTPError.from_response(e)
+        raise Escobar::Client::HTTPError.from_error(e)
+      end
+
+      def raise_on_status(resp)
+        case resp.status
+        when 401
+          raise Escobar::Client::Error::Unauthorized.from_response(resp)
+        end
       end
 
       def client

data/lib/escobar/version.rb

@@ -1,3 +1,3 @@
 module Escobar
-  VERSION = "0.4.4".freeze
+  VERSION = "0.4.5".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: escobar
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Corey Donohoe
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-12 00:00:00.000000000 Z
+date: 2017-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday