From dd9537cd888743d668f5e8cb838cf81189354393 Mon Sep 17 00:00:00 2001
From: Jeremy Ruston <jeremy@osmosoft.com>
Date: Tue, 6 Dec 2011 18:29:53 +0000
Subject: [PATCH] Renamed the store class from TiddlyWiki to WikiStore

Much less confusing.
---
 cook.js                            |  4 ++--
 js/Recipe.js                       |  1 -
 js/{TiddlyWiki.js => WikiStore.js} | 20 ++++++++++----------
 server.js                          |  4 ++--
 wikitest.js                        |  4 ++--
 5 files changed, 16 insertions(+), 17 deletions(-)
 rename js/{TiddlyWiki.js => WikiStore.js} (57%)

diff --git a/cook.js b/cook.js
index e92015b58..8179ec06a 100644
--- a/cook.js
+++ b/cook.js
@@ -5,13 +5,13 @@
 /*global require: false, exports: false */
 "use strict";
 
-var TiddlyWiki = require("./js/TiddlyWiki.js").TiddlyWiki,
+var WikiStore = require("./js/WikiStore.js").WikiStore,
 	Recipe = require("./js/Recipe.js").Recipe,
 	util = require("util");
 
 var filename = process.argv[2];
 
-var store = new TiddlyWiki();
+var store = new WikiStore();
 
 var theRecipe = new Recipe(store,filename,function() {
 	process.stdout.write(theRecipe.cook());
diff --git a/js/Recipe.js b/js/Recipe.js
index f981de028..f96aba338 100755
--- a/js/Recipe.js
+++ b/js/Recipe.js
@@ -53,7 +53,6 @@ var Tiddler = require("./Tiddler.js").Tiddler,
 	tiddlerInput = require("./TiddlerInput.js"),
 	tiddlerOutput = require("./TiddlerOutput.js"),
 	utils = require("./Utils.js"),
-	TiddlyWiki = require("./TiddlyWiki.js").TiddlyWiki,
 	retrieveFile = require("./FileRetriever.js").retrieveFile,
 	fs = require("fs"),
 	path = require("path"),
diff --git a/js/TiddlyWiki.js b/js/WikiStore.js
similarity index 57%
rename from js/TiddlyWiki.js
rename to js/WikiStore.js
index d2f013bbc..80b289ae3 100755
--- a/js/TiddlyWiki.js
+++ b/js/WikiStore.js
@@ -4,16 +4,16 @@
 var Tiddler = require("./Tiddler.js").Tiddler,
 	util = require("util");
 
-var TiddlyWiki = function TiddlyWiki(shadowStore) {
+var WikiStore = function WikiStore(shadowStore) {
 	this.tiddlers = {};
-	this.shadows = shadowStore === undefined ? new TiddlyWiki(null) : shadowStore;
+	this.shadows = shadowStore === undefined ? new WikiStore(null) : shadowStore;
 };
 
-TiddlyWiki.prototype.clear = function() {
+WikiStore.prototype.clear = function() {
 	this.tiddlers = {};
 };
 
-TiddlyWiki.prototype.getTiddler = function(title) {
+WikiStore.prototype.getTiddler = function(title) {
 	var t = this.tiddlers[title];
 	if(t instanceof Tiddler) {
 		return t;
@@ -24,24 +24,24 @@ TiddlyWiki.prototype.getTiddler = function(title) {
 	}
 };
 
-TiddlyWiki.prototype.getTiddlerText = function(title) {
+WikiStore.prototype.getTiddlerText = function(title) {
 	var t = this.getTiddler(title);
 	return t instanceof Tiddler ? t.fields.text : null;
 };
 
-TiddlyWiki.prototype.deleteTiddler = function(title) {
+WikiStore.prototype.deleteTiddler = function(title) {
 	delete this.tiddlers[title];
 };
 
-TiddlyWiki.prototype.tiddlerExists = function(title) {
+WikiStore.prototype.tiddlerExists = function(title) {
 	return this.tiddlers[title] instanceof Tiddler;
 };
 
-TiddlyWiki.prototype.addTiddler = function(tiddler) {
+WikiStore.prototype.addTiddler = function(tiddler) {
 	this.tiddlers[tiddler.fields.title] = tiddler;
 };
 
-TiddlyWiki.prototype.forEachTiddler = function(callback) {
+WikiStore.prototype.forEachTiddler = function(callback) {
 	var t;
 	for(t in this.tiddlers) {
 		var tiddler = this.tiddlers[t];
@@ -50,4 +50,4 @@ TiddlyWiki.prototype.forEachTiddler = function(callback) {
 	}
 };
 
-exports.TiddlyWiki = TiddlyWiki;
+exports.WikiStore = WikiStore;
diff --git a/server.js b/server.js
index 27e710280..fc9752d5a 100644
--- a/server.js
+++ b/server.js
@@ -4,7 +4,7 @@
 
 "use strict";
 
-var TiddlyWiki = require("./js/TiddlyWiki.js").TiddlyWiki,
+var WikiStore = require("./js/WikiStore.js").WikiStore,
 	Recipe = require("./js/Recipe.js").Recipe,
 	http = require("http"),
 	fs = require("fs"),
@@ -16,7 +16,7 @@ var filename = process.argv[2];
 
 http.createServer(function(request, response) {
 	response.writeHead(200, {"Content-Type": "text/html"});
-	var store = new TiddlyWiki(),
+	var store = new WikiStore(),
 		theRecipe = new Recipe(store,filename,function() {
 			response.end(theRecipe.cook(), "utf-8");	
 		});
diff --git a/wikitest.js b/wikitest.js
index d40151546..095816a15 100644
--- a/wikitest.js
+++ b/wikitest.js
@@ -4,14 +4,14 @@ Wikifier test rig
 
 
 var Tiddler = require("./js/Tiddler.js").Tiddler,
-	TiddlyWiki = require("./js/TiddlyWiki.js").TiddlyWiki,
+	WikiStore = require("./js/WikiStore.js").WikiStore,
 	utils = require("./js/Utils.js"),
 	util = require("util");
 
 var wikiTest = function(spec) {
 //console.error(util.inspect(spec,false,99));
 	var t,
-		store = new TiddlyWiki(),
+		store = new WikiStore(),
 		w;
 	for(t=0; t<spec.tiddlers.length; t++) {
 		var tid = new Tiddler(spec.tiddlers[t]);