modulr-api 0.0.35 → 0.0.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f20c55e590c38ec2375618c408113baff1aa4331343db485461c65109de027f5
-  data.tar.gz: 0f6834d79344f8a022b33272c557877587ff1a9b6204e7554088a6896010fc95
+  metadata.gz: 27a16c92e9514f15c9212465bf91aaec997eb6817a91c6f66f01f067e72534cb
+  data.tar.gz: 19e0a02c1630b8695b833243bc072bc7a76d7e6ea478f91ec11747736f7c9e0d
 SHA512:
-  metadata.gz: 65cc0eb610b9c1c10158fa9ef10f536313fe0e3421a111c02b6deca10c8c613bffe7c073419bd61bfb87d4a5fd505fae985beba8bfab0fa1869febda8bc1820f
-  data.tar.gz: 9fdf52f505a5f4cfcaf9c9c529dd1662c00aadff250d393a9bd400b2df5d35296f16cbca6e88b5f4f9f0836bc7f22988f2847ab9d2818ca36eaf7004e4e5b8ae
+  metadata.gz: da4baea9c2368e7819683107ad39c00835cd91c2b96182d0b3e8e68678faca60f47444a3aaed5839143b19483e8bfce67a4a0993219a9601f80e670c3d6b559e
+  data.tar.gz: a381b55be37bd68c1f9d9a8e4c6802d2d2c4fd3cb1bdc8982a9914704ed77053289a2dcd02992bd09d132472d960b6d2e9cd5a58bd1189aa5a202606905794a5

data/Gemfile.lock

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

data/lib/modulr/api/accounts_service.rb

@@ -5,9 +5,11 @@ module Modulr
     class AccountsService < Service
       def find(id:)
         response = client.get("/accounts/#{id}")
+        attributes = response.body
+
         Resources::Accounts::Account.new(
-          response.env[:raw_body],
-          response.body,
+          response,
+          attributes,
           { requested_at: response.headers["date"] }
         )
       end
@@ -20,7 +22,9 @@ module Modulr
         payload[:externalReference] = opts[:external_reference] if opts[:external_reference]
 
         response = client.post("/customers/#{customer_id}/accounts", payload)
-        Resources::Accounts::Account.new(response.env[:raw_body], response.body)
+        attributes = response.body
+
+        Resources::Accounts::Account.new(response, attributes)
       end
 
       def close(account_id:)

data/lib/modulr/api/customers_service.rb

@@ -7,7 +7,9 @@ module Modulr
     class CustomersService < Service
       def find(id:)
         response = client.get("/customers/#{id}")
-        Resources::Customers::Customer.new(response.env[:raw_body], response.body)
+        attributes = response.body
+
+        Resources::Customers::Customer.new(response, attributes)
       end
 
       def create(type:, legal_entity:, **opts)
@@ -31,7 +33,9 @@ module Modulr
         payload[:taxProfile] = opts[:tax_profile] if opts[:tax_profile]
 
         response = client.post("/customers", payload)
-        Resources::Customers::Customer.new(response.env[:raw_body], response.body)
+        attributes = response.body
+
+        Resources::Customers::Customer.new(response, attributes)
       end
     end
   end

data/lib/modulr/api/notifications_service.rb

@@ -5,12 +5,16 @@ module Modulr
     class NotificationsService < Service
       def find(id:, **opts)
         response = client.get("#{base_notification_url(opts)}/notifications/#{id}")
-        Resources::Notifications::Notification.new(response.env[:raw_body], response.body)
+        attributes = response.body
+
+        Resources::Notifications::Notification.new(response, attributes)
       end
 
       def list(**opts)
         response = client.get("#{base_notification_url(opts)}/notifications")
-        Resources::Notifications::Collection.new(response.env[:raw_body], response.body)
+        attributes_collection = response.body
+
+        Resources::Notifications::Collection.new(response, attributes_collection)
       end
 
       def create(type:, channel:, destinations:, config:, **opts)
@@ -21,7 +25,9 @@ module Modulr
           config: config,
         }
         response = client.post("#{base_notification_url(opts)}/notifications", payload)
-        Resources::Notifications::Notification.new(response.env[:raw_body], response.body)
+        attributes = response.body
+
+        Resources::Notifications::Notification.new(response, attributes)
       end
 
       def update(id:, status:, destinations:, config:, **opts)
@@ -31,7 +37,9 @@ module Modulr
           config: config,
         }
         response = client.put("#{base_notification_url(opts)}/notifications/#{id}", payload)
-        Resources::Notifications::Notification.new(response.env[:raw_body], response.body)
+        attributes = response.body
+
+        Resources::Notifications::Notification.new(response, attributes)
       end
 
       protected def base_notification_url(opts)

data/lib/modulr/api/payments_service.rb

@@ -5,17 +5,19 @@ module Modulr
     class PaymentsService < Service
       def find(id:)
         response = client.get("/payments", { id: id })
