api_client 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2ce9166ef3de775d807a9328d7c8d3cd1be6749
-  data.tar.gz: 93e0793ecc97aaba3db316c710a185241324ef42
+  metadata.gz: f3a8502965a1402c91399c6abd5f1259374f2548
+  data.tar.gz: 80c0e43636c592037d8e06e30561808612206fff
 SHA512:
-  metadata.gz: 73082e9434cb43362b144b4c0842eebdec78b156049d577424c6bfa1a6253798e1c697b1a71e75a2d2998b450591fc1227fa94859d804f5f767206ddb3ed85c4
-  data.tar.gz: 17d4779a154186e9cb74f570f94ac8e8420f364125f4d338c1c0dc456fc45a2ee2aed57ed1df34ed0f172d0b7f941d485b1f8492754bc16eabeac0104a904ba1
+  metadata.gz: 2c3e3cca8a0f0698db139544f118826eb3c44b4161634a303f3a6642ce849d9b2abc908977696a4807793317c531a72ba15606c63689151b1bf7a78cd5c9939f
+  data.tar.gz: 323466b4cf45d62c5f18b232bb9f28d4aa8b236a75287d769050d1bf583b1633d0696e6382da88aeb68cbaf3141e2150ae8dc0bb10105f0da298731d4348ab01

data/lib/api_client/connection/basic.rb

@@ -30,7 +30,7 @@ module ApiClient
       # * headers - (optional) headers sent along with the request
       #
       def get(path, data = {}, headers = {})
-        handle_response @handler.get(path, data, headers)
+        exec_request(:get, path, data, headers)
       end
 
       #### ApiClient::Connection::Abstract#post
@@ -43,7 +43,7 @@ module ApiClient
       #
       # This method automatically adds the application token header
       def post(path, data = {}, headers = {})
-        handle_response @handler.post(path, data, headers)
+        exec_request(:post, path, data, headers)
       end
 
       #### ApiClient::Connection::Abstract#put
@@ -56,7 +56,7 @@ module ApiClient
       #
       # This method automatically adds the application token header
       def put(path, data = {}, headers = {})
-        handle_response @handler.put(path, data, headers)
+        exec_request(:put, path, data, headers)
       end
 
       #### FS::Connection#delete
@@ -69,32 +69,40 @@ module ApiClient
       #
       # This method automatically adds the application token header
       def delete(path, data = {}, headers = {})
-        handle_response @handler.delete(path, data, headers)
+        exec_request(:delete, path, data, headers)
       end
 
       private
 
-      def handle_response(response)
-        raise ApiClient::Errors::ConnectionFailed if !response
+      def exec_request(method, path, data, headers)
+        response = @handler.send(method, path, data, headers)
+        request = {method: method, path: path, data: data, headers: headers}
+        handle_response(request, response)
+      rescue Faraday::Error::ConnectionFailed => e
+        raise ApiClient::Errors::ConnectionFailed.new(e.message, request, response)
+      end
+
+      def handle_response(request, response)
+        raise ApiClient::Errors::ConnectionFailed.new(request, response) unless response
         case response.status
           when 401
-            raise ApiClient::Errors::Unauthorized
+            raise ApiClient::Errors::Unauthorized.new(request, response)
           when 403
-            raise ApiClient::Errors::Forbidden
+            raise ApiClient::Errors::Forbidden.new(request, response)
           when 404
-            raise ApiClient::Errors::NotFound
+            raise ApiClient::Errors::NotFound.new(request, response)
           when 400
-            raise ApiClient::Errors::BadRequest
+            raise ApiClient::Errors::BadRequest.new(request, response)
           when 406
-            raise ApiClient::Errors::Unsupported
+            raise ApiClient::Errors::Unsupported.new(request, response)
           when 409
-            raise ApiClient::Errors::Conflict
+            raise ApiClient::Errors::Conflict.new(request, response)
           when 422
-            raise ApiClient::Errors::UnprocessableEntity.new(response.body)
+            raise ApiClient::Errors::UnprocessableEntity.new(response.body, request, response)
           when 300..399
-            raise ApiClient::Errors::Redirect.new(response['Location'])
+            raise ApiClient::Errors::Redirect.new(response['Location'], request, response)
           when 500..599
