adyen-ruby-api-library 7.0.0 → 7.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a353164deda5fc44de3ec027f4022732e9c4afdb1a5bfacf91704e9d8c9e90a
-  data.tar.gz: 1f1f2d92d0f9528a9c6945da699a3a9d8a05e0594c7fe4d2fb66ad8c85c01c77
+  metadata.gz: dfc331f9e3975a74232200c6167ae29c56be90875e00de8ab2b369c32b8e52a2
+  data.tar.gz: f21165fdab9fd26003fa1a9ebd540d4c18985160c14b0603a7e0c48e0b8ff048
 SHA512:
-  metadata.gz: a8d4190c1cbb857fa27ca0134a34b559c4e30c46d9397bce514b5894820c6fc0a33e4af10076953a27bfe5c36e3ab06558a55264c34a1ae3acfc26c818786979
-  data.tar.gz: be1328cdf8c4592cf0c3dc6573c1a248b761efc30f01e4eb997744234295c397c35b3b2755ab07593f6d5f1e776287daedf8f98493f462492e1f2284bcfda346
+  metadata.gz: 30ca572d49863116b7b0054cee61e7c41aa73455232abedd23c2d83b6d14376d5b80b7f71978d06b6364e20f053d84131ad327e15d4b56e6bbd5a71dbec4a02c
+  data.tar.gz: 8f57fe334a6f4b24894c88504d75ffeacc6f3f3df28b00c0ed511a80ce6c70002d469d1327ef6db297a519b72f94d6ce3cd32716a253cf37c18e09e9b129ad45

data/.github/CODEOWNERS

@@ -1 +1 @@
-* @Adyen/api-libraries-reviewers
+* @Adyen/integration-tools-testing

data/.github/release.yml

@@ -0,0 +1,18 @@
+changelog:
+  exclude:
+    authors:
+      - renovate[bot]
+      - dependabot[bot]
+  categories:
+    - title: Breaking Changes 🛠
+      labels:
+        - Breaking change
+    - title: New Features 💎
+      labels:
+        - Feature
+    - title: Fixes ⛑️
+      labels:
+        - Fix
+    - title: Other Changes 🖇️
+      labels:
+        - "*"

data/.github/workflows/gh_release.yml

@@ -0,0 +1,16 @@
+name: Github Release
+
+on:
+    workflow_dispatch:
+    push:
+      branches:
+        - main
+
+jobs:
+  gh_release:
+    permissions:
+      contents: write
+    uses: Adyen/adyen-node-api-library/.github/workflows/lib-gh-release.yml@develop
+    with:
+      project-name: Ruby
+    secrets: inherit

data/.github/workflows/release_request.yml

@@ -0,0 +1,15 @@
+name: Release request
+
+on:
+    workflow_dispatch:
+    push:
+      branches:
+        - develop
+
+jobs:
+  release:
+    permissions:
+      contents: write
+      pull-requests: write
+    uses: Adyen/adyen-node-api-library/.github/workflows/lib-release.yml@develop
+    secrets: inherit

data/.github/workflows/ruby.yml

@@ -9,7 +9,7 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         # Due to https://github.com/actions/runner/issues/849, we have to use quotes for '3.0'
-        ruby: [2.5, 2.6, 2.7, '3.0', head]
+        ruby: [2.7, '3.0', 3.1, 3.2, head]
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v3

data/.github/workflows/services.yml

@@ -0,0 +1,28 @@
+name: Ruby Library Services Generation
+
+on: [ workflow_dispatch ]
+
+jobs:
+  generate:
+    runs-on: ubuntu-latest
+    name: Generate Services
+    steps:
+      - uses: actions/checkout@v3
+      - run: make allServices
+      - name: Set PR variables
+        id: vars
+        run: |
+          echo ::set-output name=pr_title::"Update services"
+          echo ::set-output name=pr_body::"OpenAPI spec or templates produced new services on $(date +%d-%m-%Y) \
+            by [commit](https://github.com/Adyen/adyen-openapi/commit/$(git rev-parse HEAD))."
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@v5
+        with:
+          token: ${{ secrets.ADYEN_AUTOMATION_BOT_ACCESS_TOKEN }}
+          committer: ${{ secrets.ADYEN_AUTOMATION_BOT_EMAIL }}
+          author: ${{ secrets.ADYEN_AUTOMATION_BOT_EMAIL }}
+          base: develop
+          branch: automation/services
+          title: ${{ steps.vars.outputs.pr_title }}
+          body: ${{ steps.vars.outputs.pr_body }}
+          add-paths: lib/adyen/services