-        payment_attributes = response.body[:content]&.first
-        raise NotFoundError, "Payment #{id} not found" unless payment_attributes
+        attributes = response.body[:content]&.first
+        raise ClientError, "Payment #{id} not found" unless attributes
 
-        Resources::Payments::Payment.new(response.env[:raw_body], payment_attributes)
+        Resources::Payments::Payment.new(response, attributes)
       end
 
       def list(**opts)
         return find(id: opts[:id]) if opts[:id]
 
         response = client.get("/payments", build_query_params(opts))
-        Resources::Payments::Collection.new(response.env[:raw_body], response.body[:content])
+        attributes_collection = response.body[:content]
+
+        Resources::Payments::Collection.new(response, attributes_collection)
       end
 
       def create(account_id:, destination:, reference:, currency:, amount:, **opts) # rubocop:disable Metrics/ParameterLists
@@ -31,7 +33,9 @@ module Modulr
         payload[:endToEndReference] = opts[:e2e_reference] if opts[:e2e_reference]
 
         response = client.post("/payments", payload)
-        Resources::Payments::Payment.new(response.env[:raw_body], response.body, { network_scheme: false })
+        attributes = response.body
+
+        Resources::Payments::Payment.new(response, attributes, { network_scheme: false })
       end
 
       private def build_query_params(opts) # rubocop:disable Metrics/AbcSize

data/lib/modulr/api/transactions_service.rb

@@ -5,7 +5,9 @@ module Modulr
     class TransactionsService < Service
       def list(account_id:, **opts)
         response = client.get("/accounts/#{account_id}/transactions", build_query_params(opts))
-        Resources::Transactions::Transactions.new(response.env[:raw_body], response.body[:content])
+        attributes_collection = response.body[:content]
+
+        Resources::Transactions::Transactions.new(response, attributes_collection)
       end
 
       private def build_query_params(opts) # rubocop:disable Metrics/AbcSize

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/resources/accounts/account.rb

@@ -23,8 +23,9 @@ module Modulr
         map :createdDate, :created_at
         map :directDebit, :direct_debit
 
-        def initialize(raw_response, attributes = {}, opts = { requested_at: nil })
-          super(raw_response, attributes)
+        def initialize(response, attributes, opts = { requested_at: nil })
+          super(response, attributes)
+
           @requested_at = opts[:requested_at]
           @identifiers = Accounts::Identifiers.new(nil, attributes[:identifiers])
         end

data/lib/modulr/resources/accounts/identifiers.rb

@@ -4,8 +4,8 @@ module Modulr
   module Resources
     module Accounts
       class Identifiers < BaseCollection
-        def initialize(raw_response, attributes_collection)
-          super(raw_response, Identifier, attributes_collection)
+        def initialize(response, attributes_collection)
+          super(response, Identifier, attributes_collection)
         end
       end
     end

data/lib/modulr/resources/base.rb

@@ -3,10 +3,10 @@
 module Modulr
   module Resources
     class Base
-      attr_reader :raw_response
+      attr_reader :response
 
-      def initialize(raw_response, attributes = {})
-        @raw_response = raw_response
+      def initialize(response, attributes = {})
+        @response = response
 
         attributes.each do |key, value|
           m = "#{key}=".to_sym

data/lib/modulr/resources/base_collection.rb

@@ -3,14 +3,13 @@
 module Modulr
   module Resources
     class BaseCollection
-      attr_reader :raw_response
+      attr_reader :response
 
       include Enumerable
 
-      def initialize(raw_response, item_klass, attributes_collection = [])
-        @raw_response = raw_response
-        @attributes_collection = attributes_collection
-        @items = attributes_collection.map { |attributes_item| item_klass.new(nil, attributes_item) }
+      def initialize(response, item_klass, attributes_collection = [])
+        @response = response
+        @items = attributes_collection.map { |attributes| item_klass.new(nil, attributes) }
       end
 
       def each(&block)

data/lib/modulr/resources/notifications/collection.rb

@@ -4,8 +4,8 @@ module Modulr
   module Resources
     module Notifications
       class Collection < BaseCollection
-        def initialize(raw_response, attributes_collection)
-          super(raw_response, Notification, attributes_collection)
+        def initialize(response, attributes_collection)
+          super(response, Notification, attributes_collection)
         end
       end
     end

data/lib/modulr/resources/notifications/notification.rb

@@ -12,8 +12,9 @@ module Modulr
         map :status
         map :destinations
 
-        def initialize(raw_response, attributes = {})
-          super(raw_response, attributes)
+        def initialize(response, attributes = {})
+          super(response, attributes)
+
           @config = Config.new(nil, attributes[:config])
         end
       end

data/lib/modulr/resources/payments/collection.rb

@@ -4,8 +4,8 @@ module Modulr
   module Resources
     module Payments
       class Collection < BaseCollection
-        def initialize(raw_response, attributes_collection)
-          super(raw_response, Payment, attributes_collection)
+        def initialize(response, attributes_collection)
+          super(response, Payment, attributes_collection)
         end
       end
     end

