easy_meli 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bea2b5ce32b7601401b386bbde1fd0e1bdc8bcfe7c2fab55fe9d44d065695b2b
-  data.tar.gz: fb22b1e7d147f20d1d4638a66b4ab0eb57a2490e7d5b59725593dab506837438
+  metadata.gz: 269c22ea4f450792d02935692db9eec8adc207fc8f44c946f1d3f439cce435b1
+  data.tar.gz: 00565d53e5a9e3b40235bce3723ab962d7e3f0a8fb912713330255de90b7980c
 SHA512:
-  metadata.gz: 0dae6c7df5a569e55828291fbca8986af2538309b7df51d7be10da6007857dc71d6442797375dd0a68ddf861920a828ddfa77f57c38095249c60ce34ca789622
-  data.tar.gz: 1fa152bcb974cc631d2b5e0d990ed37cb610b4ef253966a10f948a86cdca66ceb421b87e569c9f3af860d4ebe2fead62d7e9034a2f978671a40e16e829aaf56a
+  metadata.gz: 7f3e5971e80a8a9b73b435186fad527d93e71f0d454208ecf78a412c5716726f28ab0fbc25cca60dc6701422adf089d05ae504a86d3b34efb918ef4ba1685223
+  data.tar.gz: 6f1e0cb4af4919bb9c15fbd15526787c1f13727b870d5b2345a36d67f5e790bd9602eb39fde70dcb137d62856eda5e789c2c3629962fb0c081d5ddc09d4fb738

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## V 0.6.5
+- Move Error class search to its own class and reuse it for ApiClient and AuthorizationClient
+- Raise EasyMeli exceptions for server side errors.
+
 ## V 0.6.4
 - Add Unknown error support
 

data/lib/easy_meli.rb

@@ -3,6 +3,7 @@ require 'httparty'
 require 'easy_meli/version'
 require 'easy_meli/constants'
 require 'easy_meli/errors'
+require 'easy_meli/error_parser'
 require 'easy_meli/configuration'
 require 'easy_meli/authorization_client'
 require 'easy_meli/api_client'

data/lib/easy_meli/api_client.rb

@@ -5,15 +5,6 @@ class EasyMeli::ApiClient
 
   API_ROOT_URL = 'https://api.mercadolibre.com'
 
-  ERROR_LIST = {
-    'Error validating grant' => EasyMeli::InvalidGrantError,
-    'The User ID must match the consultant\'s' => EasyMeli::ForbiddenError,
-    'invalid_token' => EasyMeli::InvalidTokenError,
-    'Malformed access_token' => EasyMeli::MalformedTokenError,
-    'too_many_requests' => EasyMeli::TooManyRequestsError,
-    'unknown_error' => EasyMeli::UnknownError
-  }
-
   base_uri API_ROOT_URL
   headers EasyMeli::DEFAULT_HEADERS
   format :json
@@ -49,25 +40,26 @@ class EasyMeli::ApiClient
 
     self.class.send(verb, path, params.merge(query)).tap do |response|
       logger&.log response
+      check_status(response)
       check_for_errors(response)
     end
   end
 
-  def check_for_errors(response)
-    return unless response.parsed_response.is_a?(Hash) && !response.body.nil?
-
-    exception = error_class(response)
+  def check_status(response)
+    exception = EasyMeli::ErrorParser.status_error_class(response)
 
     if exception
       raise exception.new(response)
     end
   end
 
-  def error_class(body)
-    ERROR_LIST.find { |key, _| error_message_from_body(body)&.include?(key) }&.last
-  end
+  def check_for_errors(response)
+    return unless response.parsed_response.is_a?(Hash) && !response.body.nil?
+
+    exception = EasyMeli::ErrorParser.error_class(response)
 
-  def error_message_from_body(response)
-    response['message'].to_s.empty? ? response['error'] : response['message']
+    if exception
+      raise exception.new(response)
+    end
   end
 end

data/lib/easy_meli/authorization_client.rb

@@ -54,7 +54,9 @@ class EasyMeli::AuthorizationClient
     if response.success?
       response.to_h[EasyMeli::AuthorizationClient::ACCESS_TOKEN_KEY]
     else
-      raise EasyMeli::InvalidTokenError.new(response)
+      exception = EasyMeli::ErrorParser.error_class(response) || EasyMeli::InvalidTokenError
+
+      raise exception.new(response)
     end
   end
 

data/lib/easy_meli/error_parser.rb

@@ -0,0 +1,38 @@
+class EasyMeli::ErrorParser
+  ERROR_LIST = {
+    'Error validating grant' => EasyMeli::InvalidGrantError,
+    'The User ID must match the consultant\'s' => EasyMeli::ForbiddenError,
+    'invalid_token' => EasyMeli::InvalidTokenError,
+    'Malformed access_token' => EasyMeli::MalformedTokenError,
+    'too_many_requests' => EasyMeli::TooManyRequestsError,
+    'unknown_error' => EasyMeli::UnknownError
+  }
+
+  STATUS_ERRORS = {
+    500 => EasyMeli::InternalServerError,
+    501 => EasyMeli::NotImplementedError,
+    502 => EasyMeli::BadGatewayError,
+    503 => EasyMeli::ServiceUnavailableError,
+    504 => EasyMeli::GatewayTimeoutError
+  }
+
+  def self.error_class(response)
+    ERROR_LIST.find { |key, _| self.error_message_from_body(response)&.include?(key) }&.last
+  end
+
+  def self.status_error_class(response)
+    return unless self.server_side_error?(response)
+
+    STATUS_ERRORS[response.code] || EasyMeli::ServerError
+  end
+
+  private
+
+  def self.error_message_from_body(response)
+    response['message'].to_s.empty? ? response['error'] : response['message']
+  end
+
+  def self.server_side_error?(response)
+    response.code >= 500
+  end
+end

data/lib/easy_meli/errors.rb

@@ -73,4 +73,52 @@ module EasyMeli
       'Unknown Error'
     end
   end
+
+  class ServerError < Error
+    private
+
+    def local_message
+      'Server Error'
+    end
+  end
+
+  class InternalServerError < ServerError
+    private
+
+    def local_message
+      'Internal Server Error'
+    end
+  end
+
+  class NotImplementedError < ServerError
+    private
+
+    def local_message
+      'Not Implemented'
+    end
+  end
+
+  class BadGatewayError < ServerError
+    private
+
+    def local_message
+      'Bad Gateway'
+    end
+  end
+
+  class ServiceUnavailableError < ServerError
+    private
+
+    def local_message
+      'Service Unavailable'
+    end
+  end
+
+  class GatewayTimeoutError < ServerError
+    private
+
+    def local_message
+      'Gateway Timeout'
+    end
+  end
 end

data/lib/easy_meli/version.rb

@@ -1,3 +1,3 @@
 module EasyMeli
-  VERSION = "0.6.4"
+  VERSION = "0.6.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: easy_meli
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - Eric Northam
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-29 00:00:00.000000000 Z
+date: 2021-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -130,6 +130,7 @@ files:
 - lib/easy_meli/authorization_client.rb
 - lib/easy_meli/configuration.rb
 - lib/easy_meli/constants.rb
+- lib/easy_meli/error_parser.rb
 - lib/easy_meli/errors.rb
 - lib/easy_meli/version.rb
 homepage: https://github.com/easybroker/easy_meli