updated bunch of file paths and changed the way posts are loaded

node_modules/ejs/ejs.js

@@ -51,9 +51,9 @@ var fs = require('fs')
   , _VERSION_STRING = require('../package.json').version
   , _DEFAULT_DELIMITER = '%'
   , _DEFAULT_LOCALS_NAME = 'locals'
-  , _REGEX_STRING = '(<%%|<%=|<%-|<%#|<%|%>|-%>)'
+  , _REGEX_STRING = '(<%%|<%=|<%-|<%_|<%#|<%|%>|-%>|_%>)'
   , _OPTS = [ 'cache', 'filename', 'delimiter', 'scope', 'context'
-            , 'debug', 'compileDebug', 'client', '_with'
+            , 'debug', 'compileDebug', 'client', '_with', 'rmWhitespace'
             ]
   , _TRAILING_SEMCOL = /;\s*$/
   , _BOM = /^\uFEFF/;
@@ -420,6 +420,10 @@ Template.prototype = {
         this.templateText.replace(/\r/g, '').replace(/^\s+|\s+$/gm, '');
     }
 
+    // Slurp spaces and tabs before <%_ and after _%>
+    this.templateText =
+      this.templateText.replace(/[ \t]*<%_/gm, '<%_').replace(/_%>[ \t]*/gm, '_%>');
+
     if (!this.source) {
       this.generateSource();
       prepended += '  var __output = [], __append = __output.push.bind(__output);' + '\n';
@@ -512,7 +516,7 @@ Template.prototype = {
         if ( line.indexOf('<' + d) === 0        // If it is a tag
           && line.indexOf('<' + d + d) !== 0) { // and is not escaped
           closing = matches[index + 2];
-          if (!(closing == d + '>' || closing == '-' + d + '>')) {
+          if (!(closing == d + '>' || closing == '-' + d + '>' || closing == '_' + d + '>')) {
             throw new Error('Could not find matching close tag for "' + line + '".');
           }
         }
@@ -520,7 +524,7 @@ Template.prototype = {
         if ((include = line.match(/^\s*include\s+(\S+)/))) {
           opening = matches[index - 1];
           // Must be in EVAL or RAW mode
-          if (opening && (opening == '<' + d || opening == '<' + d + '-')) {
+          if (opening && (opening == '<' + d || opening == '<' + d + '-' || opening == '<' + d + '_')) {
             includeOpts = utils.shallowCopy({}, self.opts);
             includeSrc = includeSource(include[1], includeOpts);
             includeSrc = '    ; (function(){' + '\n' + includeSrc +
@@ -603,6 +607,7 @@ Template.prototype = {
 
     switch (line) {
       case '<' + d:
+      case '<' + d + '_':
         this.mode = Template.modes.EVAL;
         break;
       case '<' + d + '=':
@@ -620,12 +625,13 @@ Template.prototype = {
         break;
       case d + '>':
       case '-' + d + '>':
+      case '_' + d + '>':
         if (this.mode == Template.modes.LITERAL) {
           _addOutput();
         }
 
         this.mode = null;
-        this.truncate = line.indexOf('-') === 0;
+        this.truncate = line.indexOf('-') === 0 || line.indexOf('_') === 0;
         break;
       default:
         // In script mode, depends on type of tag
@@ -1094,69 +1100,39 @@ var substr = 'ab'.substr(-1) === 'b'
 // shim for using process in browser
 
 var process = module.exports = {};
+var queue = [];
+var draining = false;
 
-process.nextTick = (function () {
-    var canSetImmediate = typeof window !== 'undefined'
-    && window.setImmediate;
-    var canMutationObserver = typeof window !== 'undefined'
-    && window.MutationObserver;
-    var canPost = typeof window !== 'undefined'
-    && window.postMessage && window.addEventListener
-    ;
-
-    if (canSetImmediate) {
-        return function (f) { return window.setImmediate(f) };
+function drainQueue() {
+    if (draining) {
+        return;
     }
-
-    var queue = [];
-
-    if (canMutationObserver) {
-        var hiddenDiv = document.createElement("div");
-        var observer = new MutationObserver(function () {
-            var queueList = queue.slice();
-            queue.length = 0;
-            queueList.forEach(function (fn) {
-                fn();
-            });
-        });
-
-        observer.observe(hiddenDiv, { attributes: true });
-
-        return function nextTick(fn) {
-            if (!queue.length) {
-                hiddenDiv.setAttribute('yes', 'no');
-            }
-            queue.push(fn);
-        };
+    draining = true;
+    var currentQueue;
+    var len = queue.length;
+    while(len) {
+        currentQueue = queue;
+        queue = [];
+        var i = -1;
+        while (++i < len) {
+            currentQueue[i]();
+        }
+        len = queue.length;
     }
-
-    if (canPost) {
-        window.addEventListener('message', function (ev) {
-            var source = ev.source;
-            if ((source === window || source === null) && ev.data === 'process-tick') {
-                ev.stopPropagation();
-                if (queue.length > 0) {
-                    var fn = queue.shift();
-                    fn();
-                }
-            }
-        }, true);
-
-        return function nextTick(fn) {
-            queue.push(fn);
-            window.postMessage('process-tick', '*');
-        };
+    draining = false;
+}
+process.nextTick = function (fun) {
+    queue.push(fun);
+    if (!draining) {
+        setTimeout(drainQueue, 0);
     }
-
-    return function nextTick(fn) {
-        setTimeout(fn, 0);
-    };
-})();
+};
 
 process.title = 'browser';
 process.browser = true;
 process.env = {};
 process.argv = [];
+process.version = ''; // empty string to avoid regexp issues
 
 function noop() {}
 
@@ -1177,6 +1153,7 @@ process.cwd = function () { return '/' };
 process.chdir = function (dir) {
     throw new Error('process.chdir is not supported');
 };
+process.umask = function() { return 0; };
 
 },{}],6:[function(require,module,exports){
 module.exports={
@@ -1187,7 +1164,7 @@ module.exports={
     "engine",
     "ejs"
   ],
-  "version": "2.3.2",
+  "version": "2.3.3",
   "author": "Matthew Eernisse <mde@fleegix.org> (http://fleegix.org)",
   "contributors": [
     "Timothy Gu <timothygu99@gmail.com> (https://timothygu.github.io)"

node_modules/ejs/lib/ejs.js

@@ -50,9 +50,9 @@ var fs = require('fs')
   , _VERSION_STRING = require('../package.json').version
   , _DEFAULT_DELIMITER = '%'
   , _DEFAULT_LOCALS_NAME = 'locals'
-  , _REGEX_STRING = '(<%%|<%=|<%-|<%#|<%|%>|-%>)'
+  , _REGEX_STRING = '(<%%|<%=|<%-|<%_|<%#|<%|%>|-%>|_%>)'
   , _OPTS = [ 'cache', 'filename', 'delimiter', 'scope', 'context'
-            , 'debug', 'compileDebug', 'client', '_with'
+            , 'debug', 'compileDebug', 'client', '_with', 'rmWhitespace'
             ]
   , _TRAILING_SEMCOL = /;\s*$/
   , _BOM = /^\uFEFF/;
@@ -419,6 +419,10 @@ Template.prototype = {
         this.templateText.replace(/\r/g, '').replace(/^\s+|\s+$/gm, '');
     }
 
+    // Slurp spaces and tabs before <%_ and after _%>
+    this.templateText =
+      this.templateText.replace(/[ \t]*<%_/gm, '<%_').replace(/_%>[ \t]*/gm, '_%>');
+
     if (!this.source) {
       this.generateSource();
       prepended += '  var __output = [], __append = __output.push.bind(__output);' + '\n';
@@ -511,7 +515,7 @@ Template.prototype = {
         if ( line.indexOf('<' + d) === 0        // If it is a tag
           && line.indexOf('<' + d + d) !== 0) { // and is not escaped
           closing = matches[index + 2];
-          if (!(closing == d + '>' || closing == '-' + d + '>')) {
+          if (!(closing == d + '>' || closing == '-' + d + '>' || closing == '_' + d + '>')) {
             throw new Error('Could not find matching close tag for "' + line + '".');
           }
         }
@@ -519,7 +523,7 @@ Template.prototype = {
         if ((include = line.match(/^\s*include\s+(\S+)/))) {
           opening = matches[index - 1];
           // Must be in EVAL or RAW mode
-          if (opening && (opening == '<' + d || opening == '<' + d + '-')) {
+          if (opening && (opening == '<' + d || opening == '<' + d + '-' || opening == '<' + d + '_')) {
             includeOpts = utils.shallowCopy({}, self.opts);
             includeSrc = includeSource(include[1], includeOpts);
             includeSrc = '    ; (function(){' + '\n' + includeSrc +
@@ -602,6 +606,7 @@ Template.prototype = {
 
     switch (line) {
       case '<' + d:
+      case '<' + d + '_':
         this.mode = Template.modes.EVAL;
         break;
       case '<' + d + '=':
@@ -619,12 +624,13 @@ Template.prototype = {
         break;
       case d + '>':
       case '-' + d + '>':
+      case '_' + d + '>':
         if (this.mode == Template.modes.LITERAL) {
           _addOutput();
         }
 
         this.mode = null;
-        this.truncate = line.indexOf('-') === 0;
+        this.truncate = line.indexOf('-') === 0 || line.indexOf('_') === 0;
         break;
       default:
         // In script mode, depends on type of tag

node_modules/ejs/package.json

@@ -1,17 +1,46 @@
 {
-  "name": "ejs",
-  "description": "Embedded JavaScript templates",
-  "keywords": [
-    "template",
-    "engine",
-    "ejs"
+  "_args": [
+    [
+      "ejs@*",
+      "/home/mitchell/Desktop/test-mywebsite/mywebsite"
+    ]
   ],
-  "version": "2.3.3",
-  "author": {
-    "name": "Matthew Eernisse",
+  "_from": "ejs@*",
+  "_id": "ejs@2.3.4",
+  "_inCache": true,
+  "_installable": true,
+  "_location": "/ejs",
+  "_nodeVersion": "0.12.4",
+  "_npmUser": {
     "email": "mde@fleegix.org",
+    "name": "mde"
+  },
+  "_npmVersion": "2.10.1",
+  "_phantomChildren": {},
+  "_requested": {
+    "name": "ejs",
+    "raw": "ejs@*",
+    "rawSpec": "*",
+    "scope": null,
+    "spec": "*",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/"
+  ],
+  "_resolved": "https://registry.npmjs.org/ejs/-/ejs-2.3.4.tgz",
+  "_shasum": "3c76caa09664b3583b0037af9dc136e79ec68b98",
+  "_shrinkwrap": null,
+  "_spec": "ejs@*",
+  "_where": "/home/mitchell/Desktop/test-mywebsite/mywebsite",
+  "author": {
+    "email": "mde@fleegix.org",
+    "name": "Matthew Eernisse",
     "url": "http://fleegix.org"
   },
+  "bugs": {
+    "url": "https://github.com/mde/ejs/issues"
+  },
   "contributors": [
     {
       "name": "Timothy Gu",
@@ -19,17 +48,8 @@
       "url": "https://timothygu.github.io"
     }
   ],
-  "license": "Apache-2.0",
-  "main": "./lib/ejs.js",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/mde/ejs.git"
-  },
-  "bugs": {
-    "url": "https://github.com/mde/ejs/issues"
-  },
-  "homepage": "https://github.com/mde/ejs",
   "dependencies": {},
+  "description": "Embedded JavaScript templates",
   "devDependencies": {
     "browserify": "^8.0.3",
     "istanbul": "~0.3.5",
@@ -40,25 +60,22 @@
     "rimraf": "^2.2.8",
     "uglify-js": "^2.4.16"
   },
+  "directories": {},
+  "dist": {
+    "shasum": "3c76caa09664b3583b0037af9dc136e79ec68b98",
+    "tarball": "http://registry.npmjs.org/ejs/-/ejs-2.3.4.tgz"
+  },
   "engines": {
     "node": ">=0.10.0"
   },
-  "scripts": {
-    "test": "mocha",
-    "coverage": "istanbul cover node_modules/mocha/bin/_mocha",
-    "doc": "rimraf out && jsdoc -c jsdoc.json lib/* docs/jsdoc/*",
-    "devdoc": "rimraf out && jsdoc -p -c jsdoc.json lib/* docs/jsdoc/*"
-  },
-  "_id": "ejs@2.3.3",
-  "_shasum": "a6babb67815d7190694af4ba82fe065e56d5f0e7",
-  "_resolved": "https://registry.npmjs.org/ejs/-/ejs-2.3.3.tgz",
-  "_from": "ejs@*",
-  "_npmVersion": "2.1.11",
-  "_nodeVersion": "0.10.33",
-  "_npmUser": {
-    "name": "mde",
-    "email": "mde@fleegix.org"
-  },
+  "homepage": "https://github.com/mde/ejs",
+  "keywords": [
+    "ejs",
+    "engine",
+    "template"
+  ],
+  "license": "Apache-2.0",
+  "main": "./lib/ejs.js",
   "maintainers": [
     {
       "name": "tjholowaychuk",
@@ -69,9 +86,18 @@
       "email": "mde@fleegix.org"
     }
   ],
-  "dist": {
-    "shasum": "a6babb67815d7190694af4ba82fe065e56d5f0e7",
-    "tarball": "http://registry.npmjs.org/ejs/-/ejs-2.3.3.tgz"
+  "name": "ejs",
+  "optionalDependencies": {},
+  "readme": "ERROR: No README data found!",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/mde/ejs.git"
   },
-  "directories": {}
+  "scripts": {
+    "coverage": "istanbul cover node_modules/mocha/bin/_mocha",
+    "devdoc": "rimraf out && jsdoc -p -c jsdoc.json lib/* docs/jsdoc/*",
+    "doc": "rimraf out && jsdoc -c jsdoc.json lib/* docs/jsdoc/*",
+    "test": "mocha"
+  },
+  "version": "2.3.4"
 }

node_modules/ejs/test/ejs.js

@@ -525,6 +525,13 @@ suite('<%%', function () {
   });
 });
 
+suite('<%_ and _%>', function () {
+  test('slurps spaces and tabs', function () {
+    assert.equal(ejs.render(fixture('space-and-tab-slurp.ejs'), {users: users}),
+      fixture('space-and-tab-slurp.html'));
+  });
+});
+
 suite('single quotes', function () {
   test('not mess up the constructed function', function () {
     assert.equal(ejs.render(fixture('single-quote.ejs')),

node_modules/ejs/test/fixtures/space-and-tab-slurp.ejs

@@ -0,0 +1,5 @@
+<ul>
+	 <%_ users.forEach(function(user){ _%>	 
+    <li><%= user.name %></li>
+ 	<%_ }) _%> 	
+</ul>

node_modules/ejs/test/fixtures/space-and-tab-slurp.html

@@ -0,0 +1,5 @@
+<ul>
+    <li>geddy</li>
+    <li>neil</li>
+    <li>alex</li>
+</ul>