data/.rubocop.yml

@@ -0,0 +1,8 @@
+Style/FrozenStringLiteralComment:
+  Enabled: false
+Metrics/BlockLength:
+  Enabled: false
+Documentation:
+  Enabled: false
+Naming/FileName:
+  Enabled: false

data/Gemfile

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-ruby ">= 2.1.0"
+ruby '>= 2.7.0'
 
-gem "faraday"
+gem 'faraday'
 
-gem "bundler", :group => :development
-gem "webmock", :group => :development
-gem "rspec", :group => :development
-gem "activesupport", :group => :development
+gem 'activesupport', group: :development
+gem 'bundler', group: :development
+gem 'rspec', group: :development
+gem 'webmock', group: :development

data/Makefile

@@ -5,8 +5,8 @@ openapi-generator-jar:=build/openapi-generator-cli.jar
 openapi-generator-cli:=java -jar build/openapi-generator-cli.jar
 output:=build/out
 
-services:=balancePlatform checkout legalEntityManagement management payout platformsAccount platformsFund platformsHostedOnboardingPage platformsNotificationConfiguration transfers
-singleFileServices:=balanceControlService binLookup dataProtection recurring storedValue posTerminalManagement payment
+services:=balancePlatform checkout legalEntityManagement management payment payout transfers
+singleFileServices:=balanceControlService binLookup dataProtection recurring storedValue posTerminalManagement 
 
 binLookup: spec=BinLookupService-v54
 checkout: spec=CheckoutService-v70
@@ -19,12 +19,8 @@ payout: spec=PayoutService-v68
 management: spec=ManagementService-v1
 legalEntityManagement: spec=LegalEntityService-v3
 balancePlatform: spec=BalancePlatformService-v2
-platformsAccount: spec=AccountService-v6
-platformsFund: spec=FundService-v6
-platformsNotificationConfiguration: spec=NotificationConfigurationService-v6
-platformsHostedOnboardingPage: spec=HopService-v6
-transfers: spec=TransferService-v3
 balanceControlService: spec=BalanceControlService-v1
+transfers: spec=TransferService-v3
 
 allServices: $(services) $(singleFileServices)
 
@@ -47,7 +43,6 @@ $(services): build/spec $(openapi-generator-jar)
 
 $(singleFileServices): build/spec
 	wget $(openapi-generator-url) -O build/openapi-generator-cli.jar
-	cat <<< "$$(jq 'del(.paths[][].tags)' build/spec/json/$(spec).json)" > build/spec/json/$(spec).json
 	rm -rf $(output)
 	$(openapi-generator-cli) generate \
 		-i build/spec/json/$(spec).json \
@@ -57,7 +52,7 @@ $(singleFileServices): build/spec
 		--global-property apis,apiTests=false,apiDocs=false\
 		--additional-properties serviceName=$@\
 		--skip-validate-spec
