paypal_client 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13c0a0a54e40d7cabab0577d59577c4155b0ce83
-  data.tar.gz: 1b4a3cd003b69dfbf092d1c7d5bb52ba5cb028a9
+  metadata.gz: 114fef4fab02f2da43e422615fb0d80edff7bb4e
+  data.tar.gz: 448d08ed8b3025c4f4d14ea93ac36efcc0e03725
 SHA512:
-  metadata.gz: 7b9ee71b2a0fc7bea795e97e769eedef8b7144261757a4167190ec4a821afd66b9d317508a66a3c259840d5ee45865d0c875b407cfd023e8f82e012c3810ad3d
-  data.tar.gz: f3d5d29d0cd208dd353da6a9dd5f73e056f38b43ce2c27a66d7efc7cafe7432aef290c80a552879dd02e02b46ae6c4cfa77bf8759a55d0d64e70f6e8e190756d
+  metadata.gz: 7ee81de3aaa594ee3f992ddd196360091d8ba33159a598a808f9500982324e7da878e81e94bab01d9d54a2af1464ba263f097b0dbcfa2ec7616fed79ec9b1e53
+  data.tar.gz: 490d3240ae8197d8d8d2874bfa163a13d9b6f1e66fc3e6097fb738e31409b11499aa3e2ff8c282a2d846255e785b50bf7152180b87b762ec221a04354e94a719

data/lib/paypal_client/errors.rb

@@ -1,31 +1,29 @@
+# frozen_string_literal: true
+
 require 'faraday_middleware'
 
 module PaypalClient
   module Errors
     class Error < StandardError
-      attr_reader :status_code
-      attr_reader :body
-      attr_reader :error
-      attr_reader :error_message
-
-      def initialize(response)
-        @status_code = response.status
-        @body = response.body
-
-        if @body.class == Hash
-          @error = @body[:name] if @body.key?(:name)
-          @error_message = @body[:message] if @body.key?(:message)
-        else
-          @error = response.reason_phrase if @error.nil?
-        end
+      attr_reader :code
+      attr_reader :http_body
+      attr_reader :http_status
+      attr_reader :message
+
+      def initialize(message = nil, http_status: nil, http_body: nil, code: nil)
+        @message = message
+        @http_status = http_status
+        @http_body = http_body
+        @code = code
+
         super(@error)
       end
 
       def inspect
-        extra = ''
-        extra << " status_code: #{status_code.inspect}" unless status_code.nil?
-        extra << " body: #{body.inspect}"               unless body.nil?
-        "#<#{self.class.name}: #{message}#{extra}>"
+        extra = []
+        extra << " status_code: #{http_status}" unless http_status.nil?
+        extra << " body: #{http_body}" unless http_body.nil?
+        "#<#{self.class.name}: #{message}#{extra.join}>"
       end
     end
 
@@ -57,10 +55,34 @@ module PaypalClient
         503 => ServiceUnavailable
       }.freeze
 
+      ERRORS_WITHOUT_BODY = [404].freeze
+
       def on_complete(response)
-        key = response[:status].to_i
-        raise ERROR_MAP[key], response if ERROR_MAP.key? key
-        raise Error, response if response.status >= 400
+        status = response[:status].to_i
+        if status >= 400
+          error = ERROR_MAP.key?(status) ? ERROR_MAP[status] : Error
+
+          body = response.body
+          raise error.new(get_error_message(response), code: get_error_code(response), http_status: status, http_body: body)
+        end
+      end
+
+      private
+
+      def get_error_message(response)
+        body = response.body
+        return body[:message] if body.is_a?(Hash) && body.key?(:message)
+        return body[:error_description] if body.is_a?(Hash) && body.key?(:error_description)
+
+        'Something went wrong'
+      end
+
+      def get_error_code(response)
+        body = response.body
+        return body[:name] if body.is_a?(Hash) && body.key?(:name)
+        return body[:error] if body.is_a?(Hash) && body.key?(:error)
+
+        response.status.to_s
       end
     end
   end

data/lib/paypal_client/version.rb

@@ -1,3 +1,3 @@
 module PaypalClient
-  VERSION = '0.2.2'.freeze
+  VERSION = '0.3.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paypal_client
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Dennis van der Vliet
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-02 00:00:00.000000000 Z
+date: 2019-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport