Text-slicer: more refactoring

plugins/tiddlywiki/text-slicer/modules/slicer.js

@@ -3,7 +3,7 @@ title: $:/plugins/tiddlywiki/text-slicer/modules/slicer.js
 type: application/javascript
 module-type: global
 
-Setup the root widget event handlers
+Main text-slicing logic
 
 \*/
 (function(){
@@ -23,6 +23,7 @@ function Slicer(wiki,sourceTitle) {
 	this.tiddlers = {};
 	this.parentStack = [];
 	this.sliceTitle = null;
+	this.slicers = $tw.modules.applyMethods("slicer");
 }
 
 Slicer.prototype.destroy = function() {
@@ -141,81 +142,22 @@ Slicer.prototype.processNodeList = function(domNodeList) {
 }
 
 Slicer.prototype.processNode = function(domNode) {
-	var title, parentTitle, tags,
+	var text = $tw.utils.htmlEncode(domNode.textContent),
-		text = $tw.utils.htmlEncode(domNode.textContent),
 		nodeType = domNode.nodeType;
 	if(nodeType === 1) { // DOM element nodes
-		var tagName = domNode.tagName.toLowerCase();
+		var tagName = domNode.tagName.toLowerCase(),
-		if(tagName === "h1" || tagName === "h2" || tagName === "h3" || tagName === "h4") {
+			hasProcessed = false;
-			if(!this.isBlank(text)) {
+		for(var slicerTitle in this.slicers) {
-				title = this.makeUniqueTitle("heading",text);
+			var slicer = this.slicers[slicerTitle];
-				parentTitle = this.popParentStackUntil(tagName);
+			if(slicer.bind(this)(domNode,tagName)) {
-				tags = [];
+				hasProcessed = true;
-				if(domNode.className.trim() !== "") {
+				break;
-					tags = tags.concat(domNode.className.split(" "));
 			}
-				this.addToList(parentTitle,title);
-				this.parentStack.push({type: tagName, title: this.addTiddler({
-					"toc-type": "heading",
-					"toc-heading-level": tagName,
-					title: title,
-					text: text,
-					list: [],
-					tags: tags
-				})});
 		}
-		} else if(tagName === "ul" || tagName === "ol") {
+		if(!hasProcessed) {
-			title = this.makeUniqueTitle("list-" + tagName);
+			if(domNode.hasChildNodes()) {
-			parentTitle = this.parentStack[this.parentStack.length - 1].title;
-			tags = [];
-			if(domNode.className.trim() !== "") {
-				tags = tags.concat(domNode.className.split(" "));
-			}
-			this.addToList(parentTitle,title);
-			this.parentStack.push({type: tagName, title: this.addTiddler({
-				"toc-type": "list",
-				"toc-list-type": tagName,
-				"toc-list-filter": "[list<currentTiddler>!has[draft.of]]",
-				text: "",
-				title: title,
-				list: [],
-				tags: tags
-			})});
 				this.processNodeList(domNode.childNodes);
-			this.parentStack.pop();
-		} else if(tagName === "li") {
-			if(!this.isBlank(text)) {
-				title = this.makeUniqueTitle("list-item",text);
-				parentTitle = this.parentStack[this.parentStack.length - 1].title;
-				tags = [];
-				if(domNode.className.trim() !== "") {
-					tags = tags.concat(domNode.className.split(" "));
 			}
-				this.addToList(parentTitle,title);
-				this.addTiddler({
-					"toc-type": "item",
-					title: title,
-					text: text,
-					list: [],
-					tags: tags
-				});
-			}
-		} else if(tagName === "p") {
-			if(!this.isBlank(text)) {
-				parentTitle = this.parentStack[this.parentStack.length - 1].title;
-				tags = [];
-				if(domNode.className.trim() !== "") {
-					tags = tags.concat(domNode.className.split(" "));
-				}
-				this.addToList(parentTitle,this.addTiddler({
-					"toc-type": "paragraph",
-					title: this.makeUniqueTitle("paragraph",text),
-					text: text,
-					tags: tags
-				}));
-			}
-		} else if(domNode.hasChildNodes()) {
-			this.processNodeList(domNode.childNodes);
 		}
 	}
 };
@@ -244,30 +186,6 @@ Slicer.prototype.outputTiddlers = function() {
 	});
 };
 
-// Output via an import tiddler
-Slicer.prototype.outputTiddlers_viaImportTiddler = function(tiddlers) {
-	// Get the current slicer output tiddler
-	var slicerOutputTiddler = this.wiki.getTiddler(SLICER_OUTPUT_TITLE),
-		slicerOutputData = this.wiki.getTiddlerData(SLICER_OUTPUT_TITLE,{}),
-		newFields = new Object({
-			title: SLICER_OUTPUT_TITLE,
-			type: "application/json",
-			"plugin-type": "import",
-			"status": "pending"
-		});
-	// Process each tiddler
-	slicerOutputData.tiddlers = slicerOutputData.tiddlers || {};
-	$tw.utils.each(tiddlers,function(tiddlerFields) {
-		var title = tiddlerFields.title;
-		if(title) {
-			slicerOutputData.tiddlers[title] = tiddlerFields;
-		}
-	});
-	// Save the slicer output tiddler
-	newFields.text = JSON.stringify(slicerOutputData,null,$tw.config.preferences.jsonSpaces);
-	this.wiki.addTiddler(new $tw.Tiddler(slicerOutputTiddler,newFields));
-};
-
 exports.Slicer = Slicer;
 
 })();

plugins/tiddlywiki/text-slicer/modules/slicers/heading.js

@@ -0,0 +1,40 @@
+/*\
+title: $:/plugins/tiddlywiki/text-slicer/modules/slicers/heading.js
+type: application/javascript
+module-type: slicer
+
+Handle slicing heading nodes
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+exports.processHeadingNode = function(domNode,tagName) {
+	if(tagName === "h1" || tagName === "h2" || tagName === "h3" || tagName === "h4") {
+		var text = $tw.utils.htmlEncode(domNode.textContent);
+		if(!this.isBlank(text)) {
+			var title = this.makeUniqueTitle("heading",text),
+				parentTitle = this.popParentStackUntil(tagName),
+				tags = [];
+			if(domNode.className.trim() !== "") {
+				tags = tags.concat(domNode.className.split(" "));
+			}
+			this.addToList(parentTitle,title);
+			this.parentStack.push({type: tagName, title: this.addTiddler({
+				"toc-type": "heading",
+				"toc-heading-level": tagName,
+				title: title,
+				text: text,
+				list: [],
+				tags: tags
+			})});
+			return true;
+		}
+	}
+	return false;
+};
+
+})();

plugins/tiddlywiki/text-slicer/modules/slicers/item.js

@@ -0,0 +1,39 @@
+/*\
+title: $:/plugins/tiddlywiki/text-slicer/modules/slicers/item.js
+type: application/javascript
+module-type: slicer
+
+Handle slicing heading nodes
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+exports.processListItemNode = function(domNode,tagName) {
+	var text = $tw.utils.htmlEncode(domNode.textContent);
+	if(tagName === "li") {
+		if(!this.isBlank(text)) {
+			var title = this.makeUniqueTitle("list-item",text),
+				parentTitle = this.parentStack[this.parentStack.length - 1].title,
+				tags = [];
+			if(domNode.className.trim() !== "") {
+				tags = tags.concat(domNode.className.split(" "));
+			}
+			this.addToList(parentTitle,title);
+			this.addTiddler({
+				"toc-type": "item",
+				title: title,
+				text: text,
+				list: [],
+				tags: tags
+			});
+			return true;
+		}
+	}
+	return false;
+};
+
+})();

plugins/tiddlywiki/text-slicer/modules/slicers/list.js

@@ -0,0 +1,40 @@
+/*\
+title: $:/plugins/tiddlywiki/text-slicer/modules/slicers/list.js
+type: application/javascript
+module-type: slicer
+
+Handle slicing heading nodes
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+exports.processListNode = function(domNode,tagName) {
+	if(tagName === "ul" || tagName === "ol") {
+		var title = this.makeUniqueTitle("list-" + tagName),
+			parentTitle = this.parentStack[this.parentStack.length - 1].title,
+			tags = [];
+		if(domNode.className.trim() !== "") {
+			tags = tags.concat(domNode.className.split(" "));
+		}
+		this.addToList(parentTitle,title);
+		this.parentStack.push({type: tagName, title: this.addTiddler({
+			"toc-type": "list",
+			"toc-list-type": tagName,
+			"toc-list-filter": "[list<currentTiddler>!has[draft.of]]",
+			text: "",
+			title: title,
+			list: [],
+			tags: tags
+		})});
+		this.processNodeList(domNode.childNodes);
+		this.parentStack.pop();
+		return true;
+	}
+	return false;
+};
+
+})();

plugins/tiddlywiki/text-slicer/modules/slicers/paragraph.js

@@ -0,0 +1,36 @@
+/*\
+title: $:/plugins/tiddlywiki/text-slicer/modules/slicers/paragraph.js
+type: application/javascript
+module-type: slicer
+
+Handle slicing heading nodes
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+exports.processParagraphNode = function(domNode,tagName) {
+	var text = $tw.utils.htmlEncode(domNode.textContent);
+	if(tagName === "p") {
+		if(!this.isBlank(text)) {
+			var parentTitle = this.parentStack[this.parentStack.length - 1].title,
+				tags = [];
+			if(domNode.className.trim() !== "") {
+				tags = tags.concat(domNode.className.split(" "));
+			}
+			this.addToList(parentTitle,this.addTiddler({
+				"toc-type": "paragraph",
+				title: this.makeUniqueTitle("paragraph",text),
+				text: text,
+				tags: tags
+			}));
+			return true;
+		}
+	} 
+	return false;
+};
+
+})();