-	mv $(output)/lib/openapi_client/api/default_api-small.rb lib/adyen/services/$@.rb
+	mv $(output)/lib/openapi_client/api/*-small.rb lib/adyen/services/$@.rb
 	rm -rf $(output)
 
 templates: $(openapi-generator-jar)
@@ -69,4 +64,13 @@ $(openapi-generator-jar):
 
 build/spec:
 	git clone https://github.com/Adyen/adyen-openapi.git build/spec
-	perl -i -pe's/"openapi" : "3.[0-9].[0-9]"/"openapi" : "3.0.0"/' build/spec/json/*.json
+	perl -i -pe's/"openapi" : "3.[0-9].[0-9]"/"openapi" : "3.0.0"/' build/spec/json/*.json
+
+# Releases
+
+version:
+	perl -lne 'print "currentVersion=$$1" if /(\d+\.\d+\.\d+)/' < lib/adyen/version.rb >> "$$GITHUB_OUTPUT"
+
+version_files:=lib/adyen/version.rb
+bump:
+	perl -i -pe 's/$$ENV{"CURRENT_VERSION"}/$$ENV{"NEXT_VERSION"}/' $(version_files) 

data/README.md

@@ -9,16 +9,16 @@ This library supports the following:
 
 | API name | API version | Description | API object |
 |----------|:-----------:|-------------|------------|
-| [BIN lookup API](https://docs.adyen.com/api-explorer/#/BinLookup/v52/overview) | v54 | The BIN Lookup API provides endpoints for retrieving information based on a given BIN. | [BinLookup](lib/adyen/services/binLookup.rb) |
-| [Checkout API](https://docs.adyen.com/api-explorer/#/CheckoutService/v69/overview) | v70 | Our latest integration for accepting online payments. | [CheckoutAPI](lib/adyen/services/checkout.rb) |
-| [Configuration API](https://docs.adyen.com/api-explorer/#/balanceplatform/v2/overview) | v2 | The Configuration API enables you to create a platform where you can onboard your users as account holders and create balance accounts, cards, and business accounts. | [BalancePlatform](lib/adyen/services/balancePlatform.rb) |
+| [BIN lookup API](https://docs.adyen.com/api-explorer/BinLookup/54/overview) | v54 | The BIN Lookup API provides endpoints for retrieving information based on a given BIN. | [BinLookup](lib/adyen/services/binLookup.rb) |
+| [Checkout API](https://docs.adyen.com/api-explorer/Checkout/70/overview) | v70 | Our latest integration for accepting online payments. | [CheckoutAPI](lib/adyen/services/checkout.rb) |
+| [Configuration API](https://docs.adyen.com/api-explorer/balanceplatform/2/overview) | v2 | The Configuration API enables you to create a platform where you can onboard your users as account holders and create balance accounts, cards, and business accounts. | [BalancePlatform](lib/adyen/services/balancePlatform.rb) |
 | [DataProtection API](https://docs.adyen.com/development-resources/data-protection-api) | v1 | Adyen Data Protection API provides a way for you to process [Subject Erasure Requests](https://gdpr-info.eu/art-17-gdpr/) as mandated in GDPR. Use our API to submit a request to delete shopper's data, including payment details and other related information (for example, delivery address or shopper email) | [DataProtection](lib/adyen/services/dataProtection.rb) |
-| [Legal Entity Management API](https://docs.adyen.com/api-explorer/#/legalentity/v3/overview) | v3 | Manage legal entities that contain information required for verification. | [LegalEntityManagement](lib/adyen/services/legalEntityManagement.rb) |
-| [Management API](https://docs.adyen.com/api-explorer/#/ManagementService/v1/overview) | v1 | Configure and manage your Adyen company and merchant accounts, stores, and payment terminals. | [Management](lib/adyen/services/management.rb) |
-| [Payments API](https://docs.adyen.com/api-explorer/#/Payment/v68/overview) | v68 | Our classic integration for online payments. | [Classic Integration API](lib/adyen/services/payment.rb) |
-| [Payouts API](https://docs.adyen.com/api-explorer/#/Payout/v68/overview) | v68 | Endpoints for sending funds to your customers. | [Payout](lib/adyen/services/payout.rb) |
-| [POS Terminal Management API](https://docs.adyen.com/api-explorer/#/postfmapi/v1/overview) | v1 | Endpoints for managing your point-of-sale payment terminals. | [TerminalManagement](lib/adyen/services/posTerminalManagement.rb) |
-| [Recurring API](https://docs.adyen.com/api-explorer/#/Recurring/v68/overview) | v68 | Endpoints for managing saved payment details. | [Recurring](lib/adyen/services/recurring.rb) |
+| [Legal Entity Management API](https://docs.adyen.com/api-explorer/legalentity/3/overview) | v3 | Manage legal entities that contain information required for verification. | [LegalEntityManagement](lib/adyen/services/legalEntityManagement.rb) |
+| [Management API](https://docs.adyen.com/api-explorer/Management/1/overview) | v1 | Configure and manage your Adyen company and merchant accounts, stores, and payment terminals. | [Management](lib/adyen/services/management.rb) |
+| [Payments API](https://docs.adyen.com/api-explorer/Payment/68/overview) | v68 | Our classic integration for online payments. | [Classic Integration API](lib/adyen/services/payment.rb) |
+| [Payouts API](https://docs.adyen.com/api-explorer/Payout/68/overview) | v68 | Endpoints for sending funds to your customers. | [Payout](lib/adyen/services/payout.rb) |
+| [POS Terminal Management API](https://docs.adyen.com/api-explorer/postfmapi/1/overview) | v1 | Endpoints for managing your point-of-sale payment terminals. | [TerminalManagement](lib/adyen/services/posTerminalManagement.rb) |
+| [Recurring API](https://docs.adyen.com/api-explorer/Recurring/68/overview) | v68 | Endpoints for managing saved payment details. | [Recurring](lib/adyen/services/recurring.rb) |
 | [Stored Value API](https://docs.adyen.com/payment-methods/gift-cards/stored-value-api) | v46 | Manage both online and point-of-sale gift cards and other stored-value cards. | [StoredValue](lib/adyen/services/storedValue.rb) |
 | [Transfers API](https://docs.adyen.com/api-explorer/transfers/3/overview) | v3 | The Transfers API provides endpoints that can be used to get information about all your transactions, move funds within your balance platform or send funds from your balance platform to a transfer instrument. | [Transfers](lib/adyen/services/transfers.rb) |
 
@@ -27,7 +27,7 @@ For more information, refer to our [documentation](https://docs.adyen.com/) or t
 ## Prerequisites
 - [Adyen test account](https://docs.adyen.com/get-started-with-adyen)
 - [API key](https://docs.adyen.com/development-resources/api-credentials#generate-api-key). For testing, your API credential needs to have the [API PCI Payments role](https://docs.adyen.com/development-resources/api-credentials#roles).
-- Ruby >= 2.1
+- Ruby >= 2.7
 
 ## Installation
 
@@ -99,6 +99,9 @@ To run the tests use :
 bundle install --with development 
 ~~~~
 
+## Feedback
+We value your input! Help us enhance our API Libraries and improve the integration experience by providing your feedback. Please take a moment to fill out [our feedback form](https://forms.gle/A4EERrR6CWgKWe5r9) to share your thoughts, suggestions or ideas.
+
 ## Contributing
 
 We encourage you to contribute to this repository, so everyone can benefit from new features, bug fixes, and any other improvements.

data/Rakefile

@@ -1,6 +1,6 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/adyen-ruby-api-library.gemspec

@@ -3,12 +3,15 @@ require_relative 'lib/adyen/version'
 Gem::Specification.new do |spec|
   spec.name = 'adyen-ruby-api-library'
   spec.version = Adyen::VERSION
-  spec.required_ruby_version = '>= 2.1.0'
+  spec.required_ruby_version = '>= 2.7.0'
   spec.authors = ['Adyen']
   spec.email = ['support@adyen.com']
 
   spec.summary = 'Official Adyen  Ruby API Library'
-  spec.description = 'Official Adyen API Library for Ruby. Simplifies integrating with the Adyen API, including Checkout, Marketpay, payments, recurring, and payouts.  For support please reach out to support@adyen.com.  If you would like to contribute please submit a comment or pull request at https://github.com/Adyen/adyen-ruby-api-library.'
+  spec.description = 'Official Adyen API Library for Ruby. Simplifies integrating with the Adyen API,\
+   including Checkout, Marketpay, payments, recurring, and payouts.  For support please reach out to \
+   support@adyen.com.  If you would like to contribute please submit \
+   a comment or pull request at https://github.com/Adyen/adyen-ruby-api-library.'
   spec.homepage = 'https://www.adyen.com'
   spec.license = 'MIT'
 
@@ -22,7 +25,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'faraday'
 
+  spec.add_development_dependency 'activesupport'
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'webmock'
-  spec.add_development_dependency 'activesupport'
 end

data/bin/console

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require_relative "../lib/adyen-ruby-api-library.rb"
+require_relative '../lib/adyen-ruby-api-library'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -9,5 +9,5 @@ require_relative "../lib/adyen-ruby-api-library.rb"
 # require "pry"
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start(__FILE__)

data/lib/adyen/client.rb

@@ -1,14 +1,22 @@
-require "faraday"
-require "json"
-require_relative "./errors"
-require_relative "./result"
+# rubocop:disable Metrics/ParameterLists
+# rubocop:disable Metrics/PerceivedComplexity
+# rubocop:disable Metrics/MethodLength
+# rubocop:disable Metrics/CyclomaticComplexity
+# rubocop:disable Metrics/AbcSize
+# rubocop:disable Metrics/ClassLength
+
+require 'faraday'
+require 'json'
+require_relative './errors'
+require_relative './result'
 
 module Adyen
   class Client
-    attr_accessor :ws_user, :ws_password, :api_key, :client, :adapter, :live_url_prefix
+    attr_accessor :ws_user, :ws_password, :api_key, :client, :adapter
     attr_reader :env, :connection_options
 
-    def initialize(ws_user: nil, ws_password: nil, api_key: nil, env: :live, adapter: nil, mock_port: 3001, live_url_prefix: nil, mock_service_url_base: nil, connection_options: nil)
+    def initialize(ws_user: nil, ws_password: nil, api_key: nil, env: :live, adapter: nil, mock_port: 3001,
+                   live_url_prefix: nil, mock_service_url_base: nil, connection_options: nil)
       @ws_user = ws_user
       @ws_password = ws_password
       @api_key = api_key
@@ -21,15 +29,16 @@ module Adyen
 
     # make sure that env can only be :live, :test, or :mock
     def env=(value)
-      raise ArgumentError, "Invalid value for Client.env: '#{value}'' - must be one of [:live, :test, :mock]" unless [:live, :test, :mock].include? value
+      raise ArgumentError, "Invalid value for Client.env: '#{value}'' - must be one of [:live, :test, :mock]" unless %i[
+        live test mock
+      ].include? value
+
       @env = value
     end
 
     # remove 'https' from live_url_prefix if necessary
     def live_url_prefix=(value)
-      if not value["https://"].nil?
-        value["https://"] = ""
-      end
+      value['https://'] = '' unless value['https://'].nil?
       @live_url_prefix = value
     end
 
@@ -39,81 +48,94 @@ module Adyen
         @mock_service_url_base
       else
         case service
-        when "Checkout"
+        when 'Checkout'
           url = "https://checkout-#{@env}.adyen.com"
           supports_live_url_prefix = true
-        when "Account", "Fund", "Notification", "Hop"
+        when 'Account', 'Fund', 'Notification', 'Hop'
           url = "https://cal-#{@env}.adyen.com/cal/services/#{service}"
           supports_live_url_prefix = false
-        when "Recurring", "Payment", "Payout", "BinLookup", "StoredValue", "BalanceControlService"
+        when 'Recurring', 'Payment', 'Payout', 'BinLookup', 'StoredValue', 'BalanceControlService'
           url = "https://pal-#{@env}.adyen.com/pal/servlet/#{service}"
           supports_live_url_prefix = true
-        when "PosTerminalManagement"
+        when 'PosTerminalManagement'
           url = "https://postfmapi-#{@env}.adyen.com/postfmapi/terminal"
           supports_live_url_prefix = false
-        when "DataProtectionService", "DisputeService"
+        when 'DataProtectionService', 'DisputeService'
           url = "https://ca-#{@env}.adyen.com/ca/services/#{service}"
           supports_live_url_prefix = false
-        when "LegalEntityManagement"
+        when 'LegalEntityManagement'
           url = "https://kyc-#{@env}.adyen.com/lem"
           supports_live_url_prefix = false
-        when "BalancePlatform" 
+        when 'BalancePlatform'
           url = "https://balanceplatform-api-#{@env}.adyen.com/bcl"
           supports_live_url_prefix = false
-        when "Transfers"
+        when 'Transfers'
           url = "https://balanceplatform-api-#{@env}.adyen.com/btl"
           supports_live_url_prefix = false
-        when "Management"
+        when 'Management'
           url = "https://management-#{@env}.adyen.com"
           supports_live_url_prefix = false
         else
-          raise ArgumentError, "Invalid service specified"
+          raise ArgumentError, 'Invalid service specified'
         end
-        
-        raise ArgumentError, "Please set Client.live_url_prefix to the portion of your merchant-specific URL prior to '-[service]-live.adyenpayments.com'" \
-         if @live_url_prefix.nil? and @env == :live and supports_live_url_prefix
+
+        if @live_url_prefix.nil? && (@env == :live) && supports_live_url_prefix
+          raise ArgumentError,
+                "Please set Client.live_url_prefix to the portion \
+          of your merchant-specific URL prior to '-[service]-live.adyenpayments.com'"
+        end
+
         if @env == :live && supports_live_url_prefix
           url.insert(8, "#{@live_url_prefix}-")
-          url["adyen.com"] = "adyenpayments.com"
+          url['adyen.com'] = 'adyenpayments.com'
         end
 
-        return url
+        url
       end
     end
 
     # construct full URL from service and endpoint
     def service_url(service, action, version)
-      "#{service_url_base(service)}/v#{version}/#{action}"
+      if service == "Checkout" && @env == :live
+        return "#{service_url_base(service)}/checkout/v#{version}/#{action}"
+      else
+        return "#{service_url_base(service)}/v#{version}/#{action}"
+      end
     end
 
     # send request to adyen API
-    def call_adyen_api(service, action, request_data, headers, version, with_application_info = false)
+    def call_adyen_api(service, action, request_data, headers, version, _with_application_info: false)
       # get URL for requested endpoint
       url = service_url(service, action.is_a?(String) ? action : action.fetch(:url), version)
 
       # make sure right authentication has been provided
       # will use api_key if present, otherwise ws_user and ws_password
       if @api_key.nil?
-        if service == "PaymentSetupAndVerification"
-          raise Adyen::AuthenticationError.new("Checkout service requires API-key", request_data), "Checkout service requires API-key"
+        if service == 'PaymentSetupAndVerification'
+          raise Adyen::AuthenticationError.new('Checkout service requires API-key', request_data),
+                'Checkout service requires API-key'
         elsif @ws_password.nil? || @ws_user.nil?
-          raise Adyen::AuthenticationError.new("No authentication found - please set api_key or ws_user and ws_password", request_data), "No authentication found - please set api_key or ws_user and ws_password"
+          raise Adyen::AuthenticationError.new(
+            'No authentication found - please set api_key or ws_user and ws_password',
+            request_data
+          ),
+                'No authentication found - please set api_key or ws_user and ws_password'
         else
-          auth_type = "basic"
+          auth_type = 'basic'
         end
       else
-        auth_type = "api-key"
+        auth_type = 'api-key'
       end
 
       # initialize Faraday connection object
       conn = Faraday.new(url, @connection_options) do |faraday|
         faraday.adapter @adapter
-        faraday.headers["Content-Type"] = "application/json"
-        faraday.headers["User-Agent"] = Adyen::NAME + "/" + Adyen::VERSION
+        faraday.headers['Content-Type'] = 'application/json'
+        faraday.headers['User-Agent'] = "#{Adyen::NAME}/#{Adyen::VERSION}"
 
         # set auth type based on service
         case auth_type
-        when "basic"
+        when 'basic'
           if Gem::Version.new(Faraday::VERSION) >= Gem::Version.new('2.0')
             # for faraday 2.0 and higher
             faraday.request :authorization, :basic, @ws_user, @ws_password
@@ -121,8 +143,8 @@ module Adyen
             # for faraday 1.x
             faraday.basic_auth(@ws_user, @ws_password)
           end
-        when "api-key"
-          faraday.headers["x-api-key"] = @api_key
+        when 'api-key'
+          faraday.headers['x-api-key'] = @api_key
         end
 
         # add optional headers if specified in request
@@ -132,81 +154,78 @@ module Adyen
         end
 
         # add library headers
-        faraday.headers["adyen-library-name"] = Adyen::NAME
-        faraday.headers["adyen-library-version"] = Adyen::VERSION
+        faraday.headers['adyen-library-name'] = Adyen::NAME
+        faraday.headers['adyen-library-version'] = Adyen::VERSION
       end
       # if json string convert to hash
       # needed to add applicationInfo
-      if request_data.is_a?(String)
-        request_data = JSON.parse(request_data)
-      end
-
+      request_data = JSON.parse(request_data) if request_data.is_a?(String)
 
       # convert to json
       request_data = request_data.to_json
 
       if action.is_a?(::Hash)
-        if action.fetch(:method) == "get"
+        if action.fetch(:method) == 'get'
           begin
             response = conn.get
-          rescue Faraday::ConnectionFailed => connection_error
-            raise connection_error, "Connection to #{url} failed"
+          rescue Faraday::ConnectionFailed => e
+            raise e, "Connection to #{url} failed"
           end
         end
-        if action.fetch(:method) == "delete"
+        if action.fetch(:method) == 'delete'
           begin
             response = conn.delete
-          rescue Faraday::ConnectionFailed => connection_error
-            raise connection_error, "Connection to #{url} failed"
+          rescue Faraday::ConnectionFailed => e
+            raise e, "Connection to #{url} failed"
           end
         end
-        if action.fetch(:method) == "patch"
+        if action.fetch(:method) == 'patch'
           begin
             response = conn.patch do |req|
               req.body = request_data
             end
-          rescue Faraday::ConnectionFailed => connection_error
-            raise connection_error, "Connection to #{url} failed"
+          rescue Faraday::ConnectionFailed => e
+            raise e, "Connection to #{url} failed"
           end
         end
-       if action.fetch(:method) == 'post'
-        # post request to Adyen
-        begin
-          response = conn.post do |req|
-            req.body = request_data
-          end # handle client errors
-        rescue Faraday::ConnectionFailed => connection_error
-          raise connection_error, "Connection to #{url} failed"
+        if action.fetch(:method) == 'post'
+          # post request to Adyen
+          begin
+            response = conn.post do |req|
+              req.body = request_data
+            end
+          rescue Faraday::ConnectionFailed => e
+            raise e, "Connection to #{url} failed"
+          end
         end
-       end 
       else
         begin
           response = conn.post do |req|
             req.body = request_data
-          end # handle client errors
-        rescue Faraday::ConnectionFailed => connection_error
-          raise connection_error, "Connection to #{url} failed"
+          end
+        rescue Faraday::ConnectionFailed => e
+          raise e, "Connection to #{url} failed"
         end
       end
       # check for API errors
       case response.status
       when 401
-        raise Adyen::AuthenticationError.new("Invalid API authentication; https://docs.adyen.com/user-management/how-to-get-the-api-key", request_data)
+        raise Adyen::AuthenticationError.new(
+          'Invalid API authentication; https://docs.adyen.com/user-management/how-to-get-the-api-key', request_data
+        )
       when 403
-        raise Adyen::PermissionError.new("Missing user permissions; https://docs.adyen.com/user-management/user-roles", request_data, response.body)
+        raise Adyen::PermissionError.new('Missing user permissions; https://docs.adyen.com/user-management/user-roles',
+                                         request_data, response.body)
       end
-      
+
       # delete has no response.body (unless it throws an error)
-      if response.body == nil
-        formatted_response = AdyenResult.new("{}", response.headers, response.status)
+      if response.body.nil? || response.body === ''
+        AdyenResult.new('{}', response.headers, response.status)
       else
-        formatted_response = AdyenResult.new(response.body, response.headers, response.status)
+        AdyenResult.new(response.body, response.headers, response.status)
       end
-      
-      formatted_response
     end
 
-
     # services
     def checkout
       @checkout ||= Adyen::Checkout.new(self)
@@ -259,13 +278,14 @@ module Adyen
     def management
       @management ||= Adyen::Management.new(self)
     end
-    
+
     def stored_value
-      @stored_value ||=Adyen::StoredValue.new(self)
+      @stored_value ||= Adyen::StoredValue.new(self)
     end
 
     def balance_control_service
-      @balance_control_service ||=Adyen::BalanceControlService.new(self)
+      @balance_control_service ||= Adyen::BalanceControlService.new(self)
     end
   end
 end
+# rubocop:enable all