Revert hourofcode.com behavior change for Pegasus sitemap #21283
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
This reverts commit bed6c0b.
wjordan
commented
Mar 16, 2018
| # We no longer want the country to be part of the path we use to search: | ||
| search_uri = File.join('/', [@language, path].compact) | ||
| return search_uri if resolve_document(search_uri) | ||
| return "/#{path}" |
There was a problem hiding this comment.
This just reverts commit bed6c0b.
Prepend 'us' country code to hourofcode.com URIs instead of following redirect.
wjordan
force-pushed
the
pegasus_sitemap
branch
from
03317af
to
0393765
Compare
|
Merging this fix now since it's essentially a partial-revert of #21143 to fix some already-broken behavior. |
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.
Fixes incorrect behavior-change to hourofcode.com document-resolution introduced in #21143.
hourofcode.com has custom logic to resolve
/:country/:language/:pathURIs to/:language/:pathdocument paths.#21143 attempted to pass the document paths as-is to the Rack application and then follow redirects to return the result, but to get this to resolve all documents I had to change the path-resolution to incorrectly interpret the language-code-specific document-paths as country-codes.
The correct approach to reduce document paths to URIs that will render correctly in all cases is to just prepend a country code (here I use the default
uscode) to the path. This simplifies the testing behavior as well because following redirects is not needed (and similarly, we don't need to configure the Sinatra application to produce relative redirects instead of absolute ones it does by default).Thanks @Hamms for helping me sort this out!