Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ruby] Fix generation when generateAliasAsModel is enabled #7419

Merged
merged 4 commits into from
Sep 25, 2020

Conversation

zippolyte
Copy link
Contributor

Attempt at implementing proper code generation of alias models for map and arrays in the ruby-client.
Previously the class were being generated like so:

class Alias < null <InnerType>
...
end

I am by no means a ruby expert, so I'd absolutely love some feedback on this. I added a config for a pet store using specifically this feature to check that the generated code looks good, make sure to have a look 😄

PR checklist

  • Read the contribution guidelines.
  • Pull Request title clearly describes the work in the pull request and Pull Request description provides details about how to validate the work. Missing information here may result in delayed response from the community.
  • If contributing template-only or documentation-only changes which will change sample output, build the project beforehand.
  • Run the shell script ./bin/generate-samples.shto update all Petstore samples related to your fix. This is important, as CI jobs will verify all generator outputs of your HEAD commit as it would merge with master. These must match the expectations made by your contribution. You may regenerate an individual generator by passing the relevant config(s) as an argument to the script, for example ./bin/generate-samples.sh bin/configs/java*. For Windows users, please run the script in Git BASH.
  • File the PR against the correct branch: master
  • Copy the technical committee to review the pull request if your PR is targeting a particular programming language.

cc @cliffano (2017/07) @zlx (2017/09) @autopp (2019/02)

@auto-labeler
Copy link

auto-labeler bot commented Sep 15, 2020

👍 Thanks for opening this issue!
🏷 I have applied any labels matching special text in your issue.

The team will review the labels and make any necessary changes.

@zippolyte
Copy link
Contributor Author

Bump. cc @jimschubert @wing328

It's pretty blocking as we can't use local template patches, and we'd rather avoid having to rely on a custom build from a fork.

Thanks 🙇

@jimschubert
Copy link
Member

@zippolyte Circle CI had failed. I've restarted, but I think it can be merged when done. Thanks for bumping.

@jimschubert jimschubert self-assigned this Sep 24, 2020
@zippolyte
Copy link
Contributor Author

Just rebased on master to try and see if the CI passes

@zippolyte
Copy link
Contributor Author

Hmm not sure what this failure is about 😞

Copy link
Member

@jimschubert jimschubert left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@jimschubert
Copy link
Member

@zippolyte thanks for the rebase. It looks like Circle CI just crapped out in the middle of the run. Your changes look good, so we'll merge and fix-forward if Circle breaks in master.

@jimschubert jimschubert changed the title [ruby-client] Fix code generation when generateAliasAsModel is enabled on array or map models [ruby] Fix generation when generateAliasAsModel is enabled Sep 25, 2020
@jimschubert jimschubert merged commit 7b15633 into OpenAPITools:master Sep 25, 2020
@jimschubert jimschubert added this to the 5.0.0 milestone Sep 25, 2020
jimschubert added a commit to Marvin1912/openapi-generator that referenced this pull request Sep 25, 2020
* master: (1357 commits)
  minor formatting change (OpenAPITools#7503)
  [ruby] Fix generation when generateAliasAsModel is enabled (OpenAPITools#7419)
  [sonar][ci] Fixes some new recommended "bug" fixes found via Sonar (OpenAPITools#7508)
  Add option to set recursion limit (OpenAPITools#7491)
  regenerate java pkmst petstore samples (OpenAPITools#7502)
  fix issue without http signature auth (OpenAPITools#7504)
  [ruby] Support for per-operation servers (OpenAPITools#7415)
  Add a link to react native tutorial (OpenAPITools#7505)
  update of Objective-C model-body.mustache to support discriminator.mappedModels (OpenAPITools#7471)
  update samples
  [ci] Sonar bug fixes (OpenAPITools#7497)
  fixed the backslash issue (OpenAPITools#7492)
  Fix the range check condition (OpenAPITools#7482)
  [batch] Option to clean files before generation (OpenAPITools#7465)
  [java][groovy] Fix mangled src paths in outputs on Windows (OpenAPITools#7487)
  remove haskell stack installation in shippable ci (OpenAPITools#7481)
  remove hardcoded PetApi (OpenAPITools#7483)
  remove SWGApiResponse.m (not used) (OpenAPITools#7478)
  update samples
  [typescript-axios] support "x-enum-descriptions" (OpenAPITools#7477)
  ...
@zippolyte zippolyte deleted the hippo/ruby_gaam branch September 25, 2020 06:40
jimschubert added a commit to jimschubert/openapi-generator that referenced this pull request Sep 25, 2020
* master: (2170 commits)
  [ci][test] Fix samples (OpenAPITools#7509)
  [bug][Java] Honor instantiationMap for default values for array, map, set (OpenAPITools#4982)
  Fix stringifying of ~= (OpenAPITools#7460)
  minor formatting change (OpenAPITools#7503)
  [ruby] Fix generation when generateAliasAsModel is enabled (OpenAPITools#7419)
  [sonar][ci] Fixes some new recommended "bug" fixes found via Sonar (OpenAPITools#7508)
  Add option to set recursion limit (OpenAPITools#7491)
  regenerate java pkmst petstore samples (OpenAPITools#7502)
  fix issue without http signature auth (OpenAPITools#7504)
  [ruby] Support for per-operation servers (OpenAPITools#7415)
  Add a link to react native tutorial (OpenAPITools#7505)
  update of Objective-C model-body.mustache to support discriminator.mappedModels (OpenAPITools#7471)
  update samples
  [ci] Sonar bug fixes (OpenAPITools#7497)
  fixed the backslash issue (OpenAPITools#7492)
  Fix the range check condition (OpenAPITools#7482)
  [batch] Option to clean files before generation (OpenAPITools#7465)
  [java][groovy] Fix mangled src paths in outputs on Windows (OpenAPITools#7487)
  remove haskell stack installation in shippable ci (OpenAPITools#7481)
  remove hardcoded PetApi (OpenAPITools#7483)
  ...
jimschubert added a commit to david1601/openapi-generator that referenced this pull request Sep 28, 2020
…or-extension-x-spring-paginated

* master: (29 commits)
  [Core, HTML2] Rendered docs are incomplete (OpenAPITools#7510)
  [C][Client]Support data callback function (OpenAPITools#7467)
  [typescript-axios] replace optional chaining (OpenAPITools#7476)
  [typescript-axios] fix refining `query` (OpenAPITools#7475)
  [powershell] Updated the Api doc with httpsiging script snippet. (OpenAPITools#7499)
  [go][client] Fix API docs example generation (OpenAPITools#7489)
  [ci][test] Fix samples (OpenAPITools#7509)
  [bug][Java] Honor instantiationMap for default values for array, map, set (OpenAPITools#4982)
  Fix stringifying of ~= (OpenAPITools#7460)
  minor formatting change (OpenAPITools#7503)
  [ruby] Fix generation when generateAliasAsModel is enabled (OpenAPITools#7419)
  [sonar][ci] Fixes some new recommended "bug" fixes found via Sonar (OpenAPITools#7508)
  Add option to set recursion limit (OpenAPITools#7491)
  regenerate java pkmst petstore samples (OpenAPITools#7502)
  fix issue without http signature auth (OpenAPITools#7504)
  [ruby] Support for per-operation servers (OpenAPITools#7415)
  Add a link to react native tutorial (OpenAPITools#7505)
  update of Objective-C model-body.mustache to support discriminator.mappedModels (OpenAPITools#7471)
  update samples
  [ci] Sonar bug fixes (OpenAPITools#7497)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants