Updated Html Media Handler

lib/media/html.js

@@ -1,21 +1,22 @@
 /**
-* Media handler for generating HTML from Wiki markup-based doc
+* Media handler for generating HTML from tempaltes
 */
 
 var Media = require("../media").Media,
 	filesystem = require("perstore/store/filesystem").FileSystem({dataFolder: "../templates"}),
 	transform = require("../html-transform"),
 	Response=require("../jsgi/response").Response,
 	resolver = require("templify/templify").Resolver,
-	when = require("promised-io/promise").when;
+	when = require("promised-io/promise").when,
+	copy = require("commonjs-utils/copy").copy;
 var templateEngine =  require('templify/templify').TemplateEngine({resolver: resolver, store: filesystem});
 
-Media({
+var defaultHandler = {
 	mediaType:"text/html",
 	defaultQuality: .1,
 	getQuality: function(object){
-
-		var contentType = object.getMetadata? object.getMetadata()['content-type'] : object['content-type'];
+	
+			var contentType = object.getMetadata? object.getMetadata()['content-type'] : object['content-type'];
 
 		if (contentType) {
 
@@ -38,6 +39,11 @@ Media({
 		var templateId = mediaParams.template || request['scriptName'] + request['pathInfo'];
 		templateId = mediaParams.templateType ? templateId + "-" + mediaParams['templateType'] : templateId;
 
+
+		if (this.createContext){
+			object = this.createContext(object, mediaParams, request, response);
+		}
+
 		if (!object && !response.status){
 			response.status = 404;
 		}else if ((!response.status || (response.status < 400)) && transform && meta['content-type']){
@@ -47,7 +53,6 @@ Media({
 		//delete any existing content-length headers as the size has changed post conversion/templating
 		delete response.headers['content-length'];
 
-		//TODO update template so we can stream the template rendering
 		if (response.status > 400) {
 			template = templateEngine.compile("/error/"+response.status);	
 		}else{
@@ -57,13 +62,27 @@ Media({
 		return {
 			forEach: function(write){
 				return when(template, function(template){
-					template(object).forEach(write);
-				})
+					return when(object, function(object){
+						template(object).forEach(write);
+					});
+				});
 			}
 		}
 	},
 
 	deserialize: function(inputStream, request){
 		throw new Error("not implemented");
 	}
-});
+};
+
+exports.setupMediaHandler = function(handler){
+	var h = {};
+	copy(defaultHandler, h);	
+	if(handler){
+		copy(handler, h);
+	}
+	Media(h);
+};
+
+exports.setupMediaHandler();
+