Merge lp:~fabricematrat/convoy/trunk into lp:convoy

[Fabrice Matrat]

Add the capability to specify a max age for the response.
This will add a cache header on ther esponse

[Brad Crittenden (bac)]

I think it would be nicer to set a variable to be the common list of items for both situations that is used as the second parameter to start_response. Then if max_age is not None you could append to the list followed by a single call to start_response.

Otherwise LGTM

review: Approve (code)

[Kyle Adams (kadams54)]

LGTM aside from Brad's comments.

[lp:~fabricematrat/convoy/trunk]

27. By Fabrice Matrat on 2014-12-12

Extract headers to variable

=== modified file 'convoy/combo.py'
--- convoy/combo.py	2013-08-20 14:48:24 +0000
+++ convoy/combo.py	2014-12-12 08:05:15 +0000
@@ -107,7 +107,7 @@
                         yield chunk
 
 
-def combo_app(root, resource_prefix="", rewrite_urls=True):
+def combo_app(root, resource_prefix="", rewrite_urls=True, max_age=None):
     """A simple YUI Combo Service WSGI app.
 
     Serves any files under C{root}, setting an appropriate
@@ -139,8 +139,11 @@
             start_response("400 Bad Request", [("Content-Type", content_type)])
             return ("Bad Request",)
         else:
-            start_response("200 OK", [("Content-Type", content_type),
-                                      ("X-Content-Type-Options", "nosniff")])
+            headers = [("Content-Type", content_type),
+                       ("X-Content-Type-Options", "nosniff")]
+            if max_age is not None:
+                headers += [('Cache-Control', 'max-age=' + str(max_age))]
+            start_response("200 OK", headers)
 
         return combine_files(fnames, updated_root, resource_prefix,
                              rewrite_urls=rewrite_urls)

=== modified file 'convoy/tests/test_combo.py'
--- convoy/tests/test_combo.py	2013-08-20 14:48:24 +0000
+++ convoy/tests/test_combo.py	2014-12-12 08:05:15 +0000
@@ -492,6 +492,14 @@
         # and ask for passwd, it's inside the new adjusted root
         app.get("/../etc?yui-min&passwd", status=400)
 
+    def test_cache_headers_set(self):
+        app = TestApp(combo_app(self.root, max_age=3600))
+        res = app.get("/?" + "&".join(
+            ["widget/skin/sam/widget.css"]), status=200)
+        self.assertEquals(res.headers, [("Content-Type", "text/css"),
+                                        ("X-Content-Type-Options", "nosniff"),
+                                        ('Cache-Control', 'max-age=3600')])
+
 
 def test_suite():
     return defaultTestLoader.loadTestsFromName(__name__)