added Content-Length header to tests, passing locally

knewmanTE · knewmanTE · commit 1374704670a6 · 2015-04-27T10:54:49.000-07:00
diff --git a/frameworks/Python/historical/install.sh b/frameworks/Python/historical/install.sh
@@ -8,11 +8,11 @@ export PIP_DOWNLOAD_CACHE=$IROOT/.pip_cache
 
 fw_depends python2 apache
 
+$PY2_PIP install --install-option="--prefix=${PY2_ROOT}" -r $TROOT/webware/requirements.txt
+
 cd $TROOT/webware 
 rm -fr Webware Webware-1.1.1
 rm Webware-1.1.1.tar.gz
 wget downloads.sourceforge.net/webware/Webware-1.1.1.tar.gz
 tar -xf Webware-1.1.1.tar.gz
 cp -r app/ Webware-1.1.1/
-#rm -fr Webware-1.1.1/WebKit/Configs
-#cp -r app/Configs/ Webware-1.1.1/WebKit/Configs/
diff --git a/frameworks/Python/historical/webware/app/Context/__init__.py b/frameworks/Python/historical/webware/app/Context/__init__.py
diff --git a/frameworks/Python/historical/webware/app/Context/db.py b/frameworks/Python/historical/webware/app/Context/db.py
@@ -11,4 +11,6 @@ def defaultAction(self):
         self.response()._headers["Content-Type"] = "application/json"
         wid = randint(1, 10000)
         world = Database.DbSession.query(World).get(wid).serialize()
-        self.write(json.dumps(world))
+        output = json.dumps(world)
+        self.response()._headers["Content-Length"] = len(output)
+        self.write(output)
diff --git a/frameworks/Python/historical/webware/app/Context/fortune.py b/frameworks/Python/historical/webware/app/Context/fortune.py
@@ -8,24 +8,16 @@
 from Fortune import Fortune
 
 class fortune(Page):
-    def writeDocType(self):
-        self.writeln("<!DOCTYPE html>")
-
-    def title(self):
-        return "Fortunes"
-
-    def htBodyArgs(self):
-        return ""
-
-    def writeContent(self):
-        self.response().clearHeaders()
-        self.response()._headers["Content-Type"] = "text/html; charset=UTF-8"
-        fortunes = Database.DbSession.query(Fortune).all()
-        fortunes.append(Fortune(id=0, message="Additional fortune added at request time."))
-        fortunes.sort(key=attrgetter("message"))
-		
-        self.writeln("<table><tr><th>id</th><th>message</th></tr>")
-        for fortune in fortunes:
-            message = bleach.clean(fortune.message)
-            self.writeln("<tr><td>%s</td><td>%s</td></tr>" % (fortune.id , message.encode("utf-8")))
-        self.writeln("</table>")
+	def writeHTML(self):
+		output = "<!DOCTYPE html><html><head><title>Fortunes</title></head><body><table><tr><th>id</th><th>message</th></tr>"
+		self.response().clearHeaders()
+		self.response()._headers["Content-Type"] = "text/html; charset=UTF-8"
+		fortunes = Database.DbSession.query(Fortune).all()
+		fortunes.append(Fortune(id=0, message="Additional fortune added at request time."))
+		fortunes.sort(key=attrgetter("message"))
+		for fortune in fortunes:
+			message = bleach.clean(fortune.message)
+			output += "<tr><td>%s</td><td>%s</td></tr>" % (fortune.id , message.encode("utf-8"))
+		output += "</table></body></html>"
+		self.response()._headers["Content-Length"] = len(output)
+		self.writeln(output)
diff --git a/frameworks/Python/historical/webware/app/Context/json2.py b/frameworks/Python/historical/webware/app/Context/json2.py
@@ -5,5 +5,7 @@
 class json2(HTTPContent):
     def defaultAction(self):
         self.response().clearHeaders()
-        self.response()._headers["Content-Type"] = "application/json"		
-        self.write(json.dumps({"message": "Hello, World!"}))
+        self.response()._headers["Content-Type"] = "application/json"
+        output = json.dumps({"message": "Hello, World!"})		
+        self.response()._headers["Content-Length"] = len(output)		
+        self.write(output)
diff --git a/frameworks/Python/historical/webware/app/Context/plaintext.py b/frameworks/Python/historical/webware/app/Context/plaintext.py
@@ -5,4 +5,6 @@ class plaintext(HTTPContent):
     def defaultAction(self):
     	self.response().clearHeaders()
         self.response()._headers["Content-Type"] = "text/plain"
-        self.write("Hello, World!")
+        output = "Hello, World!"
+        self.response()._headers["Content-Length"] = len(output)
+        self.write(output)
diff --git a/frameworks/Python/historical/webware/app/Context/queries.py b/frameworks/Python/historical/webware/app/Context/queries.py
@@ -15,4 +15,6 @@ def defaultAction(self):
         rp = partial(randint, 1, 10000)
         get = Database.DbSession.query(World).get
         worlds = [get(rp()).serialize() for _ in xrange(num_queries)]
-        self.write(json.dumps(worlds))
+        output = json.dumps(worlds)
+        self.response()._headers["Content-Length"] = len(output)
+        self.write(output)
diff --git a/frameworks/Python/historical/webware/app/Context/updates.py b/frameworks/Python/historical/webware/app/Context/updates.py
@@ -21,4 +21,6 @@ def defaultAction(self):
             world.randomNumber = rp()
             worlds.append(world.serialize())
         Database.DbSession.commit()
-        self.write(json.dumps(worlds))
+        output = json.dumps(worlds)
+        self.response()._headers["Content-Length"] = len(output)
+        self.write(output)
