From a2831eb20314e5697f2cb39ce019def3de357984 Mon Sep 17 00:00:00 2001
From: Jeremy Ruston <jeremy@osmosoft.com>
Date: Sun, 27 Nov 2011 09:46:02 +0000
Subject: [PATCH] Adopted a saner convention for handling modules that export a
 single class

---
 cook.js             | 8 ++++----
 ginsu.js            | 4 ++--
 js/Recipe.js        | 8 ++++----
 js/TiddlerInput.js  | 4 ++--
 js/TiddlerOutput.js | 3 +--
 js/TiddlyWiki.js    | 6 +++---
 server.js           | 8 ++++----
 7 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/cook.js b/cook.js
index 64a912e98..c25835383 100644
--- a/cook.js
+++ b/cook.js
@@ -3,13 +3,13 @@
 // Usage: node cook.js <recipefile>
 
 var sys = require("sys"),
-	tiddlywiki = require("./js/TiddlyWiki.js"),
-	recipe = require("./js/Recipe.js");
+	TiddlyWiki = require("./js/TiddlyWiki.js").TiddlyWiki,
+	Recipe = require("./js/Recipe.js").Recipe;
 
 var filename = process.argv[2];
 
-var store = new tiddlywiki.TiddlyWiki();
+var store = new TiddlyWiki();
 
-var theRecipe = new recipe.Recipe(store,filename);
+var theRecipe = new Recipe(store,filename);
 
 process.stdout.write(theRecipe.cook());
diff --git a/ginsu.js b/ginsu.js
index fac03f8cf..86615e868 100644
--- a/ginsu.js
+++ b/ginsu.js
@@ -8,7 +8,7 @@
 var sys = require("sys"),
 	fs = require("fs"),
 	path = require("path"),
-	tiddler = require("./js/Tiddler.js"),
+	Tiddler = require("./js/Tiddler.js").Tiddler,
 	tiddlyWikiInput = require("./js/TiddlyWikiInput.js"),
 	tiddlerOutput = require("./js/TiddlerOutput.js");
 
