esi 0.2.10 → 0.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 386ffbb606243024b14658bd8b7ef1d605cb61db
-  data.tar.gz: 832aab88bbbaff3ba94c5155fdcef87b07d51b72
+  metadata.gz: c4798ff92d7ae79a1a504d208e400145c818775f
+  data.tar.gz: be84a2bc9053863e7badc3b32f4171960a165883
 SHA512:
-  metadata.gz: e03e796d408f339b375b9b65bb87cafe512baeb64269328ded8b764ee8d8a5c2ef8d94df9d0a11992cda3dc3ee7f9f30aee104084a328a930b86478acaf3de60
-  data.tar.gz: c7ca203af84e969fb38ad8c1d16e155b81dde6bd025f16db63426961b49f70fbdf5d58f4b590155b3c0fc109a4f3cc9ec95d6aa4a4adfb82ff61afed28fd0419
+  metadata.gz: 507a2e5d2781c4812607103fb131ae4fc1fbc46a85e0aaaedc23ed17c75eb42057aa0010adcac995d8f4052db19943959fe721dee11ad780976b79994c1f9678
+  data.tar.gz: 6283815e338b287d5b7d4cc883a7010f89eefb8a79e5c8d54e3739e06700b4941b2b48b57ab7c3b7136262a379dea49755682d6bc56ddedc938c67461fd03c94

data/lib/esi.rb

@@ -106,15 +106,16 @@ module Esi
   end
 
   class ApiError < OAuth2::Error
-    attr_reader :key, :message, :type, :original_exception
+    attr_reader :response, :key, :message, :type, :original_exception
 
     def initialize(response, original_exception=nil)
       super(response.original_response)
 
+      @response = response
       @original_exception = original_exception
       @code = response.original_response.status
       @key = response.data[:key]
-      @message = response.data[:message].presence || response.data[:error]
+      @message = response.data[:message].presence || response.data[:error] || original_exception.message
       @type = response.data[:exceptionType]
     end
   end
@@ -129,6 +130,7 @@ module Esi
   end
 
   class ApiUnknownError < ApiError; end
+  class ApiBadRequestError < ApiError; end
   class ApiInvalidAppClientKeysError < ApiError; end
   class ApiNotFoundError < ApiError; end
   class ApiForbiddenError < ApiError; end

data/lib/esi/client.rb

@@ -115,13 +115,17 @@ module Esi
               raise Esi::ApiForbiddenError.new(Response.new(e.response, call))
             when 404 # Not Found
               raise Esi::ApiNotFoundError.new(Response.new(e.response, call))
+            when 400 # Bad Request
+              response = Response.new(e.response, call)
+              log_error('ApiBadRequestError', url, response)
+              raise Esi::ApiBadRequestError.new(response)
             else
               response = Response.new(e.response, call)
-              logger.error "ApiUnknownError (#{response.status}): #{url}"
+              log_error('ApiUnknownError', url, response)
 
               case response.error
               when 'invalid_client'
-                raise ApiInvalidAppClientKeysError.new(response)
+                raise Esi::ApiInvalidAppClientKeysError.new(response)
               else
                 raise Esi::ApiUnknownError.new(response)
               end
@@ -134,7 +138,7 @@ module Esi
 
       if last_ex
         logger.error "Request failed with #{last_ex.class}"
-        raise ApiRequestError.new(last_ex)
+        raise Esi::ApiRequestError.new(last_ex)
       end
 
       debug "Request successful"
@@ -148,5 +152,11 @@ module Esi
       end
       response
     end
+
+    def log_error(klass, url, response)
+      logger.error "#{klass}(#{response.status}) @ #{url}"
+      logger.error "ERROR: #{response.body.inspect}"
+      logger.error "BODY: #{response.error.inspect}"
+    end
   end
 end

data/lib/esi/version.rb

@@ -1,3 +1,3 @@
 module Esi
-  VERSION = "0.2.10"
+  VERSION = "0.2.11"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: esi
 version: !ruby/object:Gem::Version
-  version: 0.2.10
+  version: 0.2.11
 platform: ruby
 authors:
 - Danny Hiemstra