formatting fixes

This commit is contained in:
Ankit Mahato
2024-04-06 18:42:33 +05:30
parent f7a6fdeb67
commit 7f5956ba9d
3 changed files with 142 additions and 76 deletions

View File

@ -89,7 +89,7 @@ puts "Response Body: #{response.body}"
String? getCode(
RequestModel requestModel,
) {
) {
try {
String result = "";
@ -107,7 +107,8 @@ puts "Response Body: #{response.body}"
var url = stripUriParams(uri);
result += kStringFaradayRequireStatement;
if (requestModel.hasFormDataContentType && requestModel.hasFileInFormData) {
if (requestModel.hasFormDataContentType &&
requestModel.hasFileInFormData) {
result += kStringFaradayMultipartRequireStatement;
}
@ -132,22 +133,25 @@ puts "Response Body: #{response.body}"
// crreating faraday connection for request
var templateConnection = jj.Template(kTemplateConnection);
result += templateConnection.render({
"hasFile": requestModel.hasFormDataContentType && requestModel.hasFileInFormData //
"hasFile": requestModel.hasFormDataContentType &&
requestModel.hasFileInFormData //
});
// start of the request sending
var templateRequestStart = jj.Template(kTemplateRequestStart);
result += templateRequestStart.render({
"method": requestModel.method.name,
"method": requestModel.method.name,
"doesMethodAcceptBody":
kMethodsWithBody.contains(requestModel.method) && requestModel.method != HTTPVerb.delete, //
"containsBody": requestModel.hasBody,
kMethodsWithBody.contains(requestModel.method) &&
requestModel.method != HTTPVerb.delete, //
"containsBody": requestModel.hasBody,
});
var headers = requestModel.enabledHeadersMap;
if (requestModel.hasBody && !requestModel.hasContentTypeHeader) {
if (requestModel.hasJsonData || requestModel.hasTextData) {
headers[kHeaderContentType] = requestModel.requestBodyContentType.header;
headers[kHeaderContentType] =
requestModel.requestBodyContentType.header;
}
}

View File

@ -23,7 +23,10 @@ end
puts "Status Code: #{response.status}"
puts "Response Body: #{response.body}"
""";
expect(codeGen.getCode(CodegenLanguage.rubyFaraday, requestModelGet1, "https"), expectedCode);
expect(
codeGen.getCode(
CodegenLanguage.rubyFaraday, requestModelGet1, "https"),
expectedCode);
});
test('GET 2', () {
@ -45,7 +48,10 @@ end
puts "Status Code: #{response.status}"
puts "Response Body: #{response.body}"
""";
expect(codeGen.getCode(CodegenLanguage.rubyFaraday, requestModelGet2, "https"), expectedCode);
expect(
codeGen.getCode(
CodegenLanguage.rubyFaraday, requestModelGet2, "https"),
expectedCode);
});
test('GET 3', () {
@ -67,7 +73,10 @@ end
puts "Status Code: #{response.status}"
puts "Response Body: #{response.body}"
""";
expect(codeGen.getCode(CodegenLanguage.rubyFaraday, requestModelGet3, "https"), expectedCode);
expect(
codeGen.getCode(
CodegenLanguage.rubyFaraday, requestModelGet3, "https"),
expectedCode);
});
test('GET 4', () {
@ -93,7 +102,10 @@ end
puts "Status Code: #{response.status}"
puts "Response Body: #{response.body}"
""";
expect(codeGen.getCode(CodegenLanguage.rubyFaraday, requestModelGet4, "https"), expectedCode);
expect(
codeGen.getCode(
CodegenLanguage.rubyFaraday, requestModelGet4, "https"),
expectedCode);
});
test('GET 5', () {
@ -115,7 +127,10 @@ end
puts "Status Code: #{response.status}"
puts "Response Body: #{response.body}"
""";
expect(codeGen.getCode(CodegenLanguage.rubyFaraday, requestModelGet5, "https"), expectedCode);
expect(
codeGen.getCode(
CodegenLanguage.rubyFaraday, requestModelGet5, "https"),
expectedCode);
});
test('GET 6', () {
@ -140,7 +155,10 @@ end
puts "Status Code: #{response.status}"
puts "Response Body: #{response.body}"
""";
expect(codeGen.getCode(CodegenLanguage.rubyFaraday, requestModelGet6, "https"), expectedCode);
expect(
codeGen.getCode(
CodegenLanguage.rubyFaraday, requestModelGet6, "https"),
expectedCode);
});
test('GET 7', () {
@ -159,7 +177,10 @@ end
puts "Status Code: #{response.status}"
puts "Response Body: #{response.body}"
""";
expect(codeGen.getCode(CodegenLanguage.rubyFaraday, requestModelGet7, "https"), expectedCode);
expect(
codeGen.getCode(
CodegenLanguage.rubyFaraday, requestModelGet7, "https"),
expectedCode);
});
test('GET 8', () {
@ -184,7 +205,10 @@ end
puts "Status Code: #{response.status}"
puts "Response Body: #{response.body}"
""";
expect(codeGen.getCode(CodegenLanguage.rubyFaraday, requestModelGet8, "https"), expectedCode);
expect(
codeGen.getCode(
CodegenLanguage.rubyFaraday, requestModelGet8, "https"),
expectedCode);
});
test('GET 9', () {
@ -207,7 +231,10 @@ end
puts "Status Code: #{response.status}"
puts "Response Body: #{response.body}"
""";
expect(codeGen.getCode(CodegenLanguage.rubyFaraday, requestModelGet9, "https"), expectedCode);
expect(
codeGen.getCode(
CodegenLanguage.rubyFaraday, requestModelGet9, "https"),
expectedCode);
});
test('GET 10', () {
@ -261,7 +288,10 @@ end
puts "Status Code: #{response.status}"
puts "Response Body: #{response.body}"
""";
expect(codeGen.getCode(CodegenLanguage.rubyFaraday, requestModelGet11, "https"), expectedCode);
expect(
codeGen.getCode(
CodegenLanguage.rubyFaraday, requestModelGet11, "https"),
expectedCode);
});
test('GET 12', () {
@ -280,7 +310,10 @@ end
puts "Status Code: #{response.status}"
puts "Response Body: #{response.body}"
""";
expect(codeGen.getCode(CodegenLanguage.rubyFaraday, requestModelGet12, "https"), expectedCode);
expect(
codeGen.getCode(
CodegenLanguage.rubyFaraday, requestModelGet12, "https"),
expectedCode);
});
});
@ -301,7 +334,10 @@ end
puts "Status Code: #{response.status}"
puts "Response Body: #{response.body}"
""";
expect(codeGen.getCode(CodegenLanguage.rubyFaraday, requestModelHead1, "https"), expectedCode);
expect(
codeGen.getCode(
CodegenLanguage.rubyFaraday, requestModelHead1, "https"),
expectedCode);
});
test('HEAD 2', () {
@ -320,7 +356,10 @@ end
puts "Status Code: #{response.status}"
puts "Response Body: #{response.body}"
""";
expect(codeGen.getCode(CodegenLanguage.rubyFaraday, requestModelHead2, "http"), expectedCode);
expect(
codeGen.getCode(
CodegenLanguage.rubyFaraday, requestModelHead2, "http"),
expectedCode);
});
});
@ -351,7 +390,8 @@ puts "Status Code: #{response.status}"
puts "Response Body: #{response.body}"
""";
expect(
codeGen.getCode(CodegenLanguage.rubyFaraday, requestModelPost1, "https"),
codeGen.getCode(
CodegenLanguage.rubyFaraday, requestModelPost1, "https"),
expectedCode);
});
@ -386,7 +426,8 @@ puts "Status Code: #{response.status}"
puts "Response Body: #{response.body}"
""";
expect(
codeGen.getCode(CodegenLanguage.rubyFaraday, requestModelPost2, "https"),
codeGen.getCode(
CodegenLanguage.rubyFaraday, requestModelPost2, "https"),
expectedCode);
});
@ -417,7 +458,8 @@ puts "Status Code: #{response.status}"
puts "Response Body: #{response.body}"
""";
expect(
codeGen.getCode(CodegenLanguage.rubyFaraday, requestModelPost3, "https"),
codeGen.getCode(
CodegenLanguage.rubyFaraday, requestModelPost3, "https"),
expectedCode);
});
@ -476,7 +518,10 @@ end
puts "Status Code: #{response.status}"
puts "Response Body: #{response.body}"
""";
expect(codeGen.getCode(CodegenLanguage.rubyFaraday, requestModelPost5, "https"), expectedCode);
expect(
codeGen.getCode(
CodegenLanguage.rubyFaraday, requestModelPost5, "https"),
expectedCode);
});
test('POST 6', () {
const expectedCode = r"""require 'uri'
@ -502,7 +547,8 @@ puts "Status Code: #{response.status}"
puts "Response Body: #{response.body}"
""";
expect(
codeGen.getCode(CodegenLanguage.rubyFaraday, requestModelPost6, "https"),
codeGen.getCode(
CodegenLanguage.rubyFaraday, requestModelPost6, "https"),
expectedCode);
});
test('POST 7', () {
@ -529,7 +575,8 @@ puts "Status Code: #{response.status}"
puts "Response Body: #{response.body}"
""";
expect(
codeGen.getCode(CodegenLanguage.rubyFaraday, requestModelPost7, "https"),
codeGen.getCode(
CodegenLanguage.rubyFaraday, requestModelPost7, "https"),
expectedCode);
});
test('POST 8', () {
@ -558,7 +605,10 @@ end
puts "Status Code: #{response.status}"
puts "Response Body: #{response.body}"
""";
expect(codeGen.getCode(CodegenLanguage.rubyFaraday, requestModelPost8, "https"), expectedCode);
expect(
codeGen.getCode(
CodegenLanguage.rubyFaraday, requestModelPost8, "https"),
expectedCode);
});
test('POST 9', () {
const expectedCode = r"""require 'uri'
@ -592,7 +642,8 @@ puts "Status Code: #{response.status}"
puts "Response Body: #{response.body}"
""";
expect(
codeGen.getCode(CodegenLanguage.rubyFaraday, requestModelPost9, "https"),
codeGen.getCode(
CodegenLanguage.rubyFaraday, requestModelPost9, "https"),
expectedCode);
});
});
@ -625,7 +676,8 @@ puts "Status Code: #{response.status}"
puts "Response Body: #{response.body}"
""";
expect(
codeGen.getCode(CodegenLanguage.rubyFaraday, requestModelPut1, "https"),
codeGen.getCode(
CodegenLanguage.rubyFaraday, requestModelPut1, "https"),
expectedCode);
});
});
@ -658,7 +710,8 @@ puts "Status Code: #{response.status}"
puts "Response Body: #{response.body}"
""";
expect(
codeGen.getCode(CodegenLanguage.rubyFaraday, requestModelPatch1, "https"),
codeGen.getCode(
CodegenLanguage.rubyFaraday, requestModelPatch1, "https"),
expectedCode);
});
});
@ -680,7 +733,10 @@ end
puts "Status Code: #{response.status}"
puts "Response Body: #{response.body}"
""";
expect(codeGen.getCode(CodegenLanguage.rubyFaraday, requestModelDelete1, "https"), expectedCode);
expect(
codeGen.getCode(
CodegenLanguage.rubyFaraday, requestModelDelete1, "https"),
expectedCode);
});
test('DELETE 2', () {
@ -711,7 +767,8 @@ puts "Status Code: #{response.status}"
puts "Response Body: #{response.body}"
""";
expect(
codeGen.getCode(CodegenLanguage.rubyFaraday, requestModelDelete2, "https"),
codeGen.getCode(
CodegenLanguage.rubyFaraday, requestModelDelete2, "https"),
expectedCode);
});
});

View File

@ -21,13 +21,13 @@ puts "Response Code: #{response.code}"
puts "Response Body: #{response.body}"
""";
expect(
codeGen.getCode(CodegenLanguage.rubyNetHttp, requestModelGet1, "https"),
codeGen.getCode(
CodegenLanguage.rubyNetHttp, requestModelGet1, "https"),
expectedCode);
});
test('GET 2', () {
const expectedCode =
r"""require "uri"
const expectedCode = r"""require "uri"
require "net/http"
url = URI("https://api.apidash.dev/country/data?code=US")
@ -40,13 +40,13 @@ puts "Response Code: #{response.code}"
puts "Response Body: #{response.body}"
""";
expect(
codeGen.getCode(CodegenLanguage.rubyNetHttp, requestModelGet2, "https"),
codeGen.getCode(
CodegenLanguage.rubyNetHttp, requestModelGet2, "https"),
expectedCode);
});
test('GET 3', () {
const expectedCode =
r"""require "uri"
const expectedCode = r"""require "uri"
require "net/http"
url = URI("https://api.apidash.dev/country/data?code=IND")
@ -59,13 +59,13 @@ puts "Response Code: #{response.code}"
puts "Response Body: #{response.body}"
""";
expect(
codeGen.getCode(CodegenLanguage.rubyNetHttp, requestModelGet3, "https"),
codeGen.getCode(
CodegenLanguage.rubyNetHttp, requestModelGet3, "https"),
expectedCode);
});
test('GET 4', () {
const expectedCode =
r"""require "uri"
const expectedCode = r"""require "uri"
require "net/http"
url = URI("https://api.apidash.dev/humanize/social?num=8700000&digits=3&system=SS&add_space=true&trailing_zeros=true")
@ -78,13 +78,13 @@ puts "Response Code: #{response.code}"
puts "Response Body: #{response.body}"
""";
expect(
codeGen.getCode(CodegenLanguage.rubyNetHttp, requestModelGet4, "https"),
codeGen.getCode(
CodegenLanguage.rubyNetHttp, requestModelGet4, "https"),
expectedCode);
});
test('GET 5', () {
const expectedCode =
r"""require "uri"
const expectedCode = r"""require "uri"
require "net/http"
url = URI("https://api.github.com/repos/foss42/apidash")
@ -99,13 +99,13 @@ puts "Response Code: #{response.code}"
puts "Response Body: #{response.body}"
""";
expect(
codeGen.getCode(CodegenLanguage.rubyNetHttp, requestModelGet5, "https"),
codeGen.getCode(
CodegenLanguage.rubyNetHttp, requestModelGet5, "https"),
expectedCode);
});
test('GET 6', () {
const expectedCode =
r"""require "uri"
const expectedCode = r"""require "uri"
require "net/http"
url = URI("https://api.github.com/repos/foss42/apidash?raw=true")
@ -120,7 +120,8 @@ puts "Response Code: #{response.code}"
puts "Response Body: #{response.body}"
""";
expect(
codeGen.getCode(CodegenLanguage.rubyNetHttp, requestModelGet6, "https"),
codeGen.getCode(
CodegenLanguage.rubyNetHttp, requestModelGet6, "https"),
expectedCode);
});
@ -138,13 +139,13 @@ puts "Response Code: #{response.code}"
puts "Response Body: #{response.body}"
""";
expect(
codeGen.getCode(CodegenLanguage.rubyNetHttp, requestModelGet7, "https"),
codeGen.getCode(
CodegenLanguage.rubyNetHttp, requestModelGet7, "https"),
expectedCode);
});
test('GET 8', () {
const expectedCode =
r"""require "uri"
const expectedCode = r"""require "uri"
require "net/http"
url = URI("https://api.github.com/repos/foss42/apidash?raw=true")
@ -159,13 +160,13 @@ puts "Response Code: #{response.code}"
puts "Response Body: #{response.body}"
""";
expect(
codeGen.getCode(CodegenLanguage.rubyNetHttp, requestModelGet8, "https"),
codeGen.getCode(
CodegenLanguage.rubyNetHttp, requestModelGet8, "https"),
expectedCode);
});
test('GET 9', () {
const expectedCode =
r"""require "uri"
const expectedCode = r"""require "uri"
require "net/http"
url = URI("https://api.apidash.dev/humanize/social?num=8700000&add_space=true")
@ -178,13 +179,13 @@ puts "Response Code: #{response.code}"
puts "Response Body: #{response.body}"
""";
expect(
codeGen.getCode(CodegenLanguage.rubyNetHttp, requestModelGet9, "https"),
codeGen.getCode(
CodegenLanguage.rubyNetHttp, requestModelGet9, "https"),
expectedCode);
});
test('GET 10', () {
const expectedCode =
r"""require "uri"
const expectedCode = r"""require "uri"
require "net/http"
url = URI("https://api.apidash.dev/humanize/social")
@ -208,8 +209,7 @@ puts "Response Body: #{response.body}"
});
test('GET 11', () {
const expectedCode =
r"""require "uri"
const expectedCode = r"""require "uri"
require "net/http"
url = URI("https://api.apidash.dev/humanize/social?num=8700000&digits=3")
@ -224,13 +224,13 @@ puts "Response Code: #{response.code}"
puts "Response Body: #{response.body}"
""";
expect(
codeGen.getCode(CodegenLanguage.rubyNetHttp, requestModelGet11, "https"),
codeGen.getCode(
CodegenLanguage.rubyNetHttp, requestModelGet11, "https"),
expectedCode);
});
test('GET 12', () {
const expectedCode =
r"""require "uri"
const expectedCode = r"""require "uri"
require "net/http"
url = URI("https://api.apidash.dev/humanize/social")
@ -243,7 +243,8 @@ puts "Response Code: #{response.code}"
puts "Response Body: #{response.body}"
""";
expect(
codeGen.getCode(CodegenLanguage.rubyNetHttp, requestModelGet12, "https"),
codeGen.getCode(
CodegenLanguage.rubyNetHttp, requestModelGet12, "https"),
expectedCode);
});
});
@ -263,7 +264,8 @@ puts "Response Code: #{response.code}"
puts "Response Body: #{response.to_hash}"
""";
expect(
codeGen.getCode(CodegenLanguage.rubyNetHttp, requestModelHead1, "https"),
codeGen.getCode(
CodegenLanguage.rubyNetHttp, requestModelHead1, "https"),
expectedCode);
});
@ -281,7 +283,8 @@ puts "Response Code: #{response.code}"
puts "Response Body: #{response.to_hash}"
""";
expect(
codeGen.getCode(CodegenLanguage.rubyNetHttp, requestModelHead2, "http"),
codeGen.getCode(
CodegenLanguage.rubyNetHttp, requestModelHead2, "http"),
expectedCode);
});
});
@ -309,7 +312,8 @@ puts "Response Code: #{response.code}"
puts "Response Body: #{response.body}"
""";
expect(
codeGen.getCode(CodegenLanguage.rubyNetHttp, requestModelPost1, "https"),
codeGen.getCode(
CodegenLanguage.rubyNetHttp, requestModelPost1, "https"),
expectedCode);
});
@ -340,7 +344,8 @@ puts "Response Code: #{response.code}"
puts "Response Body: #{response.body}"
""";
expect(
codeGen.getCode(CodegenLanguage.rubyNetHttp, requestModelPost2, "https"),
codeGen.getCode(
CodegenLanguage.rubyNetHttp, requestModelPost2, "https"),
expectedCode);
});
@ -367,7 +372,8 @@ puts "Response Code: #{response.code}"
puts "Response Body: #{response.body}"
""";
expect(
codeGen.getCode(CodegenLanguage.rubyNetHttp, requestModelPost3, "https"),
codeGen.getCode(
CodegenLanguage.rubyNetHttp, requestModelPost3, "https"),
expectedCode);
});
test('POST 4', () {
@ -423,8 +429,7 @@ puts "Response Body: #{response.body}"
expectedCode);
});
test('POST 6', () {
const expectedCode =
r"""require "uri"
const expectedCode = r"""require "uri"
require "net/http"
url = URI("https://api.apidash.dev/io/img")
@ -449,8 +454,7 @@ puts "Response Body: #{response.body}"
expectedCode);
});
test('POST 7', () {
const expectedCode =
r"""require "uri"
const expectedCode = r"""require "uri"
require "net/http"
url = URI("https://api.apidash.dev/io/img")
@ -500,8 +504,7 @@ puts "Response Body: #{response.body}"
expectedCode);
});
test('POST 9', () {
const expectedCode =
r"""require "uri"
const expectedCode = r"""require "uri"
require "net/http"
url = URI("https://api.apidash.dev/io/img?size=2&len=3")
@ -553,7 +556,8 @@ puts "Response Code: #{response.code}"
puts "Response Body: #{response.body}"
""";
expect(
codeGen.getCode(CodegenLanguage.rubyNetHttp, requestModelPut1, "https"),
codeGen.getCode(
CodegenLanguage.rubyNetHttp, requestModelPut1, "https"),
expectedCode);
});
});
@ -582,7 +586,8 @@ puts "Response Code: #{response.code}"
puts "Response Body: #{response.body}"
""";
expect(
codeGen.getCode(CodegenLanguage.rubyNetHttp, requestModelPatch1, "https"),
codeGen.getCode(
CodegenLanguage.rubyNetHttp, requestModelPatch1, "https"),
expectedCode);
});
});