modulr-api 0.0.35 → 0.0.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f20c55e590c38ec2375618c408113baff1aa4331343db485461c65109de027f5
-  data.tar.gz: 0f6834d79344f8a022b33272c557877587ff1a9b6204e7554088a6896010fc95
+  metadata.gz: fe369be8d916cd8e22bd8189c0fda5718b69179c26dc85aef6e62dce4d0f1652
+  data.tar.gz: 0e0ccde8a0780d964afbbe43397ebdfab93b1bec31a6db84b0936ef7bc42676a
 SHA512:
-  metadata.gz: 65cc0eb610b9c1c10158fa9ef10f536313fe0e3421a111c02b6deca10c8c613bffe7c073419bd61bfb87d4a5fd505fae985beba8bfab0fa1869febda8bc1820f
-  data.tar.gz: 9fdf52f505a5f4cfcaf9c9c529dd1662c00aadff250d393a9bd400b2df5d35296f16cbca6e88b5f4f9f0836bc7f22988f2847ab9d2818ca36eaf7004e4e5b8ae
+  metadata.gz: e93009870f75d25bbff369008005b31aa5cf0ca628ec6210549902f00a1f7995a32bbf620d7231dffc9e62d23a93bbd760add321c1748a83769dc33c960e8bf2
+  data.tar.gz: 1603ea48040cf8f2639d1cb2c6818a847ae45e1295d3c42d4b7e5e517f9ef789e954e4c0e5ead35042ac385dbbc4810b2edcbcd3bae0eda501aed91c20c30b62

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    modulr-api (0.0.35)
+    modulr-api (0.0.37)
       faraday (~> 1.0)
       faraday_middleware (~> 1.0)
 

data/lib/modulr/api/payments_service.rb

@@ -6,7 +6,7 @@ module Modulr
       def find(id:)
         response = client.get("/payments", { id: id })
         payment_attributes = response.body[:content]&.first
-        raise NotFoundError, "Payment #{id} not found" unless payment_attributes
+        raise ClientError, "Payment #{id} not found" unless payment_attributes
 
         Resources::Payments::Payment.new(response.env[:raw_body], payment_attributes)
       end

data/lib/modulr/client.rb

@@ -97,19 +97,13 @@ module Modulr
     end
 
     def handle_request_error(error)
-      response = error.response
       case error
       when Faraday::ClientError
-        case response[:status]
-        when 403
-          raise ForbiddenError, response
-        when 404
-          raise NotFoundError, response
-        else
-          raise RequestError, response
-        end
+        raise ClientError, error
+      when Faraday::ServerError
+        raise ServerError, error
       else
-        raise Error, response
+        raise Error, error
       end
     end
 

data/lib/modulr/error.rb

@@ -2,44 +2,37 @@
 
 module Modulr
   class Error < StandardError
-  end
-
-  class RequestError < Error
-    attr_reader :response, :errors
-
-    def initialize(response)
-      @response = response
-      @errors = extract_errors
-      super(message_from(response))
-    end
-
-    private def extract_errors
-      return unless json?
+    attr_reader :wrapped_error, :status, :response
 
-      response[:body]
+    def initialize(error)
+      @wrapped_error = error
+      @response = @wrapped_error.response if @wrapped_error.respond_to?(:response)
+      @status = structured_response[:status]
+      super(error_message)
     end
 
-    private def message_from(response)
-      return response if response.is_a?(String)
+    private def error_message
+      return @wrapped_error unless @response
 
-      if errors
-        errors.map { |error| "#{error[:field]} #{error[:code]} #{error[:message]}" }.join(", ")
-      else
-        "#{response[:status]} #{response[:body]}"
-      end
+      wrapped_error_description = "#{@wrapped_error.class}: #{@wrapped_error}"
+      response_description = "Status: #{structured_response[:status]} - Response: '#{structured_response[:body]}'"
+      "#{response_description} (#{wrapped_error_description})"
     end
 
-    private def json?
-      return unless response.is_a?(Hash)
+    private def structured_response
+      return {} unless @response
+      return @response if @response.is_a?(Hash)
 
-      content_type = response[:headers]["content-type"]
-      content_type&.start_with?("application/json")
+      {
+        status: @response.status,
+        body: @response.body,
+      }
     end
   end
 
-  class NotFoundError < RequestError
+  class ClientError < Error
   end
 
-  class ForbiddenError < RequestError
+  class ServerError < Error
   end
 end

data/lib/modulr/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Modulr
-  VERSION = "0.0.35"
+  VERSION = "0.0.37"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: modulr-api
 version: !ruby/object:Gem::Version
-  version: 0.0.35
+  version: 0.0.37
 platform: ruby
 authors:
 - Aitor García Rey
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-09-07 00:00:00.000000000 Z
+date: 2023-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday