From f4413bf28be9afb8b635c4e35ca85652a08779e1 Mon Sep 17 00:00:00 2001
From: Ben Syverson <ben@bensyverson.com>
Date: Fri, 10 Jul 2015 12:32:43 -0500
Subject: [PATCH] Tweaks to get PSH loaded via NPM

---
 README.md           |  9 +++++----
 generatedocs.sh     |  2 ++
 index.js            |  5 +++--
 lib/putstuffhere.js | 21 ++++++++++++++-------
 package.json        |  2 +-
 5 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index 0a49123..8774d87 100644
--- a/README.md
+++ b/README.md
@@ -91,7 +91,7 @@ Put Stuff Here will only expand a phrase if it’s in one contiguous line. The l
 Put Stuff Here can be used in Node, the browser, or via Browserify.
 
 ```javascript
-var psh = require('./putstuffhere.js').shared();
+var psh = require('putstuffhere').shared();
 
 // Fetch template.html from this directory.
 psh.getTemplateFunction('template.html', function(err, func) {
@@ -103,7 +103,7 @@ psh.getTemplateFunction('template.html', function(err, func) {
 
 
 ```javascript
-var psh = require('./putstuffhere.js');
+var psh = require('putstuffhere');
 
 // Compile a string literal directly
 var func = psh.compileText('<p>Put title here</p>');
@@ -113,8 +113,9 @@ console.log( func(locals) );
 ```
 
 ```html
-<script src="queue.js" type="text/javascript" charset="utf-8"></script>
-<script src="putstuffhere.js" type="text/javascript" charset="utf-8"></script>
+<script src="lib/ajax.js" type="text/javascript" charset="utf-8"></script>
+<script src="lib/queue.js" type="text/javascript" charset="utf-8"></script>
+<script src="lib/putstuffhere.js" type="text/javascript" charset="utf-8"></script>
 <script type="text/javascript">
 		var psh = PutStuffHere.shared();
 		var func = psh.compileText('<p>Put title here</p>');
diff --git a/generatedocs.sh b/generatedocs.sh
index 89d64ea..41eb350 100755
--- a/generatedocs.sh
+++ b/generatedocs.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+# This script uses autodoc and docco to generate documentation in two flavors
+
 autodoc -t --javascripts lib/ajax.js,lib/queue.js lib/putstuffhere.js
 autodoc --template autodoc.html.mustache --javascripts lib/ajax.js,lib/queue.js lib/putstuffhere.js
 docco --output annotated/ lib/*.js
\ No newline at end of file
diff --git a/index.js b/index.js
index ef5e8bd..0074c5b 100644
--- a/index.js
+++ b/index.js
@@ -30,13 +30,14 @@
 
 if (typeof(require) === typeof(undefined))  window.require = function(){return null;};
 var PutStuffHerePrivate = PutStuffHerePrivate || require('./lib/putstuffhere.js');
+var OrgStuffHereQueue = OrgStuffHereQueue || require('./lib/queue.js');
 
 if (typeof(module) === typeof(undefined)) window.module = {};
 
 var _sharedPutStuffHereInstance = new PutStuffHerePrivate();
-
 var PutStuffHere = {
-	'shared': function(){ return _sharedPutStuffHereInstance; }
+	'shared': function(){ return _sharedPutStuffHereInstance; },
+	'queue': OrgStuffHereQueue,
 };
 
 
diff --git a/lib/putstuffhere.js b/lib/putstuffhere.js
index 8db30cb..40bd293 100644
--- a/lib/putstuffhere.js
+++ b/lib/putstuffhere.js
@@ -32,16 +32,11 @@ if (typeof(require) === typeof(undefined))  window.require = function(){return n
 var println = println || function(arg) { console.log(arg); };
 
 var isBrowser = (typeof window !== 'undefined');
-var fs = require('fs');
+var fs = isBrowser ? null : require('fs');
 
 var OrgStuffHereQueue = OrgStuffHereQueue || require('./queue.js');
 var PutStuffHereAjax = PutStuffHereAjax || require('./ajax.js');
 
-// var orgstuffhereNull = '___•••NULL•••___';
-
-
-// Test
-
 /**
  * Extend String with an escape function
  * @method orgstuffhereEscape
@@ -83,11 +78,13 @@ var PutStuffHerePrivate = function() {
 
 	this.shouldExtractBody = true;
 	
+	// The main regex. This can and should be extended with other syntaxes.
 	var regex = /([\s\W]|^)(?:(?:put|insert)\s+(.+?\S)(?:\s*\(([^)]+)\))?\s+here)([\W\s]|$)/gi;
 	var cache = {};
 
 	var rendered = '';
 
+
 	/**
 	 * Wrap variables
 	 * @private
@@ -114,6 +111,14 @@ var PutStuffHerePrivate = function() {
 		return '' + p1 + "\" + (typeof ctx." + p2 + " !== typeof(undefined) ? ctx." + varName + " : '') +  \"" + p4;
 	};
 
+	var _templateRoot = '';
+	this.setTemplateRoot = function(newValue) {
+		_templateRoot = newValue;
+	};
+
+	this.templateRoot = function() {
+		return _templateRoot;
+	};
 	
 
 	this.rendered = function() {
@@ -273,6 +278,7 @@ PutStuffHerePrivate.prototype.setDefaultHTML = function(aString) {
 	self.html[self.orgstuffhereNull] = aString;
 }
 
+
 PutStuffHerePrivate.prototype.extractBody = function(html) {
 	var self = this;
 	if (html.match(/<body[^>]*>/i)) {
@@ -384,8 +390,9 @@ PutStuffHerePrivate.prototype.readHTML = function(src, isMock) {
 			});			
 		}
 	} else if (typeof fs !== typeof(undefined)) { 
+		var path = require('path');
 		// Or in Node.js, or any context capable of loading fs
-		fs.readFile(__dirname + '/' + src, function(err, data){
+		fs.readFile(path.resolve(self.templateRoot(), src), function(err, data){
 			self.html[src] = '';
 			if (err) {
 				println("Warning: " + src);
diff --git a/package.json b/package.json
index b6eb99b..af93bb8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "putstuffhere",
-  "version": "0.9.0",
+  "version": "0.9.2",
   "description": "Put Stuff Here is a minimalist, human-first templating system.",
   "main": "index.js",
   "scripts": {