Merge lp:~stevenk/launchpad/combo-url into lp:launchpad

[Steve Kowalik]

Instead of hard-coding /+combo in the base-layout-macros, use a tal:define to include a revno in the path, just like icing does.

[Richard Harding (rharding)]

This looks like a good change to me. We'll need to coordinate this with the updated convoy that will handle the paths with the revno in them. It's awating approval:

https://code.launchpad.net/~rharding/convoy/route_with_paths/+merge/89102

review: Approve (code*)

[j.c.sackett (jcsackett)]

I have nothing to add about the diff. Coordination of this does seem like the only sticking point.

review: Approve

[Steve Kowalik (stevenk)]

This is blocked. Somewhat. Anyway, setting to WIP.

=== modified file 'Makefile'
--- Makefile	2012-01-26 00:23:55 +0000
+++ Makefile	2012-01-31 00:41:27 +0000
@@ -42,7 +42,7 @@
 
 CODEHOSTING_ROOT=/var/tmp/bazaar.launchpad.dev
 
-CONVOY_ROOT=/var/tmp/convoy
+CONVOY_ROOT?=/var/tmp/convoy
 
 BZR_VERSION_INFO = bzr-version-info.py
 
@@ -143,7 +143,7 @@
 	chmod 777 $(CODEHOSTING_ROOT)/rewrite.log
 	touch $(CODEHOSTING_ROOT)/config/launchpad-lookup.txt
 
-build: compile apidoc jsbuild css_combine sprite_image
+build: compile apidoc jsbuild combobuild css_combine sprite_image
 
 # LP_SOURCEDEPS_PATH should point to the sourcecode directory, but we
 # want the parent directory where the download-cache and eggs directory

=== modified file 'lib/lp/app/templates/base-layout-macros.pt'
--- lib/lp/app/templates/base-layout-macros.pt	2012-01-20 00:25:56 +0000
+++ lib/lp/app/templates/base-layout-macros.pt	2012-01-31 00:41:27 +0000
@@ -37,6 +37,7 @@
   tal:define="
       revno modules/lp.app.versioninfo/revno | string:unknown;
       icingroot string:/+icing/rev${revno};
+      combo_url view/combo_url;
       devmode modules/lp.services.config/config/devmode;
       yui_version view/yui_version;
       yui_console_debug view/yui_console_debug;"
@@ -78,20 +79,20 @@
       tal:content="string:var cookie_scope = '${request/lp:cookie_scope}';"></script>
 
   <tal:js-loader condition="request/features/js.combo_loader.enabled">
-   <script
-   src="/+combo/?yui/yui/yui-min.js&lp/meta.js&yui/loader/loader-min.js"></script>
+   <script type="text/javascript"
+        tal:attributes="src string:${combo_url}/?yui/yui/yui-min.js&lp/meta.js&yui/loader/loader-min.js"></script>
    <script type="text/javascript" tal:content="string:
         YUI.GlobalConfig = {
             combine: true,
-            comboBase: '/+combo/?',
+            comboBase: '${combo_url}/?',
             root: 'yui/',
             debug: ${yui_console_debug},
             fetchCSS: false,
             groups: {
                 lp: {
                     combine: true,
-                    base: '/+combo/?lp/',
-                    comboBase: '/+combo/?',
+                    base: '${combo_url}/?lp/',
+                    comboBase: '${combo_url}/?',
                     root: 'lp/',
                     // comes from including lp/meta.js
                     modules: LP_MODULES,
@@ -99,8 +100,8 @@
                 },
                 yui2: {
                     combine: true,
-                    base: '/+combo/?yui2/',
-                    comboBase: '/+combo/?',
+                    base: '${combo_url}/?yui2/',
+                    comboBase: '${combo_url}/?',
                     root: 'yui2/',
                     fetchCSS: false,
                     modules: {

=== modified file 'lib/lp/services/webapp/publisher.py'
--- lib/lp/services/webapp/publisher.py	2012-01-23 04:05:17 +0000
+++ lib/lp/services/webapp/publisher.py	2012-01-31 00:41:27 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009-2011 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2012 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Publisher of objects as web pages.
@@ -61,6 +61,7 @@
 from zope.traversing.browser.interfaces import IAbsoluteURL
 
 from lp.app.errors import NotFoundError
+from lp.app.versioninfo import revno
 from lp.layers import (
     LaunchpadLayer,
     setFirstLayer,
@@ -328,6 +329,16 @@
         from lp.services.config import config
         return 'true' if config.devmode else 'false'
 
+    @property
+    def combo_url(self):
+        """Return the URL for the combo loader."""
+        # Circular imports, natch.
+        from lp.services.config import config
+        combo_url = '/+combo'
+        if not config.devmode:
+            combo_url += '/rev%s' % revno
+        return combo_url
+
     def render(self):
         """Return the body of the response.