Merge branch 'master' of git://github.com/kriszyp/pintura

cloudwork · Sep 3, 2010 · fe7e2e4 · fe7e2e4
2 parents ab3386d + 6388276
commit fe7e2e4
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/lib/jsgi/media.js b/lib/jsgi/media.js
@@ -97,7 +97,7 @@ function Serialize(mediaSelector, nextApp){
 			if(body === undefined){
 				if(request.method === "GET"){
 					response.status = 404;
-					response.body = request.pathInfo + " not found";
+					body = request.pathInfo + " not found";
 				}
 				else{
 					// undefined indicates no body with non-GETs

diff --git a/lib/media/html.js b/lib/media/html.js
@@ -53,7 +53,6 @@ Media({
 		}else{
 			template = templateEngine.compile(templateId, (mediaParams && mediaParams.template));
 			rendered = template(object);
-			print("Rendered: " + rendered);
 		}
 
 		//delete any existing content-length headers as the size has changed post conversion/templating

diff --git a/lib/media/json.js b/lib/media/json.js
@@ -47,8 +47,9 @@ function StreamingSerializer(stringify){
 					}), function(){
 						write("]");
 					});
-				}
-				else {
+				}else if(object == undefined){
+					write("null");
+				}else{
 					write(stringify(object));
 				}
 			}

diff --git a/lib/pintura.js b/lib/pintura.js
@@ -83,6 +83,7 @@ var Connector = require("tunguska/connector").Connector;
 exports.addConnection = exports.app.addConnection = function(connection){
 	Connector("local-workers", connection);
 	connection[connection.on ? "on" : "observe"]("message", function(message){
+		message.pathInfo = message.channel || message.to;
 		if(message.method && message.method !== "subscribe"){
 			exports.directApp(message);
 		}