adyen-ruby-api-library 7.0.1 → 7.0.2

data/spec/transfers_spec.rb

@@ -1,63 +1,64 @@
-require "spec_helper"
-require "json"
+require 'spec_helper'
+require 'json'
 
-# rubocop:disable Metrics/BlockLength
-
-RSpec.describe Adyen::Transfers, service: "transfers" do
+RSpec.describe Adyen::Transfers, service: 'transfers' do
   before(:all) do
     @shared_values = {
       client: create_client(:api_key),
-      service: "Transfers",
+      service: 'Transfers'
     }
   end
 
-  it "makes a transfers POST call" do
-
-    request_body = JSON.parse(json_from_file("mocks/requests/Transfers/make_transfer.json"))
+  it 'makes a transfers POST call' do
+    request_body = JSON.parse(json_from_file('mocks/requests/Transfers/make_transfer.json'))
 
-    response_body = json_from_file("mocks/responses/Transfers/make_transfer.json")
+    response_body = json_from_file('mocks/responses/Transfers/make_transfer.json')
 
-    url = @shared_values[:client].service_url(@shared_values[:service], "transfers", @shared_values[:client].transfers.version)
-    WebMock.stub_request(:post, url).
-      with(
-        body: request_body,
-        headers: {
-          "x-api-key" => @shared_values[:client].api_key
-        }
-      ).
-      to_return(
-        body: response_body
-      )
+    url = @shared_values[:client].service_url(@shared_values[:service], 'transfers',
+                                              @shared_values[:client].transfers.version)
+    WebMock.stub_request(:post, url)
+           .with(
+             body: request_body,
+             headers: {
+               'x-api-key' => @shared_values[:client].api_key
+             }
+           )
+           .to_return(
+             body: response_body
+           )
 
     result = @shared_values[:client].transfers.transfers_api.transfer_funds(request_body)
-    response_hash = result.response
 
-      expect(result.status).
-      to eq(200)
+    expect(result.status)
+      .to eq(200)
   end
 
-  it "makes a transactions GET call" do
-
-    response_body = json_from_file("mocks/responses/Transfers/make_transfer.json")
-
-    url = @shared_values[:client].service_url(@shared_values[:service], "transactions?createdUntil=2021-05-30T15%3A07%3A40Z&createdSince=2021-05-30T15%3A07%3A40Z", @shared_values[:client].transfers.version)
-    WebMock.stub_request(:get, url).
-      with(
-        headers: {
-          "x-api-key" => @shared_values[:client].api_key
-        }
-      ).
-      to_return(
-        body: response_body
-      )
-
-    result = @shared_values[:client].transfers.transactions_api.get_all_transactions(queryParams:{"createdUntil" => "2021-05-30T15:07:40Z", "createdSince" => "2021-05-30T15:07:40Z"})
-    response_hash = result.response
-
-      expect(result.status).
-      to eq(200)
+  it 'makes a transactions GET call' do
+    response_body = json_from_file('mocks/responses/Transfers/make_transfer.json')
+
+    url = @shared_values[:client].service_url(
+      @shared_values[:service],
+      'transactions?createdUntil=2021-05-30T15%3A07%3A40Z&createdSince=2021-05-30T15%3A07%3A40Z',
+      @shared_values[:client].transfers.version
+    )
+    WebMock.stub_request(:get, url)
+           .with(
+             headers: {
+               'x-api-key' => @shared_values[:client].api_key
+             }
+           )
+           .to_return(
+             body: response_body
+           )
+
+    result = @shared_values[:client].transfers.transactions_api.get_all_transactions(
+      query_params: {
+        'createdUntil' => '2021-05-30T15:07:40Z', 'createdSince' => '2021-05-30T15:07:40Z'
+      }
+    )
+
+    expect(result.status)
+      .to eq(200)
   end
-
-
 end
-
+# rubocop:enable Metrics/BlockLength

data/spec/utils/hmac_validator_spec.rb

