Skip to content

Commit e69e8a5

Browse files
committed
fix(ruby): only prefix model by client::
1 parent f554e09 commit e69e8a5

File tree

4 files changed

+92
-57
lines changed

4 files changed

+92
-57
lines changed

templates/ruby/api.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ module {{moduleName}}
225225
# @return [{{{returnType}}}{{^returnType}}nil{{/returnType}}]
226226
def {{operationId}}({{#allParams}}{{#required}}{{paramName}}, {{/required}}{{^required}}{{paramName}}=nil, {{/required}}{{/allParams}}request_options = {})
227227
{{#returnType}}response = {{/returnType}}{{operationId}}_with_http_info({{#allParams}}{{paramName}}, {{/allParams}}request_options)
228-
{{#returnType}}@api_client.deserialize(response.body, request_options[:debug_return_type]{{#vendorExtensions}}{{#returnProperty}} || '{{#isArray}}Array<{{{modelModule}}}::{{complexType}}>{{/isArray}}{{^isArray}}{{^x-is-custom-request}}{{{modelModule}}}::{{/x-is-custom-request}}{{{dataType}}}{{/isArray}}'{{/returnProperty}}{{/vendorExtensions}}){{/returnType}}{{^returnType}}nil{{/returnType}}
228+
{{#returnType}}@api_client.deserialize(response.body, request_options[:debug_return_type]{{#vendorExtensions}}{{#returnProperty}} || '{{#isArray}}Array<{{{modelModule}}}::{{complexType}}>{{/isArray}}{{^isArray}}{{^isPrimitiveType}}{{^isMap}}{{{modelModule}}}::{{/isMap}}{{/isPrimitiveType}}{{{dataType}}}{{/isArray}}'{{/returnProperty}}{{/vendorExtensions}}){{/returnType}}{{^returnType}}nil{{/returnType}}
229229
end
230230
{{^-last}}
231231

tests/CTS/requests/search/getObject.json

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,29 @@
1515
"attributesToRetrieve": "attr1%2Cattr2"
1616
}
1717
}
18+
},
19+
{
20+
"testName": "search with a real object",
21+
"parameters": {
22+
"indexName": "cts_e2e_browse",
23+
"objectID": "Batman and Robin"
24+
},
25+
"request": {
26+
"path": "/1/indexes/cts_e2e_browse/Batman%20and%20Robin",
27+
"method": "GET"
28+
},
29+
"response": {
30+
"statusCode": 200,
31+
"body": {
32+
"objectID": "Batman and Robin",
33+
"title": "Batman and Robin",
34+
"year": 1949,
35+
"cast": [
36+
"Robert Lowery",
37+
"Johnny Duncan",
38+
"Jane Adams"
39+
]
40+
}
41+
}
1842
}
1943
]

tests/output/javascript/yarn.lock

Lines changed: 65 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -408,78 +408,87 @@ __metadata:
408408
languageName: node
409409
linkType: hard
410410

411-
"@types/node@npm:22.5.5":
412-
version: 22.5.5
413-
resolution: "@types/node@npm:22.5.5"
411+
"@types/node@npm:22.7.4":
412+
version: 22.7.4
413+
resolution: "@types/node@npm:22.7.4"
414414
dependencies:
415415
undici-types: "npm:~6.19.2"
416-
checksum: 10/172d02c8e6d921699edcf559c28b3805616bd6481af1b3cb0299f89ad9a6f33b71050434c06ce7b503166054a26275344187c443f99f745d0b12601372452f19
416+
checksum: 10/19ddab80c4eba2253c855ed67c9bbc47417183049d01e59010a738bd80d47338bab79fd1f44ae51516bd63a1db4bf21ddb38b16bf6401a2e93252068ec52e88b
417417
languageName: node
418418
linkType: hard
419419

420-
"@vitest/expect@npm:2.1.1":
421-
version: 2.1.1
422-
resolution: "@vitest/expect@npm:2.1.1"
420+
"@vitest/expect@npm:2.1.2":
421+
version: 2.1.2
422+
resolution: "@vitest/expect@npm:2.1.2"
423423
dependencies:
424-
"@vitest/spy": "npm:2.1.1"
425-
"@vitest/utils": "npm:2.1.1"
424+
"@vitest/spy": "npm:2.1.2"
425+
"@vitest/utils": "npm:2.1.2"
426426
chai: "npm:^5.1.1"
427427
tinyrainbow: "npm:^1.2.0"
428-
checksum: 10/ece8d7f9e0c083c5cf30c0df9e052bba4402649736293a18e56a8db4be46a847b18dc7b33cdd1c08bea51bf6f2cb021e40e7227d9cfc24fdba4a955bffe371a2
428+
checksum: 10/0e2991295a6b9c51e2d074d1185317dcb2d85d1e9b5045299431fd7b84e51a847942911b08efad2379f56bb4dfe2f02442abd267df348751c61c86bc7b3154a3
429429
languageName: node
430430
linkType: hard
431431

432-
"@vitest/mocker@npm:2.1.1":
433-
version: 2.1.1
434-
resolution: "@vitest/mocker@npm:2.1.1"
432+
"@vitest/mocker@npm:2.1.2":
433+
version: 2.1.2
434+
resolution: "@vitest/mocker@npm:2.1.2"
435435
dependencies:
436436
"@vitest/spy": "npm:^2.1.0-beta.1"
437437
estree-walker: "npm:^3.0.3"
438438
magic-string: "npm:^0.30.11"
439439
peerDependencies:
440-
"@vitest/spy": 2.1.1
440+
"@vitest/spy": 2.1.2
441441
msw: ^2.3.5
442442
vite: ^5.0.0
443443
peerDependenciesMeta:
444444
msw:
445445
optional: true
446446
vite:
447447
optional: true
448-
checksum: 10/4fbdaac36e3f603235b131e25d9e561381bd989a34e49522e16652077021532ae6653907b47bbca93c14ae4629e3e6a8f61438e3812620dc5654b61595b45208
448+
checksum: 10/f6ec9aa061c21877322bf3f0b12bf4e78eba3f092174a506b2d2d479b78e36b4d46a6458cd23d3bf3cbdcf212276cf5d1a87234ae2014e8362ea2afc23e46bec
449449
languageName: node
450450
linkType: hard
451451

452-
"@vitest/pretty-format@npm:2.1.1, @vitest/pretty-format@npm:^2.1.1":
453-
version: 2.1.1
454-
resolution: "@vitest/pretty-format@npm:2.1.1"
452+
"@vitest/pretty-format@npm:2.1.2, @vitest/pretty-format@npm:^2.1.2":
453+
version: 2.1.2
454+
resolution: "@vitest/pretty-format@npm:2.1.2"
455455
dependencies:
456456
tinyrainbow: "npm:^1.2.0"
457-
checksum: 10/744278a3a91d080e51a94b03eaf7cf43779978d6391060cbfdda6d03194eef744ce8f12a2fe2fa90a9bf9b9f038d4c4c4d88f6192f042c88c5ee4125f38bf892
457+
checksum: 10/5866fb3c45e794b695a9f62f76b886a8a8d07d711f7187e9e769fd614bc62df1f87d076880c032d5cd8c0272c385fe824c12191b04a3ca44a8bb9fed1a0c3693
458458
languageName: node
459459
linkType: hard
460460

461-
"@vitest/runner@npm:2.1.1":
462-
version: 2.1.1
463-
resolution: "@vitest/runner@npm:2.1.1"
461+
"@vitest/runner@npm:2.1.2":
462+
version: 2.1.2
463+
resolution: "@vitest/runner@npm:2.1.2"
464464
dependencies:
465-
"@vitest/utils": "npm:2.1.1"
465+
"@vitest/utils": "npm:2.1.2"
466466
pathe: "npm:^1.1.2"
467-
checksum: 10/cf13a2f0bebb494484e60614ff0e7cab06f4310b36c96fe311035ab2eec9cbc057fa5702e904d43e8976fb2214fe550286ceb0b3dc1c72081e23eb1b1f8fa193
467+
checksum: 10/60b086e39a31dd664875746b0da3a2402d4088801306e87fe25f20dc660abda50afd3e5ec6ea34ef0849f5652ac05ce2a93a13ea4d5dd16a549d9882941de328
468468
languageName: node
469469
linkType: hard
470470

471-
"@vitest/snapshot@npm:2.1.1":
472-
version: 2.1.1
473-
resolution: "@vitest/snapshot@npm:2.1.1"
471+
"@vitest/snapshot@npm:2.1.2":
472+
version: 2.1.2
473+
resolution: "@vitest/snapshot@npm:2.1.2"
474474
dependencies:
475-
"@vitest/pretty-format": "npm:2.1.1"
475+
"@vitest/pretty-format": "npm:2.1.2"
476476
magic-string: "npm:^0.30.11"
477477
pathe: "npm:^1.1.2"
478-
checksum: 10/820f429d950cf63316464e7f2bc1f0ba4b7d2691c51f6ad03ba1c6edc7dbdc6a86b017c082f2a519b743ae53880b41366bbb596c8b43cf8cd68032f9433ec844
478+
checksum: 10/acd29f59883899c660eeba5950366e4f9f799cb29e7edd65575a7b6ad319a1df4d7a46a95048f8f9475f4c6f46cea198a7ecfab06e88e435dfd4989b365b917f
479+
languageName: node
480+
linkType: hard
481+
482+
"@vitest/spy@npm:2.1.2":
483+
version: 2.1.2
484+
resolution: "@vitest/spy@npm:2.1.2"
485+
dependencies:
486+
tinyspy: "npm:^3.0.0"
487+
checksum: 10/0183ab53b431bd6a08531752113780e15202ebd7579eed25b9bf87c849f75d74d0e4f346d886034cd9dd1381aa8814b3e468f141f41f7539b75f30268df35a79
479488
languageName: node
480489
linkType: hard
481490

482-
"@vitest/spy@npm:2.1.1, @vitest/spy@npm:^2.1.0-beta.1":
491+
"@vitest/spy@npm:^2.1.0-beta.1":
483492
version: 2.1.1
484493
resolution: "@vitest/spy@npm:2.1.1"
485494
dependencies:
@@ -488,14 +497,14 @@ __metadata:
488497
languageName: node
489498
linkType: hard
490499

491-
"@vitest/utils@npm:2.1.1":
492-
version: 2.1.1
493-
resolution: "@vitest/utils@npm:2.1.1"
500+
"@vitest/utils@npm:2.1.2":
501+
version: 2.1.2
502+
resolution: "@vitest/utils@npm:2.1.2"
494503
dependencies:
495-
"@vitest/pretty-format": "npm:2.1.1"
504+
"@vitest/pretty-format": "npm:2.1.2"
496505
loupe: "npm:^3.1.1"
497506
tinyrainbow: "npm:^1.2.0"
498-
checksum: 10/605f1807c343ac01cde053b062bda8f0cc51b321a3cd9c751424a1e24549a35120896bd58612a14f068460242013f69e08fc0a69355387e981a5a50bce9ae04e
507+
checksum: 10/fa898ea6312cb62e4027f55b06859d84ba50ac20e583bab2889eeadea41d73baf6022ed87547deec6251cd8021f1df13d2ea4515ab253582c3ca93226acd6313
499508
languageName: node
500509
linkType: hard
501510

@@ -1031,11 +1040,11 @@ __metadata:
10311040
"@algolia/monitoring": "link:../../../clients/algoliasearch-client-javascript/packages/monitoring"
10321041
"@algolia/recommend": "link:../../../clients/algoliasearch-client-javascript/packages/recommend"
10331042
"@algolia/requester-testing": "link:../../../clients/algoliasearch-client-javascript/packages/requester-testing"
1034-
"@types/node": "npm:22.5.5"
1043+
"@types/node": "npm:22.7.4"
10351044
algoliasearch: "link:../../../clients/algoliasearch-client-javascript/packages/algoliasearch"
10361045
dotenv: "npm:16.4.5"
10371046
typescript: "npm:5.6.2"
1038-
vitest: "npm:2.1.1"
1047+
vitest: "npm:2.1.2"
10391048
languageName: unknown
10401049
linkType: soft
10411050

@@ -1644,17 +1653,17 @@ __metadata:
16441653
languageName: node
16451654
linkType: hard
16461655

1647-
"vite-node@npm:2.1.1":
1648-
version: 2.1.1
1649-
resolution: "vite-node@npm:2.1.1"
1656+
"vite-node@npm:2.1.2":
1657+
version: 2.1.2
1658+
resolution: "vite-node@npm:2.1.2"
16501659
dependencies:
16511660
cac: "npm:^6.7.14"
16521661
debug: "npm:^4.3.6"
16531662
pathe: "npm:^1.1.2"
16541663
vite: "npm:^5.0.0"
16551664
bin:
16561665
vite-node: vite-node.mjs
1657-
checksum: 10/c21892b560cad87414ef774d7e53b207e8d66b511b7ef085940fd2f2160d8f6c42dfa9af2ef5465e775b767fc3312ec5b3418b898041f592b8e0b093b4b7110a
1666+
checksum: 10/582843800ee968e7edf2cf6e6f1573634122cba74e47ef531a373337f6084c4a394c3c1c2abb210c178c8671200530412c09f5cc2f02a4519f0045a03c3eed02
16581667
languageName: node
16591668
linkType: hard
16601669

@@ -1701,17 +1710,17 @@ __metadata:
17011710
languageName: node
17021711
linkType: hard
17031712

1704-
"vitest@npm:2.1.1":
1705-
version: 2.1.1
1706-
resolution: "vitest@npm:2.1.1"
1707-
dependencies:
1708-
"@vitest/expect": "npm:2.1.1"
1709-
"@vitest/mocker": "npm:2.1.1"
1710-
"@vitest/pretty-format": "npm:^2.1.1"
1711-
"@vitest/runner": "npm:2.1.1"
1712-
"@vitest/snapshot": "npm:2.1.1"
1713-
"@vitest/spy": "npm:2.1.1"
1714-
"@vitest/utils": "npm:2.1.1"
1713+
"vitest@npm:2.1.2":
1714+
version: 2.1.2
1715+
resolution: "vitest@npm:2.1.2"
1716+
dependencies:
1717+
"@vitest/expect": "npm:2.1.2"
1718+
"@vitest/mocker": "npm:2.1.2"
1719+
"@vitest/pretty-format": "npm:^2.1.2"
1720+
"@vitest/runner": "npm:2.1.2"
1721+
"@vitest/snapshot": "npm:2.1.2"
1722+
"@vitest/spy": "npm:2.1.2"
1723+
"@vitest/utils": "npm:2.1.2"
17151724
chai: "npm:^5.1.1"
17161725
debug: "npm:^4.3.6"
17171726
magic-string: "npm:^0.30.11"
@@ -1722,13 +1731,13 @@ __metadata:
17221731
tinypool: "npm:^1.0.0"
17231732
tinyrainbow: "npm:^1.2.0"
17241733
vite: "npm:^5.0.0"
1725-
vite-node: "npm:2.1.1"
1734+
vite-node: "npm:2.1.2"
17261735
why-is-node-running: "npm:^2.3.0"
17271736
peerDependencies:
17281737
"@edge-runtime/vm": "*"
17291738
"@types/node": ^18.0.0 || >=20.0.0
1730-
"@vitest/browser": 2.1.1
1731-
"@vitest/ui": 2.1.1
1739+
"@vitest/browser": 2.1.2
1740+
"@vitest/ui": 2.1.2
17321741
happy-dom: "*"
17331742
jsdom: "*"
17341743
peerDependenciesMeta:
@@ -1746,7 +1755,7 @@ __metadata:
17461755
optional: true
17471756
bin:
17481757
vitest: vitest.mjs
1749-
checksum: 10/5bbbc7298a043c7ca0914817a2c30e18af5a1619f4a750d36056f64f4d907a1fad50b8bab93aaf39f8174eb475108c9287f6e226e24d3a3ccd6f0b71d3f56438
1758+
checksum: 10/3a331a10499f5ed678530594903869e37a0de548598bcf540db9a6e015bb7a38f36c3585376b3aeeb53fee6b20d75b93081f32b1ea09fd8c2098aa541af28491
17501759
languageName: node
17511760
linkType: hard
17521761

tests/output/python/tests/helpers.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ def unwrap(self, resp):
66
for _, r in enumerate(resp):
77
_res.append(r.to_dict())
88
return _res
9+
if isinstance(resp, dict):
10+
return resp
911
return resp.to_dict()
1012

1113
def union(self, expected, received):

0 commit comments

Comments
 (0)