Issue 2610 - Return notification version in a response header

sitescripts/notifications/web/notification.py

 # coding: utf-8
 
 # This file is part of the Adblock Plus web scripts,
 # Copyright (C) 2006-2015 Eyeo GmbH
 #
 # Adblock Plus is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
 # published by the Free Software Foundation.
 #
 # Adblock Plus is distributed in the hope that it will be useful,
@@ skipping 43 matching lines @@
     if variant > 0:
       notification = next(x for x in notifications if x["id"] == group_id)
       notification = copy.deepcopy(notification)
       notification.update(notification["variants"][variant - 1])
       for key_to_remove in ("sample", "variants"):
         notification.pop(key_to_remove, None)
       response["notifications"] = [notification]
   if "notifications" not in response:
     response["notifications"] = [x for x in notifications
                                  if "variants" not in x]
-  return json.dumps(response, ensure_ascii=False, indent=2,
-                    separators=(",", ": "), sort_keys=True)
+  return response
 
 @url_handler("/notification.json")
 def notification(environ, start_response):
   params = parse_qs(environ.get("QUERY_STRING", ""))
   version = params.get("lastVersion", [""])[0]
   current_groups = dict(x.split("/") for x in version.split("-")[1:]
                         if x.count("/") == 1)
   notifications = load_notifications()
   groups = []
   for notification in notifications:
     if "variants" not in notification:
       continue
     group_id = notification["id"]
     if group_id in current_groups:
       groups.append({"id": group_id, "variant": int(current_groups[group_id])})
   if not groups:
     groups = _assign_groups(notifications)
   response = _create_response(notifications, groups)
-  start_response("200 OK",
-                 [("Content-Type", "application/json; charset=utf-8")])
-  return response.encode("utf-8")
+  response_headers = [("Content-Type", "application/json; charset=utf-8"),
+                      ("ABP-Notification-Version", response["version"])]
+  response_body = json.dumps(response, ensure_ascii=False, indent=2,
+                             separators=(",", ": "),
+                             sort_keys=True).encode("utf-8")
+  start_response("200 OK", response_headers)
+  return response_body