data/lib/modulr/resources/payments/counterparty.rb

@@ -9,8 +9,9 @@ module Modulr
         map :name
         map :address
 
-        def initialize(raw_response, attributes = {})
-          super(raw_response, attributes)
+        def initialize(response, attributes = {})
+          super(response, attributes)
+
           @identifier = Accounts::Identifier.new(nil, attributes[:identifier])
         end
       end

data/lib/modulr/resources/payments/destination.rb

@@ -9,8 +9,9 @@ module Modulr
         map :type
         map :name
 
-        def initialize(raw_response, attributes = {})
-          super(raw_response, attributes)
+        def initialize(response, attributes = {})
+          super(response, attributes)
+
           @identifier = Accounts::Identifier.new(nil, attributes)
         end
       end

data/lib/modulr/resources/payments/details/incoming/general.rb

@@ -27,8 +27,9 @@ module Modulr
             map :schemeType, :scheme_type
             map :details, :raw_details
 
-            def initialize(raw_response, attributes = {})
-              super(raw_response, attributes)
+            def initialize(response, attributes = {})
+              super(response, attributes)
+
               @payer = Counterparty.new(nil, attributes[:payer])
               @payee = Counterparty.new(nil, attributes[:payee])
               @destination = parse_destination(attributes)

data/lib/modulr/resources/payments/details/incoming/internal.rb

@@ -13,8 +13,9 @@ module Modulr
             map :amount
             map :reference
 
-            def initialize(raw_response, attributes = {})
-              super(raw_response, attributes)
+            def initialize(response, attributes = {})
+              super(response, attributes)
+
               @destination = Destination.new(nil, attributes[:destination])
             end
           end

data/lib/modulr/resources/payments/details/outgoing/general.rb

@@ -13,8 +13,8 @@ module Modulr
             map :amount
             map :reference
 
-            def initialize(raw_response, attributes = {})
-              super(raw_response, attributes)
+            def initialize(response, attributes = {})
+              super(response, attributes)
               @destination = Destination.new(nil, attributes[:destination])
             end
           end

data/lib/modulr/resources/payments/payment.rb

@@ -15,8 +15,9 @@ module Modulr
         map :message, :message
         map :type
 
-        def initialize(raw_response, attributes = {}, opts = { network_scheme: true })
-          super(raw_response, attributes)
+        def initialize(response, attributes = {}, opts = { network_scheme: true })
+          super(response, attributes)
+
           @attributes = attributes
           @opts = opts
           parse_attributes

data/lib/modulr/resources/transactions/collection.rb

@@ -4,8 +4,8 @@ module Modulr
   module Resources
     module Transactions
       class Transactions < BaseCollection
-        def initialize(raw_response, attributes_collection)
-          super(raw_response, Transaction, attributes_collection)
+        def initialize(response, attributes_collection)
+          super(response, Transaction, attributes_collection)
         end
       end
     end

data/lib/modulr/resources/transactions/transaction.rb

@@ -18,8 +18,8 @@ module Modulr
         map :sourceExternalReference, :external_reference
         map :additionalInfo, :additional_info
 
-        def initialize(raw_response, attributes = {})
-          super(raw_response, attributes)
+        def initialize(response, attributes = {})
+          super(response, attributes)
 
           @balance = attributes[:account][:balance]
           @available_balance = attributes[:account][:availableBalance]

data/lib/modulr/version.rb

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

data/modulr.gemspec

@@ -5,8 +5,14 @@ require_relative "lib/modulr/version"
 Gem::Specification.new do |spec|
   spec.name = "modulr-api"
   spec.version = Modulr::VERSION
-  spec.authors = ["Aitor García Rey"]
-  spec.email = ["aitor@devengo.com"]
+  spec.authors = [
+    "Aitor García Rey", "Fran Moya", "Techi Rexach", "Iván Guardado",
+    "Carlos López", "Nacho Ortiz",
+  ]
+  spec.email = [
+    "aitor@devengo.com", "fran@devengo.com", "techi@devengo.com", "ivan@devengo.com",
+    "carlos@devengo.com", "nacho@devengo.com",
+  ]
 
   spec.summary = "Ruby client for Modulr Finance API."
   spec.description = "Ruby client for Modulr Finance API."

metadata

@@ -1,14 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: modulr-api
 version: !ruby/object:Gem::Version
-  version: 0.0.35
+  version: 0.0.39
 platform: ruby
 authors:
 - Aitor García Rey
+- Fran Moya
+- Techi Rexach
+- Iván Guardado
+- Carlos López
+- Nacho Ortiz
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-09-07 00:00:00.000000000 Z
+date: 2023-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -195,6 +200,11 @@ dependencies:
 description: Ruby client for Modulr Finance API.
 email:
 - aitor@devengo.com
+- fran@devengo.com
+- techi@devengo.com
+- ivan@devengo.com
+- carlos@devengo.com
+- nacho@devengo.com
 executables: []
 extensions: []
 extra_rdoc_files: []