Extract build_endpoint

Author: gcatanese

lib/adyen/services/service.rb

@@ -31,5 +31,12 @@ def create_query_string(params)
       return '' if params.empty?
       "?#{URI.encode_www_form(params)}"
     end
+
+    private
+
+    def build_endpoint(path, *params)
+      endpoint = path.gsub('%', '%%').gsub(/{.+?}/, '%s').delete_prefix('/')
+      format(endpoint, *params)
+    end
   end
 end

spec/service_spec.rb

@@ -3,6 +3,30 @@
 require 'spec_helper'
 
 RSpec.describe Adyen::Service do
+  describe '#build_endpoint' do
+    subject(:service) { described_class.new(nil, nil, 'Test') }
+
+    it 'strips the leading slash' do
+      expect(service.send(:build_endpoint, '/accountHolders')).to eq 'accountHolders'
+    end
+
+    it 'substitutes a single path parameter' do
+      expect(service.send(:build_endpoint, '/accountHolders/{id}', 'AH123')).to eq 'accountHolders/AH123'
+    end
+
+    it 'substitutes multiple path parameters' do
+      expect(service.send(:build_endpoint, '/merchants/{merchantId}/stores/{storeId}', 'M1', 'S2')).to eq 'merchants/M1/stores/S2'
+    end
+
+    it 'handles a path with no parameters' do
+      expect(service.send(:build_endpoint, '/companies')).to eq 'companies'
+    end
+
+    it 'preserves literal percent characters in the path' do
+      expect(service.send(:build_endpoint, '/path%20with/{id}/spaces', 'X')).to eq 'path%20with/X/spaces'
+    end
+  end
+
   describe '.action_for_method_name' do
     it 'handles all methods that exist currently' do
       expect(described_class.action_for_method_name(:adjust_authorisation)).to eq 'adjustAuthorisation'

templates/api-small.mustache

@@ -20,9 +20,7 @@ module Adyen
     # Deprecated {{#vendorExtensions.x-deprecatedInVersion}}since {{#appName}}{{{.}}}{{/appName}} v{{.}}{{/vendorExtensions.x-deprecatedInVersion}}{{#vendorExtensions.x-deprecatedMessage}}
     # {{{.}}}{{/vendorExtensions.x-deprecatedMessage}}{{/isDeprecated}}
     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}})
+      endpoint = build_endpoint('{{path}}'{{#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}}        

templates/api.mustache

@@ -19,9 +19,7 @@ module Adyen
     # Deprecated {{#vendorExtensions.x-deprecatedInVersion}}since {{#appName}}{{{.}}}{{/appName}} v{{.}}{{/vendorExtensions.x-deprecatedInVersion}}{{#vendorExtensions.x-deprecatedMessage}}
     # {{{.}}}{{/vendorExtensions.x-deprecatedMessage}}{{/isDeprecated}}
     def {{#lambda.snakecase}}{{#vendorExtensions.x-methodName}}{{.}}{{/vendorExtensions.x-methodName}}{{^vendorExtensions.x-methodName}}{{nickname}}{{/vendorExtensions.x-methodName}}{{/lambda.snakecase}}({{#bodyParams}}request, {{/bodyParams}}{{#pathParams}}{{#lambda.snakecase}}{{paramName}}{{/lambda.snakecase}}, {{/pathParams}}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}})
+      endpoint = build_endpoint('{{path}}'{{#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}}