From 4b3548e7bbebc95e486d98dd441371cb73934561 Mon Sep 17 00:00:00 2001
From: Jeremy Ruston <jeremy@osmosoft.com>
Date: Wed, 30 Nov 2011 19:35:01 +0000
Subject: [PATCH] Minor corrections and refactorings

---
 js/Tiddler.js      |  3 +++
 js/TiddlerInput.js | 22 +++++++++++-----------
 server.js          |  5 +++--
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/js/Tiddler.js b/js/Tiddler.js
index 0c1ad5786..6316b0eef 100755
--- a/js/Tiddler.js
+++ b/js/Tiddler.js
@@ -21,6 +21,9 @@ as a TiddlyWiki quoted string (eg, "one [[two three]]").
 
 "use strict";
 
+var utils = require("./Utils.js"),
+	ArgParser = require("./ArgParser.js").ArgParser;
+
 var Tiddler = function(/* tiddler,fields */) {
 	this.fields = {};
 	for(var c=0; c<arguments.length; c++) {
diff --git a/js/TiddlerInput.js b/js/TiddlerInput.js
index b27516721..1821b005a 100755
--- a/js/TiddlerInput.js
+++ b/js/TiddlerInput.js
@@ -4,8 +4,7 @@ Functions concerned with parsing representations of tiddlers
 
 "use strict";
 
-var ArgParser = require("./ArgParser.js").ArgParser,
-	utils = require("./Utils.js"),
+var utils = require("./Utils.js"),
 	util = require("util");
 
 var tiddlerInput = exports;
@@ -71,16 +70,17 @@ tiddlerInput.parseTiddlerFileByMimeType = {
 		return [fields];
 	},
 	"application/json": function(text,fields) {
-		var tiddlers = JSON.parse(text);
-		var result = [];
+		var tiddlers = JSON.parse(text),
+			result = [],
+			getKnownFields = function(tid) {
+				var fields = {};
+				"title text created creator modified modifier type tags".split(" ").forEach(function(value) {
+					fields[value] = tid[value];
+				});
+				return fields;
+			};
 		for(var t=0; t<tiddlers.length; t++) {
-			var tid = tiddlers[t],
-				fields = {};
-			// Just whitelist the fields we know that we want
-			"title text created creator modified modifier type tags".split(" ").forEach(function(value) {
-				fields[value] = tid[value];
-			});
-			result.push(fields);
+			result.push(getKnownFields(tiddlers[t]));
 		}
 		return result;
 	}
diff --git a/server.js b/server.js
index 268b0d57f..27e710280 100644
--- a/server.js
+++ b/server.js
@@ -9,7 +9,8 @@ var TiddlyWiki = require("./js/TiddlyWiki.js").TiddlyWiki,
 	http = require("http"),
 	fs = require("fs"),
 	url = require("url"),
-	path = require("path");
+	path = require("path"),
+	util = require("util");
 
 var filename = process.argv[2];
 
@@ -21,4 +22,4 @@ http.createServer(function(request, response) {
 		});
 }).listen(8000);
 
-sys.puts("Server running at http://127.0.0.1:8000/");
+util.puts("Server running at http://127.0.0.1:8000/");