@@ -20,7 +20,7 @@ var tiddlers = tiddlyWikiInput.parseTiddlyWiki(tiddlywikidoc);
 
 var recipe = [];
 for(var t=0; t<tiddlers.length; t++) {
-	var tid = new tiddler.Tiddler(tiddlers[t]);
+	var tid = new Tiddler(tiddlers[t]);
 	var filename = encodeURIComponent(tid.fields.title.replace(/ /g,"_")) + ".tid";
 	fs.writeFileSync(path.join(outputdir,filename),tiddlerOutput.outputTiddler(tid));
 	recipe.push("tiddler: " + filename + "\n");
diff --git a/js/Recipe.js b/js/Recipe.js
index c5af6c646..8566da362 100755
--- a/js/Recipe.js
+++ b/js/Recipe.js
@@ -27,11 +27,11 @@ this.ingredients = {
 
 */
 
-var tiddler = require("./Tiddler.js"),
+var Tiddler = require("./Tiddler.js").Tiddler,
 	tiddlerInput = require("./TiddlerInput.js"),
 	tiddlerOutput = require("./TiddlerOutput.js"),
 	utils = require("./Utils.js"),
-	tiddlywiki = require("./TiddlyWiki.js"),
+	TiddlyWiki = require("./TiddlyWiki.js").TiddlyWiki,
 	fs = require("fs"),
 	path = require("path"),
 	util = require("util");
@@ -86,7 +86,7 @@ Recipe.prototype.readIngredientPostProcess = {
 };
 
 Recipe.prototype.addIngredient = function(marker,tiddlerFields) {
-	var ingredientTiddler = new tiddler.Tiddler(tiddlerFields);
+	var ingredientTiddler = new Tiddler(tiddlerFields);
 	this.store.addTiddler(ingredientTiddler);
 	if(marker in this.ingredients) {
 		this.ingredients[marker].push(ingredientTiddler);
@@ -192,7 +192,7 @@ Recipe.ingredientOutputter = {
 			var title = tid.fields.title;
 			var tweakedTiddler;
 			if(title.indexOf(".shadow") === title.length - 7) {
-				tweakedTiddler = new tiddler.Tiddler(tid,{
+				tweakedTiddler = new Tiddler(tid,{
 					title: title.substr(0, title.length-7)
 				});
 			} else {
diff --git a/js/TiddlerInput.js b/js/TiddlerInput.js
index 18840e6b6..03710f91c 100755
--- a/js/TiddlerInput.js
+++ b/js/TiddlerInput.js
@@ -2,7 +2,7 @@
 Functions concerned with parsing representations of tiddlers
 */
 
-var argParser = require("./ArgParser.js"),
+var ArgParser = require("./ArgParser.js").ArgParser,
 	utils = require("./Utils.js");
 
 var tiddlerInput = exports;
@@ -143,7 +143,7 @@ tiddlerInput.parseMetaDataItem = function(field,value) {
 			result = utils.convertFromYYYYMMDDHHMMSS(value);
 			break;
 		case "tags":
-			var parser = new argParser.ArgParser(value,{noNames: true});
+			var parser = new ArgParser(value,{noNames: true});
 			result = parser.getValuesByName("","");
 			break;
 		default:
diff --git a/js/TiddlerOutput.js b/js/TiddlerOutput.js
index 81f72ec24..23f6cc57a 100755
--- a/js/TiddlerOutput.js
+++ b/js/TiddlerOutput.js
@@ -2,8 +2,7 @@
 Functions concerned with parsing representations of tiddlers
 */
 
-var argParser = require("./ArgParser.js"),
-	utils = require("./Utils.js");
+var utils = require("./Utils.js");
 
 var tiddlerOutput = exports;
 
diff --git a/js/TiddlyWiki.js b/js/TiddlyWiki.js
index e8f8fbd59..9e2b88683 100755
--- a/js/TiddlyWiki.js
+++ b/js/TiddlyWiki.js
@@ -1,4 +1,4 @@
-var tiddler = require("./Tiddler.js");
+var Tiddler = require("./Tiddler.js").Tiddler;
 
 var TiddlyWiki = function() {
 	this.tiddlers = {};
@@ -10,7 +10,7 @@ TiddlyWiki.prototype.clear = function() {
 
 TiddlyWiki.prototype.fetchTiddler = function(title) {
 	var t = this.tiddlers[title];
-	return t instanceof tiddler.Tiddler ? t : null;
+	return t instanceof Tiddler ? t : null;
 }
 
 TiddlyWiki.prototype.deleteTiddler = function(title) {
@@ -25,7 +25,7 @@ TiddlyWiki.prototype.forEachTiddler = function(callback) {
 	var t;
 	for(t in this.tiddlers) {
 		var tiddler = this.tiddlers[t];
-		if(tiddler instanceof tiddler.Tiddler)
+		if(tiddler instanceof Tiddler)
 			callback.call(this,t,tiddler);
 	}
 }
diff --git a/server.js b/server.js
index cc0649393..e7fb11a79 100644
--- a/server.js
+++ b/server.js
@@ -2,8 +2,8 @@
 //
 // Usage: node server.js <recipefile>
 
-var tiddlywiki = require("./js/TiddlyWiki.js"),
-	recipe = require("./js/Recipe.js"),
+var TiddlyWiki = require("./js/TiddlyWiki.js").TiddlyWiki,
+	Recipe = require("./js/Recipe.js").Recipe,
 	sys = require("sys"),
 	http = require("http"),
 	fs = require("fs"),
@@ -14,8 +14,8 @@ var filename = process.argv[2];
 
 http.createServer(function (request, response) {
 	response.writeHead(200, {"Content-Type": "text/html"});
-	var store = new tiddlywiki.TiddlyWiki();
-	var theRecipe = new recipe.Recipe(store,filename);
+	var store = new TiddlyWiki();
+	var theRecipe = new Recipe(store,filename);
 	response.end(theRecipe.cook(), "utf-8");
 }).listen(8000);