-            raise ApiClient::Errors::ServerError
+            raise ApiClient::Errors::ServerError.new(request, response)
           else
             response
         end

data/lib/api_client/errors.rb

@@ -1,7 +1,16 @@
 module ApiClient
 
   module Errors
-    class ApiClientError < StandardError; end
+    class ApiClientError < StandardError
+      def initialize(message=nil, request, response)
+        super(message)
+        @request = request
+        @response = response
+      end
+
+      attr_reader :request, :response
+    end
+
     class ConnectionFailed < ApiClientError; end
     class Config < ApiClientError; end
     class Unauthorized < ApiClientError; end

data/lib/api_client/scope.rb

@@ -1,4 +1,3 @@
-
 module ApiClient
 
   class Scope

data/lib/api_client/version.rb

@@ -1,3 +1,3 @@
 module ApiClient
-  VERSION = "0.5.3"
+  VERSION = "0.5.4"
 end

data/spec/api_client/connection/basic_spec.rb

@@ -79,6 +79,7 @@ describe ApiClient::Connection::Basic do
   end
 
   describe "#handle_response" do
+    let(:request) { double }
 
     before do
       @instance = ApiClient::Connection::Basic.new("http://google.com")
@@ -87,56 +88,56 @@ describe ApiClient::Connection::Basic do
 
     it "raises an ApiClient::Errors::ConnectionFailed if there is no response" do
       lambda {
-        @instance.send :handle_response, nil
+        @instance.send :handle_response, request, nil
       }.should raise_error(ApiClient::Errors::ConnectionFailed)
     end
 
     it "raises an ApiClient::Errors::Unauthorized if status is 401" do
       @response.env[:status] = 401
       lambda {
-        @instance.send :handle_response, @response
+        @instance.send :handle_response, request, @response
       }.should raise_error(ApiClient::Errors::Unauthorized)
     end
 
     it "raises an ApiClient::Errors::Forbidden if status is 403" do
       @response.env[:status] = 403
       lambda {
-        @instance.send :handle_response, @response
+        @instance.send :handle_response, request, @response
       }.should raise_error(ApiClient::Errors::Forbidden)
     end
 
     it "raises an ApiClient::Errors::NotFound if status is 404" do
       @response.env[:status] = 404
       lambda {
-        @instance.send :handle_response, @response
+        @instance.send :handle_response, request, @response
       }.should raise_error(ApiClient::Errors::NotFound)
     end
 
     it "raises an ApiClient::Errors::BadRequest if status is 400" do
       @response.env[:status] = 400
       lambda {
-        @instance.send :handle_response, @response
+        @instance.send :handle_response, request, @response
       }.should raise_error(ApiClient::Errors::BadRequest)
     end
 
     it "raises an ApiClient::Errors::Unsupported if status is 406" do
       @response.env[:status] = 406
       lambda {
-        @instance.send :handle_response, @response
+        @instance.send :handle_response, request, @response
       }.should raise_error(ApiClient::Errors::Unsupported)
     end
 
     it "raises an ApiClient::Errors::Conflict if status is 409" do
       @response.env[:status] = 409
       lambda {
-        @instance.send :handle_response, @response
+        @instance.send :handle_response, request, @response
       }.should raise_error(ApiClient::Errors::Conflict)
     end
 
     it "raises an ApiClient::Errors::Unsupported if status is 422" do
       @response.env[:status] = 422
       lambda {
-        @instance.send :handle_response, @response
+        @instance.send :handle_response, request, @response
       }.should raise_error(ApiClient::Errors::UnprocessableEntity)
     end
 
@@ -144,14 +145,14 @@ describe ApiClient::Connection::Basic do
       @response.env[:status] = 302
       @response.env[:response_headers] = { 'Location' => "https://google.com" }
       lambda {
-        @instance.send :handle_response, @response
+        @instance.send :handle_response, request, @response
       }.should raise_error(ApiClient::Errors::Redirect)
     end
 
     it "raises an ApiClient::Errors::ServerError if status is 500..599" do
       @response.env[:status] = 502
       lambda {
-        @instance.send :handle_response, @response
+        @instance.send :handle_response, request, @response
       }.should raise_error(ApiClient::Errors::ServerError)
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: api_client
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Marcin Bunsch