easy_meli 0.6.1 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c8dc1140d9368b076baf0a49a9742aea8de95565a90512152c9c58ec2b98723
-  data.tar.gz: 543cbed2c4789b0259b62f11d332a02c3b5b281feb2c5b60c5f87fd8640c0754
+  metadata.gz: 67691d59c76a0324aa03dfc6e9f67c86954be2d93a49836ce33cb52bed270bed
+  data.tar.gz: 6f4740a8bbce9b8cc55aaccdd55b53e46bb19cd89b44f8fdaa2dfd0204d29274
 SHA512:
-  metadata.gz: c2a7ecfa32beed3a9329b01312b1cfd4ed70fceb26469dc90e8d0d2c3b42186a9c1ec06f115f1dc5fa15236aa48d99b7e074a089fad7f710bddaf2bcb324680a
-  data.tar.gz: dfc01a8544c0f2d23711888fdfa3fb6a6f6f68196782d41cb501c1f50d53900882fb5c1b8d7a9f88e610eb1fafc8112447943ff87b8793af7fccd29e800a6d17
+  metadata.gz: e37596a5954f789afc52ab92fe58c9b0bb0cfd32cdb6662b96305362081c56dba4a7f346a48989fa6da1487c5e84332c4382dcb9ab78278fa30f82b9c50541f0
+  data.tar.gz: 4d61945cbb1389ba00ae6c47829769c45244c3ffffb23147e75f34c245d2eee95aff60b150ef1e7e8929315fdea9b2c8b7ce97278b10d024c1ddef1d4f29cc8a

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Changelog
 
+## V 0.6.6
+- Classify status code 401 as EasyMeli::InvalidTokenError.
+
+## 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
+
+## V 0.6.3
+- Fix error when the api response doesn't include error or message keys.
+- Add right error message for forbidden error.
+
+## V 0.6.2
+- Update Error classification mechanism to use error message as first option
+
 ## V 0.6.1
 - Fix a bug in the error raising in the authorization client introduced in V 0.6.0
 

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,17 +5,6 @@ class EasyMeli::ApiClient
 
   API_ROOT_URL = 'https://api.mercadolibre.com'
 
-  ERROR_LIST = {
-    'invalid_grant' => EasyMeli::InvalidGrantError,
-    'forbidden' => EasyMeli::ForbiddenError,
-    'invalid_token' => EasyMeli::InvalidTokenError,
-    'Malformed access_token' => EasyMeli::MalformedTokenError
-  }
-
-  STATUS_ERRORS = {
-    429 => EasyMeli::TooManyRequestsError
-  }
-
   base_uri API_ROOT_URL
   headers EasyMeli::DEFAULT_HEADERS
   format :json
@@ -51,30 +40,26 @@ class EasyMeli::ApiClient
 
     self.class.send(verb, path, params.merge(query)).tap do |response|
       logger&.log response
-      check_authentication(response)
       check_status(response)
+      check_for_errors(response)
     end
   end
 
-  def check_authentication(response)
-    response_message = error_message_from_body(response.to_h) if response.parsed_response.is_a? Hash
-    return if response_message.to_s.empty?
+  def check_status(response)
+    exception = EasyMeli::ErrorParser.status_error_class(response)
 
-    ERROR_LIST.keys.each do |key|
-      if response_message.include?(key)
-        exception = ERROR_LIST[key]
-        raise exception.new(response)
-      end
+    if exception
+      raise exception.new(response)
     end
   end
 
-  def error_message_from_body(body)
-    return if body.nil?
-    body['error'].to_s.empty? ? body['message'] : body['error']
-  end
+  def check_for_errors(response)
+    return unless response.parsed_response.is_a?(Hash) && !response.body.nil?
 
-  def check_status(response)
-    status_error = STATUS_ERRORS[response.code]
-    raise status_error.new(response) if status_error
+    exception = EasyMeli::ErrorParser.error_class(response)
+
+    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,43 @@
+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 = {
+    401 => EasyMeli::InvalidTokenError,
+    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.status_code_listed?(response) || 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
+
+  def self.status_code_listed?(response)
+    STATUS_ERRORS.keys.include?(response.code)
+  end
+end

data/lib/easy_meli/errors.rb

@@ -65,4 +65,60 @@ module EasyMeli
       'Too many requests'
     end
   end
+
+  class UnknownError < Error
+    private
+
+    def local_message
+      '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.1"
+  VERSION = "0.6.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: easy_meli
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.6
 platform: ruby
 authors:
 - Eric Northam
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-27 00:00:00.000000000 Z
+date: 2021-02-26 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