Issue 510 - [Typed objects] Don`t hardcode script load order in unit tests

run_tests.py

 #!/usr/bin/env python
 # coding: utf-8
 
 # This file is part of Adblock Plus <https://adblockplus.org/>,
 # 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.
 #
@@ skipping 37 matching lines @@
     data = doRewrite([os.path.abspath(path)], []).decode("utf-8")
   else:
     with io.open(path, "r", encoding="utf-8") as handle:
       data = handle.read()
   data += "\n//# sourceURL=%s" % sourceURL
   return js_encode(data)
 
 @app.route("/<path:path>", methods = ["GET"])
 @app.route("/", methods = ["GET"])
 def multiplex(path=""):
-  request_url = urlparse.urlparse(flask.request.url)
+  base_url = flask.request.url
+  request_url = urlparse.urlparse(base_url)
   request_path = request_url.path
   islib = request_path.startswith("/lib/")
   backcompat = request_url.query == "backcompat"
 
   rootdir = os.path.dirname(__file__)
   if request_path == "/lib.js":
-    data = ""

[Sebastian Noack, 2015/02/05 11:32:21]

Instead concatenating the whole string here, you might want to generate the
response on the fly: http://flask.pocoo.org/docs/0.10/patterns/streaming/

Or at least I'd use at list, instead concatenating strings with the plus
operator. I think you wouldn't even need to join that list but can just return
it.

[Wladimir Palant, 2015/02/05 14:51:26]

I think we are getting extremely nit-picky now, considering that the performance
of this piece of code has no practical relevance whatsoever. But - fine with me,
generators it is now.

-    for path, relpath in get_scripts(os.path.join(rootdir, "lib")):
-      url = urlparse.urljoin(flask.request.url, "/lib/" + relpath)
-      data += "require.sources[%s] = %s;\n" % (
-          js_encode(posixpath.splitext(relpath)[0]),
-          script_as_string(path, url, backcompat)
-      )
-    return (data, 200, {"Content-Type": "application/javascript; charset=utf-8"})
+    def generate_libs():
+      for path, relpath in get_scripts(os.path.join(rootdir, "lib")):
+        url = urlparse.urljoin(base_url, "/lib/" + relpath)
+        yield "require.sources[%s] = %s;\n" % (
+            js_encode(posixpath.splitext(relpath)[0]),
+            script_as_string(path, url, backcompat)
+        )
+    return flask.Response(generate_libs(), mimetype="application/javascript")
   elif request_path == "/tests.js":
-    data = "var tests = ["
-    for path, relpath in get_scripts(os.path.join(rootdir, "test", "tests")):
-      url = urlparse.urljoin(flask.request.url, "/tests/" + relpath)
-      data += "  %s,\n" % script_as_string(path, url, backcompat)
-    data += "];"
-    return (data, 200, {"Content-Type": "application/javascript; charset=utf-8"})
+    def generate_tests():
+      yield "var tests = ["
+      for path, relpath in get_scripts(os.path.join(rootdir, "test", "tests")):
+        url = urlparse.urljoin(base_url, "/tests/" + relpath)
+        yield "  %s,\n" % script_as_string(path, url, backcompat)
+      yield "];"
+    return flask.Response(generate_tests(), mimetype="application/javascript")
   else:
     if request_path.startswith("/lib/"):
       rootdir = os.path.join(rootdir, "lib")
     else:
       rootdir = os.path.join(rootdir, "test")
     if request_path.endswith("/"):
       request_path += "index.html"
     return flask.send_from_directory(rootdir, request_path.lstrip("/"))
 
 if __name__ == "__main__":
   app.run(debug=True)