Fixed fetching namespace options for mounted APIs. #129
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@CraigCottingham could use another pair of eyes, please check and merge, thx |
| @@ -26,8 +40,7 @@ def add_swagger_documentation(options = {}) | |||
|
|
|||
| @combined_namespaces = {} | |||
| endpoints.each do |endpoint| | |||
| ns = endpoint.settings.stack.last[:namespace] | |||
| @combined_namespaces[ns.space] = ns if ns | |||
| @combined_namespaces.merge! endpoint.combined_namespaces | |||
There was a problem hiding this comment.
I don't see where endpoint is an instance of Grape::Endpoint. In fact, I'm not seeing where endpoints is defined, either as a method or an variable. Am I just missing it?
There was a problem hiding this comment.
This is an extension to the Grape class.
|
@dblock We've got a merge conflict now. Can you resolve it, please? |
|
The fix in #136 is better, I am merging just the specs from my PR. |
dblock
added a commit
that referenced
this pull request
Aug 6, 2014
…-apis Fixed fetching namespace options for mounted APIs.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This fixes the scenario where an API is mounted by another API, in the simple case.
There's a bigger issue is that namespaces can nest and that swagger namespaces != grape namespaces, but that's another can of worms, https://github.com/tim-vandecasteele/grape-swagger/issues/130.