@@ -4,7 +4,7 @@ RSpec.describe Adyen::Utils::HmacValidator do
   let(:validator) { described_class.new }
   let(:key) { '44782DEF547AAA06C910C43932B1EB0C71FC68D9D0C057550C48EC2ACF6BA056' }
   let(:expected_sign) { 'coqCmt/IZ4E3CzPvMY8zTjQVL5hYJUiBRg8UU+iCWo0=' }
-  let(:notification_request_item) do
+  let(:webhook_request_item) do
     {
       additionalData: {
         hmacSignature: expected_sign
@@ -24,43 +24,44 @@ RSpec.describe Adyen::Utils::HmacValidator do
 
   describe 'HMAC Validator' do
     it 'should get correct data' do
-      data_to_sign = validator.data_to_sign(notification_request_item)
+      data_to_sign = validator.data_to_sign(webhook_request_item)
       expect(data_to_sign).to eq '7914073381342284::TestMerchant:TestPayment-1407325143704:1130:EUR:AUTHORISATION:true'
     end
 
     it 'should encrypt properly' do
-      encrypted = validator.calculate_notification_hmac(notification_request_item, key)
+      encrypted = validator.calculate_webhook_hmac(webhook_request_item, key)
       expect(encrypted).to eq expected_sign
     end
 
     it 'should have a valid hmac' do
-      expect(validator.valid_notification_hmac?(notification_request_item, key)).to be true
+      expect(validator.valid_webhook_hmac?(webhook_request_item, key)).to be true
     end
 
     it 'should have an invalid hmac' do
-      notification_request_item['additionalData'] = { 'hmacSignature' => 'invalidHMACsign' }
+      webhook_request_item['additionalData'] = { 'hmacSignature' => 'invalidHMACsign' }
 
-      expect(validator.valid_notification_hmac?(notification_request_item, key)).to be false
+      expect(validator.valid_webhook_hmac?(webhook_request_item, key)).to be false
     end
 
     it 'should validate backslashes correctly' do
-      webhook = JSON.parse(json_from_file("mocks/responses/Webhooks/backslash_notification.json"))
-      expect(validator.valid_notification_hmac?(webhook, '74F490DD33F7327BAECC88B2947C011FC02D014A473AAA33A8EC93E4DC069174')).to be true
+      webhook = JSON.parse(json_from_file("mocks/responses/Webhooks/backslash_webhook.json"))
+      expect(validator.valid_webhook_hmac?(webhook, '74F490DD33F7327BAECC88B2947C011FC02D014A473AAA33A8EC93E4DC069174')).to be true
     end
 
     it 'should validate colons correctly' do
-      webhook = JSON.parse(json_from_file("mocks/responses/Webhooks/colon_notification.json"))
-      expect(validator.valid_notification_hmac?(webhook, '74F490DD33F7327BAECC88B2947C011FC02D014A473AAA33A8EC93E4DC069174')).to be true
+      webhook = JSON.parse(json_from_file("mocks/responses/Webhooks/colon_webhook.json"))
+      expect(validator.valid_webhook_hmac?(webhook, '74F490DD33F7327BAECC88B2947C011FC02D014A473AAA33A8EC93E4DC069174')).to be true
     end
 
     it 'should validate forward slashes correctly' do
-      webhook = JSON.parse(json_from_file("mocks/responses/Webhooks/forwardslash_notification.json"))
-      expect(validator.valid_notification_hmac?(webhook, '74F490DD33F7327BAECC88B2947C011FC02D014A473AAA33A8EC93E4DC069174')).to be true
+      webhook = JSON.parse(json_from_file("mocks/responses/Webhooks/forwardslash_webhook.json"))
+      expect(validator.valid_webhook_hmac?(webhook, '74F490DD33F7327BAECC88B2947C011FC02D014A473AAA33A8EC93E4DC069174')).to be true
     end
 
     it 'should validate mix of slashes and colon correctly' do
-      webhook = JSON.parse(json_from_file("mocks/responses/Webhooks/mixed_notification.json"))
-      expect(validator.valid_notification_hmac?(webhook, '74F490DD33F7327BAECC88B2947C011FC02D014A473AAA33A8EC93E4DC069174')).to be true
+      webhook = JSON.parse(json_from_file("mocks/responses/Webhooks/mixed_webhook.json"))
+      expect(validator.valid_webhook_hmac?(webhook, '74F490DD33F7327BAECC88B2947C011FC02D014A473AAA33A8EC93E4DC069174')).to be true
     end
   end
 end
+# rubocop:enable Metrics/BlockLength

data/templates/api-single.mustache

@@ -5,25 +5,23 @@ require_relative '{{serviceName}}/{{#lambda.snakecase}}{{classname}}{{/lambda.sn
     {{/apiInfo}}
 
 module Adyen
-    
+  class {{#lambda.titlecase}}{{serviceName}}{{/lambda.titlecase}}
+    attr_accessor :service, :version
 
-    class {{#lambda.titlecase}}{{serviceName}}{{/lambda.titlecase}}
-        attr_accessor :service, :version
-        
-        DEFAULT_VERSION = {{version}}
-        def initialize(client, version = DEFAULT_VERSION)
-        @service = "{{#lambda.titlecase}}{{serviceName}}{{/lambda.titlecase}}"
-        @client = client
-        @version = version
-        end
+    DEFAULT_VERSION = {{version}}
+    def initialize(client, version = DEFAULT_VERSION)
+      @service = '{{#lambda.titlecase}}{{serviceName}}{{/lambda.titlecase}}'
+      @client = client
+      @version = version
+    end
 
     {{#apiInfo}}
         {{#apis}}
-        def {{classFilename}}
-            @{{classFilename}} ||= Adyen::{{classname}}.new(@client, @version)
-        end
+    def {{classFilename}}
+      @{{classFilename}} ||= Adyen::{{classname}}.new(@client, @version)
+    end
 
         {{/apis}}
     {{/apiInfo}}
-    end
-end
+  end
+end

data/templates/api-small.mustache

@@ -1,28 +1,21 @@
 require_relative './service'
 module Adyen
 {{#operations}}
-
-
   class {{#lambda.titlecase}}{{serviceName}}{{/lambda.titlecase}} < Service
     attr_accessor :service, :version
-    DEFAULT_VERSION = {{version}}
 
+    DEFAULT_VERSION = {{version}}
     def initialize(client, version = DEFAULT_VERSION)
-      @service = "{{#lambda.titlecase}}{{serviceName}}{{/lambda.titlecase}}"
-      @client = client
-      @version = version
+      super(client, version, '{{#lambda.titlecase}}{{serviceName}}{{/lambda.titlecase}}')
     end
 
 {{#operation}}
-    def {{#lambda.snakecase}}{{#vendorExtensions.x-methodName}}{{.}}{{/vendorExtensions.x-methodName}}{{^vendorExtensions.x-methodName}}{{nickname}}{{/vendorExtensions.x-methodName}}{{/lambda.snakecase}}({{#bodyParams}}request, {{/bodyParams}}{{#requiredParams}}{{^isQueryParam}}{{#lambda.camelcase}}{{paramName}}{{/lambda.camelcase}}, {{/isQueryParam}}{{/requiredParams}}headers: {} {{#queryParams}}{{#-first}}, queryParams: {}{{/-first}}{{/queryParams}})
-      """
-      {{{summary}}}{{^summary}}{{operationId}}{{/summary}}
-      """
-      endpoint = "{{path}}".gsub(/{.+?}/, '%s') 
-      endpoint = endpoint.gsub(/^\//, "")
-      endpoint = endpoint % [{{#pathParams}}{{#lambda.camelcase}}{{paramName}}{{/lambda.camelcase}}{{^-last}},{{/-last}}{{/pathParams}}]
-      {{#queryParams}}{{#-first}}endpoint = endpoint + create_query_string(queryParams){{/-first}}{{/queryParams}}
-      action = { method: "{{#lambda.lowercase}}{{httpMethod}}{{/lambda.lowercase}}", url: endpoint}
+    def {{#lambda.snakecase}}{{#vendorExtensions.x-methodName}}{{.}}{{/vendorExtensions.x-methodName}}{{^vendorExtensions.x-methodName}}{{nickname}}{{/vendorExtensions.x-methodName}}{{/lambda.snakecase}}({{#bodyParams}}request, {{/bodyParams}}{{#requiredParams}}{{^isQueryParam}}{{#lambda.snakecase}}{{paramName}}{{/lambda.snakecase}}, {{/isQueryParam}}{{/requiredParams}}headers: {}{{#queryParams}}{{#-first}}, query_params: {}{{/-first}}{{/queryParams}})
+      endpoint = '{{path}}'.gsub(/{.+?}/, '%s')
+      endpoint = endpoint.gsub(%r{^/}, '')
+      endpoint = format(endpoint{{#pathParams}}{{#lambda.snakecase}}, {{paramName}}{{/lambda.snakecase}}{{/pathParams}})
+      {{#queryParams}}{{#-first}}endpoint += create_query_string(query_params){{/-first}}{{/queryParams}}
+      action = { method: '{{#lambda.lowercase}}{{httpMethod}}{{/lambda.lowercase}}', url: endpoint }
   {{#bodyParams}}        
       @client.call_adyen_api(@service, action, request, headers, @version)
   {{/bodyParams}}

data/templates/api.mustache

@@ -1,27 +1,20 @@
 require_relative '../service'
 module Adyen
 {{#operations}}
-
-
   class {{classname}} < Service
     attr_accessor :service, :version
 
     def initialize(client, version = DEFAULT_VERSION)
-      @service = "{{#lambda.titlecase}}{{serviceName}}{{/lambda.titlecase}}"
-      @client = client
-      @version = version
+      super(client, version, '{{#lambda.titlecase}}{{serviceName}}{{/lambda.titlecase}}')
     end
 
 {{#operation}}
-    def {{#lambda.snakecase}}{{#vendorExtensions.x-methodName}}{{.}}{{/vendorExtensions.x-methodName}}{{^vendorExtensions.x-methodName}}{{nickname}}{{/vendorExtensions.x-methodName}}{{/lambda.snakecase}}({{#bodyParams}}request, {{/bodyParams}}{{#requiredParams}}{{^isQueryParam}}{{#lambda.camelcase}}{{paramName}}{{/lambda.camelcase}}, {{/isQueryParam}}{{/requiredParams}}headers: {} {{#queryParams}}{{#-first}}, queryParams: {}{{/-first}}{{/queryParams}})
-      """
-      {{{summary}}}{{^summary}}{{operationId}}{{/summary}}
-      """
-      endpoint = "{{path}}".gsub(/{.+?}/, '%s') 
-      endpoint = endpoint.gsub(/^\//, "")
-      endpoint = endpoint % [{{#pathParams}}{{#lambda.camelcase}}{{paramName}}{{/lambda.camelcase}}{{^-last}},{{/-last}}{{/pathParams}}]
-      {{#queryParams}}{{#-first}}endpoint = endpoint + create_query_string(queryParams){{/-first}}{{/queryParams}}
-      action = { method: "{{#lambda.lowercase}}{{httpMethod}}{{/lambda.lowercase}}", url: endpoint}
+    def {{#lambda.snakecase}}{{#vendorExtensions.x-methodName}}{{.}}{{/vendorExtensions.x-methodName}}{{^vendorExtensions.x-methodName}}{{nickname}}{{/vendorExtensions.x-methodName}}{{/lambda.snakecase}}({{#bodyParams}}request, {{/bodyParams}}{{#requiredParams}}{{^isQueryParam}}{{#lambda.snakecase}}{{paramName}}{{/lambda.snakecase}}, {{/isQueryParam}}{{/requiredParams}}headers: {}{{#queryParams}}{{#-first}}, query_params: {}{{/-first}}{{/queryParams}})
+      endpoint = '{{path}}'.gsub(/{.+?}/, '%s')
+      endpoint = endpoint.gsub(%r{^/}, '')
+      endpoint = format(endpoint{{#pathParams}}, {{#lambda.snakecase}}{{paramName}}{{/lambda.snakecase}}{{/pathParams}})
+      {{#queryParams}}{{#-first}}endpoint += create_query_string(query_params){{/-first}}{{/queryParams}}
+      action = { method: '{{#lambda.lowercase}}{{httpMethod}}{{/lambda.lowercase}}', url: endpoint }
   {{#bodyParams}}        
       @client.call_adyen_api(@service, action, request, headers, @version)
   {{/bodyParams}}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adyen-ruby-api-library
 version: !ruby/object:Gem::Version
-  version: 7.0.1
+  version: 7.0.2
 platform: ruby
 authors:
 - Adyen
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-08 00:00:00.000000000 Z
+date: 2023-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -66,10 +66,11 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-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.
+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.
 email:
 - support@adyen.com
 executables: []
@@ -80,11 +81,15 @@ files:
 - ".github/ISSUE_TEMPLATE/bug_report.md"
 - ".github/ISSUE_TEMPLATE/feature_request.md"
 - ".github/PULL_REQUEST_TEMPLATE.md"
-- ".github/dependabot.yml"
+- ".github/release.yml"
 - ".github/workflows/codeql.yml"
+- ".github/workflows/gh_release.yml"
+- ".github/workflows/release_request.yml"
 - ".github/workflows/ruby.yml"
 - ".github/workflows/rubygems_release.yml"
+- ".github/workflows/services.yml"
 - ".gitignore"
+- ".rubocop.yml"
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
 - Gemfile
@@ -159,6 +164,7 @@ files:
 - lib/adyen/services/management/my_api_credential_api.rb
 - lib/adyen/services/management/payment_methods_merchant_level_api.rb
 - lib/adyen/services/management/payout_settings_merchant_level_api.rb
+- lib/adyen/services/management/split_configuration_merchant_level_api.rb
 - lib/adyen/services/management/terminal_actions_company_level_api.rb
 - lib/adyen/services/management/terminal_actions_terminal_level_api.rb
 - lib/adyen/services/management/terminal_orders_company_level_api.rb
@@ -174,6 +180,8 @@ files:
 - lib/adyen/services/management/webhooks_merchant_level_api.rb
 - lib/adyen/services/marketpay.rb
 - lib/adyen/services/payment.rb
+- lib/adyen/services/payment/general_api.rb
+- lib/adyen/services/payment/modifications_api.rb
 - lib/adyen/services/payout.rb
 - lib/adyen/services/payout/initialization_api.rb
 - lib/adyen/services/payout/instant_payouts_api.rb
@@ -183,6 +191,7 @@ files:
 - lib/adyen/services/service.rb
 - lib/adyen/services/storedValue.rb
 - lib/adyen/services/transfers.rb
+- lib/adyen/services/transfers/capital_api.rb
 - lib/adyen/services/transfers/transactions_api.rb
 - lib/adyen/services/transfers/transfers_api.rb
 - lib/adyen/utils/hmac_validator.rb
@@ -389,10 +398,10 @@ files:
 - spec/mocks/responses/Terminal/get_terminals_under_account.json
 - spec/mocks/responses/Transfers/get_transactions.json
 - spec/mocks/responses/Transfers/make_transfer.json
-- spec/mocks/responses/Webhooks/backslash_notification.json
-- spec/mocks/responses/Webhooks/colon_notification.json
-- spec/mocks/responses/Webhooks/forwardslash_notification.json
-- spec/mocks/responses/Webhooks/mixed_notification.json
+- spec/mocks/responses/Webhooks/backslash_webhook.json
+- spec/mocks/responses/Webhooks/colon_webhook.json
+- spec/mocks/responses/Webhooks/forwardslash_webhook.json
+- spec/mocks/responses/Webhooks/mixed_webhook.json
 - spec/notification_spec.rb
 - spec/payments_spec.rb
 - spec/payouts_spec.rb
@@ -414,7 +423,7 @@ metadata:
   documentation_uri: https://docs.adyen.com/developers/development-resources/libraries
   homepage_uri: https://www.adyen.com
   source_code_uri: https://github.com/Adyen/adyen-ruby-api-library
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -422,7 +431,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -430,7 +439,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.4.10
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Official Adyen  Ruby API Library
 test_files: []

data/.github/dependabot.yml

@@ -1,8 +0,0 @@
-version: 2
-updates:
-- package-ecosystem: bundler
-  directory: "/"
-  schedule:
-    interval: daily
-    time: "04:00"
-  open-pull-requests-limit: 10