Docserver: there is only one.

Docserver: move to a single version served from trunk. Permanently redirect requests
from any channel to the non-channel version (served from trunk). Improve the
redirect logic in other ways. Fix a few bugs in caching classes that cause this all not
to work. Replace the channel switcher (now moot) with a platform switcher.


R=cduvall@chromium.org
BUG=233978
NOTRY=true

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=212646

[not at google - send to devlin, 2013-05-14 18:35:11]

Hey Clark,

This is the big patch that makes all of the manifest etc stuff possible to
submit - though I can't commit it until we have some kind of channel
distinguishing code committed (e.g. Evan's stuff).

In the meantime though, ready to review.

One thing to look out for - anything that will make Evan/Jared's life harder
(particularly Evan's since I think his may conflict more).

Evan/Jared - FYI.

[cduvall, 2013-05-15 00:50:50]

Awesome, this is going to simplify things a lot.

https://codereview.chromium.org/15087006/diff/5001/chrome/common/extensions/d...
File chrome/common/extensions/docs/server2/path_canonicalizer.py (right):

https://codereview.chromium.org/15087006/diff/5001/chrome/common/extensions/d...
chrome/common/extensions/docs/server2/path_canonicalizer.py:30: return
{_SimplifyFileName(name): name for name in file_names}
use dict((...

https://codereview.chromium.org/15087006/diff/5001/chrome/common/extensions/d...
chrome/common/extensions/docs/server2/path_canonicalizer.py:45: def
__eq__(self): raise NotImplementedError()
these need to take another argument or you get a TypeError instead of the
NotImplementedError.

https://codereview.chromium.org/15087006/diff/5001/chrome/common/extensions/d...
chrome/common/extensions/docs/server2/path_canonicalizer.py:74: if
any(path.startswith(prefix) for prefix in ('extensions/', 'apps/')):
i believe you can do:
path.startswith(('extensions/', 'apps/'))

https://codereview.chromium.org/15087006/diff/5001/chrome/common/extensions/d...
File chrome/common/extensions/docs/server2/render_servlet.py (right):

https://codereview.chromium.org/15087006/diff/5001/chrome/common/extensions/d...
chrome/common/extensions/docs/server2/render_servlet.py:36: canonical_result =
server_instance.path_canonicalizer.Canonicalize(path)
does the path passed in here have a leading '/'? I think Canonicalize expects no
leading '/' when stripping channel names, so it might be safer to lstrip it
here.

https://codereview.chromium.org/15087006/diff/5001/chrome/common/extensions/d...
File chrome/common/extensions/docs/static/js/platform_chooser.js (right):

https://codereview.chromium.org/15087006/diff/5001/chrome/common/extensions/d...
chrome/common/extensions/docs/static/js/platform_chooser.js:7: function init() {
nit: just run init immediately? (function() {...})()

either way I guess, whatever you prefer.

https://codereview.chromium.org/15087006/diff/5001/chrome/common/extensions/d...
File chrome/common/extensions/docs/templates/private/header_body.html (right):

https://codereview.chromium.org/15087006/diff/5001/chrome/common/extensions/d...
chrome/common/extensions/docs/templates/private/header_body.html:4: <a
href="/{{platform}}s" title="Google Chrome {{title}}">
/{{platform}}s/ to avoid the redirect?

[not at google - send to devlin, 2013-05-15 01:26:49]

Thanks Clark.

https://codereview.chromium.org/15087006/diff/5001/chrome/common/extensions/d...
File chrome/common/extensions/docs/server2/path_canonicalizer.py (right):

https://codereview.chromium.org/15087006/diff/5001/chrome/common/extensions/d...
chrome/common/extensions/docs/server2/path_canonicalizer.py:30: return
{_SimplifyFileName(name): name for name in file_names}
On 2013/05/15 00:50:50, cduvall wrote:
> use dict((...

Done.

https://codereview.chromium.org/15087006/diff/5001/chrome/common/extensions/d...
chrome/common/extensions/docs/server2/path_canonicalizer.py:45: def
__eq__(self): raise NotImplementedError()
On 2013/05/15 00:50:50, cduvall wrote:
> these need to take another argument or you get a TypeError instead of the
> NotImplementedError.

ah. thanks.

https://codereview.chromium.org/15087006/diff/5001/chrome/common/extensions/d...
chrome/common/extensions/docs/server2/path_canonicalizer.py:74: if
any(path.startswith(prefix) for prefix in ('extensions/', 'apps/')):
On 2013/05/15 00:50:50, cduvall wrote:
> i believe you can do:
> path.startswith(('extensions/', 'apps/'))

Done.

https://codereview.chromium.org/15087006/diff/5001/chrome/common/extensions/d...
File chrome/common/extensions/docs/server2/render_servlet.py (right):

https://codereview.chromium.org/15087006/diff/5001/chrome/common/extensions/d...
chrome/common/extensions/docs/server2/render_servlet.py:36: canonical_result =
server_instance.path_canonicalizer.Canonicalize(path)
On 2013/05/15 00:50:50, cduvall wrote:
> does the path passed in here have a leading '/'? I think Canonicalize expects
no
> leading '/' when stripping channel names, so it might be safer to lstrip it
> here.

yeah, the servlet strips off the leading '/' for the request, but I don't know
whether I like that anyway, so done.

https://codereview.chromium.org/15087006/diff/5001/chrome/common/extensions/d...
File chrome/common/extensions/docs/static/js/platform_chooser.js (right):

https://codereview.chromium.org/15087006/diff/5001/chrome/common/extensions/d...
chrome/common/extensions/docs/static/js/platform_chooser.js:7: function init() {
On 2013/05/15 00:50:50, cduvall wrote:
> nit: just run init immediately? (function() {...})()
> 
> either way I guess, whatever you prefer.

I like it when these files are complex, but I suppose this isn't very complex.
done.

https://codereview.chromium.org/15087006/diff/5001/chrome/common/extensions/d...
File chrome/common/extensions/docs/templates/private/header_body.html (right):

https://codereview.chromium.org/15087006/diff/5001/chrome/common/extensions/d...
chrome/common/extensions/docs/templates/private/header_body.html:4: <a
href="/{{platform}}s" title="Google Chrome {{title}}">
On 2013/05/15 00:50:50, cduvall wrote:
> /{{platform}}s/ to avoid the redirect?

Done.

[cduvall, 2013-05-15 01:39:43]

lgtm when you're ready to commit

[commit-bot: I haz the power, 2013-07-19 20:40:14]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/kalman@chromium.org/15087006/39001

[commit-bot: I haz the power, 2013-07-19 20:44:06]

Change committed as 212646