From a5604a71f938dd5044a6a85a06587ebc75b45565 Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Sun, 20 Sep 2015 23:02:00 +0200
Subject: [PATCH 001/104] 0.6.0-dev start

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index bb00598..cc2b8a5 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "sourcejs",
   "description": "Living Style Guide Engine for Managing and Developing Front-end Components.",
   "author": "SourceJS",
-  "version": "0.5.6",
+  "version": "0.6.0-dev",
   "license": "MIT",
   "engines": {
     "node": ">=0.10.0 <4.0"

From 63e66055bd8c757bb7b12d668067f99841cb9b67 Mon Sep 17 00:00:00 2001
From: Sergey Zarouski <szarouski@indigo.ca>
Date: Fri, 25 Sep 2015 11:45:41 -0400
Subject: [PATCH 002/104] update middleware docs

---
 docs/api/plugins/readme.md | 45 ++++++++++++++++++++++++++++++++++++--
 1 file changed, 43 insertions(+), 2 deletions(-)

diff --git a/docs/api/plugins/readme.md b/docs/api/plugins/readme.md
index 0d5074e..edd7c17 100644
--- a/docs/api/plugins/readme.md
+++ b/docs/api/plugins/readme.md
@@ -119,11 +119,52 @@ Middlewares are automatically loaded after installation, and are evaluated on ea
 
 ### Modifying Spec contents
 
-We alredy mentioned before that Middlewares use `req.specData.renderedHtml` object to get processed Spec contents and modify them.
+We already mentioned before that Middlewares use `req.specData.renderedHtml` object to get processed Spec contents and modify them.
 
 As any other basic ExpressJS middleware, at the processing start, we get `req` object on input and pass it to the next handler on each request. This architecture allows us to modify `req` contents on each step.
 
-In 0.4.0 middlewares from plugins are connected one by one, sorted by alphabet. In nearest releases we will add a feature for controlling the queue.
+It's possible to define middleware group/order and control group execution sequence. By default all middlewares (and older plugins) will be placed in default group. Here's the default group execution order:
+
+```js
+loadGroupsOrder: [
+  'request',
+  'pre-html',
+  'default',
+  'html',
+  'response'
+]
+```
+
+####Example configurations
+
+In SourceJS core (configurable from `user/options.js`):
+```js
+{
+  core: {
+    middlewares: {
+        list: {
+          md: {
+            enabled: true,
+            order: -1,
+            group: 'pre-html',
+            indexPath: path.join(appRoot, 'core/middlewares/md.js')
+         }
+         'sourcejs-plugin-name': {
+           order: -2
+         }
+      }
+    }
+  }
+}
+```
+Plugin level configuration in `sourcejs-plugin-name/options.js`, will be merged on-top of defaults:
+```js
+module.exports = {
+  order: 1,
+  group: 'pre-html'
+};
+```
+To override core middlewares, changing their order or replacing with alternative plugins, user will need to modify his `options.js` file. For the security reason, plugin level options can't override core middlewares or set an execution order option lower than 0 (zero).
 
 ### Examples
 

From ddcba17540cf6bd8acb9cde43eeb32d735d4723b Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Mon, 28 Sep 2015 08:22:30 +0200
Subject: [PATCH 003/104] #99: initial spec parser version on CHeerion

---
 assets/test/js/tests.js                       |  12 +-
 core/lib/request.js                           |  46 ++++++
 core/lib/specsParser.js                       |  61 ++++++++
 core/middlewares/clarify.js                   | 110 +++++++++-----
 core/routes/redirects.js                      |   3 +-
 options.js                                    |   2 +-
 package.json                                  |   1 -
 test/unit/lib/specParserTest.js               | 139 ++++++++++++++++++
 .../specs/few-examples/index.src.html         |   7 +
 .../partials/specs/few-examples/info.json     |   4 +
 .../unit/partials/specs/nested/index.src.html |  17 +++
 test/unit/partials/specs/nested/info.json     |   4 +
 .../unit/partials/specs/simple/index.src.html |   5 +
 test/unit/partials/specs/simple/info.json     |   4 +
 14 files changed, 372 insertions(+), 43 deletions(-)
 create mode 100644 core/lib/request.js
 create mode 100644 core/lib/specsParser.js
 create mode 100644 test/unit/lib/specParserTest.js
 create mode 100644 test/unit/partials/specs/few-examples/index.src.html
 create mode 100644 test/unit/partials/specs/few-examples/info.json
 create mode 100644 test/unit/partials/specs/nested/index.src.html
 create mode 100644 test/unit/partials/specs/nested/info.json
 create mode 100644 test/unit/partials/specs/simple/index.src.html
 create mode 100644 test/unit/partials/specs/simple/info.json

diff --git a/assets/test/js/tests.js b/assets/test/js/tests.js
index 15c0584..ee9b9d4 100644
--- a/assets/test/js/tests.js
+++ b/assets/test/js/tests.js
@@ -8,9 +8,9 @@ requirejs.config({
     urlArgs: 'cb=' + Math.random(), /* to avoid caching */
 
     paths: {
-        test: '/test',
-        jasmine: '/test/jasmine/jasmine',
-        'jasmine-html': '/test/jasmine/jasmine-html'
+        test: '/jasmine-test',
+        jasmine: '/jasmine-test/jasmine/jasmine',
+        'jasmine-html': '/jasmine-test/jasmine/jasmine-html'
     },
 
     shim: {
@@ -39,9 +39,9 @@ require(['jquery', 'jasmine-html'], function($, jasmine){
 
     var specs = [];
 
-    specs.push('test/spec/moduleSpec');
-    specs.push('test/spec/sectionsSpec');
-    specs.push('test/spec/innerNavigationSpec');
+    specs.push('spec/moduleSpec');
+    specs.push('spec/sectionsSpec');
+    specs.push('spec/innerNavigationSpec');
 
     $(function(){
         require(specs, function(){
diff --git a/core/lib/request.js b/core/lib/request.js
new file mode 100644
index 0000000..ee026e2
--- /dev/null
+++ b/core/lib/request.js
@@ -0,0 +1,46 @@
+var http = require('http');
+var url = require('url');
+var Q = require('q');
+
+module.exports = function(options) {
+    var deferred = Q.defer();
+
+    options = options || {};
+
+    if (!options.path) return;
+
+    var reqOptions = {
+        host: options.host || '127.0.0.1',
+        port: options.port || global.opts.core.server.port,
+        path: options.path + (options.internal ? '?internal=true' : '')
+    };
+    var fullUrl = url.resolve(reqOptions.host + ':' + reqOptions.port, reqOptions.path);
+
+    var reqCallback = function (response) {
+        var endResponse = '';
+
+        response.on('data', function (chunk) {
+            endResponse += chunk;
+        });
+
+        response.on('end', function () {
+            if (typeof options.callback === 'function') {
+                options.callback(endResponse);
+            }
+
+            deferred.resolve(endResponse);
+        });
+    };
+
+    var request = http.request(reqOptions, reqCallback);
+
+    request.on('error', function (e) {
+        deferred.reject({
+            msg: 'Failed loading spec ' + fullUrl
+        });
+    });
+
+    request.end();
+
+    return deferred.promise;
+};
\ No newline at end of file
diff --git a/core/lib/specsParser.js b/core/lib/specsParser.js
new file mode 100644
index 0000000..77dd609
--- /dev/null
+++ b/core/lib/specsParser.js
@@ -0,0 +1,61 @@
+var cheerio = require('cheerio');
+
+module.exports = function (specHTML, sectionID) {
+    var output = {
+        headResources: {},
+        bodyResources: {},
+        contents: []
+    };
+
+    var $ = cheerio.load(specHTML, {decodeEntities: false});
+    var nesting;
+
+    var parseBlock = function (elements, blockID, blockDefaultID) {
+        var headers = ['h2','h3', 'h4'];
+        var currentHeaderLevel = headers[nesting] || '';
+        var nextLevelheading = headers[(nesting + 1)] || '';
+        var untilHook = headers.slice(0, nesting + 2);
+
+        var block = {
+            nested: [],
+            html: []
+        };
+        var nextHeadersArr = elements.filter(nextLevelheading);
+        var $currentScope = elements.first().nextUntil(untilHook.join(', '));
+        $currentScope = elements.first().add($currentScope);
+
+        block.id = blockID;
+        block.visualID = blockDefaultID;
+        block.header = $currentScope.filter(currentHeaderLevel).first().text();
+
+        $currentScope.filter('.source_example').each(function () {
+            block.html.push($(this).html());
+        });
+
+        nesting++;
+
+        // TODO: fix ID's
+        nextHeadersArr.each(function(subIndex){
+            var $nextScope = $(this).nextUntil(nextLevelheading);
+            $nextScope = $(this).first().add($nextScope);
+
+            blockDefaultID = blockDefaultID + '.' +  (subIndex + 1);
+            blockID = $nextScope.filter(nextLevelheading).first().attr('id') || blockDefaultID;
+            block.nested.push(parseBlock($nextScope, blockID, blockDefaultID));
+        });
+
+        return block;
+    };
+
+    $('.source_section').each(function (index) {
+        var $this = $(this);
+        var nextIndexString = (index + 1).toString();
+        var blockID = $this.attr('id') || nextIndexString;
+        var blockDefaultID = nextIndexString;
+        nesting = 0;
+
+        output.contents.push(parseBlock($this.children(), blockID, blockDefaultID));
+    });
+
+    return output;
+};
\ No newline at end of file
diff --git a/core/middlewares/clarify.js b/core/middlewares/clarify.js
index 30ee825..70daac3 100644
--- a/core/middlewares/clarify.js
+++ b/core/middlewares/clarify.js
@@ -5,13 +5,15 @@ var fs = require('fs-extra');
 var url = require('url');
 var Q = require('q');
 var _ = require('lodash');
-var jsdom = require('jsdom');
+var http = require('http');
+var cheerio = require('cheerio');
 
 var ejs = require(path.join(global.pathToApp, 'core/ejsWithHelpers.js'));
 var trackStats = require(path.join(global.pathToApp, 'core/trackStats'));
 var pathToApp = path.dirname(require.main.filename);
 var specUtils = require(path.join(pathToApp, 'core/lib/specUtils'));
 var parseData = require(path.join(pathToApp, 'core/lib/parseData'));
+var specsParser = require(path.join(pathToApp, 'core/lib/specsParser'));
 var htmlParser = require(path.join(pathToApp, 'core/html-tree/html-parser'));
 
 
@@ -103,44 +105,82 @@ var getTplList = function(){
 var parseSpec = function(sections, pathToSpec) {
     var deferred = Q.defer();
 
-    // Parsing spec with JSdom
-    jsdom.env(
-        'http://127.0.0.1:' + global.opts.core.server.port + pathToSpec + '?internal=true',
-        ['http://127.0.0.1:' + global.opts.core.server.port + '/source/assets/js/modules/sectionsParser.js'],
-        function (err, window) {
-            if (err) {
-                deferred.reject({
-                    err: err,
-                    msg: 'JSDOM error'
-                });
-                return;
-            }
+    var options = {
+        host: '127.0.0.1',
+        port: global.opts.core.server.port,
+        path: pathToSpec + '?internal=true'
+    };
+    var fullUrl = url.resolve(options.host + ':' + options.port, options.path);
 
-            var output = {};
+    var callback = function (response) {
+        var specHTML = '';
 
-            var SourceGetSections = window.SourceGetSections;
+        //another chunk of data has been recieved, so append it to `str`
+        response.on('data', function (chunk) {
+            specHTML += chunk;
+        });
 
-            var parser = new SourceGetSections();
-            var allContents = parser.getSpecFull();
+        //the whole response has been recieved, so we just print it out here
+        response.on('end', function () {
+            deferred.resolve({
+                // whole json or by spec
+                output: specsParser(specHTML),
 
-            if (sections) {
-                output = parser.getSpecFull(sections);
-            } else {
-                output = allContents;
-            }
+                // whole json
+                allContents: specsParser(specHTML)
+            });
+        });
+    };
 
-            if (output) {
-                deferred.resolve({
-                    output: output,
-                    allContents: allContents
-                });
-            } else {
-                deferred.reject({
-                    msg: 'Requested sections HTML not found'
-                });
-            }
-        }
-    );
+    var request = http.request(options, callback);
+
+    request.on('error', function (e) {
+        deferred.reject({
+            msg: 'Failed loading spec ' + fullUrl
+        });
+    });
+
+    request.end();
+
+
+    //// Parsing spec with JSdom
+    //jsdom.env(
+    //    'http://127.0.0.1:' + global.opts.core.server.port + pathToSpec + '?internal=true',
+    //    ['http://127.0.0.1:' + global.opts.core.server.port + '/source/assets/js/modules/sectionsParser.js'],
+    //    function (err, window) {
+    //        if (err) {
+    //            deferred.reject({
+    //                err: err,
+    //                msg: 'JSDOM error'
+    //            });
+    //            return;
+    //        }
+    //
+    //        var output = {};
+    //
+    //        var SourceGetSections = window.SourceGetSections;
+    //
+    //        var parser = new SourceGetSections();
+    //        var allContents = parser.getSpecFull();
+    //
+    //        if (sections) {
+    //            output = parser.getSpecFull(sections);
+    //        } else {
+    //            output = allContents;
+    //        }
+    //
+    //        if (output) {
+    //            deferred.resolve({
+    //                output: output,
+    //                allContents: allContents
+    //            });
+    //        } else {
+    //            deferred.reject({
+    //                msg: 'Requested sections HTML not found'
+    //            });
+    //        }
+    //    }
+    //);
 
     return deferred.promise;
 };
@@ -274,6 +314,8 @@ module.exports.process = function(req, res, next) {
             getSpecData(),
             getTplList()
         ]).spread(function(_specData, tplList) {
+            console.log('_specData', JSON.stringify(_specData, null, 4));
+
             var specData = _specData.output;
             var sections = specData.contents ? specData.contents : [];
 
diff --git a/core/routes/redirects.js b/core/routes/redirects.js
index f28a6d8..9e4ae8d 100644
--- a/core/routes/redirects.js
+++ b/core/routes/redirects.js
@@ -35,5 +35,6 @@ global.app.use('/source/assets', express.static(path.join(pathToApp, 'assets')))
 
 // Custom routes
 global.app.use('/docs', express.static(path.join(pathToApp, '/docs')));
+global.app.use('/test', express.static(path.join(pathToApp, '/test')));
 global.app.use('/jsdoc', express.static(path.join(pathToApp, '/jsdoc')));
-global.app.use('/test', express.static(path.join(pathToApp, '/assets/test')));
\ No newline at end of file
+global.app.use('/jasmine-test', express.static(path.join(pathToApp, '/assets/test')));
\ No newline at end of file
diff --git a/options.js b/options.js
index 660bc03..e652798 100644
--- a/options.js
+++ b/options.js
@@ -8,7 +8,7 @@ module.exports = {
         common: {
             defaultLogLevel: 'INFO',
             defaultProdLogLevel: 'ERROR',
-            includedDirs: ['docs'],
+            includedDirs: ['docs', 'test'],
             specPaths: ['specs'],
 
             // Turn on context level setting
diff --git a/package.json b/package.json
index cc2b8a5..7dbff8a 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,6 @@
     "grunt-jsdoc": "^0.5.7",
     "grunt-newer": "~0.6.1",
     "gulp-watch": "operatino/gulp-watch#4.3.5-latest-fsevents",
-    "jsdom": "^1.2.1",
     "load-grunt-parent-tasks": "^0.1.1",
     "load-grunt-tasks": "~0.3.0",
     "lodash": "^3.10.1",
diff --git a/test/unit/lib/specParserTest.js b/test/unit/lib/specParserTest.js
new file mode 100644
index 0000000..92f336e
--- /dev/null
+++ b/test/unit/lib/specParserTest.js
@@ -0,0 +1,139 @@
+var path = require('path');
+var expect = require('chai').expect;
+
+var pathToMasterApp = path.resolve('./');
+
+var loadOptions = require(path.join(pathToMasterApp, 'core/loadOptions'));
+global.opts = loadOptions(path.resolve(pathToMasterApp));
+var specsParser = require(path.join(pathToMasterApp, 'core/lib/specsParser'));
+var request = require(path.join(pathToMasterApp, 'core/lib/request'));
+
+describe('specsParser', function () {
+    it('it should return proper object structure', function (done) {
+        var result = specsParser('');
+
+        expect(result).to.be.an('object');
+        expect(result.headResources).to.be.an('object');
+        expect(result.bodyResources).to.be.an('object');
+        expect(result.contents).to.be.an('array');
+
+        done();
+    });
+
+    it('it should return parsed spec object', function (done) {
+        request({
+            path: '/test/unit/partials/specs/simple/',
+            internal: true,
+            callback: function (response) {
+                var result = specsParser(response);
+
+                expect(result).to.deep.equal({
+                    headResources: {},
+                    bodyResources: {},
+                    contents: [{
+                        nested: [],
+                        html: [
+                            'HTML example'
+                        ],
+                        id: 1,
+                        visualID: 1,
+                        header: 'Section header'
+                    }]
+                });
+
+                done();
+            }
+        });
+    });
+
+    it('it should return parsed spec object with few examples', function (done) {
+        request({
+            path: '/test/unit/partials/specs/few-examples/',
+            internal: true,
+            callback: function (response) {
+                var result = specsParser(response);
+
+                expect(result).to.deep.equal({
+                    headResources: {},
+                    bodyResources: {},
+                    contents: [{
+                        nested: [],
+                        html: [
+                            'HTML example 1',
+                            'HTML example 2'
+                        ],
+                        id: 1,
+                        visualID: 1,
+                        header: 'Section header'
+                    }]
+                });
+
+                done();
+            }
+        });
+    });
+
+    it.only('it should properly parse nested IDs', function (done) {
+        request({
+            path: '/test/unit/partials/specs/nested/',
+            internal: true,
+            callback: function (response) {
+                var result = specsParser(response);
+
+                expect(result.contents[0].visualID).to.equal('1');
+                expect(result.contents[0].nested[0].visualID).to.equal('1.1');
+                expect(result.contents[0].nested[1].visualID).to.equal('1.2');
+                expect(result.contents[0].nested[0].nested[0].visualID).to.equal('1.1.1');
+
+                expect(result.contents[0].id).to.equal('1');
+                expect(result.contents[0].nested[0].id).to.equal('custom-sub-id');
+                expect(result.contents[0].nested[1].id).to.equal('1.2');
+                expect(result.contents[0].nested[0].nested[0].id).to.equal('1.1.1');
+
+                done();
+            }
+        });
+    });
+
+    it('it should return nested spec object', function (done) {
+        request({
+            path: '/test/unit/partials/specs/nested/',
+            internal: true,
+            callback: function (response) {
+                var result = specsParser(response);
+
+                expect(result).to.deep.equal({
+                    headResources: {},
+                    bodyResources: {},
+                    contents: [{
+                        html: [
+                            'HTML example 1'
+                        ],
+                        id: '1',
+                        visualID: '1',
+                        header: 'Section header',
+                        nested: [{
+                            nested: [{
+                                nested: [],
+                                html: [
+                                    'HTML example 1.1.1'
+                                ],
+                                id: 'custom-sub-id',
+                                visualID: '1.1.1',
+                                header: 'Section header'
+                            }],
+                            html: [
+                                'HTML example 1.1'
+                            ],
+                            id: '1.1',
+                            visualID: '1.1',
+                            header: 'Section header'
+                        }]
+                    }]
+                });
+
+                done();
+            }
+        });
+    });
+});
\ No newline at end of file
diff --git a/test/unit/partials/specs/few-examples/index.src.html b/test/unit/partials/specs/few-examples/index.src.html
new file mode 100644
index 0000000..e270c3b
--- /dev/null
+++ b/test/unit/partials/specs/few-examples/index.src.html
@@ -0,0 +1,7 @@
+<div class="source_section">
+    <h2>Section header</h2>
+
+    <div class="source_example">HTML example 1</div>
+
+    <div class="source_example">HTML example 2</div>
+</div>
\ No newline at end of file
diff --git a/test/unit/partials/specs/few-examples/info.json b/test/unit/partials/specs/few-examples/info.json
new file mode 100644
index 0000000..5bf65ff
--- /dev/null
+++ b/test/unit/partials/specs/few-examples/info.json
@@ -0,0 +1,4 @@
+{
+    "title": "Few-examples Spec",
+    "template": "doc"
+}
diff --git a/test/unit/partials/specs/nested/index.src.html b/test/unit/partials/specs/nested/index.src.html
new file mode 100644
index 0000000..dad4637
--- /dev/null
+++ b/test/unit/partials/specs/nested/index.src.html
@@ -0,0 +1,17 @@
+<div class="source_section">
+    <h2>Section header</h2>
+
+    <div class="source_example">HTML example 1</div>
+
+    <h3 id="custom-sub-id">Section sub-header</h3>
+
+    <div class="source_example">HTML example 1.1</div>
+
+    <h4>Section sub-sub-header</h4>
+
+    <div class="source_example">HTML example 1.1.1</div>
+
+    <h3>Section sub-header</h3>
+
+    <div class="source_example">HTML example 1.2</div>
+</div>
\ No newline at end of file
diff --git a/test/unit/partials/specs/nested/info.json b/test/unit/partials/specs/nested/info.json
new file mode 100644
index 0000000..071dd19
--- /dev/null
+++ b/test/unit/partials/specs/nested/info.json
@@ -0,0 +1,4 @@
+{
+    "title": "Nested Spec",
+    "template": "doc"
+}
diff --git a/test/unit/partials/specs/simple/index.src.html b/test/unit/partials/specs/simple/index.src.html
new file mode 100644
index 0000000..45ca756
--- /dev/null
+++ b/test/unit/partials/specs/simple/index.src.html
@@ -0,0 +1,5 @@
+<div class="source_section">
+    <h2>Section header</h2>
+
+    <div class="source_example">HTML example</div>
+</div>
\ No newline at end of file
diff --git a/test/unit/partials/specs/simple/info.json b/test/unit/partials/specs/simple/info.json
new file mode 100644
index 0000000..695a230
--- /dev/null
+++ b/test/unit/partials/specs/simple/info.json
@@ -0,0 +1,4 @@
+{
+    "title": "Simple Spec",
+    "template": "doc"
+}

From 21b77d74c2addfac933a79a7298e3ba77a80714b Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Tue, 29 Sep 2015 00:11:58 +0200
Subject: [PATCH 004/104] #99: finish section parsing script

---
 core/lib/request.js                           |  2 +
 core/lib/specsParser.js                       | 29 ++++----
 core/middlewares/clarify.js                   |  1 -
 test/unit/lib/specParserTest.js               | 66 ++++++++++++++++---
 .../partials/specs/complex/index.src.html     | 41 ++++++++++++
 test/unit/partials/specs/complex/info.json    |  4 ++
 6 files changed, 120 insertions(+), 23 deletions(-)
 create mode 100644 test/unit/partials/specs/complex/index.src.html
 create mode 100644 test/unit/partials/specs/complex/info.json

diff --git a/core/lib/request.js b/core/lib/request.js
index ee026e2..e82952e 100644
--- a/core/lib/request.js
+++ b/core/lib/request.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var http = require('http');
 var url = require('url');
 var Q = require('q');
diff --git a/core/lib/specsParser.js b/core/lib/specsParser.js
index 77dd609..4d18f90 100644
--- a/core/lib/specsParser.js
+++ b/core/lib/specsParser.js
@@ -1,3 +1,5 @@
+'use strict';
+
 var cheerio = require('cheerio');
 
 module.exports = function (specHTML, sectionID) {
@@ -8,9 +10,10 @@ module.exports = function (specHTML, sectionID) {
     };
 
     var $ = cheerio.load(specHTML, {decodeEntities: false});
-    var nesting;
 
-    var parseBlock = function (elements, blockID, blockDefaultID) {
+    var parseBlock = function (elements, blockID, blockDefaultID, nesting) {
+        nesting = nesting || 0;
+
         var headers = ['h2','h3', 'h4'];
         var currentHeaderLevel = headers[nesting] || '';
         var nextLevelheading = headers[(nesting + 1)] || '';
@@ -26,23 +29,26 @@ module.exports = function (specHTML, sectionID) {
 
         block.id = blockID;
         block.visualID = blockDefaultID;
+
         block.header = $currentScope.filter(currentHeaderLevel).first().text();
 
         $currentScope.filter('.source_example').each(function () {
             block.html.push($(this).html());
         });
 
-        nesting++;
+        if (nextHeadersArr.length > 0) {
+            nesting++;
 
-        // TODO: fix ID's
-        nextHeadersArr.each(function(subIndex){
-            var $nextScope = $(this).nextUntil(nextLevelheading);
-            $nextScope = $(this).first().add($nextScope);
+            nextHeadersArr.each(function(subIndex){
+                var $nextScope = $(this).nextUntil(nextLevelheading);
+                $nextScope = $(this).first().add($nextScope);
 
-            blockDefaultID = blockDefaultID + '.' +  (subIndex + 1);
-            blockID = $nextScope.filter(nextLevelheading).first().attr('id') || blockDefaultID;
-            block.nested.push(parseBlock($nextScope, blockID, blockDefaultID));
-        });
+                var nextBlockDefaultID = blockDefaultID + '.' +  (subIndex + 1);
+                var nextBlockID = $nextScope.filter(nextLevelheading).first().attr('id') || nextBlockDefaultID;
+
+                block.nested.push(parseBlock($nextScope, nextBlockID, nextBlockDefaultID, nesting));
+            });
+        }
 
         return block;
     };
@@ -52,7 +58,6 @@ module.exports = function (specHTML, sectionID) {
         var nextIndexString = (index + 1).toString();
         var blockID = $this.attr('id') || nextIndexString;
         var blockDefaultID = nextIndexString;
-        nesting = 0;
 
         output.contents.push(parseBlock($this.children(), blockID, blockDefaultID));
     });
diff --git a/core/middlewares/clarify.js b/core/middlewares/clarify.js
index 70daac3..2ab4432 100644
--- a/core/middlewares/clarify.js
+++ b/core/middlewares/clarify.js
@@ -6,7 +6,6 @@ var url = require('url');
 var Q = require('q');
 var _ = require('lodash');
 var http = require('http');
-var cheerio = require('cheerio');
 
 var ejs = require(path.join(global.pathToApp, 'core/ejsWithHelpers.js'));
 var trackStats = require(path.join(global.pathToApp, 'core/trackStats'));
diff --git a/test/unit/lib/specParserTest.js b/test/unit/lib/specParserTest.js
index 92f336e..dc96a6d 100644
--- a/test/unit/lib/specParserTest.js
+++ b/test/unit/lib/specParserTest.js
@@ -35,8 +35,8 @@ describe('specsParser', function () {
                         html: [
                             'HTML example'
                         ],
-                        id: 1,
-                        visualID: 1,
+                        id: '1',
+                        visualID: '1',
                         header: 'Section header'
                     }]
                 });
@@ -62,8 +62,8 @@ describe('specsParser', function () {
                             'HTML example 1',
                             'HTML example 2'
                         ],
-                        id: 1,
-                        visualID: 1,
+                        id: '1',
+                        visualID: '1',
                         header: 'Section header'
                     }]
                 });
@@ -73,7 +73,7 @@ describe('specsParser', function () {
         });
     });
 
-    it.only('it should properly parse nested IDs', function (done) {
+    it('it should properly parse nested IDs', function (done) {
         request({
             path: '/test/unit/partials/specs/nested/',
             internal: true,
@@ -95,7 +95,44 @@ describe('specsParser', function () {
         });
     });
 
-    it('it should return nested spec object', function (done) {
+    it('it should properly parse multiple custom ID\'s', function (done) {
+        request({
+            path: '/test/unit/partials/specs/complex/',
+            internal: true,
+            callback: function (response) {
+                var result = specsParser(response);
+
+                expect(result.contents[0].nested[0].id).to.equal('custom-sub-id');
+
+                expect(result.contents[1].id).to.equal('custom-section');
+
+                expect(result.contents[1].nested[0].nested[0].id).to.equal('custom-h4');
+
+                done();
+            }
+        });
+    });
+
+    it('it should properly pass multiple HTML examples', function (done) {
+        request({
+            path: '/test/unit/partials/specs/complex/',
+            internal: true,
+            callback: function (response) {
+                var result = specsParser(response);
+
+                expect(result.contents[0].html[0]).to.equal('HTML example 1');
+                expect(result.contents[1].nested[0].html[0]).to.equal('HTML example 1.1');
+                expect(result.contents[1].nested[0].nested[0].html[0]).to.equal('HTML example 1.1.1');
+                expect(result.contents[1].nested[0].nested[0].html[1]).to.equal('HTML example 1.1.1');
+
+                expect(result.contents[1].nested[1].html[0]).to.equal('HTML example 1.2');
+
+                done();
+            }
+        });
+    });
+
+    it('it should return full nested spec object', function (done) {
         request({
             path: '/test/unit/partials/specs/nested/',
             internal: true,
@@ -118,16 +155,25 @@ describe('specsParser', function () {
                                 html: [
                                     'HTML example 1.1.1'
                                 ],
-                                id: 'custom-sub-id',
+                                id: '1.1.1',
                                 visualID: '1.1.1',
-                                header: 'Section header'
+                                header: 'Section sub-sub-header'
                             }],
                             html: [
                                 'HTML example 1.1'
                             ],
-                            id: '1.1',
+                            id: 'custom-sub-id',
                             visualID: '1.1',
-                            header: 'Section header'
+                            header: 'Section sub-header'
+                        },
+                        {
+                            nested: [],
+                            html: [
+                                'HTML example 1.2'
+                            ],
+                            id: '1.2',
+                            visualID: '1.2',
+                            header: 'Section sub-header'
                         }]
                     }]
                 });
diff --git a/test/unit/partials/specs/complex/index.src.html b/test/unit/partials/specs/complex/index.src.html
new file mode 100644
index 0000000..fe63052
--- /dev/null
+++ b/test/unit/partials/specs/complex/index.src.html
@@ -0,0 +1,41 @@
+<div class="source_section">
+    <h2>Section header</h2>
+
+    <div class="source_example">HTML example 1</div>
+
+    <h3 id="custom-sub-id">Section sub-header</h3>
+
+    <div class="source_example">HTML example 1.1</div>
+
+    <h4>Section sub-sub-header</h4>
+
+    <div class="source_example">HTML example 1.1.1</div>
+
+    <h3>Section sub-header</h3>
+
+    <div class="source_example">HTML example 1.2</div>
+</div>
+
+<div class="source_section" id="custom-section">
+    <h2 id="custom-section-false">Section header</h2>
+
+    <div class="source_example">
+        <h1>Example header</h1>
+        <h2>Example header</h2>
+        <h3>Example header</h3>
+        <h4>Example header</h4>
+    </div>
+
+    <h3>Section sub-header</h3>
+
+    <div class="source_example">HTML example 1.1</div>
+
+    <h4 id="custom-h4">Section sub-sub-header</h4>
+
+    <div class="source_example">HTML example 1.1.1</div>
+    <div class="source_example">HTML example 1.1.1</div>
+
+    <h3>Section sub-header</h3>
+
+    <div class="source_example">HTML example 1.2</div>
+</div>
\ No newline at end of file
diff --git a/test/unit/partials/specs/complex/info.json b/test/unit/partials/specs/complex/info.json
new file mode 100644
index 0000000..071dd19
--- /dev/null
+++ b/test/unit/partials/specs/complex/info.json
@@ -0,0 +1,4 @@
+{
+    "title": "Nested Spec",
+    "template": "doc"
+}

From ff8429b54053e84d2be5665ac4b65639a3775a34 Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Tue, 29 Sep 2015 01:27:26 +0200
Subject: [PATCH 005/104] #99: working clarify with cheerio, and selection by
 section

---
 core/lib/parseData.js                         | 40 +++++++----
 .../lib/{specsParser.js => specPageParser.js} | 24 ++++++-
 core/middlewares/clarify.js                   | 69 +++++--------------
 package.json                                  |  3 +-
 ...pecParserTest.js => specPageParserSpec.js} | 42 ++++++++---
 test/unit/lib/{utils.js => utilsSpec.js}      |  0
 .../clarify.js => middlewares/clarifySpec.js} |  6 +-
 .../md.js => middlewares/mdSpec.js}           |  0
 8 files changed, 106 insertions(+), 78 deletions(-)
 rename core/lib/{specsParser.js => specPageParser.js} (75%)
 rename test/unit/lib/{specParserTest.js => specPageParserSpec.js} (82%)
 rename test/unit/lib/{utils.js => utilsSpec.js} (100%)
 rename test/unit/{middleware/clarify.js => middlewares/clarifySpec.js} (98%)
 rename test/unit/{middleware/md.js => middlewares/mdSpec.js} (100%)

diff --git a/core/lib/parseData.js b/core/lib/parseData.js
index b68c0ce..8b731bc 100644
--- a/core/lib/parseData.js
+++ b/core/lib/parseData.js
@@ -15,6 +15,8 @@ var flattenTillSpec = require(path.join(global.pathToApp, 'core/lib/flattenTillS
  * @param {String} config.path - path do data
  */
 function ParseData(config) {
+    config = config || {};
+
     this.data = {};
     this.scope = config.scope;
     this.dataPath = config.path;
@@ -292,26 +294,36 @@ ParseData.prototype.flattenHTMLcontents = function(contents) {
 ParseData.prototype.getBySection = function(id, sections) {
     // Sections are defined only in html data storage
     if (this.scope === 'html' && Array.isArray(sections) && sections.length > 0) {
-        var specData = this.getByID(id);
+        return this.traverseSections(this.getByID(id), sections);
+    } else {
+        return undefined;
+    }
+};
 
-        if (specData) {
-            var specSections = this.flattenHTMLcontents(specData.contents);
+/**
+ * Traverse Spec page object sections
+ *
+ * @param {Object} specData - HTML data structure to parse
+ * @param {Array} sections - Array of sections to return
+ *
+ * @returns {Object} Return single object by requested ID with specified sections HTML OR undefined
+ */
+ParseData.prototype.traverseSections = function(specData, sections) {
+    if (specData && sections) {
+        var specSections = this.flattenHTMLcontents(specData.contents);
 
-            var pickedSections = [];
+        var pickedSections = [];
 
-            sections.forEach(function(id){
-                var objectToAdd = specSections[id];
+        sections.forEach(function(sectionID){
+            var objectToAdd = specSections[sectionID];
 
-                if (objectToAdd) pickedSections.push(objectToAdd);
-            });
+            if (objectToAdd) pickedSections.push(objectToAdd);
+        });
 
-            if (pickedSections.length !== 0) {
-                specData.contents = pickedSections;
+        if (pickedSections.length > 0) {
+            specData.contents = pickedSections;
 
-                return specData;
-            } else {
-                return undefined;
-            }
+            return specData;
         } else {
             return undefined;
         }
diff --git a/core/lib/specsParser.js b/core/lib/specPageParser.js
similarity index 75%
rename from core/lib/specsParser.js
rename to core/lib/specPageParser.js
index 4d18f90..097737f 100644
--- a/core/lib/specsParser.js
+++ b/core/lib/specPageParser.js
@@ -1,8 +1,16 @@
 'use strict';
 
 var cheerio = require('cheerio');
-
-module.exports = function (specHTML, sectionID) {
+var ParseData = new (require('./parseData'));
+
+/**
+ * Parse Spec page contents into HTML tree
+ *
+ * @param {String} specHTML - Full Spec page html (from request)
+ *
+ * @returns {Object} Return parsed Spec page object
+ */
+var process = module.exports.process = function (specHTML) {
     var output = {
         headResources: {},
         bodyResources: {},
@@ -63,4 +71,16 @@ module.exports = function (specHTML, sectionID) {
     });
 
     return output;
+};
+
+/**
+ * Get specific sections from parsed Spec page object
+ *
+ * @param {Object} specObject - Parsed Spec page object
+ * @param {Array} sections - Array of sections to return
+ *
+ * @returns {Object} Return object with specified sections HTML OR undefined
+ */
+module.exports.getBySection = function (specObject, sections) {
+    return ParseData.traverseSections(specObject, sections);
 };
\ No newline at end of file
diff --git a/core/middlewares/clarify.js b/core/middlewares/clarify.js
index 2ab4432..308fa81 100644
--- a/core/middlewares/clarify.js
+++ b/core/middlewares/clarify.js
@@ -12,7 +12,7 @@ var trackStats = require(path.join(global.pathToApp, 'core/trackStats'));
 var pathToApp = path.dirname(require.main.filename);
 var specUtils = require(path.join(pathToApp, 'core/lib/specUtils'));
 var parseData = require(path.join(pathToApp, 'core/lib/parseData'));
-var specsParser = require(path.join(pathToApp, 'core/lib/specsParser'));
+var specsParser = require(path.join(pathToApp, 'core/lib/specPageParser'));
 var htmlParser = require(path.join(pathToApp, 'core/html-tree/html-parser'));
 
 
@@ -100,7 +100,6 @@ var getTplList = function(){
     return deferred.promise;
 };
 
-// TODO: Move to standalone API, for fast JSDOM spec parsing
 var parseSpec = function(sections, pathToSpec) {
     var deferred = Q.defer();
 
@@ -121,13 +120,25 @@ var parseSpec = function(sections, pathToSpec) {
 
         //the whole response has been recieved, so we just print it out here
         response.on('end', function () {
-            deferred.resolve({
-                // whole json or by spec
-                output: specsParser(specHTML),
+            var output = {};
+            var allContents = specsParser.process(specHTML);
 
-                // whole json
-                allContents: specsParser(specHTML)
-            });
+            if (sections) {
+                output = specsParser.getBySection(allContents, sections);
+            } else {
+                output = allContents;
+            }
+
+            if (output) {
+                deferred.resolve({
+                    output: output,
+                    allContents: allContents
+                });
+            } else {
+                deferred.reject({
+                    msg: 'Requested sections HTML not found'
+                });
+            }
         });
     };
 
@@ -141,46 +152,6 @@ var parseSpec = function(sections, pathToSpec) {
 
     request.end();
 
-
-    //// Parsing spec with JSdom
-    //jsdom.env(
-    //    'http://127.0.0.1:' + global.opts.core.server.port + pathToSpec + '?internal=true',
-    //    ['http://127.0.0.1:' + global.opts.core.server.port + '/source/assets/js/modules/sectionsParser.js'],
-    //    function (err, window) {
-    //        if (err) {
-    //            deferred.reject({
-    //                err: err,
-    //                msg: 'JSDOM error'
-    //            });
-    //            return;
-    //        }
-    //
-    //        var output = {};
-    //
-    //        var SourceGetSections = window.SourceGetSections;
-    //
-    //        var parser = new SourceGetSections();
-    //        var allContents = parser.getSpecFull();
-    //
-    //        if (sections) {
-    //            output = parser.getSpecFull(sections);
-    //        } else {
-    //            output = allContents;
-    //        }
-    //
-    //        if (output) {
-    //            deferred.resolve({
-    //                output: output,
-    //                allContents: allContents
-    //            });
-    //        } else {
-    //            deferred.reject({
-    //                msg: 'Requested sections HTML not found'
-    //            });
-    //        }
-    //    }
-    //);
-
     return deferred.promise;
 };
 
@@ -313,8 +284,6 @@ module.exports.process = function(req, res, next) {
             getSpecData(),
             getTplList()
         ]).spread(function(_specData, tplList) {
-            console.log('_specData', JSON.stringify(_specData, null, 4));
-
             var specData = _specData.output;
             var sections = specData.contents ? specData.contents : [];
 
diff --git a/package.json b/package.json
index 7dbff8a..f25779d 100644
--- a/package.json
+++ b/package.json
@@ -58,7 +58,8 @@
     "shortid": "^2.2.2",
     "time-grunt": "~0.2.10",
     "tinyforever": "0.0.3",
-    "universal-analytics": "^0.3.9"
+    "universal-analytics": "^0.3.9",
+    "jsdom": "^1.2.1"
   },
   "scripts": {
     "postinstall": "node ./core/postInstall && grunt update && node ./core/trackInstall",
diff --git a/test/unit/lib/specParserTest.js b/test/unit/lib/specPageParserSpec.js
similarity index 82%
rename from test/unit/lib/specParserTest.js
rename to test/unit/lib/specPageParserSpec.js
index dc96a6d..c263b96 100644
--- a/test/unit/lib/specParserTest.js
+++ b/test/unit/lib/specPageParserSpec.js
@@ -5,12 +5,12 @@ var pathToMasterApp = path.resolve('./');
 
 var loadOptions = require(path.join(pathToMasterApp, 'core/loadOptions'));
 global.opts = loadOptions(path.resolve(pathToMasterApp));
-var specsParser = require(path.join(pathToMasterApp, 'core/lib/specsParser'));
+var specsParser = require(path.join(pathToMasterApp, 'core/lib/specPageParser'));
 var request = require(path.join(pathToMasterApp, 'core/lib/request'));
 
-describe('specsParser', function () {
+describe('specsParser.process', function () {
     it('it should return proper object structure', function (done) {
-        var result = specsParser('');
+        var result = specsParser.process('');
 
         expect(result).to.be.an('object');
         expect(result.headResources).to.be.an('object');
@@ -25,7 +25,7 @@ describe('specsParser', function () {
             path: '/test/unit/partials/specs/simple/',
             internal: true,
             callback: function (response) {
-                var result = specsParser(response);
+                var result = specsParser.process(response);
 
                 expect(result).to.deep.equal({
                     headResources: {},
@@ -51,7 +51,7 @@ describe('specsParser', function () {
             path: '/test/unit/partials/specs/few-examples/',
             internal: true,
             callback: function (response) {
-                var result = specsParser(response);
+                var result = specsParser.process(response);
 
                 expect(result).to.deep.equal({
                     headResources: {},
@@ -78,7 +78,7 @@ describe('specsParser', function () {
             path: '/test/unit/partials/specs/nested/',
             internal: true,
             callback: function (response) {
-                var result = specsParser(response);
+                var result = specsParser.process(response);
 
                 expect(result.contents[0].visualID).to.equal('1');
                 expect(result.contents[0].nested[0].visualID).to.equal('1.1');
@@ -100,7 +100,7 @@ describe('specsParser', function () {
             path: '/test/unit/partials/specs/complex/',
             internal: true,
             callback: function (response) {
-                var result = specsParser(response);
+                var result = specsParser.process(response);
 
                 expect(result.contents[0].nested[0].id).to.equal('custom-sub-id');
 
@@ -118,7 +118,7 @@ describe('specsParser', function () {
             path: '/test/unit/partials/specs/complex/',
             internal: true,
             callback: function (response) {
-                var result = specsParser(response);
+                var result = specsParser.process(response);
 
                 expect(result.contents[0].html[0]).to.equal('HTML example 1');
                 expect(result.contents[1].nested[0].html[0]).to.equal('HTML example 1.1');
@@ -137,7 +137,7 @@ describe('specsParser', function () {
             path: '/test/unit/partials/specs/nested/',
             internal: true,
             callback: function (response) {
-                var result = specsParser(response);
+                var result = specsParser.process(response);
 
                 expect(result).to.deep.equal({
                     headResources: {},
@@ -178,6 +178,30 @@ describe('specsParser', function () {
                     }]
                 });
 
+                done();
+            }
+        });
+    });
+});
+
+describe('specsParser.getBySection', function () {
+    it('it should properly get by single section', function (done) {
+        request({
+            path: '/test/unit/partials/specs/nested/',
+            internal: true,
+            callback: function (response) {
+                var result = specsParser.process(response);
+                var assertOption = function (sections) {
+                    var endResult = specsParser.getBySection(result, sections);
+
+                    expect(endResult.contents.length).to.equal(1);
+                    expect(endResult.contents[0].id).to.equal(sections[0]);
+                };
+
+                assertOption(['1']);
+                assertOption(['custom-sub-id']);
+                assertOption(['1.1.1']);
+
                 done();
             }
         });
diff --git a/test/unit/lib/utils.js b/test/unit/lib/utilsSpec.js
similarity index 100%
rename from test/unit/lib/utils.js
rename to test/unit/lib/utilsSpec.js
diff --git a/test/unit/middleware/clarify.js b/test/unit/middlewares/clarifySpec.js
similarity index 98%
rename from test/unit/middleware/clarify.js
rename to test/unit/middlewares/clarifySpec.js
index eafd6c5..92e02cb 100644
--- a/test/unit/middleware/clarify.js
+++ b/test/unit/middlewares/clarifySpec.js
@@ -7,6 +7,8 @@ var jq = fs.readFileSync(path.join(pathToMasterApp,'assets/js/lib/jquery-2.1.4.m
 var should = require('should');
 var assert = require('assert');
 var request = require('supertest');
+
+// TODO: rewrite tests with cheerio
 var jsdom = require('jsdom');
 
 var loadOptions = require(path.join(pathToMasterApp, 'core/loadOptions'));
@@ -19,7 +21,7 @@ describe('Clarify test /docs/spec?clarify=true', function () {
         it('should return nothing (&sections=77)', function (done) {
             request(url)
                 .get('&sections=77')
-                .expect(200)
+                .expect(500)
                 .end(function (err, res) {
                     if (err) {
                         throw err;
@@ -90,7 +92,7 @@ describe('Clarify test /docs/spec?clarify=true', function () {
                 });
         });
 
-        it('should have injected resources', function (done) {
+        xit('should have injected resources', function (done) {
             request(url)
                 .get('&sections=1.1')
                 .expect(200)
diff --git a/test/unit/middleware/md.js b/test/unit/middlewares/mdSpec.js
similarity index 100%
rename from test/unit/middleware/md.js
rename to test/unit/middlewares/mdSpec.js

From bf7847430d640ac3e50eedc7ea816facd9e302ca Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Tue, 29 Sep 2015 01:34:21 +0200
Subject: [PATCH 006/104] fix linting issues

---
 core/lib/specPageParser.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/lib/specPageParser.js b/core/lib/specPageParser.js
index 097737f..cbb13b9 100644
--- a/core/lib/specPageParser.js
+++ b/core/lib/specPageParser.js
@@ -1,7 +1,7 @@
 'use strict';
 
 var cheerio = require('cheerio');
-var ParseData = new (require('./parseData'));
+var ParseData = new (require('./parseData'))();
 
 /**
  * Parse Spec page contents into HTML tree
@@ -10,7 +10,7 @@ var ParseData = new (require('./parseData'));
  *
  * @returns {Object} Return parsed Spec page object
  */
-var process = module.exports.process = function (specHTML) {
+module.exports.process = function (specHTML) {
     var output = {
         headResources: {},
         bodyResources: {},

From 23e433d3bf763e84bd357544bd288ec68a0bda07 Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Sat, 3 Oct 2015 16:49:38 +0200
Subject: [PATCH 007/104] fix: custom view resolving in

---
 Gruntfile.js             |  4 ++--
 core/middlewares/wrap.js | 11 +++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 727399a..5fca981 100755
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -328,7 +328,7 @@ module.exports = function(grunt) {
 
     // Test task. Execute with running app
     grunt.registerTask('test', 'Run ALL tests or specified by second param', function () {
-        // if custom mask set - `grunt test --spec=test/unit/middleware/**/*.js`
+        // if custom mask set - `grunt test --spec=test/unit/**/*.js`
         var spec = grunt.option('spec');
         if (spec) {
             grunt.config.set('mochaTest.test.src', [spec]);
@@ -340,7 +340,7 @@ module.exports = function(grunt) {
 
     // Test task. Execute with running app
     grunt.registerTask('test-func', 'Run ALL functional tests or specified by second param', function () {
-        // if custom mask set - `grunt test --spec=test/unit/middleware/**/*.js`
+        // if custom mask set - `grunt test --spec=test/unit/**/*.js`
         var spec = grunt.option('spec');
         if (spec) {
             grunt.config.set('casperjs.files', [spec]);
diff --git a/core/middlewares/wrap.js b/core/middlewares/wrap.js
index 075d0c2..99d66e5 100644
--- a/core/middlewares/wrap.js
+++ b/core/middlewares/wrap.js
@@ -40,6 +40,17 @@ exports.process = function (req, res, next) {
             viewParam = 'navigation';
         }
 
+        // Check if we're working with included dirs
+        if (context) {
+            global.opts.core.common.includedDirs.forEach(function (includedDir) {
+                var pathToCheck = path.join(global.app.get('user'), includedDir) + '/';
+
+                if (context.indexOf(pathToCheck) === 0) {
+                    context = context.replace(pathToCheck, path.join(global.pathToApp, includedDir) + '/')
+                }
+            });
+        }
+
         var templatePath = viewResolver(viewParam, contextOptions.rendering.views, context) || viewParam;
 
         fs.readFile(templatePath, "utf-8", function(err, template){

From e19bfad048aca827ac431f1247aeb0de6ba045d0 Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Sat, 3 Oct 2015 16:53:08 +0200
Subject: [PATCH 008/104] add reserved notice

---
 test/index.src.html | 5 +++++
 test/info.json      | 5 +++++
 2 files changed, 10 insertions(+)
 create mode 100644 test/index.src.html
 create mode 100644 test/info.json

diff --git a/test/index.src.html b/test/index.src.html
new file mode 100644
index 0000000..426541b
--- /dev/null
+++ b/test/index.src.html
@@ -0,0 +1,5 @@
+<div class="source_subhead">
+    <h1>Reserved Catalog</h1>
+</div>
+
+<p>This specs catalogue path is reserved for core features.</p>
\ No newline at end of file
diff --git a/test/info.json b/test/info.json
new file mode 100644
index 0000000..e60890b
--- /dev/null
+++ b/test/info.json
@@ -0,0 +1,5 @@
+{
+    "title": "Reserved Catalog",
+    "role": "navigation",
+    "tag": ["hidden"]
+}

From d0660552619e8e3e9a87be9efd0a8e1fe428ad8b Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Sat, 3 Oct 2015 18:07:06 +0200
Subject: [PATCH 009/104] #99: add resource parsing and tests, move partials to
 tests root folder

---
 core/lib/specPageParser.js                    | 134 +++++++-
 .../partials/markdown-ejs-nested.md           |   0
 test/{unit => }/partials/markdown-ejs.md      |   0
 test/{unit => }/partials/markdown.md          |   0
 test/{unit => }/partials/mask-one.html        |   0
 test/{unit => }/partials/mask-two.html        |   0
 .../partials/specs/complex/index.src.html     |   0
 test/partials/specs/complex/info.json         |   5 +
 .../specs/few-examples/index.src.html         |   0
 test/partials/specs/few-examples/info.json    |   5 +
 .../specs/many-assets}/index.src.html         |   0
 test/partials/specs/many-assets/info.json     |   5 +
 test/partials/specs/many-assets/template.ejs  |  48 +++
 .../partials/specs/nested/index.src.html      |   0
 test/partials/specs/nested/info.json          |   5 +
 test/partials/specs/simple/index.src.html     |   5 +
 test/partials/specs/simple/info.json          |   5 +
 test/{unit => }/partials/three.html           |   0
 test/unit/ejsHelpersSpec.js                   |  10 +-
 test/unit/lib/specPageParserSpec.js           | 318 +++++++++++++++---
 test/unit/middlewares/clarifySpec.js          |   2 +-
 test/unit/partials/specs/complex/info.json    |   4 -
 .../partials/specs/few-examples/info.json     |   4 -
 test/unit/partials/specs/nested/info.json     |   4 -
 test/unit/partials/specs/simple/info.json     |   4 -
 25 files changed, 492 insertions(+), 66 deletions(-)
 rename test/{unit => }/partials/markdown-ejs-nested.md (100%)
 rename test/{unit => }/partials/markdown-ejs.md (100%)
 rename test/{unit => }/partials/markdown.md (100%)
 rename test/{unit => }/partials/mask-one.html (100%)
 rename test/{unit => }/partials/mask-two.html (100%)
 rename test/{unit => }/partials/specs/complex/index.src.html (100%)
 create mode 100644 test/partials/specs/complex/info.json
 rename test/{unit => }/partials/specs/few-examples/index.src.html (100%)
 create mode 100644 test/partials/specs/few-examples/info.json
 rename test/{unit/partials/specs/simple => partials/specs/many-assets}/index.src.html (100%)
 create mode 100644 test/partials/specs/many-assets/info.json
 create mode 100644 test/partials/specs/many-assets/template.ejs
 rename test/{unit => }/partials/specs/nested/index.src.html (100%)
 create mode 100644 test/partials/specs/nested/info.json
 create mode 100644 test/partials/specs/simple/index.src.html
 create mode 100644 test/partials/specs/simple/info.json
 rename test/{unit => }/partials/three.html (100%)
 delete mode 100644 test/unit/partials/specs/complex/info.json
 delete mode 100644 test/unit/partials/specs/few-examples/info.json
 delete mode 100644 test/unit/partials/specs/nested/info.json
 delete mode 100644 test/unit/partials/specs/simple/info.json

diff --git a/core/lib/specPageParser.js b/core/lib/specPageParser.js
index cbb13b9..d76c0c0 100644
--- a/core/lib/specPageParser.js
+++ b/core/lib/specPageParser.js
@@ -3,22 +3,144 @@
 var cheerio = require('cheerio');
 var ParseData = new (require('./parseData'))();
 
+/**
+ * Filter list of HTML nodes
+ *
+ * @param {Object} $ - cheerio root object
+ * @param {Array} $elements - nodelist to filter
+ * @param {Function} [customElFilter] - Additional filter for element
+ * @param {Boolean} [skipAttrFilters] - Set to true, if expect not filtered list of resources
+ *
+ * @returns {Array} Returns array with HTML of Style containers OR undefined
+ */
+var filterResourceElements = function($, $elements, customElFilter, skipAttrFilters){
+    var filteredArr = [];
+    var defaultFilter = function () {
+        return true;
+    };
+    var _customElFilter = typeof customElFilter === 'function' ? customElFilter : defaultFilter;
+
+    // Checking some exceptions
+    var checkDataSet = function($el){
+        var elementAttrs = $el.attributes || $el.attribs;
+
+        if (skipAttrFilters) {
+            return true;
+        } else {
+            return !(
+                elementAttrs['data-nonclarify'] ||
+                elementAttrs['data-requiremodule'] ||
+                elementAttrs['data-source'] === 'core' ||
+                elementAttrs['data-source'] === 'plugin'
+            );
+        }
+    };
+
+    if ($elements && $elements.length > 0) {
+        $elements.each(function(){
+           var el = this;
+
+            if (_customElFilter(el) && checkDataSet(el)) {
+                // If not need to filter out, then push to output
+                filteredArr.push($.html($(el)));
+            }
+        });
+
+        return filteredArr.length > 0 ? filteredArr : undefined;
+    } else {
+        return undefined;
+    }
+};
+
+/**
+ * Parse CSS links from Spec
+ *
+ * @param {Object} $ - cheerio root object
+ * @param {Object} scope to search - body or head, defaults to root
+ * @param {Boolean} [skipAttrFilters] - Set to true, if expect not filtered list of resources
+ *
+ * @returns {Array} Returns array with HTML of CSS links OR undefined
+ */
+var getCssLinksHTML = module.exports.getCssLinksHTML = function($, scope, skipAttrFilters) {
+    var $scope = scope ? $(scope) : $.root();
+    var $links = $scope.find('link');
+
+    var customFilter = function(el){
+        var elementAttrs = el.attributes || el.attribs;
+
+        return elementAttrs.rel === 'stylesheet';
+    };
+
+    return filterResourceElements($, $links, customFilter, skipAttrFilters);
+};
+
+
+/**
+ * Parse Scripts from Spec
+ *
+ * @param {Object} $ - cheerio root object
+ * @param {Object} scope to search - body or head, defaults to root
+ * @param {Boolean} [skipAttrFilters] - Set to true, if expect not filtered list of resources
+ *
+ * @returns {Array} Returns array with HTML of Scripts OR undefined
+ */
+var getScriptsHTML = module.exports.getScriptsHTML = function($, scope, skipAttrFilters) {
+    var $scope = scope ? $(scope) : $.root();
+    var $scripts = $scope.find('script');
+
+    return filterResourceElements($, $scripts, null, skipAttrFilters);
+};
+
+/**
+ * Parse Style containers from Spec
+ *
+ * @param {Object} $ - cheerio root object
+ * @param {Object} scope to search - body or head, defaults to root
+ * @param {Boolean} [skipAttrFilters] - Set to true, if expect not filtered list of resources
+ *
+ * @returns {Array} Returns array with HTML of Style containers OR undefined
+ */
+var getStyleContainersHTML = module.exports.getStyleContainersHTML = function($, scope, skipAttrFilters){
+    var $scope = scope ? $(scope) : $.root();
+    var $styles = $scope.find('style');
+
+    return filterResourceElements($, $styles, null, skipAttrFilters);
+};
+
+
+/**
+ * Getter for assets resources of the Spec
+ *
+ * @param {Object} $ - cheerio root object
+ * @param {String} $scope - cheerio DOM object
+ *
+ * @returns {Object} Returns object with HTML lists containing Spec assets resources OR undefined
+ */
+var getSpecResources = module.exports.getSpecResources = function ($, scope) {
+    var output = {};
+
+    output.cssLinks = getCssLinksHTML($, scope) || [];
+    output.scripts = getScriptsHTML($, scope) || [];
+    output.cssStyles = getStyleContainersHTML($, scope) || [];
+
+    return (output.cssLinks || output.scripts || output.cssStyles) ? output : undefined;
+};
+
 /**
  * Parse Spec page contents into HTML tree
  *
- * @param {String} specHTML - Full Spec page html (from request)
+ * @param {String} specHTML - Full Spec page html, including head section (from request)
  *
  * @returns {Object} Return parsed Spec page object
  */
 module.exports.process = function (specHTML) {
+    var $ = cheerio.load(specHTML, {decodeEntities: false});
     var output = {
-        headResources: {},
-        bodyResources: {},
+        headResources: getSpecResources($, 'head'),
+        bodyResources: getSpecResources($, 'body'),
         contents: []
     };
 
-    var $ = cheerio.load(specHTML, {decodeEntities: false});
-
     var parseBlock = function (elements, blockID, blockDefaultID, nesting) {
         nesting = nesting || 0;
 
@@ -83,4 +205,4 @@ module.exports.process = function (specHTML) {
  */
 module.exports.getBySection = function (specObject, sections) {
     return ParseData.traverseSections(specObject, sections);
-};
\ No newline at end of file
+};
diff --git a/test/unit/partials/markdown-ejs-nested.md b/test/partials/markdown-ejs-nested.md
similarity index 100%
rename from test/unit/partials/markdown-ejs-nested.md
rename to test/partials/markdown-ejs-nested.md
diff --git a/test/unit/partials/markdown-ejs.md b/test/partials/markdown-ejs.md
similarity index 100%
rename from test/unit/partials/markdown-ejs.md
rename to test/partials/markdown-ejs.md
diff --git a/test/unit/partials/markdown.md b/test/partials/markdown.md
similarity index 100%
rename from test/unit/partials/markdown.md
rename to test/partials/markdown.md
diff --git a/test/unit/partials/mask-one.html b/test/partials/mask-one.html
similarity index 100%
rename from test/unit/partials/mask-one.html
rename to test/partials/mask-one.html
diff --git a/test/unit/partials/mask-two.html b/test/partials/mask-two.html
similarity index 100%
rename from test/unit/partials/mask-two.html
rename to test/partials/mask-two.html
diff --git a/test/unit/partials/specs/complex/index.src.html b/test/partials/specs/complex/index.src.html
similarity index 100%
rename from test/unit/partials/specs/complex/index.src.html
rename to test/partials/specs/complex/index.src.html
diff --git a/test/partials/specs/complex/info.json b/test/partials/specs/complex/info.json
new file mode 100644
index 0000000..2fbaeb3
--- /dev/null
+++ b/test/partials/specs/complex/info.json
@@ -0,0 +1,5 @@
+{
+    "title": "Nested Spec",
+    "template": "doc",
+    "tag": ["hidden"]
+}
diff --git a/test/unit/partials/specs/few-examples/index.src.html b/test/partials/specs/few-examples/index.src.html
similarity index 100%
rename from test/unit/partials/specs/few-examples/index.src.html
rename to test/partials/specs/few-examples/index.src.html
diff --git a/test/partials/specs/few-examples/info.json b/test/partials/specs/few-examples/info.json
new file mode 100644
index 0000000..6830b86
--- /dev/null
+++ b/test/partials/specs/few-examples/info.json
@@ -0,0 +1,5 @@
+{
+    "title": "Few-examples Spec",
+    "template": "doc",
+    "tag": ["hidden"]
+}
diff --git a/test/unit/partials/specs/simple/index.src.html b/test/partials/specs/many-assets/index.src.html
similarity index 100%
rename from test/unit/partials/specs/simple/index.src.html
rename to test/partials/specs/many-assets/index.src.html
diff --git a/test/partials/specs/many-assets/info.json b/test/partials/specs/many-assets/info.json
new file mode 100644
index 0000000..237f4a3
--- /dev/null
+++ b/test/partials/specs/many-assets/info.json
@@ -0,0 +1,5 @@
+{
+    "title": "Many Assets",
+    "template": "$(context)/template.ejs",
+    "tag": ["hidden"]
+}
diff --git a/test/partials/specs/many-assets/template.ejs b/test/partials/specs/many-assets/template.ejs
new file mode 100644
index 0000000..fc3a81c
--- /dev/null
+++ b/test/partials/specs/many-assets/template.ejs
@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <title><%= info.title %></title>
+    <meta name="author" content="<%= info.author %>">
+    <% if (info.keywords !== '') {%>
+    <meta name="keywords" content="<%= info.keywords %>">
+    <% } %>
+
+    <!-- Your master-app styles -->
+        <link href="/docs/data/bootstrap-head.css" rel="stylesheet">
+        <script src="script-in-head.js"></script>
+        <style>.head{color:red}</style>
+
+        <link href="/docs/data/bootstrap-head.css" rel="stylesheet" data-nonclarify="true">
+        <script src="script-in-head.js" data-nonclarify="true"></script>
+        <style  data-nonclarify="true">.head{color:red}</style>
+    <!-- /Your master-app styles -->
+
+    <!-- Source default resources -->
+        <link href="/source/assets/css/source.css" rel="stylesheet" data-source="core">
+        <script src="/source/assets/js/require.bundle.js" data-source="core"></script>
+        <script src="/source/assets/js/enter-the-source.js" data-source="core"></script>
+    <!-- /Source default resources -->
+
+    <%- head %>
+</head>
+<body class="source_page __spec">
+    <link href="/docs/data/bootstrap-body.css" rel="stylesheet">
+    <div class="source_container">
+        <%- header %>
+        <div class="source_main source_col-main" role="main">
+            <h1><%= info.title %></h1>
+            <div class="source_header-meta">v.<%- engineVersion %></div>
+            <%- content %>
+        </div>
+        <%- footer %>
+        <style>.body{color:red}</style>
+    </div>
+    <script src="script-in-body.js"></script>
+
+    <link href="/docs/data/bootstrap-head.css" rel="stylesheet" data-nonclarify="true">
+    <script src="script-in-head.js" data-nonclarify="true"></script>
+    <style data-nonclarify="true">.body{color:red}</style>
+</body>
+</html>
\ No newline at end of file
diff --git a/test/unit/partials/specs/nested/index.src.html b/test/partials/specs/nested/index.src.html
similarity index 100%
rename from test/unit/partials/specs/nested/index.src.html
rename to test/partials/specs/nested/index.src.html
diff --git a/test/partials/specs/nested/info.json b/test/partials/specs/nested/info.json
new file mode 100644
index 0000000..2fbaeb3
--- /dev/null
+++ b/test/partials/specs/nested/info.json
@@ -0,0 +1,5 @@
+{
+    "title": "Nested Spec",
+    "template": "doc",
+    "tag": ["hidden"]
+}
diff --git a/test/partials/specs/simple/index.src.html b/test/partials/specs/simple/index.src.html
new file mode 100644
index 0000000..45ca756
--- /dev/null
+++ b/test/partials/specs/simple/index.src.html
@@ -0,0 +1,5 @@
+<div class="source_section">
+    <h2>Section header</h2>
+
+    <div class="source_example">HTML example</div>
+</div>
\ No newline at end of file
diff --git a/test/partials/specs/simple/info.json b/test/partials/specs/simple/info.json
new file mode 100644
index 0000000..f2a5c8b
--- /dev/null
+++ b/test/partials/specs/simple/info.json
@@ -0,0 +1,5 @@
+{
+    "title": "Simple Spec",
+    "template": "doc",
+    "tag": ["hidden"]
+}
diff --git a/test/unit/partials/three.html b/test/partials/three.html
similarity index 100%
rename from test/unit/partials/three.html
rename to test/partials/three.html
diff --git a/test/unit/ejsHelpersSpec.js b/test/unit/ejsHelpersSpec.js
index 803cd29..7224f67 100644
--- a/test/unit/ejsHelpersSpec.js
+++ b/test/unit/ejsHelpersSpec.js
@@ -9,7 +9,7 @@ global.opts = loadOptions(path.resolve(pathToMasterApp));
 
 describe('includeMD', function () {
     it('should properly include Markdown file', function (done) {
-        var result = ejs.render('<%- includeMD("partials/markdown") %>', {
+        var result = ejs.render('<%- includeMD("../partials/markdown") %>', {
             filename: __filename
         });
 
@@ -19,7 +19,7 @@ describe('includeMD', function () {
     });
 
     it('should properly include Markdown file with EJS includes', function (done) {
-        var result = ejs.render('<%- includeMD("partials/markdown-ejs") %>', {
+        var result = ejs.render('<%- includeMD("../partials/markdown-ejs") %>', {
           world: 'world'
         }, {
             filename: __filename
@@ -31,7 +31,7 @@ describe('includeMD', function () {
     });
 
     it('should properly include Markdown with nested include', function (done) {
-        var result = ejs.render('<%- includeMD("partials/markdown-ejs-nested") %>', {
+        var result = ejs.render('<%- includeMD("../partials/markdown-ejs-nested") %>', {
           world: 'world'
         }, {
             filename: __filename
@@ -45,7 +45,7 @@ describe('includeMD', function () {
 
 describe('includeFiles', function () {
     it('should include one file by glob', function (done) {
-        var result = ejs.render('<%- includeFiles("partials/mask-one.html") %>', {
+        var result = ejs.render('<%- includeFiles("../partials/mask-one.html") %>', {
             filename: __filename
         });
 
@@ -55,7 +55,7 @@ describe('includeFiles', function () {
     });
 
     it('should include multiple files by glob', function (done) {
-        var result = ejs.render('<%- includeFiles("partials/mask-*.html") %>', {
+        var result = ejs.render('<%- includeFiles("../partials/mask-*.html") %>', {
             filename: __filename
         });
 
diff --git a/test/unit/lib/specPageParserSpec.js b/test/unit/lib/specPageParserSpec.js
index c263b96..daa144e 100644
--- a/test/unit/lib/specPageParserSpec.js
+++ b/test/unit/lib/specPageParserSpec.js
@@ -1,4 +1,5 @@
 var path = require('path');
+var cheerio = require('cheerio');
 var expect = require('chai').expect;
 
 var pathToMasterApp = path.resolve('./');
@@ -8,13 +9,240 @@ global.opts = loadOptions(path.resolve(pathToMasterApp));
 var specsParser = require(path.join(pathToMasterApp, 'core/lib/specPageParser'));
 var request = require(path.join(pathToMasterApp, 'core/lib/request'));
 
+describe('specsParser.getCssLinksHTML', function () {
+    it('it should parse all css links html', function (done) {
+        request({
+            path: '/test/partials/specs/many-assets/',
+            internal: true,
+            callback: function (response) {
+                var $ = cheerio.load(response, {decodeEntities: false});
+                var result = specsParser.getCssLinksHTML($);
+
+                expect(result).to.be.an('array');
+                expect(result[0]).to.equal('<link href="/docs/data/bootstrap-head.css" rel="stylesheet">');
+                expect(result[1]).to.equal('<link href="/docs/data/bootstrap-body.css" rel="stylesheet">');
+
+                done();
+            }
+        });
+    });
+    it('it should parse css links only from head', function (done) {
+        request({
+            path: '/test/partials/specs/many-assets/',
+            internal: true,
+            callback: function (response) {
+                var $ = cheerio.load(response, {decodeEntities: false});
+                var result = specsParser.getCssLinksHTML($, 'head');
+
+                expect(result).to.be.an('array');
+                expect(result.length).to.equal(1);
+                expect(result[0]).to.equal('<link href="/docs/data/bootstrap-head.css" rel="stylesheet">');
+
+                done();
+            }
+        });
+    });
+    it('it should parse css links only from head', function (done) {
+        request({
+            path: '/test/partials/specs/many-assets/',
+            internal: true,
+            callback: function (response) {
+                var $ = cheerio.load(response, {decodeEntities: false});
+                var result = specsParser.getCssLinksHTML($, 'body');
+
+                expect(result).to.be.an('array');
+                expect(result.length).to.equal(1);
+                expect(result[0]).to.equal('<link href="/docs/data/bootstrap-body.css" rel="stylesheet">');
+
+                done();
+            }
+        });
+    });
+});
+
+describe('specsParser.getScriptsHTML', function () {
+    it('it should parse all scripts in html', function (done) {
+        request({
+            path: '/test/partials/specs/many-assets/',
+            internal: true,
+            callback: function (response) {
+                var $ = cheerio.load(response, {decodeEntities: false});
+                var result = specsParser.getScriptsHTML($);
+
+                expect(result).to.be.an('array');
+                expect(result[0]).to.equal('<script src="script-in-head.js"></script>');
+                expect(result[1]).to.equal('<script src="script-in-body.js"></script>');
+
+                done();
+            }
+        });
+    });
+    it('it should parse scriptsonly from head', function (done) {
+        request({
+            path: '/test/partials/specs/many-assets/',
+            internal: true,
+            callback: function (response) {
+                var $ = cheerio.load(response, {decodeEntities: false});
+                var result = specsParser.getScriptsHTML($, 'head');
+
+                expect(result).to.be.an('array');
+                expect(result.length).to.equal(1);
+                expect(result[0]).to.equal('<script src="script-in-head.js"></script>');
+
+                done();
+            }
+        });
+    });
+    it('it should parse scripts only from head', function (done) {
+        request({
+            path: '/test/partials/specs/many-assets/',
+            internal: true,
+            callback: function (response) {
+                var $ = cheerio.load(response, {decodeEntities: false});
+                var result = specsParser.getScriptsHTML($, 'body');
+
+                expect(result).to.be.an('array');
+                expect(result.length).to.equal(1);
+                expect(result[0]).to.equal('<script src="script-in-body.js"></script>');
+
+                done();
+            }
+        });
+    });
+});
+
+describe('specsParser.getStyleContainersHTML', function () {
+    it('it should parse all style containers html', function (done) {
+        request({
+            path: '/test/partials/specs/many-assets/',
+            internal: true,
+            callback: function (response) {
+                var $ = cheerio.load(response, {decodeEntities: false});
+                var result = specsParser.getStyleContainersHTML($);
+
+                expect(result).to.be.an('array');
+                expect(result[0]).to.equal('<style>.head{color:red}</style>');
+                expect(result[1]).to.equal('<style>.body{color:red}</style>');
+
+                done();
+            }
+        });
+    });
+    it('it should parse styles only from head', function (done) {
+        request({
+            path: '/test/partials/specs/many-assets/',
+            internal: true,
+            callback: function (response) {
+                var $ = cheerio.load(response, {decodeEntities: false});
+                var result = specsParser.getStyleContainersHTML($, 'head');
+
+                expect(result).to.be.an('array');
+                expect(result.length).to.equal(1);
+                expect(result[0]).to.equal('<style>.head{color:red}</style>');
+
+                done();
+            }
+        });
+    });
+    it('it should parse styles only from head', function (done) {
+        request({
+            path: '/test/partials/specs/many-assets/',
+            internal: true,
+            callback: function (response) {
+                var $ = cheerio.load(response, {decodeEntities: false});
+                var result = specsParser.getStyleContainersHTML($, 'body');
+
+                expect(result).to.be.an('array');
+                expect(result.length).to.equal(1);
+                expect(result[0]).to.equal('<style>.body{color:red}</style>');
+
+                done();
+            }
+        });
+    });
+});
+
+describe('specsParser.getSpecResources', function () {
+    it('it should parse all resources', function (done) {
+        request({
+            path: '/test/partials/specs/many-assets/',
+            internal: true,
+            callback: function (response) {
+                var $ = cheerio.load(response, {decodeEntities: false});
+                var result = specsParser.getSpecResources($);
+
+                expect(result).to.be.an('object');
+                expect(result.cssLinks).to.be.an('array');
+                expect(result.scripts).to.be.an('array');
+                expect(result.cssStyles).to.be.an('array');
+
+                expect(result.cssLinks.length).to.equal(2);
+                expect(result.scripts.length).to.equal(2);
+                expect(result.cssStyles.length).to.equal(2);
+
+                done();
+            }
+        });
+    });
+    it('it should parse all resources from head', function (done) {
+        request({
+            path: '/test/partials/specs/many-assets/',
+            internal: true,
+            callback: function (response) {
+                var $ = cheerio.load(response, {decodeEntities: false});
+                var result = specsParser.getSpecResources($, 'head');
+
+                expect(result).to.be.an('object');
+                expect(result.cssLinks).to.be.an('array');
+                expect(result.scripts).to.be.an('array');
+                expect(result.cssStyles).to.be.an('array');
+
+                expect(result.cssLinks.length).to.equal(1);
+                expect(result.scripts.length).to.equal(1);
+                expect(result.cssStyles.length).to.equal(1);
+
+                done();
+            }
+        });
+    });
+    it('it should parse all resources from body', function (done) {
+        request({
+            path: '/test/partials/specs/many-assets/',
+            internal: true,
+            callback: function (response) {
+                var $ = cheerio.load(response, {decodeEntities: false});
+                var result = specsParser.getSpecResources($, 'head');
+
+                expect(result).to.be.an('object');
+                expect(result.cssLinks).to.be.an('array');
+                expect(result.scripts).to.be.an('array');
+                expect(result.cssStyles).to.be.an('array');
+
+                expect(result.cssLinks.length).to.equal(1);
+                expect(result.scripts.length).to.equal(1);
+                expect(result.cssStyles.length).to.equal(1);
+
+                done();
+            }
+        });
+    });
+});
+
 describe('specsParser.process', function () {
     it('it should return proper object structure', function (done) {
         var result = specsParser.process('');
 
         expect(result).to.be.an('object');
-        expect(result.headResources).to.be.an('object');
-        expect(result.bodyResources).to.be.an('object');
+            expect(result.headResources).to.be.an('object');
+                expect(result.headResources.cssLinks).to.be.an('array');
+                expect(result.headResources.cssStyles).to.be.an('array');
+                expect(result.headResources.scripts).to.be.an('array');
+
+            expect(result.bodyResources).to.be.an('object');
+                expect(result.bodyResources.cssLinks).to.be.an('array');
+                expect(result.bodyResources.cssStyles).to.be.an('array');
+                expect(result.bodyResources.scripts).to.be.an('array');
+
         expect(result.contents).to.be.an('array');
 
         done();
@@ -22,24 +250,20 @@ describe('specsParser.process', function () {
 
     it('it should return parsed spec object', function (done) {
         request({
-            path: '/test/unit/partials/specs/simple/',
+            path: '/test/partials/specs/simple/',
             internal: true,
             callback: function (response) {
                 var result = specsParser.process(response);
 
-                expect(result).to.deep.equal({
-                    headResources: {},
-                    bodyResources: {},
-                    contents: [{
-                        nested: [],
-                        html: [
-                            'HTML example'
-                        ],
-                        id: '1',
-                        visualID: '1',
-                        header: 'Section header'
-                    }]
-                });
+                expect(result.contents).to.deep.equal([{
+                    nested: [],
+                    html: [
+                        'HTML example'
+                    ],
+                    id: '1',
+                    visualID: '1',
+                    header: 'Section header'
+                }]);
 
                 done();
             }
@@ -48,25 +272,21 @@ describe('specsParser.process', function () {
 
     it('it should return parsed spec object with few examples', function (done) {
         request({
-            path: '/test/unit/partials/specs/few-examples/',
+            path: '/test/partials/specs/few-examples/',
             internal: true,
             callback: function (response) {
                 var result = specsParser.process(response);
 
-                expect(result).to.deep.equal({
-                    headResources: {},
-                    bodyResources: {},
-                    contents: [{
-                        nested: [],
-                        html: [
-                            'HTML example 1',
-                            'HTML example 2'
-                        ],
-                        id: '1',
-                        visualID: '1',
-                        header: 'Section header'
-                    }]
-                });
+                expect(result.contents).to.deep.equal([{
+                    nested: [],
+                    html: [
+                        'HTML example 1',
+                        'HTML example 2'
+                    ],
+                    id: '1',
+                    visualID: '1',
+                    header: 'Section header'
+                }]);
 
                 done();
             }
@@ -75,7 +295,7 @@ describe('specsParser.process', function () {
 
     it('it should properly parse nested IDs', function (done) {
         request({
-            path: '/test/unit/partials/specs/nested/',
+            path: '/test/partials/specs/nested/',
             internal: true,
             callback: function (response) {
                 var result = specsParser.process(response);
@@ -97,7 +317,7 @@ describe('specsParser.process', function () {
 
     it('it should properly parse multiple custom ID\'s', function (done) {
         request({
-            path: '/test/unit/partials/specs/complex/',
+            path: '/test/partials/specs/complex/',
             internal: true,
             callback: function (response) {
                 var result = specsParser.process(response);
@@ -115,7 +335,7 @@ describe('specsParser.process', function () {
 
     it('it should properly pass multiple HTML examples', function (done) {
         request({
-            path: '/test/unit/partials/specs/complex/',
+            path: '/test/partials/specs/complex/',
             internal: true,
             callback: function (response) {
                 var result = specsParser.process(response);
@@ -134,14 +354,24 @@ describe('specsParser.process', function () {
 
     it('it should return full nested spec object', function (done) {
         request({
-            path: '/test/unit/partials/specs/nested/',
+            path: '/test/partials/specs/nested/',
             internal: true,
             callback: function (response) {
                 var result = specsParser.process(response);
 
                 expect(result).to.deep.equal({
-                    headResources: {},
-                    bodyResources: {},
+                    "headResources": {
+                        "cssLinks": [
+                            "<link href=\"/docs/data/bootstrap.css\" rel=\"stylesheet\">"
+                        ],
+                        "cssStyles": [],
+                        "scripts": []
+                    },
+                    bodyResources: {
+                        "cssLinks": [],
+                        "cssStyles": [],
+                        "scripts": []
+                    },
                     contents: [{
                         html: [
                             'HTML example 1'
@@ -187,13 +417,25 @@ describe('specsParser.process', function () {
 describe('specsParser.getBySection', function () {
     it('it should properly get by single section', function (done) {
         request({
-            path: '/test/unit/partials/specs/nested/',
+            path: '/test/partials/specs/nested/',
             internal: true,
             callback: function (response) {
                 var result = specsParser.process(response);
                 var assertOption = function (sections) {
                     var endResult = specsParser.getBySection(result, sections);
 
+                    expect(result).to.be.an('object');
+
+                    expect(result.headResources).to.be.an('object');
+                    expect(result.headResources.cssLinks).to.be.an('array');
+                    expect(result.headResources.cssStyles).to.be.an('array');
+                    expect(result.headResources.scripts).to.be.an('array');
+
+                    expect(result.bodyResources).to.be.an('object');
+                    expect(result.bodyResources.cssLinks).to.be.an('array');
+                    expect(result.bodyResources.cssStyles).to.be.an('array');
+                    expect(result.bodyResources.scripts).to.be.an('array');
+
                     expect(endResult.contents.length).to.equal(1);
                     expect(endResult.contents[0].id).to.equal(sections[0]);
                 };
diff --git a/test/unit/middlewares/clarifySpec.js b/test/unit/middlewares/clarifySpec.js
index 92e02cb..e603919 100644
--- a/test/unit/middlewares/clarifySpec.js
+++ b/test/unit/middlewares/clarifySpec.js
@@ -92,7 +92,7 @@ describe('Clarify test /docs/spec?clarify=true', function () {
                 });
         });
 
-        xit('should have injected resources', function (done) {
+        it('should have injected resources', function (done) {
             request(url)
                 .get('&sections=1.1')
                 .expect(200)
diff --git a/test/unit/partials/specs/complex/info.json b/test/unit/partials/specs/complex/info.json
deleted file mode 100644
index 071dd19..0000000
--- a/test/unit/partials/specs/complex/info.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "title": "Nested Spec",
-    "template": "doc"
-}
diff --git a/test/unit/partials/specs/few-examples/info.json b/test/unit/partials/specs/few-examples/info.json
deleted file mode 100644
index 5bf65ff..0000000
--- a/test/unit/partials/specs/few-examples/info.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "title": "Few-examples Spec",
-    "template": "doc"
-}
diff --git a/test/unit/partials/specs/nested/info.json b/test/unit/partials/specs/nested/info.json
deleted file mode 100644
index 071dd19..0000000
--- a/test/unit/partials/specs/nested/info.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "title": "Nested Spec",
-    "template": "doc"
-}
diff --git a/test/unit/partials/specs/simple/info.json b/test/unit/partials/specs/simple/info.json
deleted file mode 100644
index 695a230..0000000
--- a/test/unit/partials/specs/simple/info.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "title": "Simple Spec",
-    "template": "doc"
-}

From 416025ba4263f3e79d7e690cef2bac15f98d5cd4 Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Sat, 3 Oct 2015 18:12:29 +0200
Subject: [PATCH 010/104] fix linting issue

---
 core/middlewares/wrap.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/middlewares/wrap.js b/core/middlewares/wrap.js
index 99d66e5..a2d6cf5 100644
--- a/core/middlewares/wrap.js
+++ b/core/middlewares/wrap.js
@@ -46,7 +46,7 @@ exports.process = function (req, res, next) {
                 var pathToCheck = path.join(global.app.get('user'), includedDir) + '/';
 
                 if (context.indexOf(pathToCheck) === 0) {
-                    context = context.replace(pathToCheck, path.join(global.pathToApp, includedDir) + '/')
+                    context = context.replace(pathToCheck, path.join(global.pathToApp, includedDir) + '/');
                 }
             });
         }

From 899caf77d3215cf96544072b9878e0e9a1f67304 Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Sat, 3 Oct 2015 18:51:46 +0200
Subject: [PATCH 011/104] fix: return missing list of ID's

---
 core/middlewares/clarify.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/middlewares/clarify.js b/core/middlewares/clarify.js
index 308fa81..4838d0c 100644
--- a/core/middlewares/clarify.js
+++ b/core/middlewares/clarify.js
@@ -35,7 +35,7 @@ var getTpl = function(tpl) {
     var pathToTemplate = path.join(pathToApp, 'core/views/clarify', templateName + '.ejs');
     var userPathToTemplate = path.join(global.app.get('user'), 'core/views/clarify', templateName + '.ejs');
 
-    // First we check user tempalte, then core
+    // First we check user tempalate, then core
     fs.readFile(userPathToTemplate, 'utf-8', function(err, data){
         if (err) {
 
@@ -124,7 +124,7 @@ var parseSpec = function(sections, pathToSpec) {
             var allContents = specsParser.process(specHTML);
 
             if (sections) {
-                output = specsParser.getBySection(allContents, sections);
+                output = specsParser.getBySection(_.merge({}, allContents), sections);
             } else {
                 output = allContents;
             }

From cee60d1fcc7b0b8cb9c8c8ddb16ba5f1353510f8 Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Sat, 3 Oct 2015 19:03:31 +0200
Subject: [PATCH 012/104] #99: removing last bits of jsdom

---
 docs/base/readme.md                  |  24 ----
 docs/clarify/readme.md               |   2 +-
 package.json                         |   3 +-
 test/unit/middlewares/clarifySpec.js | 171 ++++++++-------------------
 4 files changed, 54 insertions(+), 146 deletions(-)

diff --git a/docs/base/readme.md b/docs/base/readme.md
index b02b387..1885108 100644
--- a/docs/base/readme.md
+++ b/docs/base/readme.md
@@ -31,30 +31,6 @@ npm install sourcejs --save
 npm start
 ```
 
-Starting from 0.6.0 we're planning to change official install path to one with NPM packages. Yeoman generator will be also replaced by [sourcejs-cli](https://github.com/sourcejs/sourcejs-cli) with commands like `run`, `install` (plugin), `init`, `create`.
-
-### Installing On Windows
-
-If you're running Windows and have some issues with [JSDom](https://github.com/tmpvar/jsdom) dependencies compilation, please check this [topic](https://github.com/sourcejs/Source/issues/23).
-
-Alternatively with 0.5.6 we prepared a special build without JSDom, until it's full removal from core at 0.6.0.
-
-```html
-npm install -g yo generator-sourcejs
-mkdir sourcejs && cd sourcejs
-yo sourcejs --branch 0.5.6-no-jsdom
-```
-
-Please note that Clarify feature is not available in `no-jsdom` version. If you had generator installed before, run `npm update -g generator-sourcejs` (v.0.4.2+ required).
-
-And installing same build from NPM:
-
-```html
-git clone https://github.com/sourcejs/init.git -b npm my-sourcejs && cd my-sourcejs
-npm install sourcejs@0.5.6-no-jsdom --save
-npm start
-```
-
 ## Commands
 
 ### Run
diff --git a/docs/clarify/readme.md b/docs/clarify/readme.md
index 544c68e..0346c87 100644
--- a/docs/clarify/readme.md
+++ b/docs/clarify/readme.md
@@ -8,7 +8,7 @@ Clarify is an [expressJS](http://expressjs.com/) middleware built into SourceJS
 http://localhost:8080/docs/spec/?clarify=true&sections=1.1
 ```
 
-When enabled, Clarify uses [JSdom](https://github.com/tmpvar/jsdom) for getting specified sections and wrap them in pre-defined or user templates. If you're using SourceJS HTML API, Clarify can be configured to take data directly from API storage as well.
+When enabled, Clarify uses [Cheerio](https://github.com/cheeriojs/cheerio) for getting specified sections and wrap them in pre-defined or user templates. If you're using SourceJS HTML API, Clarify can be configured to take data directly from API storage as well.
 
 Clarify page is enhanced with helper panel, where you can chose any option available:
 
diff --git a/package.json b/package.json
index f25779d..7dbff8a 100644
--- a/package.json
+++ b/package.json
@@ -58,8 +58,7 @@
     "shortid": "^2.2.2",
     "time-grunt": "~0.2.10",
     "tinyforever": "0.0.3",
-    "universal-analytics": "^0.3.9",
-    "jsdom": "^1.2.1"
+    "universal-analytics": "^0.3.9"
   },
   "scripts": {
     "postinstall": "node ./core/postInstall && grunt update && node ./core/trackInstall",
diff --git a/test/unit/middlewares/clarifySpec.js b/test/unit/middlewares/clarifySpec.js
index e603919..e1fc221 100644
--- a/test/unit/middlewares/clarifySpec.js
+++ b/test/unit/middlewares/clarifySpec.js
@@ -2,21 +2,19 @@ var fs = require('fs');
 var path = require('path');
 
 var pathToMasterApp = path.resolve('./');
-var jq = fs.readFileSync(path.join(pathToMasterApp,'assets/js/lib/jquery-2.1.4.min.js'), "utf-8");
 
 var should = require('should');
 var assert = require('assert');
 var request = require('supertest');
 
-// TODO: rewrite tests with cheerio
-var jsdom = require('jsdom');
+var cheerio = require('cheerio');
 
 var loadOptions = require(path.join(pathToMasterApp, 'core/loadOptions'));
 global.opts = loadOptions(path.resolve(pathToMasterApp));
 
 
-describe('Clarify test /docs/spec?clarify=true', function () {
-    describe('GET from JSDOM /docs/spec?clarify=true...', function () {
+describe.only('Clarify test /docs/spec?clarify=true', function () {
+    describe('GET /docs/spec?clarify=true...', function () {
         var url = 'http://localhost:8080/docs/spec/?clarify=true';
         it('should return nothing (&sections=77)', function (done) {
             request(url)
@@ -27,18 +25,11 @@ describe('Clarify test /docs/spec?clarify=true', function () {
                         throw err;
                     }
 
-                    jsdom.env({
-                        html: res.text,
-                        src: [jq],
-                        done: function (errors, window) {
-                            var $ = window.$;
-                            var examples = $('.source_example');
+                    var $ = cheerio.load(res.text, {decodeEntities: false});
+                    var examples = $('.source_example');
 
-                            examples.length.should.equal(0);
-
-                            done();
-                        }
-                    });
+                    examples.length.should.equal(0);
+                    done();
                 });
         });
 
@@ -51,20 +42,14 @@ describe('Clarify test /docs/spec?clarify=true', function () {
                         throw err;
                     }
 
-                    jsdom.env({
-                        html: res.text,
-                        src: [jq],
-                        done: function (errors, window) {
-                            var $ = window.$;
-                            var sectionHeaders = $('.source_section_h');
-                            var examples = $('.source_example');
+                    var $ = cheerio.load(res.text, {decodeEntities: false});
+                    var sectionHeaders = $('.source_section_h');
+                    var examples = $('.source_example');
 
-                            sectionHeaders.length.should.be.greaterThan(1);
-                            examples.length.should.be.greaterThan(0);
+                    sectionHeaders.length.should.be.greaterThan(1);
+                    examples.length.should.be.greaterThan(0);
 
-                            done();
-                        }
-                    });
+                    done();
                 });
         });
 
@@ -77,18 +62,10 @@ describe('Clarify test /docs/spec?clarify=true', function () {
                         throw err;
                     }
 
-                    jsdom.env({
-                        html: res.text,
-                        src: [jq],
-                        done: function (errors, window) {
-                            var $ = window.$;
-                            var examples = $('.source_example');
-
-                            examples.length.should.equal(1);
-
-                            done();
-                        }
-                    });
+                    var $ = cheerio.load(res.text, {decodeEntities: false});
+                    var examples = $('.source_example');
+                    examples.length.should.equal(1);
+                    done();
                 });
         });
 
@@ -101,19 +78,12 @@ describe('Clarify test /docs/spec?clarify=true', function () {
                         throw err;
                     }
 
-                    jsdom.env({
-                        html: res.text,
-                        src: [jq],
-                        done: function (errors, window) {
-                            var $ = window.$;
-
-                            $('[href*="bootstrap.css"]').length.should.equal(1);
-                            $('body > style').length.should.be.greaterThan(0);
-                            $('body > script').length.should.be.greaterThan(0);
+                    var $ = cheerio.load(res.text, {decodeEntities: false});
+                    $('[href*="bootstrap.css"]').length.should.equal(1);
+                    $('body > style').length.should.be.greaterThan(0);
+                    $('body > script').length.should.be.greaterThan(0);
 
-                            done();
-                        }
-                    });
+                    done();
                 });
         });
 
@@ -126,19 +96,13 @@ describe('Clarify test /docs/spec?clarify=true', function () {
                         throw err;
                     }
 
-                    jsdom.env({
-                        html: res.text,
-                        src: [jq],
-                        done: function (errors, window) {
-                            var $ = window.$;
-                            var examples = $('.source_example');
+                    var $ = cheerio.load(res.text, {decodeEntities: false});
 
-                            $('.__clear').length.should.equal(1);
-                            examples.length.should.equal(0);
+                    var examples = $('.source_example');
 
-                            done();
-                        }
-                    });
+                    $('.__clear').length.should.equal(1);
+                    examples.length.should.equal(0);
+                    done();
                 });
         });
     });
@@ -156,18 +120,10 @@ describe('Clarify test /docs/spec?clarify=true', function () {
                         throw err;
                     }
 
-                    jsdom.env({
-                        html: res.text,
-                        src: [jq],
-                        done: function (errors, window) {
-                            var $ = window.$;
-                            var examples = $('.source_example');
-
-                            examples.length.should.equal(0);
-
-                            done();
-                        }
-                    });
+                    var $ = cheerio.load(res.text, {decodeEntities: false});
+                    var examples = $('.source_example');
+                    examples.length.should.equal(0);
+                    done();
                 });
         });
 
@@ -181,20 +137,14 @@ describe('Clarify test /docs/spec?clarify=true', function () {
                             throw err;
                         }
 
-                        jsdom.env({
-                            html: res.text,
-                            src: [jq],
-                            done: function (errors, window) {
-                                var $ = window.$;
-                                var sectionHeaders = $('.source_section_h');
-                                var examples = $('.source_example');
+                        var $ = cheerio.load(res.text, {decodeEntities: false});
+                        var sectionHeaders = $('.source_section_h');
+                        var examples = $('.source_example');
 
-                                sectionHeaders.length.should.be.greaterThan(1);
-                                examples.length.should.be.greaterThan(0);
+                        sectionHeaders.length.should.be.greaterThan(1);
+                        examples.length.should.be.greaterThan(0);
 
-                                done();
-                            }
-                        });
+                        done();
                     });
             });
 
@@ -207,18 +157,12 @@ describe('Clarify test /docs/spec?clarify=true', function () {
                             throw err;
                         }
 
-                        jsdom.env({
-                            html: res.text,
-                            src: [jq],
-                            done: function (errors, window) {
-                                var $ = window.$;
-                                var examples = $('.source_example');
+                        var $ = cheerio.load(res.text, {decodeEntities: false});
+                        var examples = $('.source_example');
 
-                                examples.length.should.equal(1);
+                        examples.length.should.equal(1);
 
-                                done();
-                            }
-                        });
+                        done();
                     });
             });
 
@@ -231,19 +175,13 @@ describe('Clarify test /docs/spec?clarify=true', function () {
                             throw err;
                         }
 
-                        jsdom.env({
-                            html: res.text,
-                            src: [jq],
-                            done: function (errors, window) {
-                                var $ = window.$;
+                        var $ = cheerio.load(res.text, {decodeEntities: false});
 
-                                $('[href*="bootstrap.css"]').length.should.equal(1);
-                                $('body > style').length.should.be.greaterThan(0);
-                                $('body > script').length.should.be.greaterThan(0);
+                        $('[href*="bootstrap.css"]').length.should.equal(1);
+                        $('body > style').length.should.be.greaterThan(0);
+                        $('body > script').length.should.be.greaterThan(0);
 
-                                done();
-                            }
-                        });
+                        done();
                     });
             });
 
@@ -256,19 +194,14 @@ describe('Clarify test /docs/spec?clarify=true', function () {
                             throw err;
                         }
 
-                        jsdom.env({
-                            html: res.text,
-                            src: [jq],
-                            done: function (errors, window) {
-                                var $ = window.$;
-                                var examples = $('.source_example');
+                        var $ = cheerio.load(res.text, {decodeEntities: false});
+
+                        var examples = $('.source_example');
 
-                                $('.__clear').length.should.equal(1);
-                                examples.length.should.equal(0);
+                        $('.__clear').length.should.equal(1);
+                        examples.length.should.equal(0);
 
-                                done();
-                            }
-                        });
+                        done();
                     });
             });
         }

From 0aad6900b9479405f70d3d6c2246ad275fb1cd11 Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Sat, 3 Oct 2015 19:41:35 +0200
Subject: [PATCH 013/104] improve clarify tests

---
 Gruntfile.js                         |  2 +-
 test/functional/clarify.js           | 44 ++++++++++++++++++++++++++++
 test/unit/middlewares/clarifySpec.js | 32 +++++++++++++++++---
 3 files changed, 73 insertions(+), 5 deletions(-)
 create mode 100644 test/functional/clarify.js

diff --git a/Gruntfile.js b/Gruntfile.js
index 5fca981..8fb2f0d 100755
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -340,7 +340,7 @@ module.exports = function(grunt) {
 
     // Test task. Execute with running app
     grunt.registerTask('test-func', 'Run ALL functional tests or specified by second param', function () {
-        // if custom mask set - `grunt test --spec=test/unit/**/*.js`
+        // if custom mask set - `grunt test --spec=test/functional/**/*.js`
         var spec = grunt.option('spec');
         if (spec) {
             grunt.config.set('casperjs.files', [spec]);
diff --git a/test/functional/clarify.js b/test/functional/clarify.js
new file mode 100644
index 0000000..738e1dd
--- /dev/null
+++ b/test/functional/clarify.js
@@ -0,0 +1,44 @@
+var appPort = casper.cli.get('app-port') || 8080;
+var url = 'http://127.0.0.1:' + appPort + '/docs/spec/';
+
+casper.options.viewportSize = {width: 1024, height: 768};
+
+casper.test.begin('Open clarify', 4, function suite(test) {
+	casper.start(url).then(function() {
+        var openClarifyLink = '.source_clarify-in-spec_link';
+
+        this.waitForSelector(openClarifyLink,
+            function pass() {
+                this.click(openClarifyLink);
+            },
+            function fail() {
+                test.fail('Failed openning clarify link.');
+            }
+        );
+
+    }).then(function(){
+         this.waitFor(
+            function check() {
+                return (this.getCurrentUrl() === url + '?clarify=true&sections=1');
+            },
+            function then() { // step to execute when check() is ok
+                this.waitForSelector('.source_clarify_panel',
+                    function pass() {
+                        test.assertEquals(this.getCurrentUrl(), url + '?clarify=true&sections=1', 'Clarify url is corrent');
+                        test.assertExists('.source_clarify_panel', 'Clarify panel exists');
+                        test.assertExists('.source_example', 'Example exists');
+                        test.assertEval(function () {
+                            return document.querySelectorAll('.source_clarify_panel_sections option').length > 2;
+                        }, 'Should show more than 2 sections in list');
+                    },
+                    function fail() {
+                        test.fail('Failed searching for clarify link');
+                    }
+                );
+            },
+            function timeout() { // step to execute if check has failed
+                this.echo('Failed to open clarify');
+            }
+        );
+    }).run(function() { test.done() }).clear();
+});
\ No newline at end of file
diff --git a/test/unit/middlewares/clarifySpec.js b/test/unit/middlewares/clarifySpec.js
index e1fc221..65dc217 100644
--- a/test/unit/middlewares/clarifySpec.js
+++ b/test/unit/middlewares/clarifySpec.js
@@ -1,10 +1,8 @@
-var fs = require('fs');
 var path = require('path');
 
 var pathToMasterApp = path.resolve('./');
 
 var should = require('should');
-var assert = require('assert');
 var request = require('supertest');
 
 var cheerio = require('cheerio');
@@ -13,9 +11,9 @@ var loadOptions = require(path.join(pathToMasterApp, 'core/loadOptions'));
 global.opts = loadOptions(path.resolve(pathToMasterApp));
 
 
-describe.only('Clarify test /docs/spec?clarify=true', function () {
+describe('Clarify test /docs/spec?clarify=true', function () {
     describe('GET /docs/spec?clarify=true...', function () {
-        var url = 'http://localhost:8080/docs/spec/?clarify=true';
+        var url = 'http://127.0.0.1:8080/docs/spec/?clarify=true';
         it('should return nothing (&sections=77)', function (done) {
             request(url)
                 .get('&sections=77')
@@ -63,8 +61,13 @@ describe.only('Clarify test /docs/spec?clarify=true', function () {
                     }
 
                     var $ = cheerio.load(res.text, {decodeEntities: false});
+
                     var examples = $('.source_example');
+                    var headers = $('.source_section_h');
+
                     examples.length.should.equal(1);
+                    headers.length.should.equal(1);
+
                     done();
                 });
         });
@@ -102,6 +105,27 @@ describe.only('Clarify test /docs/spec?clarify=true', function () {
 
                     $('.__clear').length.should.equal(1);
                     examples.length.should.equal(0);
+
+                    done();
+                });
+        });
+
+        it('should disable javascript', function (done) {
+            request(url)
+                .get('&nojs=true')
+                .expect(200)
+                .end(function (err, res) {
+                    if (err) {
+                        throw err;
+                    }
+
+                    var $ = cheerio.load(res.text, {decodeEntities: false});
+
+                    var scripts = $('body script');
+
+                    // Only clarify script should remain
+                    scripts.length.should.be.equal(1);
+
                     done();
                 });
         });

From 83994e1fbc313e6919be4da923e9240ac4820c77 Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Sat, 3 Oct 2015 20:04:22 +0200
Subject: [PATCH 014/104] fix windows paths"

---
 core/middlewares/wrap.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/middlewares/wrap.js b/core/middlewares/wrap.js
index a2d6cf5..49ce273 100644
--- a/core/middlewares/wrap.js
+++ b/core/middlewares/wrap.js
@@ -43,7 +43,7 @@ exports.process = function (req, res, next) {
         // Check if we're working with included dirs
         if (context) {
             global.opts.core.common.includedDirs.forEach(function (includedDir) {
-                var pathToCheck = path.join(global.app.get('user'), includedDir) + '/';
+                var pathToCheck = (path.join(global.app.get('user'), includedDir) + '/').replace(/\\/g, '/');
 
                 if (context.indexOf(pathToCheck) === 0) {
                     context = context.replace(pathToCheck, path.join(global.pathToApp, includedDir) + '/');

From 907386afcee61f59ab71128a064d2705e63fa1a0 Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Sun, 4 Oct 2015 12:33:39 +0200
Subject: [PATCH 015/104] #186: remove html parser from core

---
 app.js                                      |  10 -
 assets/js/clarify.js                        |   2 -
 assets/templates/clarifyPanel.inc.html      |   7 -
 core/html-tree/html-parser/index.js         | 197 --------------------
 core/html-tree/html-parser/phantomRunner.js |  96 ----------
 core/middlewares/clarify.js                 |  38 +---
 options.js                                  |   4 -
 package.json                                |   2 -
 test/unit/middlewares/clarifySpec.js        |  79 --------
 9 files changed, 2 insertions(+), 433 deletions(-)
 delete mode 100644 core/html-tree/html-parser/index.js
 delete mode 100644 core/html-tree/html-parser/phantomRunner.js

diff --git a/app.js b/app.js
index f8a626f..695c0ac 100644
--- a/app.js
+++ b/app.js
@@ -30,7 +30,6 @@ commander
     .option('-l, --log [string]', 'Log level (default: ' + global.opts.core.common.defaultLogLevel + ').',  global.opts.core.common.defaultLogLevel)
     .option('-p, --port [number]', 'Server port (default: ' + global.opts.core.server.port + ').')
     .option('--hostname [string]', 'Server hostname  (default: ' + global.opts.core.server.hostname + ').')
-    .option('--html', 'Turn on HTML parser on app start (requires installed and enabled parser).')
     .option('--test', 'Run app with tests.')
     .option('--no-watch', 'Run with disabled watcher.')
     .option('--post-grunt [string]', 'Define Grunt command to run after app start', 'ci-post-run')
@@ -53,15 +52,6 @@ var logger = require('./core/logger');
 var log = logger.log;
 global.log = log;
 
-if (commander.html) {
-    trackStats.event({
-        group: 'features',
-        event: 'enabled html parser'
-    });
-
-    global.opts.plugins.htmlParser.enabled = true;
-    global.opts.plugins.htmlParser.onStart = true;
-}
 if (commander.port) global.opts.core.server.port = parseInt(commander.port);
 if (commander.hostname) global.opts.core.server.hostname = commander.hostname;
 if (!commander.watch) {
diff --git a/assets/js/clarify.js b/assets/js/clarify.js
index 69f2ed0..ca8a45b 100644
--- a/assets/js/clarify.js
+++ b/assets/js/clarify.js
@@ -15,10 +15,8 @@ require([
     // If we have data from Clarify output
     if (window.sourceClarifyData){
         var _options = JSON.parse(options);
-        var htmlParser = _options.plugins && _options.plugins.htmlParser && _options.plugins.htmlParser.enabled;
 
         var $panelTemplate = $(_.template(clarifyPanelTpl, {
-            htmlParser: htmlParser,
             showApiTargetOption: window.sourceClarifyData.showApiTargetOption,
             specUrl: window.sourceClarifyData.specUrl,
             tplList: window.sourceClarifyData.tplList,
diff --git a/assets/templates/clarifyPanel.inc.html b/assets/templates/clarifyPanel.inc.html
index 64000e2..6934adf 100644
--- a/assets/templates/clarifyPanel.inc.html
+++ b/assets/templates/clarifyPanel.inc.html
@@ -28,13 +28,6 @@ <h2 class="source_clarify_panel_h2">Options</h2>
                         </label>
                     </li>
                 <% } %>
-                <% if (htmlParser) { %>
-                    <li class="source_clarify_panel_option-item">
-                        <label>
-                            <input type="checkbox" class="source_clarify_panel_option-checkbox js-source_clarify_panel_option-checkbox" name="apiUpdate"> Update Spec HTML API on each Clarify call
-                        </label>
-                    </li>
-                <% } %>
                 <li class="source_clarify_panel_option-item">
                     <label>
                         <input type="checkbox" class="source_clarify_panel_option-checkbox js-source_clarify_panel_option-checkbox" name="nojs"> Remove JS scripts
diff --git a/core/html-tree/html-parser/index.js b/core/html-tree/html-parser/index.js
deleted file mode 100644
index 9797087..0000000
--- a/core/html-tree/html-parser/index.js
+++ /dev/null
@@ -1,197 +0,0 @@
-'use strict';
-
-var path = require('path');
-var async = require('async');
-var ParseData = require(path.join(global.pathToApp,'core/lib/parseData'));
-var phantom = require('phantomjs');
-var unflatten = require(path.join(global.pathToApp,'core/unflat'));
-var childProcess = require('child_process');
-var htmlTree = require(path.join(global.pathToApp,'core/html-tree'));
-var utils = require(path.join(global.pathToApp,'core/lib/utils'));
-
-var processFlagNotExec = true;
-
-var config = {
-    enabled: true,
-
-    // Run HTML parser on app start
-    onStart: false,
-    cron: false,
-    cronProd: true,
-    cronRepeatTime: 600000,
-
-    // PhantomJS retry limit
-    errorLimit: 2,
-    asyncPhantomCallLimit: 5,
-
-    specsFilter: {
-        filterOut: {
-            cats: ['docs'],
-            tags: ['parse-problems']
-        }
-    },
-
-    // Path to HTML data otput
-    pathToSpecs: path.join(global.pathToApp, global.opts.core.api.specsData)
-};
-
-// Overwriting base options
-if (global.opts.core.parseHTML) utils.extendOptions(config, global.opts.core.parseHTML); // Legacy support
-if (global.opts.plugins && global.opts.plugins.htmlParser) utils.extendOptions(config, global.opts.plugins.htmlParser);
-
-/**
- * Get list of specs for parsing with PhantomJS
- *
- * @returns {Array} Returns array with spec URLs
- */
-var getSpecsList = function() {
-    var parseSpecs = new ParseData({
-        scope: 'specs',
-        path: require.resolve(config.pathToSpecs)
-    });
-
-    var specs = parseSpecs.getFilteredData(config.specsFilter, true);
-
-    // Preparing data for specs iteration
-    specs = specs.map(function(item){
-        return item.url.substring(1);
-    });
-
-    return specs;
-};
-
-/**
- * PhantomJS async runner, calls writeDataFile on finish
- *
- * @param {Array} specs - array with URL list, that will be passed to PhantomJS
- *
- * @param {Function} [callback] - callback function
- * @param {Object} callback.err - Error object
- * @param {Object} callback.outputData - Passes output data to callback
- */
-var processSpecs = module.exports.processSpecs = function(specs, callback){
-    callback = typeof callback === 'function' ? callback : function(){};
-
-    if (!config.enabled) {
-        callback('HTML parser disabled.');
-
-        return;
-    }
-
-    if (processFlagNotExec) {
-        global.log.info('HTML API update started');
-
-        var _specs = specs || getSpecsList();
-        var specsLeft = _specs.slice(0);
-        var PhantomPath = phantom.path;
-        var outputHTML = {};
-        var errorCounter = {};
-        var specLength = _specs.length;
-        var doneCounter = 0;
-        var phExecCommand = PhantomPath + " " + path.join(global.pathToApp, 'core/html-tree/html-parser/phantomRunner.js');
-
-        processFlagNotExec = false;
-
-        global.log.trace('Processing ' + specLength + ' specs.');
-
-        async.mapLimit(_specs, config.asyncPhantomCallLimit, function (spec, next) {
-            var n = _specs.indexOf(spec) + 1;
-
-            global.log.trace('Starts...' + n, spec);
-
-            childProcess.exec(phExecCommand + " " + spec + " " + global.opts.core.server.port, function (error, stdout, stderr) {
-                handler(error, stdout, stderr, spec);
-                next();
-            });
-        });
-
-        var handler = function(error, stdout, stderr, spec) {
-            if (error) {
-                if (typeof errorCounter[spec] !== 'number') {
-                     errorCounter[spec] = 0;
-                }
-
-                errorCounter[spec]++;
-
-                // If limit is not reached, try again
-                if (errorCounter[spec] <= config.errorLimit) {
-                    global.log.debug('Rerun', spec);
-
-                    childProcess.exec(phExecCommand + " " + spec, function (error, stdout, stderr) {
-                        handler(error, stdout, stderr, spec, writeCallback);
-                    });
-                    return;
-                }
-
-                global.log.error('Exec error on spec ' + spec + ': '+ error);
-                global.log.debug('Error info: ', JSON.stringify({
-                    spec: spec,
-                    error: error,
-                    stdount: stdout,
-                    stderr: stderr
-                }));
-            } else {
-                var parsedStdout = [];
-
-                try {
-                    parsedStdout = JSON.parse(stdout);
-                } catch(e) {
-                    global.log.debug('HTML Parser stdout parse error: ', e, stdout);
-                    global.log.debug('Error from Phantom parser: ', stdout);
-                    parsedStdout = {
-                        message: "Stdout parse error"
-                    };
-                }
-
-                global.log.debug('Spec done: ', JSON.stringify({
-                    spec: spec,
-                    error: error,
-                    stderr: stderr
-                }));
-
-                // Writing contents to common obj
-                outputHTML[spec+'/specFile/contents'] = parsedStdout.contents;
-                outputHTML[spec+'/specFile/headResources'] = parsedStdout.headResources;
-                outputHTML[spec+'/specFile/bodyResources'] = parsedStdout.bodyResources;
-            }
-
-            global.log.debug((doneCounter/specLength*100).toFixed(2),'%...Done', spec);
-
-            // Logging specs queen
-            specsLeft.splice(specsLeft.indexOf(spec), 1);
-            if (specsLeft.length < 5 && specsLeft.length !== 0) {
-                global.log.trace('Specs queen', specsLeft);
-            }
-
-            doneCounter++;
-
-            // We handled all requested specs
-            if (doneCounter === specLength) {
-                var outputData = unflatten(outputHTML, { delimiter: '/', overwrite: 'root' });
-
-                // Callback is passed to writeDataFile
-                var writeCallback = function() {
-                    global.log.info('HTML API successfully updated');
-                    processFlagNotExec = true;
-
-                    callback(null, outputData);
-                };
-
-                htmlTree.writeDataFile(outputData, true, false, writeCallback);
-            }
-        };
-    }
-};
-
-if (config.enabled) {
-    // Running processSpecs by cron
-    if (config.cron || (global.MODE === 'production' && config.cronProd)) {
-        setInterval(function () {
-            processSpecs();
-        }, config.cronRepeatTime);
-    }
-
-    if (config.onStart) {
-        setTimeout(processSpecs, 100);
-    }
-}
\ No newline at end of file
diff --git a/core/html-tree/html-parser/phantomRunner.js b/core/html-tree/html-parser/phantomRunner.js
deleted file mode 100644
index 60fb8c9..0000000
--- a/core/html-tree/html-parser/phantomRunner.js
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- *
- * This script is executed in separate process from main app and runs in PhantomJS context
- *
- * */
-
-'use strict';
-
-/* global phantom: true */
-var page = require('webpage').create();
-var system = require('system');
-
-// arguments from node query
-var url = system.args[1];
-var port = system.args[2];
-
-page.onResourceReceived = function(response) {
-    if (response.id === 1 && response.status === 404 || response.status === 500) {
-        console.log(JSON.stringify({
-                "error": "Network error status "+ response.status,
-                "url": url
-            })
-        );
-        phantom.exit();
-    }
-};
-
-page.onConsoleMessage = function(msg) {
-    //console.log('-- webkit console: ' + msg);
-};
-
-page.open('http://127.0.0.1:' + port + '/' + url, function (status) {
-    if (status !== 'success') {
-        console.log(JSON.stringify({
-                "error": "Error loading page.",
-                "url": url
-            })
-        );
-
-        phantom.exit();
-    }
-
-    setTimeout(function () {
-        console.log(JSON.stringify([{
-                "error": "Too long execution time.",
-                "url": url
-            }])
-        );
-        phantom.exit();
-    }, 5000);
-});
-
-page.onCallback = function (data) {
-    if (data.message) {
-        var code = page.evaluate(function (url) {
-            var output = {};
-
-            $.ajax({
-                url: '/source/assets/js/modules/sectionsParser.js',
-                dataType: "script",
-                async: false,
-                success: function(){
-                    var parser = new SourceGetSections();
-
-                    output = parser.getSpecFull();
-                }
-            });
-
-            return output;
-        }, url);
-
-        // TODO: make reponse in {{ ... }} to parse only relevant part
-        // Returns stdout, that is then parsed from main app
-        console.log(JSON.stringify(code));
-        phantom.exit();
-
-    } else {
-        console.log("No callback received", JSON.stringify({
-                "url": url
-            })
-        );
-        phantom.exit();
-    }
-};
-
-page.onError = function(msg, trace) {
-    var log = {
-        "error": "Error onpage",
-        "message": msg,
-        "file": trace[0],
-        "line": trace[0].line,
-        "function": trace[0].function
-    };
-
-    console.log('Phantom-runner error: ', JSON.stringify(log, null, 4));
-};
\ No newline at end of file
diff --git a/core/middlewares/clarify.js b/core/middlewares/clarify.js
index 4838d0c..7690978 100644
--- a/core/middlewares/clarify.js
+++ b/core/middlewares/clarify.js
@@ -13,8 +13,6 @@ var pathToApp = path.dirname(require.main.filename);
 var specUtils = require(path.join(pathToApp, 'core/lib/specUtils'));
 var parseData = require(path.join(pathToApp, 'core/lib/parseData'));
 var specsParser = require(path.join(pathToApp, 'core/lib/specPageParser'));
-var htmlParser = require(path.join(pathToApp, 'core/html-tree/html-parser'));
-
 
 var htmlDataPath = path.join(pathToApp, global.opts.core.api.htmlData);
 var parseHTMLData = new parseData({
@@ -22,8 +20,6 @@ var parseHTMLData = new parseData({
     path: htmlDataPath
 });
 
-var htmlParserEnabled = global.opts.plugins && global.opts.plugins.htmlParser && global.opts.plugins.htmlParser.enabled;
-
 //TODO JSdoc
 
 var getTpl = function(tpl) {
@@ -155,21 +151,6 @@ var parseSpec = function(sections, pathToSpec) {
     return deferred.promise;
 };
 
-var updateApiData = function(specID) {
-    var deferred = Q.defer();
-    var specs = [specID];
-
-    htmlParser.processSpecs(specs, function(err){
-        if (err) {
-            deferred.reject(err);
-        } else {
-            deferred.resolve();
-        }
-    });
-
-    return deferred.promise;
-};
-
 var getDataFromApi = function(sections, specID, apiUpdate) {
     var deferred = Q.defer();
     var output = {};
@@ -198,20 +179,7 @@ var getDataFromApi = function(sections, specID, apiUpdate) {
         }
     };
 
-    if (apiUpdate) {
-        updateApiData(specID).then(function(){
-            getSpecData();
-        }).fail(function(err) {
-            var msg = 'Failed updating HTML Spec API. ';
-
-            deferred.reject({
-                err: err,
-                msg: msg
-            });
-        });
-    } else {
-        getSpecData();
-    }
+    getSpecData();
 
     return deferred.promise;
 };
@@ -274,8 +242,6 @@ module.exports.process = function(req, res, next) {
             return;
         }
 
-        if (!specHasHTMLAPIData) apiUpdate = true;
-
         var getSpecData = function(){
             return fromApi ? getDataFromApi(sections, specID, apiUpdate) : parseSpec(sections, parsedPath.pathToSpec);
         };
@@ -297,7 +263,7 @@ module.exports.process = function(req, res, next) {
                 };
 
                 var clarifyData = '<script>var sourceClarifyData = '+ JSON.stringify({
-                    showApiTargetOption: specHasHTMLAPIData || htmlParserEnabled,
+                    showApiTargetOption: specHasHTMLAPIData,
                     specUrl: specInfo.url,
                     sectionsIDList: getSectionsIDList(_specData.allContents),
                     tplList: tplList
diff --git a/options.js b/options.js
index e652798..b91a346 100644
--- a/options.js
+++ b/options.js
@@ -171,10 +171,6 @@ module.exports = {
 
     // External plugins options (are also exposed to client-side
     plugins: {
-        // PhantomJS HTML API parser will be moved to plugin at v.0.6
-        htmlParser: {
-            enabled: false
-        }
     },
 
     /*
diff --git a/package.json b/package.json
index 7dbff8a..1b2b45a 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,6 @@
     "url": "https://github.com/sourcejs/Source.git"
   },
   "dependencies": {
-    "async": "~0.9.0",
     "body-parser": "~1.6.4",
     "cheerio": "^0.19.0",
     "colors": "0.6.x",
@@ -51,7 +50,6 @@
     "macaddress": "^0.2.8",
     "marked": "^0.3.2",
     "path": "^0.4.9",
-    "phantomjs": "1.9.7-15",
     "pretty-hrtime": "^1.0.0",
     "q": "^1.1.1",
     "serve-favicon": "^2.2.0",
diff --git a/test/unit/middlewares/clarifySpec.js b/test/unit/middlewares/clarifySpec.js
index 65dc217..b1d2019 100644
--- a/test/unit/middlewares/clarifySpec.js
+++ b/test/unit/middlewares/clarifySpec.js
@@ -150,84 +150,5 @@ describe('Clarify test /docs/spec?clarify=true', function () {
                     done();
                 });
         });
-
-        if (global.opts.plugins && global.opts.plugins.htmlParser && global.opts.plugins.htmlParser.enabled) {
-            it('should return all sections', function (done) {
-                request(urlFromApi)
-                    .get()
-                    .expect(200)
-                    .end(function (err, res) {
-                        if (err) {
-                            throw err;
-                        }
-
-                        var $ = cheerio.load(res.text, {decodeEntities: false});
-                        var sectionHeaders = $('.source_section_h');
-                        var examples = $('.source_example');
-
-                        sectionHeaders.length.should.be.greaterThan(1);
-                        examples.length.should.be.greaterThan(0);
-
-                        done();
-                    });
-            });
-
-            it('should return one example', function (done) {
-                request(urlFromApi)
-                    .get('&sections=1.1')
-                    .expect(200)
-                    .end(function (err, res) {
-                        if (err) {
-                            throw err;
-                        }
-
-                        var $ = cheerio.load(res.text, {decodeEntities: false});
-                        var examples = $('.source_example');
-
-                        examples.length.should.equal(1);
-
-                        done();
-                    });
-            });
-
-            it('should have injected resources', function (done) {
-                request(urlFromApi)
-                    .get('&sections=1.1')
-                    .expect(200)
-                    .end(function (err, res) {
-                        if (err) {
-                            throw err;
-                        }
-
-                        var $ = cheerio.load(res.text, {decodeEntities: false});
-
-                        $('[href*="bootstrap.css"]').length.should.equal(1);
-                        $('body > style').length.should.be.greaterThan(0);
-                        $('body > script').length.should.be.greaterThan(0);
-
-                        done();
-                    });
-            });
-
-            it('should change template', function (done) {
-                request(urlFromApi)
-                    .get('&tpl=clear')
-                    .expect(200)
-                    .end(function (err, res) {
-                        if (err) {
-                            throw err;
-                        }
-
-                        var $ = cheerio.load(res.text, {decodeEntities: false});
-
-                        var examples = $('.source_example');
-
-                        $('.__clear').length.should.equal(1);
-                        examples.length.should.equal(0);
-
-                        done();
-                    });
-            });
-        }
     });
 });
\ No newline at end of file

From ff1918ee44fa3db5247eec11d266056bc9fe348e Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Sun, 4 Oct 2015 12:34:26 +0200
Subject: [PATCH 016/104] cleanup npm module build

---
 .npmignore   |  4 ++++
 package.json | 14 +++++++-------
 2 files changed, 11 insertions(+), 7 deletions(-)
 create mode 100644 .npmignore

diff --git a/.npmignore b/.npmignore
new file mode 100644
index 0000000..60161c2
--- /dev/null
+++ b/.npmignore
@@ -0,0 +1,4 @@
+test
+jsdoc
+log
+user
\ No newline at end of file
diff --git a/package.json b/package.json
index 1b2b45a..df36d93 100644
--- a/package.json
+++ b/package.json
@@ -34,13 +34,7 @@
     "grunt-cli": "^0.1.13",
     "grunt-contrib-clean": "^0.6.0",
     "grunt-contrib-copy": "~0.5.0",
-    "grunt-contrib-cssmin": "~0.6.2",
-    "grunt-contrib-htmlmin": "~0.3.0",
-    "grunt-contrib-jshint": "^0.11.2",
     "grunt-contrib-less": "~0.11.0",
-    "grunt-contrib-uglify": "~0.2.7",
-    "grunt-contrib-watch": "~0.5.3",
-    "grunt-jsdoc": "^0.5.7",
     "grunt-newer": "~0.6.1",
     "gulp-watch": "operatino/gulp-watch#4.3.5-latest-fsevents",
     "load-grunt-parent-tasks": "^0.1.1",
@@ -79,6 +73,12 @@
     "grunt-mocha-test": "^0.12.4",
     "mocha": "^2.0.1",
     "should": "~4.0.4",
-    "supertest": "~0.13.0"
+    "supertest": "~0.13.0",
+    "grunt-jsdoc": "^0.5.7",
+    "grunt-contrib-uglify": "~0.2.7",
+    "grunt-contrib-cssmin": "~0.6.2",
+    "grunt-contrib-htmlmin": "~0.3.0",
+    "grunt-contrib-jshint": "^0.11.2",
+    "grunt-contrib-watch": "~0.5.3"
   }
 }

From 0b2b71a7740e462d3983f0e868df15688daeee74 Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Sun, 4 Oct 2015 12:40:38 +0200
Subject: [PATCH 017/104] fix npm version check

---
 Gruntfile.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 8fb2f0d..8dcf84f 100755
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -12,7 +12,7 @@ var getLoaderPackageName = function() {
     var packageName;
     var parentFolderName = path.basename(path.resolve('..'));
     var isSubPackage = parentFolderName === 'node_modules';
-    var isLocalDepsAvailable = fs.existsSync('node_modules/grunt-autoprefixer') && fs.existsSync('node_modules/grunt-contrib-cssmin');
+    var isLocalDepsAvailable = fs.existsSync('node_modules/grunt-autoprefixer') && fs.existsSync('node_modules/grunt-contrib-copy');
 
     if (isSubPackage && !isLocalDepsAvailable) {
         packageName = 'load-grunt-parent-tasks';

From b622840a52012e80349bfaf5f59a50760522c4ec Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Sun, 4 Oct 2015 13:08:09 +0200
Subject: [PATCH 018/104] correct npm ignore list

---
 .npmignore | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.npmignore b/.npmignore
index 60161c2..e2f64a3 100644
--- a/.npmignore
+++ b/.npmignore
@@ -1,4 +1,4 @@
-test
-jsdoc
-log
-user
\ No newline at end of file
+test/
+jsdoc/
+log/
+user/
\ No newline at end of file

From 59a3795db657d3987060b09e253668e3dad030ae Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Sun, 4 Oct 2015 13:14:40 +0200
Subject: [PATCH 019/104] correct npm ignore list

---
 .npmignore | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/.npmignore b/.npmignore
index e2f64a3..9349107 100644
--- a/.npmignore
+++ b/.npmignore
@@ -1,4 +1,24 @@
-test/
-jsdoc/
-log/
-user/
\ No newline at end of file
+*.idea
+*.iml
+
+.travis.yml
+.jshintrc
+appveyor.yml
+source.sh
+
+# Generated data for API
+/core/api/data/
+/log/
+
+# Generated JSdoc
+/jsdoc/
+
+# Build folder for assets
+/build/
+
+# Web server root, and your specs home
+# You can store other repository in this path
+/user/
+
+# Folder with tests
+/test/
\ No newline at end of file

From ddbd81dfb3543b82752c3c2bad08f90a7ff5a4ec Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Sun, 4 Oct 2015 15:51:49 +0200
Subject: [PATCH 020/104] #60: improving support for sourcejs as npm module

---
 assets/js/clarify.js        |  2 --
 core/file-tree/index.js     | 11 +++++++----
 core/lib/parseData.js       |  3 +++
 core/lib/specUtils.js       |  9 ++++++---
 core/middlewares/clarify.js |  3 ++-
 core/postInstall.js         |  4 +---
 package.json                |  2 +-
 7 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/assets/js/clarify.js b/assets/js/clarify.js
index ca8a45b..1780d5a 100644
--- a/assets/js/clarify.js
+++ b/assets/js/clarify.js
@@ -14,8 +14,6 @@ require([
 
     // If we have data from Clarify output
     if (window.sourceClarifyData){
-        var _options = JSON.parse(options);
-
         var $panelTemplate = $(_.template(clarifyPanelTpl, {
             showApiTargetOption: window.sourceClarifyData.showApiTargetOption,
             specUrl: window.sourceClarifyData.specUrl,
diff --git a/core/file-tree/index.js b/core/file-tree/index.js
index cb304bf..781cd6e 100644
--- a/core/file-tree/index.js
+++ b/core/file-tree/index.js
@@ -65,10 +65,13 @@ var getRelativeSpecPath = module.exports.getRelativeSpecPath = function(absolute
         relativeSpecPath = absolutePath.replace(config.specsRoot, '');
     } else {
         // Cleaning path for included folders
-
         relativeSpecPath = absolutePath.replace(normalizedPathToApp, '');
     }
 
+    if (relativeSpecPath === '') {
+        relativeSpecPath = '/';
+    }
+
     return relativeSpecPath;
 };
 
@@ -170,7 +173,7 @@ var getSpecMeta = module.exports.getSpecMeta = function(specDirOrPath){
     var relativeSpecPath = specLocation.relativeSpecPath;
 
     // Remove first slash for ID
-    page.id = relativeSpecPath.substring(1);
+    page.id = relativeSpecPath === '/' ? '/' : relativeSpecPath.substring(1);
     page.url = relativeSpecPath;
 
     // If we have Spec, get additional meta
@@ -211,7 +214,7 @@ var fileTree = function (workingDir) {
         dirContent[i] = path.join(processingDir, dirContent[i].replace(/\\/g, '/'));
     }
 
-    //on first call we add includedDirs
+    // On first call we add includedDirs
     if (processingDir === config.specsRoot) {
         config.includedDirs.map(function (includedDir) {
             dirContent.push(path.join(normalizedPathToApp, includedDir));
@@ -220,7 +223,7 @@ var fileTree = function (workingDir) {
 
     dirContent.forEach(function(pathToFile) {
         // Path is excluded
-        if (excludes.test(processingDir)) return;
+        if (excludes.test(processingDir) || !fs.existsSync(pathToFile)) return;
 
         var infoFileName = coreOpts.common.infoFile;
         var targetFile = path.basename(pathToFile);
diff --git a/core/lib/parseData.js b/core/lib/parseData.js
index 8b731bc..12bf912 100644
--- a/core/lib/parseData.js
+++ b/core/lib/parseData.js
@@ -247,6 +247,9 @@ ParseData.prototype.getFilteredData = function(filterConf, array, data) {
  * @returns {Object} Return single object by requested ID, null (no id found) or undefined (no data found)
  */
 ParseData.prototype.getByID = function(id) {
+    // TODO: fix flat id's list, to remove this hack
+    if (id === '/') id = 'specFile';
+
     var dataExists = this.updateData();
     var targetData = this.data[id];
 
diff --git a/core/lib/specUtils.js b/core/lib/specUtils.js
index cb261a5..093bfa4 100644
--- a/core/lib/specUtils.js
+++ b/core/lib/specUtils.js
@@ -39,9 +39,11 @@ var parseSpecUrlPath = module.exports.parseSpecUrlPath = function(urlPath){
  * @returns {String} Return a parsed Spec ID
  */
 var getSpecIDFromUrl = module.exports.getSpecIDFromUrl = function(urlToSpec){
-    urlToSpec = urlToSpec.replace(/^\//, '').replace(/\/+$/, '');
-
-    return urlToSpec;
+    if (urlToSpec === '/') {
+        return urlToSpec;
+    } else {
+        return urlToSpec.replace(/^\//, '').replace(/\/+$/, '');
+    }
 };
 
 /**
@@ -57,6 +59,7 @@ module.exports.getSpecInfo = function(urlSpecPath) {
         scope: 'specs',
         path: specsDataPath
     });
+
     var specID = getSpecIDFromUrl(urlSpecPath);
 
     return parseSpecData.getByID(specID);
diff --git a/core/middlewares/clarify.js b/core/middlewares/clarify.js
index 7690978..d46341e 100644
--- a/core/middlewares/clarify.js
+++ b/core/middlewares/clarify.js
@@ -104,7 +104,8 @@ var parseSpec = function(sections, pathToSpec) {
         port: global.opts.core.server.port,
         path: pathToSpec + '?internal=true'
     };
-    var fullUrl = url.resolve(options.host + ':' + options.port, options.path);
+
+    var fullUrl = options.host + ':' + options.port + options.path;
 
     var callback = function (response) {
         var specHTML = '';
diff --git a/core/postInstall.js b/core/postInstall.js
index b338d84..7b04c8c 100644
--- a/core/postInstall.js
+++ b/core/postInstall.js
@@ -1,7 +1,6 @@
 'use strict';
 
 var path = require('path');
-var fs = require('fs');
 var link = require('./lib/createLink');
 
 var pathToApp = __dirname.replace(/^\w:\\/, function (match) {
@@ -15,8 +14,7 @@ var parentNodeModules = path.join(enginePath, '../');
 
 // check if sourcejs is installed as a node_package
 if (
-    path.relative(parentNodeModules, enginePath) === 'sourcejs' &&
-    fs.existsSync(path.join(userPath, 'options.js'))
+    path.relative(parentNodeModules, enginePath) === 'sourcejs'
 ) {
     link(userPath, internalUserPath, 'dir');
     console.log('SourceJS User folder symlink created.');
diff --git a/package.json b/package.json
index df36d93..e6c507c 100644
--- a/package.json
+++ b/package.json
@@ -54,7 +54,7 @@
   },
   "scripts": {
     "postinstall": "node ./core/postInstall && grunt update && node ./core/trackInstall",
-    "build": "npm i",
+    "build": "node ./core/postInstall && grunt update",
     "lint": "grunt jshint",
     "start": "node app",
     "watch": "grunt watch-all",

From 8fff72b8ac37059d46df8682f5da93060a8c06b5 Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Sun, 4 Oct 2015 16:18:42 +0200
Subject: [PATCH 021/104] update npm deps

---
 core/file-tree/index.js |  2 +-
 core/html-tree/index.js |  4 ++--
 core/lib/configUtils.js |  2 +-
 package.json            | 47 ++++++++++++++++++++---------------------
 4 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/core/file-tree/index.js b/core/file-tree/index.js
index 781cd6e..f4364e4 100644
--- a/core/file-tree/index.js
+++ b/core/file-tree/index.js
@@ -286,7 +286,7 @@ var updateFileTree = module.exports.updateFileTree = function (data, unflattenDa
         }
 
         try {
-            prevData = fs.readJsonFileSync(dataStoragePath);
+            prevData = fs.readJsonSync(dataStoragePath);
         } catch (e) {
             global.log.trace('Reading initial data error: ', e);
             global.log.debug('Extending from empty object, as we do not have initial data');
diff --git a/core/html-tree/index.js b/core/html-tree/index.js
index b12563c..ceb5d31 100644
--- a/core/html-tree/index.js
+++ b/core/html-tree/index.js
@@ -111,7 +111,7 @@ var writeDataFile = module.exports.writeDataFile = function(data, extend, dataPa
             var prevData = {};
 
             try {
-                prevData = fs.readJsonFileSync(dataStoragePath);
+                prevData = fs.readJsonSync(dataStoragePath);
             } catch (e) {
                 apiLog.trace('Reading initial data error: ', e);
                 apiLog.debug('Extending from empty object, as we do not have initial data');
@@ -170,7 +170,7 @@ module.exports.deleteFromDataFile = function(dataPath, removeID, callback) {
         var pathSplit = removeID.split('/');
 
         try {
-            data = fs.readJsonFileSync(dataPath);
+            data = fs.readJsonSync(dataPath);
         } catch (e) {}
 
         if (data) {
diff --git a/core/lib/configUtils.js b/core/lib/configUtils.js
index c38012f..0a13255 100644
--- a/core/lib/configUtils.js
+++ b/core/lib/configUtils.js
@@ -180,7 +180,7 @@ module.exports.getContextOptions = function(refUrl, defaultOpts) {
     var infoOptionsKey = global.opts.core.common.infoFileOptions;
 
     // Extent context options object with info.json contents
-    contextOptions.specInfo = fs.readJsonFileSync(infoFilePath, {throws: false});
+    contextOptions.specInfo = fs.readJsonSync(infoFilePath, {throws: false});
 
     // Override local options
     if (contextOptionsEnabled && contextOptions.specInfo && contextOptions.specInfo[infoOptionsKey]) {
diff --git a/package.json b/package.json
index e6c507c..044adb6 100644
--- a/package.json
+++ b/package.json
@@ -12,43 +12,42 @@
     "url": "https://github.com/sourcejs/Source.git"
   },
   "dependencies": {
-    "body-parser": "~1.6.4",
+    "body-parser": "^1.14.1",
     "cheerio": "^0.19.0",
     "colors": "0.6.x",
     "commander": "^2.8.1",
-    "compression": "~1.0.11",
-    "cookie-parser": "~1.3.2",
-    "deep-extend": "~0.2.11",
+    "compression": "^1.6.0",
+    "cookie-parser": "^1.4.0",
+    "deep-extend": "^0.4.0",
     "device": "^0.3.2",
     "ejs": "operatino/ejs#2.3.4-sandbox-option",
     "everyauth": "^0.4.9",
-    "express": "~4.8.3",
+    "express": "^4.13.3",
     "express-session": "^1.10.2",
     "extend": "~1.2.1",
     "flat": "^1.2.1",
-    "fs-extra": "~0.11.1",
+    "fs-extra": "^0.24.0",
     "fs-finder": "operatino/node-fs-finder#fix-windows-find-up",
     "glob": "^5.0.14",
     "grunt": "~0.4.5",
-    "grunt-autoprefixer": "~1.0.0",
+    "grunt-autoprefixer": "^3.0.3",
     "grunt-cli": "^0.1.13",
     "grunt-contrib-clean": "^0.6.0",
-    "grunt-contrib-copy": "~0.5.0",
-    "grunt-contrib-less": "~0.11.0",
-    "grunt-newer": "~0.6.1",
+    "grunt-contrib-copy": "^0.8.1",
+    "grunt-contrib-less": "^1.0.1",
+    "grunt-newer": "^1.1.1",
     "gulp-watch": "operatino/gulp-watch#4.3.5-latest-fsevents",
     "load-grunt-parent-tasks": "^0.1.1",
-    "load-grunt-tasks": "~0.3.0",
+    "load-grunt-tasks": "^3.3.0",
     "lodash": "^3.10.1",
     "log4js": "~0.6.20",
     "macaddress": "^0.2.8",
     "marked": "^0.3.2",
-    "path": "^0.4.9",
     "pretty-hrtime": "^1.0.0",
     "q": "^1.1.1",
     "serve-favicon": "^2.2.0",
     "shortid": "^2.2.2",
-    "time-grunt": "~0.2.10",
+    "time-grunt": "^1.2.1",
     "tinyforever": "0.0.3",
     "universal-analytics": "^0.3.9"
   },
@@ -66,19 +65,19 @@
     "ci-test-win": "grunt ci-pre-run && node app.js --post-grunt ci-post-run-win --test --log trace --no-watch"
   },
   "devDependencies": {
-    "assert": "~1.1.1",
+    "assert": "^1.3.0",
     "chai": "^3.2.0",
-    "cross-spawn": "^0.4.0",
+    "cross-spawn": "^2.0.0",
     "grunt-casperjs": "^2.1.0",
-    "grunt-mocha-test": "^0.12.4",
+    "grunt-contrib-cssmin": "^0.14.0",
+    "grunt-contrib-htmlmin": "^0.5.0",
+    "grunt-contrib-jshint": "^0.11.3",
+    "grunt-contrib-uglify": "^0.9.2",
+    "grunt-contrib-watch": "^0.6.1",
+    "grunt-jsdoc": "^1.0.0",
+    "grunt-mocha-test": "^0.12.7",
     "mocha": "^2.0.1",
-    "should": "~4.0.4",
-    "supertest": "~0.13.0",
-    "grunt-jsdoc": "^0.5.7",
-    "grunt-contrib-uglify": "~0.2.7",
-    "grunt-contrib-cssmin": "~0.6.2",
-    "grunt-contrib-htmlmin": "~0.3.0",
-    "grunt-contrib-jshint": "^0.11.2",
-    "grunt-contrib-watch": "~0.5.3"
+    "should": "^7.1.0",
+    "supertest": "^1.1.0"
   }
 }

From b1f456d2864da0c3265ea5b7c645240335e142e1 Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Sun, 4 Oct 2015 16:30:56 +0200
Subject: [PATCH 022/104] rever cross-spawn update

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 044adb6..ffeaa67 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,7 @@
   "devDependencies": {
     "assert": "^1.3.0",
     "chai": "^3.2.0",
-    "cross-spawn": "^2.0.0",
+    "cross-spawn": "^0.4.0",
     "grunt-casperjs": "^2.1.0",
     "grunt-contrib-cssmin": "^0.14.0",
     "grunt-contrib-htmlmin": "^0.5.0",

From 9447c7522e7d334ce700ef2d804eb5f86cabfb7e Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Sun, 4 Oct 2015 17:46:58 +0200
Subject: [PATCH 023/104] fix linking user folder when sourcejs in npm linked

---
 core/postInstall.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/core/postInstall.js b/core/postInstall.js
index 7b04c8c..bdabab1 100644
--- a/core/postInstall.js
+++ b/core/postInstall.js
@@ -1,21 +1,21 @@
 'use strict';
 
 var path = require('path');
+var fs = require('fs-extra');
 var link = require('./lib/createLink');
 
-var pathToApp = __dirname.replace(/^\w:\\/, function (match) {
+var pathToApp = process.env.PWD.replace(/^\w:\\/, function (match) {
     return match.toLowerCase();
 });
 
-var enginePath = path.join(pathToApp, '../');
-var userPath = path.join(enginePath, '../../');
-var internalUserPath = path.join(enginePath, 'user');
-var parentNodeModules = path.join(enginePath, '../');
+var userPath = path.join(pathToApp, '../../');
+
+var internalUserPath = path.join(pathToApp, 'user');
+var parentNodeModules = path.join(pathToApp, '../');
 
 // check if sourcejs is installed as a node_package
-if (
-    path.relative(parentNodeModules, enginePath) === 'sourcejs'
-) {
+if (path.relative(parentNodeModules, pathToApp) === 'sourcejs') {
+    fs.removeSync(internalUserPath);
     link(userPath, internalUserPath, 'dir');
     console.log('SourceJS User folder symlink created.');
 }
\ No newline at end of file

From 153cb9068f8ad1fd3f9c0f863642124ca28f1aa4 Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Sun, 4 Oct 2015 17:50:20 +0200
Subject: [PATCH 024/104] fix windows dirname check

---
 core/postInstall.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/postInstall.js b/core/postInstall.js
index bdabab1..60ecb6f 100644
--- a/core/postInstall.js
+++ b/core/postInstall.js
@@ -4,7 +4,8 @@ var path = require('path');
 var fs = require('fs-extra');
 var link = require('./lib/createLink');
 
-var pathToApp = process.env.PWD.replace(/^\w:\\/, function (match) {
+var currentDir = process.env.PWD || __dirname;
+var pathToApp = currentDir.replace(/^\w:\\/, function (match) {
     return match.toLowerCase();
 });
 

From 6b0842abf7590140bfbd593f48005027b8266c92 Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Sun, 4 Oct 2015 18:11:11 +0200
Subject: [PATCH 025/104] node 0.4 is now supported

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ffeaa67..a77a8bf 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
   "version": "0.6.0-dev",
   "license": "MIT",
   "engines": {
-    "node": ">=0.10.0 <4.0"
+    "node": ">=0.10.0"
   },
   "repository": {
     "type": "git",

From 792b4b9bc470fd1f0ebb29b7148f61910265acb6 Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Tue, 6 Oct 2015 21:31:12 +0200
Subject: [PATCH 026/104] move ejs pre-rendering into next step after read

---
 core/middlewares/loader.js       |  6 +++++
 core/middlewares/preRenderEjs.js | 46 ++++++++++++++++++++++++++++++++
 core/middlewares/read.js         | 17 ------------
 3 files changed, 52 insertions(+), 17 deletions(-)
 create mode 100644 core/middlewares/preRenderEjs.js

diff --git a/core/middlewares/loader.js b/core/middlewares/loader.js
index 786bf35..d6d143c 100644
--- a/core/middlewares/loader.js
+++ b/core/middlewares/loader.js
@@ -117,6 +117,12 @@ module.exports.process = function(app, globalOptions){
                 group: 'pre-html',
                 indexPath: path.join(appRoot, 'core/middlewares/md.js')
             },
+            preRenderEjs: {
+                enabled: true,
+                order: -2,
+                group: 'pre-html',
+                indexPath: path.join(appRoot, 'core/middlewares/preRenderEjs.js')
+            },
             mdTag: {
                 enabled: true,
                 order: 0,
diff --git a/core/middlewares/preRenderEjs.js b/core/middlewares/preRenderEjs.js
new file mode 100644
index 0000000..cea0961
--- /dev/null
+++ b/core/middlewares/preRenderEjs.js
@@ -0,0 +1,46 @@
+'use strict';
+
+var path = require('path');
+var ejs = require(path.join(global.pathToApp, 'core/ejsWithHelpers.js'));
+var specUtils = require(path.join(global.pathToApp,'core/lib/specUtils'));
+
+/**
+ * Processing pre-ejs rendering on spec request
+ *
+ * @param {object} req - Request object
+ * @param {object} res - Response object
+ * @param {function} next - The callback function
+ * */
+exports.process = function(req, res, next) {
+    // Check if spec is request and ejs pre-rendering enabled
+    if (req.specData && req.specData.renderedHtml) {
+        var specInfo = req.specData.info;
+
+        if (specInfo.noEjs) {
+            next();
+            return;
+        }
+
+        var specPath = specUtils.getFullPathToSpec(req.path);
+        var contextOptions = req.specData.contextOptions;
+        var specFiles = contextOptions.specInfo && contextOptions.specInfo.specFile ? [contextOptions.specInfo.specFile] : contextOptions.rendering.specFiles;
+        var physicalPath = specUtils.getSpecFromDir(specPath, specFiles);
+        var processedData = req.specData.renderedHtml.replace(/^\s+|\s+$/g, '');
+
+        try {
+            processedData = ejs.render(processedData, {
+                engineVersion: global.engineVersion,
+                info: req.specData.info
+            }, {
+                filename: physicalPath
+            });
+        } catch(err){
+            global.log.warn('Could not pre-render spec with EJS: ' + req.path, err);
+        }
+        req.specData.renderedHtml = processedData;
+
+        next();
+    } else {
+        next();
+    }
+};
\ No newline at end of file
diff --git a/core/middlewares/read.js b/core/middlewares/read.js
index a11ff06..d83e3ab 100644
--- a/core/middlewares/read.js
+++ b/core/middlewares/read.js
@@ -3,7 +3,6 @@
 var fs = require('fs-extra');
 var path = require('path');
 
-var ejs = require(path.join(global.pathToApp, 'core/ejsWithHelpers.js'));
 var specUtils = require(path.join(global.pathToApp,'core/lib/specUtils'));
 var configUtils = require(path.join(global.pathToApp,'core/lib/configUtils'));
 
@@ -76,22 +75,6 @@ exports.process = function(req, res, next) {
                 capitalizedExtension = specFileExtension.charAt(0).toUpperCase() + specFileExtension.slice(1);
             }
 
-            data = data.replace(/^\s+|\s+$/g, '');
-
-            // Pre-render Spec contents with EJS
-            if (!specInfo.noEjs) {
-                try {
-                    data = ejs.render(data, {
-                        engineVersion: global.engineVersion,
-                        info: specInfo
-                    }, {
-                        filename: physicalPath
-                    });
-                } catch(err){
-                    global.log.warn('Could not pre-render spec with EJS: ' + req.path, err);
-                }
-            }
-
             req.specData["is" + capitalizedExtension] = true;
             req.specData.info = specInfo; // add spec info object to request
             req.specData.contextOptions = contextOptions; // add context options to request

From dbb1d80ee731ffd820903295b8cfc87e3b3df183 Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Tue, 6 Oct 2015 21:32:48 +0200
Subject: [PATCH 027/104] update default header and footer

---
 assets/templates/footer.inc.html | 13 +++++++------
 assets/templates/header.inc.html |  5 +++--
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/assets/templates/footer.inc.html b/assets/templates/footer.inc.html
index 54701a2..13408e7 100644
--- a/assets/templates/footer.inc.html
+++ b/assets/templates/footer.inc.html
@@ -2,12 +2,13 @@
 
 <footer class="source_footer">
     <div class="source_col-main">
-        <div class="source_col">
-            <h2>Catalog</h2>
-            <ul class="source_ul">
-	            <li><a class="source_a_l" href="#777">Your link</a></li>
-            </ul>
-        </div>
+        <!-- Example markup -->
+        <!--<div class="source_col">-->
+            <!--<h2>Catalog</h2>-->
+            <!--<ul class="source_ul">-->
+	            <!--<li><a class="source_a_l" href="#777">Your link</a></li>-->
+            <!--</ul>-->
+        <!--</div>-->
         <div class="source_footer_copy">
             Copyright © 2013-2015 <a href="http://sourcejs.com" class="source_a_l">Sourcejs.com</a> <span class="source_footer_version">(v.<%- engineVersion %>)</span>
         </div>
diff --git a/assets/templates/header.inc.html b/assets/templates/header.inc.html
index f97cd10..33a0708 100644
--- a/assets/templates/header.inc.html
+++ b/assets/templates/header.inc.html
@@ -10,11 +10,12 @@
         </div>
 
         <div class="source_col source_col__23">
-            <a class="source_logo" href="/">Source</a>
+            <a class="source_logo" href="/">SourceJS</a>
 
             <nav class="source_header_nav">
                 <ul class="source_header_nav_lst">
-                    <li class="source_header_nav_i"><a class="source_a_l" href="#777">Link</a></li>
+                    <!-- Example markup -->
+                    <!--<li class="source_header_nav_i"><a class="source_a_l" href="#777">Link</a></li>-->
                 </ul>
             </nav>
 

From 0d0aa389e040622846d36533476c84821b1712c6 Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Mon, 19 Oct 2015 22:23:40 +0200
Subject: [PATCH 028/104] chore: update npm deps

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a77a8bf..ee5ec03 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
   "dependencies": {
     "body-parser": "^1.14.1",
     "cheerio": "^0.19.0",
-    "colors": "0.6.x",
+    "colors": "^1.1.2",
     "commander": "^2.8.1",
     "compression": "^1.6.0",
     "cookie-parser": "^1.4.0",

From d935e6e59cff0b2e601858cbea4ca2b3d47f5bf8 Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Mon, 19 Oct 2015 22:56:36 +0200
Subject: [PATCH 029/104] chore: remove extend and deepExtend deps

---
 core/file-tree/index.js  | 7 +++----
 core/lib/processMd.js    | 4 ++--
 core/watch/childWatch.js | 4 ++--
 package.json             | 2 --
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/core/file-tree/index.js b/core/file-tree/index.js
index f4364e4..3f86e14 100644
--- a/core/file-tree/index.js
+++ b/core/file-tree/index.js
@@ -1,8 +1,7 @@
 'use strict';
 
 var fs = require('fs-extra');
-var extend = require('extend');
-var deepExtend = require('deep-extend');
+var _ = require('lodash');
 var path = require('path');
 var extendTillSpec = require(path.join(global.pathToApp,'core/lib/extendTillSpec'));
 var unflatten = require(path.join(global.pathToApp,'core/unflat'));
@@ -191,7 +190,7 @@ var getSpecMeta = module.exports.getSpecMeta = function(specDirOrPath){
     page.thumbnail = getThumbnailPath(specDir, specInfo.thumbnailPath) || false;
 
     // Apply info file contents on top
-    deepExtend(page, specInfo);
+    _.merge(page, specInfo);
 
     return page;
 };
@@ -239,7 +238,7 @@ var fileTree = function (workingDir) {
             // Going deeper
             var childObj = fileTree(pathToFile);
             if (Object.getOwnPropertyNames(childObj).length !== 0) {
-                outputJSON[targetFile] = extend(outputJSON[targetFile], childObj);
+                outputJSON[targetFile] = childObj;
             }
 
         } else if (targetFile.toLowerCase() === infoFileName.toLowerCase()) {
diff --git a/core/lib/processMd.js b/core/lib/processMd.js
index d3cb8ed..4be3fb6 100644
--- a/core/lib/processMd.js
+++ b/core/lib/processMd.js
@@ -3,7 +3,7 @@
 var path = require('path');
 var marked = require('marked');
 var cheerio = require('cheerio');
-var deepExtend = require('deep-extend');
+var _ = require('lodash');
 var translit = require(path.join(global.pathToApp,'core/lib/translit'));
 var utils = require(path.join(global.pathToApp,'core/lib/utils'));
 
@@ -47,7 +47,7 @@ renderer.heading = function (text, level) {
 };
 
 // Extend re-defined renderer
-config.marked.renderer = deepExtend(renderer, config.marked.renderer);
+config.marked.renderer = _.merge(renderer, config.marked.renderer);
 
 marked.setOptions(config.marked);
 
diff --git a/core/watch/childWatch.js b/core/watch/childWatch.js
index 92d5ee5..9ff3b9c 100644
--- a/core/watch/childWatch.js
+++ b/core/watch/childWatch.js
@@ -4,7 +4,7 @@
 
 var path = require('path');
 var watch = require('gulp-watch');
-var deepExtend = require('deep-extend');
+var _ = require('lodash');
 var commander = require('commander');
 
 // Parse arguments
@@ -47,7 +47,7 @@ utils.extendOptions(config, global.opts.core.watch);
 var prepareData = function(data, targetFile){
     var dir = path.dirname(targetFile);
 
-    return deepExtend(fileTree.getSpecMeta(dir), data);
+    return _.merge(fileTree.getSpecMeta(dir), data);
 };
 
 if (config.enabled){
diff --git a/package.json b/package.json
index ee5ec03..907b46d 100644
--- a/package.json
+++ b/package.json
@@ -18,13 +18,11 @@
     "commander": "^2.8.1",
     "compression": "^1.6.0",
     "cookie-parser": "^1.4.0",
-    "deep-extend": "^0.4.0",
     "device": "^0.3.2",
     "ejs": "operatino/ejs#2.3.4-sandbox-option",
     "everyauth": "^0.4.9",
     "express": "^4.13.3",
     "express-session": "^1.10.2",
-    "extend": "~1.2.1",
     "flat": "^1.2.1",
     "fs-extra": "^0.24.0",
     "fs-finder": "operatino/node-fs-finder#fix-windows-find-up",

From 6d0348a30328e10422cbf5905590bca9cdfa9606 Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Mon, 19 Oct 2015 23:02:31 +0200
Subject: [PATCH 030/104] chore: add .bithoundrc

---
 .bithoundrc | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 .bithoundrc

diff --git a/.bithoundrc b/.bithoundrc
new file mode 100644
index 0000000..b30de9a
--- /dev/null
+++ b/.bithoundrc
@@ -0,0 +1,10 @@
+{
+  "ignore": [
+    "assets/js/lib/**",
+    "assets/test/jasmine/**"
+  ],
+  "test": [
+    "test/**",
+    "assets/test/**"
+  ]
+}
\ No newline at end of file

From 300e9c7e9bb7e4654ac1b79e509864a664e2330f Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Tue, 20 Oct 2015 12:03:53 +0200
Subject: [PATCH 031/104] remove appveyor unstable settings

---
 appveyor.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index ae75ddf..dc95b4a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -23,6 +23,4 @@ matrix:
   fast_finish: true
 
 cache:
-  - C:\Users\appveyor\AppData\Roaming\npm\node_modules -> package.json  # global npm modules
-  - C:\Users\appveyor\AppData\Roaming\npm-cache -> package.json         # npm cache
-  - node_modules -> package.json                                        # local npm modules
\ No newline at end of file
+  - node_modules -> package.json # Local npm modules

From 7d6c3abca8c3fdfe7f82525412eafb0fe0d1ff8a Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Tue, 20 Oct 2015 12:05:24 +0200
Subject: [PATCH 032/104] add Node.js v4 to appveyor

---
 appveyor.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/appveyor.yml b/appveyor.yml
index dc95b4a..9d4c74b 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -5,6 +5,7 @@ environment:
   matrix:
     - nodejs_version: 0.10
     - nodejs_version: 0.12
+    - nodejs_version: 4
 
 install:
   - ps: Install-Product node $env:nodejs_version

From e047071929e982d3c484679431bf834f6edbe4ed Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Tue, 20 Oct 2015 12:06:18 +0200
Subject: [PATCH 033/104] add Node.js v4 to travis

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 494dab7..9cd6563 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,12 @@
 language: node_js
 node_js:
   - "0.10"
-  - "0.11"
   - "0.12"
+  - "4"
 sudo: false
 notifications:
   email:
     on_success: never
     on_failure: always
 before_script: "git clone https://github.com/sourcejs/init.git user"
-script: npm run ci-test
\ No newline at end of file
+script: npm run ci-test

From ab5cbd0def7b2a7c6908528650781d55c53e4cd6 Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Thu, 22 Oct 2015 21:29:05 +0200
Subject: [PATCH 034/104] hotfix: fix node v4 unit test

---
 test/unit/middlewares/clarifySpec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/unit/middlewares/clarifySpec.js b/test/unit/middlewares/clarifySpec.js
index b1d2019..f7745a8 100644
--- a/test/unit/middlewares/clarifySpec.js
+++ b/test/unit/middlewares/clarifySpec.js
@@ -33,7 +33,7 @@ describe('Clarify test /docs/spec?clarify=true', function () {
 
         it('should return all sections', function (done) {
             request(url)
-                .get()
+                .get('')
                 .expect(200)
                 .end(function (err, res) {
                     if (err) {

From 6481b9d92a476a0e1b35f7f310b3443c14d7f4c9 Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Thu, 22 Oct 2015 21:38:53 +0200
Subject: [PATCH 035/104] clean npm cache in CI

---
 .travis.yml  | 3 +++
 appveyor.yml | 1 +
 2 files changed, 4 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 9cd6563..0fbaa2e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,9 @@ node_js:
   - "0.12"
   - "4"
 sudo: false
+install:
+  - npm cache clean
+  - npm install
 notifications:
   email:
     on_success: never
diff --git a/appveyor.yml b/appveyor.yml
index 9d4c74b..c96b1ce 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -9,6 +9,7 @@ environment:
 
 install:
   - ps: Install-Product node $env:nodejs_version
+  - npm cache clean
   - npm install
 
 build: off

From 597132bb7f6f41e89a0c974e1aadd7582e223eef Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Thu, 22 Oct 2015 21:56:17 +0200
Subject: [PATCH 036/104] #190: add node module check lib

---
 core/lib/isNodeModule.js | 13 +++++++++++++
 core/postInstall.js      |  4 ++--
 2 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 core/lib/isNodeModule.js

diff --git a/core/lib/isNodeModule.js b/core/lib/isNodeModule.js
new file mode 100644
index 0000000..c379aff
--- /dev/null
+++ b/core/lib/isNodeModule.js
@@ -0,0 +1,13 @@
+'use strict';
+
+var path = require('path');
+var fs = require('fs-extra');
+
+module.exports = function(customPathToApp) {
+    var pathToApp = customPathToApp || global.pathToApp;
+    var grantParentPath = path.join(pathToApp, '../../');
+    var relativePathToApp = path.relative(grantParentPath, pathToApp);
+    var assumedSourceNpmPath = path.join('node_modules', fs.readJsonSync(path.join(pathToApp, 'package.json')).name);
+
+    return relativePathToApp === assumedSourceNpmPath;
+};
\ No newline at end of file
diff --git a/core/postInstall.js b/core/postInstall.js
index 60ecb6f..3a77d05 100644
--- a/core/postInstall.js
+++ b/core/postInstall.js
@@ -3,6 +3,7 @@
 var path = require('path');
 var fs = require('fs-extra');
 var link = require('./lib/createLink');
+var isNodeModule = require('./lib/isNodeModule');
 
 var currentDir = process.env.PWD || __dirname;
 var pathToApp = currentDir.replace(/^\w:\\/, function (match) {
@@ -12,10 +13,9 @@ var pathToApp = currentDir.replace(/^\w:\\/, function (match) {
 var userPath = path.join(pathToApp, '../../');
 
 var internalUserPath = path.join(pathToApp, 'user');
-var parentNodeModules = path.join(pathToApp, '../');
 
 // check if sourcejs is installed as a node_package
-if (path.relative(parentNodeModules, pathToApp) === 'sourcejs') {
+if (isNodeModule(pathToApp)) {
     fs.removeSync(internalUserPath);
     link(userPath, internalUserPath, 'dir');
     console.log('SourceJS User folder symlink created.');

From 8c49e49f6bca9b6fe1af39bfe95297f848a5dabd Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Thu, 22 Oct 2015 23:14:27 +0200
Subject: [PATCH 037/104] #190: remove auto-linking and fix npm link issue with
 sourcejs dev flow

---
 app.js                  |  3 ++-
 core/lib/createLink.js  | 52 -----------------------------------------
 core/lib/getUserPath.js | 18 ++++++++++++++
 core/postInstall.js     | 22 -----------------
 options.js              |  3 ++-
 package.json            |  2 +-
 6 files changed, 23 insertions(+), 77 deletions(-)
 delete mode 100644 core/lib/createLink.js
 create mode 100644 core/lib/getUserPath.js
 delete mode 100644 core/postInstall.js

diff --git a/app.js b/app.js
index 695c0ac..7f8b06b 100644
--- a/app.js
+++ b/app.js
@@ -38,9 +38,10 @@ commander
 global.commander = commander;
 
 var trackStats = require(path.join(global.pathToApp, 'core/trackStats'));
+var userPath = (require('./core/lib/getUserPath'))();
 
 app.set('views', path.join(__dirname, 'core/views'));
-app.set('user', path.join(__dirname, global.opts.core.common.pathToUser));
+app.set('user', userPath);
 
 // We support `development` (default), `production` and `presentation` (for demos)
 var MODE = global.MODE = process.env.NODE_ENV || 'development';
diff --git a/core/lib/createLink.js b/core/lib/createLink.js
deleted file mode 100644
index 4be8dfb..0000000
--- a/core/lib/createLink.js
+++ /dev/null
@@ -1,52 +0,0 @@
-// Modified lib from Bower
-
-'use strict';
-
-var fs = require('fs-extra');
-var path = require('path');
-var Q = require('q');
-
-var isWin = process.platform === 'win32';
-
-function createLink(src, dst, type) {
-    var dstDir = path.dirname(dst);
-
-    // Create directory
-    return Q.nfcall(fs.mkdirp, dstDir)
-    // Check if source exists
-    .then(function () {
-        return Q.nfcall(fs.stat, src)
-        .fail(function (error) {
-            if (error.code === 'ENOENT') {
-                console.log('Failed to create link to ' + path.basename(src), 'ENOENT', {
-                    details: src + ' does not exist or points to a non-existent file'
-                });
-            }
-
-            throw error;
-        });
-    })
-    // Create symlink
-    .then(function (stat) {
-        type = type || (stat.isDirectory() ? 'dir' : 'file');
-
-        return Q.nfcall(fs.symlink, src, dst, type)
-        .fail(function (err) {
-            if (!isWin || err.code !== 'EPERM') {
-                throw err;
-            }
-
-            // Try with type "junction" on Windows
-            // Junctions behave equally to true symlinks and can be created in
-            // non elevated terminal (well, not always..)
-            return Q.nfcall(fs.symlink, src, dst, 'junction')
-            .fail(function (err) {
-                console.log('Unable to create link to ' + path.basename(src), err.code, {
-                    details: err.message.trim() + '\n\nTry running this command in an elevated terminal (run as root/administrator).'
-                });
-            });
-        });
-    });
-}
-
-module.exports = createLink;
\ No newline at end of file
diff --git a/core/lib/getUserPath.js b/core/lib/getUserPath.js
new file mode 100644
index 0000000..6b095ce
--- /dev/null
+++ b/core/lib/getUserPath.js
@@ -0,0 +1,18 @@
+'use strict';
+
+var path = require('path');
+var fs = require('fs');
+var pathToApp = global.pathToApp;
+var isNodeModule = require('./isNodeModule');
+
+module.exports = function(){
+    var sourcePathFromParent = path.join(process.cwd(), 'node_modules/sourcejs');
+
+    if (fs.existsSync(sourcePathFromParent)) {
+        pathToApp = sourcePathFromParent;
+    }
+
+    var relativeUserPath = isNodeModule(pathToApp) ? '../../' : global.opts.core.common.pathToUser;
+
+    return path.join(pathToApp, relativeUserPath);
+};
\ No newline at end of file
diff --git a/core/postInstall.js b/core/postInstall.js
deleted file mode 100644
index 3a77d05..0000000
--- a/core/postInstall.js
+++ /dev/null
@@ -1,22 +0,0 @@
-'use strict';
-
-var path = require('path');
-var fs = require('fs-extra');
-var link = require('./lib/createLink');
-var isNodeModule = require('./lib/isNodeModule');
-
-var currentDir = process.env.PWD || __dirname;
-var pathToApp = currentDir.replace(/^\w:\\/, function (match) {
-    return match.toLowerCase();
-});
-
-var userPath = path.join(pathToApp, '../../');
-
-var internalUserPath = path.join(pathToApp, 'user');
-
-// check if sourcejs is installed as a node_package
-if (isNodeModule(pathToApp)) {
-    fs.removeSync(internalUserPath);
-    link(userPath, internalUserPath, 'dir');
-    console.log('SourceJS User folder symlink created.');
-}
\ No newline at end of file
diff --git a/options.js b/options.js
index b91a346..37edd99 100644
--- a/options.js
+++ b/options.js
@@ -17,7 +17,8 @@ module.exports = {
             // Name of context level settings file
             contextOptionsFile: 'sourcejs-options.js',
 
-            // Path to your SourceJS configuration folder
+            // Custom path to user contents path, relative to SourceJS root
+            // Used only in case if SourceJS installed as a parent folder for content (old approach)
             pathToUser: 'user',
 
             // Name of spec meta info file
diff --git a/package.json b/package.json
index 907b46d..df5532a 100644
--- a/package.json
+++ b/package.json
@@ -50,7 +50,7 @@
     "universal-analytics": "^0.3.9"
   },
   "scripts": {
-    "postinstall": "node ./core/postInstall && grunt update && node ./core/trackInstall",
+    "postinstall": "grunt update && node ./core/trackInstall",
     "build": "node ./core/postInstall && grunt update",
     "lint": "grunt jshint",
     "start": "node app",

From 1f9517ef24794a635e999d87f1eaaded25025d2f Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Sun, 25 Oct 2015 15:21:15 +0100
Subject: [PATCH 038/104] #147: remove req.path override

---
 core/middlewares/read.js | 20 ++++++++------------
 core/trackStats.js       |  2 +-
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/core/middlewares/read.js b/core/middlewares/read.js
index d83e3ab..9b013d7 100644
--- a/core/middlewares/read.js
+++ b/core/middlewares/read.js
@@ -18,7 +18,7 @@ var configUtils = require(path.join(global.pathToApp,'core/lib/configUtils'));
 exports.process = function(req, res, next) {
     var reqExt = path.extname(req.path);
 
-    // Skip static resources, and dirs witout trailing slash
+    // Skip static resources, and dirs without trailing slash
     if (reqExt !== "" || (reqExt === "" && req.path.slice(-1) !== '/')) {
         next();
         return;
@@ -29,9 +29,15 @@ exports.process = function(req, res, next) {
 
     // Check if folder is requested but not the reserved namespaces
     if (!apiRe.test(req.path) && !sourceRe.test(req.path)) {
+        var specPath = specUtils.getFullPathToSpec(req.path);
+
+        if (!fs.existsSync(specPath)) {
+            next();
+            return;
+        }
+
         global.specLoadTime = process.hrtime();
 
-        var specPath = specUtils.getFullPathToSpec(req.path);
         var contextOptions = configUtils.getContextOptions(req.path);
 
         var specFiles = contextOptions.specInfo && contextOptions.specInfo.specFile ? [contextOptions.specInfo.specFile] : contextOptions.rendering.specFiles;
@@ -44,16 +50,6 @@ exports.process = function(req, res, next) {
             return;
         }
 
-        // Passing req params
-        var urlParams = req.url.split('?')[1];
-        var paramsString = urlParams ? '?' + urlParams : '';
-
-        // Modifying url and saving params string
-        // TODO: remove in next non-patch release https://github.com/sourcejs/Source/issues/147
-        req.originalUrl = req.url;
-        req.originalPath = req.path;
-        req.url = path.join(req.path, specFile) + paramsString;
-
         fs.readFile(physicalPath, 'utf8', function (err, data) {
             if (err) {
                 res.send(err);
diff --git a/core/trackStats.js b/core/trackStats.js
index 9c02c2e..0c9d959 100644
--- a/core/trackStats.js
+++ b/core/trackStats.js
@@ -124,7 +124,7 @@ module.exports.specs = function(req) {
 
     if (q.internal) return;
 
-    if (req.originalPath === '/') {
+    if (req.path === '/') {
         pageName = '/';
     } else if (req.specData && req.specData.info && req.specData.info.role === 'navigation') {
         pageName = 'navigation';

From 85b7ce9ca031261c19e470ab540400c97cc0b9da Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Sun, 25 Oct 2015 15:54:30 +0100
Subject: [PATCH 039/104] #190: user new userPath global

---
 app.js                      | 13 ++++++-------
 core/file-tree/index.js     |  5 +++--
 core/headerFooter.js        |  2 +-
 core/lib/configUtils.js     |  2 +-
 core/lib/pathResolver.js    |  4 ++--
 core/lib/specUtils.js       |  2 +-
 core/loadPlugins.js         |  2 +-
 core/middlewares/clarify.js |  4 ++--
 core/middlewares/loader.js  |  2 +-
 core/middlewares/wrap.js    |  2 +-
 core/routes/index.js        |  2 +-
 core/watch/childWatch.js    | 14 +++++++++-----
 12 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/app.js b/app.js
index 7f8b06b..9b33e1c 100644
--- a/app.js
+++ b/app.js
@@ -38,10 +38,9 @@ commander
 global.commander = commander;
 
 var trackStats = require(path.join(global.pathToApp, 'core/trackStats'));
-var userPath = (require('./core/lib/getUserPath'))();
+var userPath = global.userPath = (require('./core/lib/getUserPath'))();
 
-app.set('views', path.join(__dirname, 'core/views'));
-app.set('user', userPath);
+console.log('Running user contents from', '`' + userPath + '`.');
 
 // We support `development` (default), `production` and `presentation` (for demos)
 var MODE = global.MODE = process.env.NODE_ENV || 'development';
@@ -111,7 +110,7 @@ app.use(function (req, res, next) {
 });
 
 // Favicon
-var faviconPath = path.join(app.get('user'), 'favicon.ico');
+var faviconPath = path.join(userPath, 'favicon.ico');
 if (fs.existsSync(faviconPath)){
     app.use(favicon(faviconPath));
 }
@@ -170,7 +169,7 @@ require("./core/loadPlugins.js");
 
 try {
     // User additional functionality
-    require(app.get('user') + "/core/app.js");
+    require(userPath + "/core/app.js");
 } catch(e){}
 
 
@@ -192,7 +191,7 @@ if (global.opts.core.watch.enabled && global.MODE === 'development') {
 var headerFooter = require('./core/headerFooter');
 
 // Static content
-app.use(express.static(app.get('user')));
+app.use(express.static(userPath));
 
 // Page 404
 app.use(function(req, res){
@@ -219,7 +218,7 @@ var logErrors = function(err, req, res, next) {
         var url = req.url || '';
 
         log.debug(req.method, req.headers);
-        log.error(('Requested url: ' + url).red, ('Error: ' + err.stack).red);
+        log.error(('Error on requesting url: ' + url).red +'.', ('Error: ' + err.stack).red);
 
         if (req.xhr) {
             res.status(500).json({msg: 'Server error'});
diff --git a/core/file-tree/index.js b/core/file-tree/index.js
index 3f86e14..081b32c 100644
--- a/core/file-tree/index.js
+++ b/core/file-tree/index.js
@@ -11,6 +11,8 @@ var coreOpts = global.opts.core;
 var prettyHrtime = require('pretty-hrtime');
 
 var busy = false;
+var normalizedPathToApp = global.pathToApp.replace(/\\/g, '/');
+var userPath = global.userPath.replace(/\\/g, '/');
 
 var config = {
     includedDirs: coreOpts.common.includedDirs,
@@ -22,7 +24,7 @@ var config = {
     cronProd: true,
     cronRepeatTime: 60000,
     outputFile: path.join(global.pathToApp, 'core/api/data/pages-tree.json'),
-    specsRoot: path.join(global.pathToApp, coreOpts.common.pathToUser).replace(/\\/g, '/'),
+    specsRoot: userPath,
     busyTimeout: 300,
     thumbnail: 'thumbnail.png'
 };
@@ -30,7 +32,6 @@ var config = {
 // Overwriting base options
 utils.extendOptions(config, coreOpts.fileTree);
 
-var normalizedPathToApp = global.pathToApp.replace(/\\/g, '/');
 
 var prepareExcludesRegex = function(){
     var dirsForRegExp = '';
diff --git a/core/headerFooter.js b/core/headerFooter.js
index 1220ff0..5eb7cbf 100644
--- a/core/headerFooter.js
+++ b/core/headerFooter.js
@@ -5,7 +5,7 @@ var path = require('path');
 
 exports.getHeaderAndFooter = function () {
     var defaultTemplatePath = path.join(global.pathToApp, 'assets/templates');
-    var userTemplatePath = path.join(global.app.get('user'), 'assets/templates');
+    var userTemplatePath = path.join(global.userPath, 'assets/templates');
     var headerFile = 'header.inc.html';
     var footerFile = 'footer.inc.html';
 
diff --git a/core/lib/configUtils.js b/core/lib/configUtils.js
index 0a13255..8018df8 100644
--- a/core/lib/configUtils.js
+++ b/core/lib/configUtils.js
@@ -48,7 +48,7 @@ var getContextOptionsList = module.exports.getContextOptionsList = function(star
     var checkPath = fs.existsSync(startPath);
     if (!checkPath) return [];
 
-    var searchStopPath = global.app.get('user');
+    var searchStopPath = global.userPath;
     var fileToFind = path.sep + global.opts.core.common.contextOptionsFile;
 
     // Skip if start path is behind stop path
diff --git a/core/lib/pathResolver.js b/core/lib/pathResolver.js
index c51631d..0abfb50 100644
--- a/core/lib/pathResolver.js
+++ b/core/lib/pathResolver.js
@@ -17,8 +17,8 @@ var resolve = module.exports.resolve = function(pathToResolve, context){
 
     var map = {
         sourcejs: global.pathToApp,
-        user: global.app.get('user'),
-        context: context || global.app.get('user')
+        user: global.userPath,
+        context: context || global.userPath
     };
     var result = pathToResolve;
 
diff --git a/core/lib/specUtils.js b/core/lib/specUtils.js
index 093bfa4..42440c1 100644
--- a/core/lib/specUtils.js
+++ b/core/lib/specUtils.js
@@ -112,7 +112,7 @@ module.exports.getSpecFromDir = function(dirPath, specFiles) {
 module.exports.getFullPathToSpec = function(urlPath){
     var pathToSpec = parseSpecUrlPath(urlPath).pathToSpec;
     var cleanPath = urlPath.replace(/\/+$/, '').replace(/\//, '');
-    var specPath = path.join(global.app.get('user'), pathToSpec).replace(/\\/g, '/');
+    var specPath = path.join(global.userPath, pathToSpec).replace(/\\/g, '/');
 
     // Including non-standard paths, outside default static route
     global.opts.core.common.includedDirs.forEach(function(item){
diff --git a/core/loadPlugins.js b/core/loadPlugins.js
index 4c1f150..0dacec5 100644
--- a/core/loadPlugins.js
+++ b/core/loadPlugins.js
@@ -8,7 +8,7 @@
 
 var fs = require('fs');
 var path = require('path');
-var pathToModules = path.join(global.app.get('user'), 'node_modules');
+var pathToModules = path.join(global.userPath, 'node_modules');
 
 // Loading all sourcejs-*/core/index.js files from npm plugins section
 if (fs.existsSync(pathToModules)) {
diff --git a/core/middlewares/clarify.js b/core/middlewares/clarify.js
index d46341e..2ed8362 100644
--- a/core/middlewares/clarify.js
+++ b/core/middlewares/clarify.js
@@ -29,7 +29,7 @@ var getTpl = function(tpl) {
 
     // TODO: use view resolver
     var pathToTemplate = path.join(pathToApp, 'core/views/clarify', templateName + '.ejs');
-    var userPathToTemplate = path.join(global.app.get('user'), 'core/views/clarify', templateName + '.ejs');
+    var userPathToTemplate = path.join(global.userPath, 'core/views/clarify', templateName + '.ejs');
 
     // First we check user tempalate, then core
     fs.readFile(userPathToTemplate, 'utf-8', function(err, data){
@@ -56,7 +56,7 @@ var getTplList = function(){
     var deferred = Q.defer();
 
     var pathToTemplates = path.join(pathToApp, 'core/views/clarify');
-    var userPathToTemplates = path.join(global.app.get('user'), 'core/views/clarify');
+    var userPathToTemplates = path.join(global.userPath, 'core/views/clarify');
 
     var templatesList = [];
 
diff --git a/core/middlewares/loader.js b/core/middlewares/loader.js
index d6d143c..0545121 100644
--- a/core/middlewares/loader.js
+++ b/core/middlewares/loader.js
@@ -158,7 +158,7 @@ module.exports.process = function(app, globalOptions){
     utils.extendOptions(
         config,
         {
-            list: gatherMiddlewares(path.join(app.get('user'), 'node_modules'), new RegExp(/^sourcejs-/), 'core/middleware/index.js')
+            list: gatherMiddlewares(path.join(global.userPath, 'node_modules'), new RegExp(/^sourcejs-/), 'core/middleware/index.js')
         },
         globalOptions.core.middlewares
     );
diff --git a/core/middlewares/wrap.js b/core/middlewares/wrap.js
index 49ce273..efbc65f 100644
--- a/core/middlewares/wrap.js
+++ b/core/middlewares/wrap.js
@@ -43,7 +43,7 @@ exports.process = function (req, res, next) {
         // Check if we're working with included dirs
         if (context) {
             global.opts.core.common.includedDirs.forEach(function (includedDir) {
-                var pathToCheck = (path.join(global.app.get('user'), includedDir) + '/').replace(/\\/g, '/');
+                var pathToCheck = (path.join(global.userPath, includedDir) + '/').replace(/\\/g, '/');
 
                 if (context.indexOf(pathToCheck) === 0) {
                     context = context.replace(pathToCheck, path.join(global.pathToApp, includedDir) + '/');
diff --git a/core/routes/index.js b/core/routes/index.js
index bd07129..719fc83 100644
--- a/core/routes/index.js
+++ b/core/routes/index.js
@@ -5,5 +5,5 @@ require("./redirects.js");
 
 // User custom routes
 try {
-    require(global.app.get('user') + "/core/routes");
+    require(global.userPath + "/core/routes");
 } catch(e){}
\ No newline at end of file
diff --git a/core/watch/childWatch.js b/core/watch/childWatch.js
index 9ff3b9c..e1adcbc 100644
--- a/core/watch/childWatch.js
+++ b/core/watch/childWatch.js
@@ -25,6 +25,8 @@ var logger = require(path.join(global.pathToApp, 'core/logger'));
 var log = logger.log;
 global.log = log;
 
+var userPath = global.userPath = (require(path.join(global.pathToApp, 'core/lib/getUserPath')))();
+
 var utils = require(path.join(global.pathToApp, 'core/lib/utils'));
 var fileTree = require(path.join(global.pathToApp, 'core/file-tree'));
 
@@ -33,11 +35,13 @@ var config = {
     verbose: false,
     glob: [
         '!' + global.pathToApp + '/**/.*/**',
-        '!' + global.pathToApp + '/**/bower_components/**',
-        '!' + global.pathToApp + '/**/node_modules/**',
+        '!' + userPath + '/**/.*/**',
+        '!' + userPath + '/**/bower_components/**',
+        '!' + userPath + '/**/node_modules/**',
 
-        global.pathToApp + '/**/' + global.opts.core.common.infoFile,
-        global.pathToApp + '/' + global.opts.core.common.pathToUser + '/**/' + global.opts.core.common.infoFile
+        global.pathToApp + '/docs/**/' + global.opts.core.common.infoFile,
+        global.pathToApp + '/test/**/' + global.opts.core.common.infoFile,
+        userPath + '/**/' + global.opts.core.common.infoFile
     ],
     ignoreHiddenFiles: true
 };
@@ -60,7 +64,7 @@ if (config.enabled){
     }, function(vinyl){
         var filePath = vinyl.path.replace(/\\/g, '/');
         var event = vinyl.event;
-        var cleanPath = filePath.replace(global.pathToApp + '/', '').replace(global.opts.core.common.pathToUser +'/', '');
+        var cleanPath = filePath.replace(userPath, '').replace(global.pathToApp + '/', '');
         var specID = path.dirname(cleanPath);
         var rawContents;
 

From 7130152cf4f026e77ccedc1c1b52199e383f8f23 Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Sun, 25 Oct 2015 16:12:17 +0100
Subject: [PATCH 040/104] #190: align ejs sandboxing with new user path

---
 core/ejsWithHelpers.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/ejsWithHelpers.js b/core/ejsWithHelpers.js
index 99f2338..d76c425 100644
--- a/core/ejsWithHelpers.js
+++ b/core/ejsWithHelpers.js
@@ -97,6 +97,8 @@ var includeFiles = function(data, options){
 };
 
 ejs.render = function(template, data, options){
+    var sandboxPath = /^..\//.test(path.relative(global.pathToApp, global.userPath)) ? global.userPath : global.pathToApp;
+
     data = data || {};
     options = options || {};
 
@@ -113,7 +115,7 @@ ejs.render = function(template, data, options){
 
     if (global.opts.core.sandboxIncludes) {
         _.assign(options, {
-            sandbox: global.pathToApp
+            sandbox: sandboxPath
         });
     }
 

From 051ed50f268ac66e8ca1d611848ca9eeecce0fa7 Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Sun, 25 Oct 2015 17:34:55 +0100
Subject: [PATCH 041/104] #190: fixes due to new user path

---
 app.js                  |  3 +++
 core/ejsWithHelpers.js  | 33 +++++++++++++++++++++++++++++----
 core/lib/configUtils.js |  2 +-
 core/lib/specUtils.js   |  2 +-
 4 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/app.js b/app.js
index 9b33e1c..b9b05d4 100644
--- a/app.js
+++ b/app.js
@@ -40,6 +40,9 @@ global.commander = commander;
 var trackStats = require(path.join(global.pathToApp, 'core/trackStats'));
 var userPath = global.userPath = (require('./core/lib/getUserPath'))();
 
+// Legacy support
+app.set('user', userPath);
+
 console.log('Running user contents from', '`' + userPath + '`.');
 
 // We support `development` (default), `production` and `presentation` (for demos)
diff --git a/core/ejsWithHelpers.js b/core/ejsWithHelpers.js
index d76c425..bfb908d 100644
--- a/core/ejsWithHelpers.js
+++ b/core/ejsWithHelpers.js
@@ -2,6 +2,7 @@
 
 var ejs = require('ejs');
 var fs = require('fs');
+var nodeUtil = require('util');
 var glob = require('glob');
 var path = require('path');
 var _ = require('lodash');
@@ -20,7 +21,7 @@ var EJS_OPTS = ['cache', 'filename', 'sandbox', 'delimiter', 'scope', 'context',
  *
  * @memberof module:ejs-internal
  * @param {Object}  data data object
- * @param {Options} opts options object
+ * @param {Object} opts options object
  * @static
  */
 
@@ -32,8 +33,29 @@ var cpOptsInData = function (data, opts) {
     });
 };
 
+var isRestrictedReadPath = function(pathToRead, options) {
+  var isRescricted = true;
+  var i;
+
+  if (nodeUtil.isArray(options.sandbox)) {
+    for (i = 0; i < options.sandbox.length; i++) {
+      var sandboxPpath = options.sandbox[i];
+      var notRestricted = path.relative(sandboxPpath, pathToRead).substring(0, 2) !== '..';
+
+      if (notRestricted) {
+        isRescricted = false;
+        break;
+      }
+    }
+
+    return isRescricted;
+  } else {
+    return path.relative(options.sandbox, pathToRead).substring(0, 2) === '..';
+  }
+};
+
 var readFile = function (filePath, options) {
-    if (options.sandbox && path.relative(options.sandbox, filePath).substring(0, 2) === '..') {
+    if (options.sandbox && isRestrictedReadPath(filePath, options)) {
         throw new Error('reading files beyond sandbox is restricted, limit set to ' + options.sandbox);
     }
 
@@ -97,7 +119,10 @@ var includeFiles = function(data, options){
 };
 
 ejs.render = function(template, data, options){
-    var sandboxPath = /^..\//.test(path.relative(global.pathToApp, global.userPath)) ? global.userPath : global.pathToApp;
+    var sandboxPaths = [
+        global.pathToApp,
+        global.userPath
+    ];
 
     data = data || {};
     options = options || {};
@@ -115,7 +140,7 @@ ejs.render = function(template, data, options){
 
     if (global.opts.core.sandboxIncludes) {
         _.assign(options, {
-            sandbox: sandboxPath
+            sandbox: sandboxPaths
         });
     }
 
diff --git a/core/lib/configUtils.js b/core/lib/configUtils.js
index 8018df8..f050b98 100644
--- a/core/lib/configUtils.js
+++ b/core/lib/configUtils.js
@@ -180,7 +180,7 @@ module.exports.getContextOptions = function(refUrl, defaultOpts) {
     var infoOptionsKey = global.opts.core.common.infoFileOptions;
 
     // Extent context options object with info.json contents
-    contextOptions.specInfo = fs.readJsonSync(infoFilePath, {throws: false});
+    contextOptions.specInfo = fs.existsSync(infoFilePath) ? fs.readJsonSync(infoFilePath, {throws: false}) : undefined;
 
     // Override local options
     if (contextOptionsEnabled && contextOptions.specInfo && contextOptions.specInfo[infoOptionsKey]) {
diff --git a/core/lib/specUtils.js b/core/lib/specUtils.js
index 42440c1..0536244 100644
--- a/core/lib/specUtils.js
+++ b/core/lib/specUtils.js
@@ -117,7 +117,7 @@ module.exports.getFullPathToSpec = function(urlPath){
     // Including non-standard paths, outside default static route
     global.opts.core.common.includedDirs.forEach(function(item){
         if (cleanPath.split('/')[0] === item) {
-            specPath = specPath.replace('/' + global.opts.core.common.pathToUser + '/' + cleanPath, '/' + cleanPath);
+            specPath = specPath.replace(global.userPath, global.pathToApp + '/');
         }
     });
 

From 5391cb5f07bcf91e4a9a262ed4d393e07ccae939 Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Sun, 25 Oct 2015 18:11:11 +0100
Subject: [PATCH 042/104] #190: fixes due to new user path

---
 assets/js/modules/sectionsParser.js | 2 +-
 core/file-tree/index.js             | 2 +-
 core/lib/getUserPath.js             | 2 +-
 core/middlewares/wrap.js            | 2 +-
 package.json                        | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/assets/js/modules/sectionsParser.js b/assets/js/modules/sectionsParser.js
index 05e65f1..50c9f81 100644
--- a/assets/js/modules/sectionsParser.js
+++ b/assets/js/modules/sectionsParser.js
@@ -211,7 +211,7 @@ function SourceGetSections() {
 /**
  * Filter list of HTML nodes
  *
- * @param {Array} elementsArr - nodelist to filter
+ * @param {Array} elementsArr - elements array to filter
  * @param {Function} [customElFilter] - Additional filter for element
  * @param {Boolean} [skipAttrFilters] - Set to true, if expect not filtered list of resources
  *
diff --git a/core/file-tree/index.js b/core/file-tree/index.js
index 081b32c..57b58ad 100644
--- a/core/file-tree/index.js
+++ b/core/file-tree/index.js
@@ -173,7 +173,7 @@ var getSpecMeta = module.exports.getSpecMeta = function(specDirOrPath){
     var relativeSpecPath = specLocation.relativeSpecPath;
 
     // Remove first slash for ID
-    page.id = relativeSpecPath === '/' ? '/' : relativeSpecPath.substring(1);
+    page.id = relativeSpecPath === '/' ? '/' : relativeSpecPath.replace(/^\//, '');
     page.url = relativeSpecPath;
 
     // If we have Spec, get additional meta
diff --git a/core/lib/getUserPath.js b/core/lib/getUserPath.js
index 6b095ce..e5157a6 100644
--- a/core/lib/getUserPath.js
+++ b/core/lib/getUserPath.js
@@ -12,7 +12,7 @@ module.exports = function(){
         pathToApp = sourcePathFromParent;
     }
 
-    var relativeUserPath = isNodeModule(pathToApp) ? '../../' : global.opts.core.common.pathToUser;
+    var relativeUserPath = isNodeModule(pathToApp) ? '../..' : global.opts.core.common.pathToUser;
 
     return path.join(pathToApp, relativeUserPath);
 };
\ No newline at end of file
diff --git a/core/middlewares/wrap.js b/core/middlewares/wrap.js
index efbc65f..4efb4b4 100644
--- a/core/middlewares/wrap.js
+++ b/core/middlewares/wrap.js
@@ -20,7 +20,7 @@ exports.process = function (req, res, next) {
 
     // Check if we're working with processed file
     if (req.specData && req.specData.renderedHtml) {
-        var specDir = specUtils.getFullPathToSpec(req.url);
+        var specDir = specUtils.getFullPathToSpec(req.path);
         var contextOptions = req.specData.contextOptions;
 
         // get spec content
diff --git a/package.json b/package.json
index df5532a..861adb7 100644
--- a/package.json
+++ b/package.json
@@ -51,7 +51,7 @@
   },
   "scripts": {
     "postinstall": "grunt update && node ./core/trackInstall",
-    "build": "node ./core/postInstall && grunt update",
+    "build": "grunt update",
     "lint": "grunt jshint",
     "start": "node app",
     "watch": "grunt watch-all",

From 093918bc7eb62a48f4d130f8b1491079e256cab8 Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Sun, 15 Nov 2015 21:36:02 +0100
Subject: [PATCH 043/104] #190: fix user options loading

---
 assets/js/modules/utils.js | 4 ++--
 core/lib/getUserPath.js    | 7 ++++---
 core/loadOptions.js        | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/assets/js/modules/utils.js b/assets/js/modules/utils.js
index 342161b..8983f39 100644
--- a/assets/js/modules/utils.js
+++ b/assets/js/modules/utils.js
@@ -59,8 +59,8 @@ define([
         var specName;
         var pageUrl = window.location.pathname;
 
-        var pageUrlSplit = pageUrl.split("/"); //Разбивает на массив
-        specName = pageUrlSplit[pageUrlSplit.length - 2]; //Берет последнюю часть урла
+        var pageUrlSplit = pageUrl.split("/");
+        specName = pageUrlSplit[pageUrlSplit.length - 2];
 
         return specName;
     };
diff --git a/core/lib/getUserPath.js b/core/lib/getUserPath.js
index e5157a6..7d4b322 100644
--- a/core/lib/getUserPath.js
+++ b/core/lib/getUserPath.js
@@ -2,17 +2,18 @@
 
 var path = require('path');
 var fs = require('fs');
-var pathToApp = global.pathToApp;
 var isNodeModule = require('./isNodeModule');
 
-module.exports = function(){
+module.exports = function(customGlobalopts, customPathToApp){
+    var globalOpts = customGlobalopts || global.opts;
+    var pathToApp = customPathToApp || global.pathToApp;
     var sourcePathFromParent = path.join(process.cwd(), 'node_modules/sourcejs');
 
     if (fs.existsSync(sourcePathFromParent)) {
         pathToApp = sourcePathFromParent;
     }
 
-    var relativeUserPath = isNodeModule(pathToApp) ? '../..' : global.opts.core.common.pathToUser;
+    var relativeUserPath = isNodeModule(pathToApp) ? '../..' : globalOpts.core.common.pathToUser;
 
     return path.join(pathToApp, relativeUserPath);
 };
\ No newline at end of file
diff --git a/core/loadOptions.js b/core/loadOptions.js
index 21ab8ea..68acf77 100644
--- a/core/loadOptions.js
+++ b/core/loadOptions.js
@@ -79,9 +79,9 @@ module.exports = function(basePath, _silent){
     var pathToApp = basePath || path.dirname(require.main.filename);
 
     var mergedOptions = utils.requireUncached(path.join(pathToApp, 'options'));
-    var pathToUser = path.join(pathToApp, mergedOptions.core.common.pathToUser);
 
     // Using specific path to specs parsing, because we don't have global.opts yet
+    var pathToUser = (require('./lib/getUserPath'))(mergedOptions, pathToApp);
     var userSettingsFile = path.join(pathToUser, 'options.js');
     var userLocalSettingsFile = path.join(pathToUser, 'local-options.js');
 

From 908d267a8cedae24802c61ce4d5d9dec45b93253 Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Sun, 15 Nov 2015 21:36:42 +0100
Subject: [PATCH 044/104] give clarify panel a change to load itself in
 critical envs

---
 assets/js/clarify.js | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/assets/js/clarify.js b/assets/js/clarify.js
index 1780d5a..a3d1236 100644
--- a/assets/js/clarify.js
+++ b/assets/js/clarify.js
@@ -10,10 +10,11 @@ require([
     "sourceModules/utils",
     "sourceLib/lodash",
     "text!sourceTemplates/clarifyPanel.inc.html"
-    ], function ($, options, u, _, clarifyPanelTpl){
+], function ($, options, u, _, clarifyPanelTpl){
+    var triesLimit = 2;
+    var triesCount = 0;
 
-    // If we have data from Clarify output
-    if (window.sourceClarifyData){
+    var handler = function() {
         var $panelTemplate = $(_.template(clarifyPanelTpl, {
             showApiTargetOption: window.sourceClarifyData.showApiTargetOption,
             specUrl: window.sourceClarifyData.specUrl,
@@ -81,7 +82,21 @@ require([
 
             location.href = clarifyBaseUrl + constructedParams;
         });
-    } else {
-        console.log('Clarify panel failed to receive expected data from clarify, check your tpl.');
-    }
+    };
+
+    var renderClarify = function(){
+        // If we have data from Clarify output
+        if (window.sourceClarifyData){
+            handler();
+        } else {
+            if (triesCount < triesLimit) {
+                triesCount++;
+                setTimeout(renderClarify, 1000);
+            } else {
+                console.log('Clarify panel failed to receive expected data from clarify, check your tpl.');
+            }
+        }
+    };
+
+    renderClarify();
 });

From 67838ab2e65c171661f9350675646a062af6f588 Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Sun, 15 Nov 2015 21:37:10 +0100
Subject: [PATCH 045/104] pass index to custom markdows renderers

---
 core/lib/processMd.js | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/core/lib/processMd.js b/core/lib/processMd.js
index 4be3fb6..712d174 100644
--- a/core/lib/processMd.js
+++ b/core/lib/processMd.js
@@ -9,6 +9,8 @@ var utils = require(path.join(global.pathToApp,'core/lib/utils'));
 
 var renderer = new marked.Renderer();
 
+var markedCodeRenderCounter = 0;
+
 // Module configuration
 var globalConfig = global.opts.core && global.opts.core.processMd ? global.opts.core.processMd : {};
 var config = {
@@ -27,17 +29,22 @@ utils.extendOptions(config, globalConfig);
 
 // Processing with native markdown renderer
 renderer.code = function (code, language) {
+    var result = '';
+
     if (config.languageRenderers.hasOwnProperty(language)) {
-        return config.languageRenderers[language](code);
+        result = config.languageRenderers[language](code, markedCodeRenderCounter);
     } else {
         if (config.espaceCodeHTML) code = code.replace(/</g, "&lt;").replace(/>/g, "&gt;");
 
         if (language && language !== '') {
-            return '<code class="src-' + language + ' source_visible">' + code + '</code>';
+            result = '<code class="src-' + language + ' source_visible">' + code + '</code>';
         } else {
-            return '<pre><code class="lang-source_wide-code">' + code + '</code></pre>';
+            result = '<pre><code class="lang-source_wide-code">' + code + '</code></pre>';
         }
     }
+
+    markedCodeRenderCounter++;
+    return result;
 };
 
 renderer.heading = function (text, level) {
@@ -52,6 +59,8 @@ config.marked.renderer = _.merge(renderer, config.marked.renderer);
 marked.setOptions(config.marked);
 
 module.exports = function (markdown, options) {
+    markedCodeRenderCounter = 0;
+
     var _options = options || {};
     var $ = cheerio.load('<div id="content">' + marked(markdown) + '</div>');
     var $content = $('#content').first();

From 17e361b8d1a6ddd54fb67905c800d9e01eaefcbc Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Sun, 15 Nov 2015 21:49:26 +0100
Subject: [PATCH 046/104] #156: fix broken footer on some loading edge cases

---
 assets/js/modules/headerFooter.js | 135 +++++++++++++-----------------
 1 file changed, 57 insertions(+), 78 deletions(-)

diff --git a/assets/js/modules/headerFooter.js b/assets/js/modules/headerFooter.js
index 554adb9..e09a1ad 100644
--- a/assets/js/modules/headerFooter.js
+++ b/assets/js/modules/headerFooter.js
@@ -2,96 +2,75 @@ define(['source/load-options'], function(options) {
 
     'use strict';
 
-    var $header = $(".source_header");
-    var $footer = $(".source_footer");
+    $(function(){
+        var headerEl = document.querySelector('.source_header');
+        var footerEl = document.querySelector('.source_footer');
 
-    if(options.modulesEnabled.headerFooter) {
-        var headerExists = $header.length > 0;
-        var footerExists = $footer.length > 0;
+        if(options.modulesEnabled.headerFooter) {
+            //Header and Footer injection
+            var $sourceContainer = $('.source_container');
 
-        //Header and Footer injection
-        var source_container = $('.source_container');
-
-        if (!headerExists) {
-            source_container.prepend($('<div class="source_header"></div>'));
-        }
-
-        if (!footerExists) {
-            source_container.append($('<div class="source_footer"></div>'));
-        }
+            if (!headerEl) {
+                $sourceContainer.prepend($('<div class="source_header"></div>'));
+            }
 
-        if (source_container.length && !(headerExists && footerExists)) {
-            //some empty page
-            if (!source_container.contents().length) {
-                source_container.append($('<div class="source_main source_col-main" role="main">Welcome to Source!</div>'));
+            if (!footerEl) {
+                $sourceContainer.append($('<div class="source_footer"></div>'));
             }
 
-            var insertHeader = function(data) {
-                $('.source_header').replaceWith(data.responseText);
-            };
+            if ($sourceContainer.length && !(headerEl && footerEl)) {
+                //some empty page
+                if (!$sourceContainer.contents().length) {
+                    $sourceContainer.append($('<div class="source_main source_col-main" role="main">Welcome to Source!</div>'));
+                }
+
+                var insertHeader = function(data) {
+                    $('.source_header').replaceWith(data.responseText);
+                };
 
-            var headerFile = 'header.inc.html';
-            var footerFile = 'footer.inc.html';
+                var headerFile = 'header.inc.html';
+                var footerFile = 'footer.inc.html';
 
-            $.ajax({
-                url:"/assets/templates/"+headerFile,
-                async:true,
-                complete:function (data, status) {
-                    if (status === 'success') {
-                        insertHeader(data);
-                    } else {
-                        $.ajax({
-                            url:"/source/assets/templates/"+headerFile,
-                            async:true,
-                            complete:function (data) {
-                                insertHeader(data);
-                            }
-                        });
+                $.ajax({
+                    url:"/assets/templates/"+headerFile,
+                    async:true,
+                    complete:function (data, status) {
+                        if (status === 'success') {
+                            insertHeader(data);
+                        } else {
+                            $.ajax({
+                                url:"/source/assets/templates/"+headerFile,
+                                async:true,
+                                complete:function (data) {
+                                    insertHeader(data);
+                                }
+                            });
+                        }
                     }
-                }
-            });
+                });
 
-            var insertFooter = function(data) {
-                $('.source_footer').replaceWith(data.responseText);
-            };
+                var insertFooter = function(data) {
+                    $('.source_footer').replaceWith(data.responseText);
+                };
 
-            $.ajax({
-                url:"/assets/templates/"+footerFile,
-                async:true,
-                complete:function (data, status) {
-                    if (status === 'success') {
-                        insertFooter(data);
-                    } else {
-                        $.ajax({
-                            url:"/source/assets/templates/"+footerFile,
-                            async:true,
-                            complete:function (data) {
-                                insertFooter(data);
-                            }
-                        });
+                $.ajax({
+                    url:"/assets/templates/"+footerFile,
+                    async:true,
+                    complete:function (data, status) {
+                        if (status === 'success') {
+                            insertFooter(data);
+                        } else {
+                            $.ajax({
+                                url:"/source/assets/templates/"+footerFile,
+                                async:true,
+                                complete:function (data) {
+                                    insertFooter(data);
+                                }
+                            });
+                        }
                     }
-                }
-            });
-        }
-    }
-
-    //click on header - go up
-    $header.on({
-        mouseover: function(e){
-            if(e.target === this){
-                $('.source_header').css('cursor', 'pointer');
-            }else {
-                $('.source_header').css('cursor', 'inherit');
-            }
-        },
-        click: function(e){
-            if(e.target === this){
-                window.scrollTo(0, 0);
+                });
             }
-        },
-        mouseout : function(){
-            $('.source_header').css('cursor', 'inherit');
         }
     });
-
 });
\ No newline at end of file

From cdfa8616b8cf85a2396c75c6f73cd8e53f6de9eb Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Tue, 17 Nov 2015 00:26:13 +0100
Subject: [PATCH 047/104] #190: refactor file tree parsing to match sourcejs as
 node_modules set-up

---
 core/file-tree/index.js | 121 ++++++++++------------------------------
 core/lib/globArray.js   |  34 +++++++++++
 options.js              |  12 ++--
 package.json            |   1 +
 4 files changed, 72 insertions(+), 96 deletions(-)
 create mode 100644 core/lib/globArray.js

diff --git a/core/file-tree/index.js b/core/file-tree/index.js
index 57b58ad..0d7bcaa 100644
--- a/core/file-tree/index.js
+++ b/core/file-tree/index.js
@@ -7,6 +7,8 @@ var extendTillSpec = require(path.join(global.pathToApp,'core/lib/extendTillSpec
 var unflatten = require(path.join(global.pathToApp,'core/unflat'));
 var specUtils = require(path.join(global.pathToApp,'core/lib/specUtils'));
 var utils = require(path.join(global.pathToApp,'core/lib/utils'));
+var globArray = require(path.join(global.pathToApp,'core/lib/globArray'));
+var isNodeModule = require(path.join(global.pathToApp,'core/lib/isNodeModule'));
 var coreOpts = global.opts.core;
 var prettyHrtime = require('pretty-hrtime');
 
@@ -16,10 +18,9 @@ var userPath = global.userPath.replace(/\\/g, '/');
 
 var config = {
     includedDirs: coreOpts.common.includedDirs,
-    excludedDirs: [],
 
-    // TODO: merge with `excludedDirs` in next major release.
-    excludedDirsGlobal: [],
+    // Filled from options.js
+    excludes: [],
     cron: false,
     cronProd: true,
     cronRepeatTime: 60000,
@@ -32,21 +33,18 @@ var config = {
 // Overwriting base options
 utils.extendOptions(config, coreOpts.fileTree);
 
+var glob = config.excludes;
+glob.unshift('**/info.json');
 
-var prepareExcludesRegex = function(){
-    var dirsForRegExp = '';
-    var i = 1;
-    config.excludedDirs.forEach(function (exlDir) {
-        if (i < config.excludedDirs.length) {
-            dirsForRegExp = dirsForRegExp + '^' + config.specsRoot + '\/' + exlDir + '|';
+if (Array.isArray(config.includedDirs)) {
+    config.includedDirs.forEach(function(item){
+        if (isNodeModule) {
+            glob.push('node_modules/sourcejs/' + item + '/**/info.json');
         } else {
-            dirsForRegExp = dirsForRegExp + '^' + config.specsRoot + '\/' + exlDir;
+            glob.push('../' + item + '/**/info.json');
         }
-        i++;
     });
-    return new RegExp(dirsForRegExp);
-};
-
+}
 
 /**
  * Prepare relative path for web usage (like `/docs/spec`, `/specs/btn`) out of absolute path
@@ -62,7 +60,7 @@ var getRelativeSpecPath = module.exports.getRelativeSpecPath = function(absolute
         // If starts with root (specs)
 
         // Cleaning path to specs root folder
-        relativeSpecPath = absolutePath.replace(config.specsRoot, '');
+        relativeSpecPath = absolutePath.replace(config.specsRoot, '').replace('node_modules/sourcejs/', '');
     } else {
         // Cleaning path for included folders
         relativeSpecPath = absolutePath.replace(normalizedPathToApp, '');
@@ -75,35 +73,6 @@ var getRelativeSpecPath = module.exports.getRelativeSpecPath = function(absolute
     return relativeSpecPath;
 };
 
-var getSpecLocation = function(specDirOrPath){
-    // Normalize windows URL and remove trailing slash
-    var _specDirOrPath = specDirOrPath.replace(/\\/g, '/').replace(/\/$/, '');
-    var isSpecPath = path.extname(_specDirOrPath) !== '';
-    var specDir;
-    var specPath;
-    var relativeSpecPath = getRelativeSpecPath(_specDirOrPath);
-
-    if (isSpecPath) {
-        relativeSpecPath = path.dirname(relativeSpecPath);
-    }
-
-    // Try to get specPath
-    if (isSpecPath) {
-        specDir = path.dirname(_specDirOrPath);
-        specPath = _specDirOrPath;
-    } else {
-        specDir = _specDirOrPath;
-        specPath = specUtils.getSpecFromDir(_specDirOrPath);
-    }
-
-    return {
-        relativeSpecPath: relativeSpecPath,
-        isSpecPath: isSpecPath,
-        specDir: specDir,
-        specPath: specPath
-    };
-};
-
 /**
  * Get spec thumbnail image path
  *
@@ -157,20 +126,18 @@ var getSpecInfoFile = module.exports.getSpecInfoFile = function(specDir){
 /**
  * Prepares Spec meta object from specs directory or Spec file path
  *
- * @param {String} specDirOrPath - path to Spec directory or Spec file
+ * @param {String} specDir - path to Spec directory
  *
  * @returns {Object} Return Spec file meta info (used in file-tree.json and in other places)
  */
-var getSpecMeta = module.exports.getSpecMeta = function(specDirOrPath){
+var getSpecMeta = module.exports.getSpecMeta = function(specDir){
     var page = {};
 
     // Check if arg is provided and path exists
-    if ( !(specDirOrPath && fs.existsSync(specDirOrPath))) return page;
+    if ( !(specDir && fs.existsSync(specDir)) ) return page;
 
-    var specLocation = getSpecLocation(specDirOrPath);
-    var specPath = specLocation.specPath;
-    var specDir = specLocation.specDir;
-    var relativeSpecPath = specLocation.relativeSpecPath;
+    var relativeSpecPath = getRelativeSpecPath(specDir);
+    var specPath = specUtils.getSpecFromDir(specDir);
 
     // Remove first slash for ID
     page.id = relativeSpecPath === '/' ? '/' : relativeSpecPath.replace(/^\//, '');
@@ -196,58 +163,30 @@ var getSpecMeta = module.exports.getSpecMeta = function(specDirOrPath){
     return page;
 };
 
-var fileTree = function (workingDir) {
-    var processingDir = workingDir;
+var fileTree = function(workingDir) {
     var outputJSON = {};
 
     // Allow to run app without existing specsRoot
     if (!fs.existsSync(workingDir) && workingDir === config.specsRoot) {
         global.log.warn('Running SourceJS without user dir. This set-up should be used only for running tests.');
-        processingDir = global.pathToApp;
+        workingDir = global.pathToApp;
     }
 
-    var dirContent = fs.readdirSync(processingDir);
-    var excludes = prepareExcludesRegex();
-
-    // Adding paths to files in array
-    for (var i = 0; dirContent.length > i; i++) {
-        dirContent[i] = path.join(processingDir, dirContent[i].replace(/\\/g, '/'));
-    }
-
-    // On first call we add includedDirs
-    if (processingDir === config.specsRoot) {
-        config.includedDirs.map(function (includedDir) {
-            dirContent.push(path.join(normalizedPathToApp, includedDir));
-        });
-    }
-
-    dirContent.forEach(function(pathToFile) {
-        // Path is excluded
-        if (excludes.test(processingDir) || !fs.existsSync(pathToFile)) return;
-
-        var infoFileName = coreOpts.common.infoFile;
-        var targetFile = path.basename(pathToFile);
-
-        // Normalizing path for windows
-        pathToFile = path.normalize(pathToFile).replace(/\\/g, '/');
-
-        var fileStats = fs.statSync(pathToFile);
+    var files = globArray(glob, {
+        cwd: workingDir
+    });
 
-        if (fileStats.isDirectory()) {
-            if (config.excludedDirsGlobal.indexOf(targetFile) > -1) return;
+    files.forEach(function(file){
+        var realFilePath = path.join(workingDir, file);
+        var specPath = path.dirname(realFilePath);
+        var specId = path.dirname(file).replace('node_modules/sourcejs/', '').replace('../', '');
 
-            // Going deeper
-            var childObj = fileTree(pathToFile);
-            if (Object.getOwnPropertyNames(childObj).length !== 0) {
-                outputJSON[targetFile] = childObj;
-            }
+        specId = specId === '.' ? '' : specId + '/';
 
-        } else if (targetFile.toLowerCase() === infoFileName.toLowerCase()) {
-            outputJSON['specFile'] = getSpecMeta(processingDir);
-        }
+        outputJSON[specId + 'specFile'] = getSpecMeta(specPath);
     });
 
-    return outputJSON;
+    return unflatten(outputJSON, { delimiter: '/', overwrite: 'root' });
 };
 
 // function for write file tree json
diff --git a/core/lib/globArray.js b/core/lib/globArray.js
new file mode 100644
index 0000000..84d4c22
--- /dev/null
+++ b/core/lib/globArray.js
@@ -0,0 +1,34 @@
+'use strict';
+
+var glob = require('glob');
+var minimatch = require("minimatch");
+
+module.exports = function (patterns, options) {
+    var i, list = [];
+    if (!Array.isArray(patterns)) {
+        patterns = [patterns];
+    }
+
+    patterns.forEach(function (pattern) {
+        if (pattern[0] === "!") {
+            i = list.length - 1;
+            while (i > -1) {
+                if (!minimatch(list[i], pattern)) {
+                    list.splice(i, 1);
+                }
+                i--;
+            }
+
+        }
+        else {
+            var newList = glob.sync(pattern, options);
+            newList.forEach(function (item) {
+                if (list.indexOf(item) === -1) {
+                    list.push(item);
+                }
+            });
+        }
+    });
+
+    return list;
+};
\ No newline at end of file
diff --git a/options.js b/options.js
index 37edd99..c250a17 100644
--- a/options.js
+++ b/options.js
@@ -43,11 +43,13 @@ module.exports = {
 
         // Spec catalogs navigation tree
         fileTree: {
-            // Exclude files from file-tree indexing (first level, in user folder)
-            excludedDirs: ['node_modules', 'bower_components', 'data', 'plugins', '.git', '.idea'],
-
-            // Exclude files from file-tree indexing (on any level, by folder name)
-            excludedDirsGlobal: ['node_modules', '.git', '.idea'],
+            // Glob excludes for `info.json` search paths
+            excludes: [
+                '!**/node_modules/**',
+                '!**/bower_components/**',
+                '!**/.git/**',
+                '!**/.idea/**'
+            ],
 
             // Update navigation tree by cron task (setTimeout)
             cron: false,
diff --git a/package.json b/package.json
index 861adb7..1eac42a 100644
--- a/package.json
+++ b/package.json
@@ -41,6 +41,7 @@
     "log4js": "~0.6.20",
     "macaddress": "^0.2.8",
     "marked": "^0.3.2",
+    "minimatch": "^3.0.0",
     "pretty-hrtime": "^1.0.0",
     "q": "^1.1.1",
     "serve-favicon": "^2.2.0",

From 33954cfe487647659c24f188aa904eef2355042e Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Tue, 17 Nov 2015 00:36:49 +0100
Subject: [PATCH 048/104] fix node modules check in file-tree

---
 core/file-tree/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/file-tree/index.js b/core/file-tree/index.js
index 0d7bcaa..a3e7869 100644
--- a/core/file-tree/index.js
+++ b/core/file-tree/index.js
@@ -38,7 +38,7 @@ glob.unshift('**/info.json');
 
 if (Array.isArray(config.includedDirs)) {
     config.includedDirs.forEach(function(item){
-        if (isNodeModule) {
+        if (isNodeModule()) {
             glob.push('node_modules/sourcejs/' + item + '/**/info.json');
         } else {
             glob.push('../' + item + '/**/info.json');

From b1e25532aa465211416ce0799cdff0115259d9ac Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Tue, 17 Nov 2015 01:26:03 +0100
Subject: [PATCH 049/104] fix node module check from file-tree

---
 app.js                   |  5 ++++-
 core/file-tree/index.js  |  3 +--
 core/lib/getUserPath.js  |  3 ++-
 core/lib/isNodeModule.js | 20 +++++++++++++-------
 4 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/app.js b/app.js
index b9b05d4..e4c478c 100644
--- a/app.js
+++ b/app.js
@@ -38,7 +38,10 @@ commander
 global.commander = commander;
 
 var trackStats = require(path.join(global.pathToApp, 'core/trackStats'));
-var userPath = global.userPath = (require('./core/lib/getUserPath'))();
+
+var getUserPath = require('./core/lib/getUserPath');
+var userPath = global.userPath = getUserPath();
+global.isNodeModule = getUserPath.isNodeModule;
 
 // Legacy support
 app.set('user', userPath);
diff --git a/core/file-tree/index.js b/core/file-tree/index.js
index a3e7869..ee3a957 100644
--- a/core/file-tree/index.js
+++ b/core/file-tree/index.js
@@ -8,7 +8,6 @@ var unflatten = require(path.join(global.pathToApp,'core/unflat'));
 var specUtils = require(path.join(global.pathToApp,'core/lib/specUtils'));
 var utils = require(path.join(global.pathToApp,'core/lib/utils'));
 var globArray = require(path.join(global.pathToApp,'core/lib/globArray'));
-var isNodeModule = require(path.join(global.pathToApp,'core/lib/isNodeModule'));
 var coreOpts = global.opts.core;
 var prettyHrtime = require('pretty-hrtime');
 
@@ -38,7 +37,7 @@ glob.unshift('**/info.json');
 
 if (Array.isArray(config.includedDirs)) {
     config.includedDirs.forEach(function(item){
-        if (isNodeModule()) {
+        if (global.isNodeModule) {
             glob.push('node_modules/sourcejs/' + item + '/**/info.json');
         } else {
             glob.push('../' + item + '/**/info.json');
diff --git a/core/lib/getUserPath.js b/core/lib/getUserPath.js
index 7d4b322..04a5129 100644
--- a/core/lib/getUserPath.js
+++ b/core/lib/getUserPath.js
@@ -13,7 +13,8 @@ module.exports = function(customGlobalopts, customPathToApp){
         pathToApp = sourcePathFromParent;
     }
 
-    var relativeUserPath = isNodeModule(pathToApp) ? '../..' : globalOpts.core.common.pathToUser;
+    var _isNodeModule = module.exports.isNodeModule = isNodeModule(pathToApp);
+    var relativeUserPath = _isNodeModule ? '../..' : globalOpts.core.common.pathToUser;
 
     return path.join(pathToApp, relativeUserPath);
 };
\ No newline at end of file
diff --git a/core/lib/isNodeModule.js b/core/lib/isNodeModule.js
index c379aff..89032d3 100644
--- a/core/lib/isNodeModule.js
+++ b/core/lib/isNodeModule.js
@@ -3,11 +3,17 @@
 var path = require('path');
 var fs = require('fs-extra');
 
-module.exports = function(customPathToApp) {
-    var pathToApp = customPathToApp || global.pathToApp;
-    var grantParentPath = path.join(pathToApp, '../../');
-    var relativePathToApp = path.relative(grantParentPath, pathToApp);
-    var assumedSourceNpmPath = path.join('node_modules', fs.readJsonSync(path.join(pathToApp, 'package.json')).name);
+if (typeof global.isNodeModule === 'undefined') {
+    module.exports = function (customPathToApp) {
+        var pathToApp = customPathToApp || global.pathToApp;
+        var grantParentPath = path.join(pathToApp, '../../');
+        var relativePathToApp = path.relative(grantParentPath, pathToApp);
+        var assumedSourceNpmPath = path.join('node_modules', fs.readJsonSync(path.join(pathToApp, 'package.json')).name);
 
-    return relativePathToApp === assumedSourceNpmPath;
-};
\ No newline at end of file
+        return relativePathToApp === assumedSourceNpmPath;
+    }
+} else {
+    module.exports = function() {
+        return global.isNodeModule;
+    };
+}
\ No newline at end of file

From 7aaacac219516b713bd1a2ae2ac8b84503fe8b95 Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Sat, 21 Nov 2015 13:16:31 +0100
Subject: [PATCH 050/104] fix windows file-tree

---
 app.js                   |  2 +-
 core/file-tree/index.js  | 20 ++++++++++++++------
 core/lib/getUserPath.js  |  4 +++-
 core/lib/isNodeModule.js |  2 +-
 core/lib/specUtils.js    |  6 +++---
 5 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/app.js b/app.js
index e4c478c..f40cdaa 100644
--- a/app.js
+++ b/app.js
@@ -17,7 +17,7 @@ var favicon = require('serve-favicon');
 /* Globals */
 // Define absolute path to app, normalizing windows disk name
 global.pathToApp = __dirname.replace(/^\w:\\/, function (match) {
-    return match.toLowerCase();
+    return match.toUpperCase();
 });
 
 var app = global.app = express();
diff --git a/core/file-tree/index.js b/core/file-tree/index.js
index ee3a957..be1ab7b 100644
--- a/core/file-tree/index.js
+++ b/core/file-tree/index.js
@@ -32,6 +32,7 @@ var config = {
 // Overwriting base options
 utils.extendOptions(config, coreOpts.fileTree);
 
+var relativePathFromUserToApp = path.relative(userPath, normalizedPathToApp);
 var glob = config.excludes;
 glob.unshift('**/info.json');
 
@@ -40,7 +41,7 @@ if (Array.isArray(config.includedDirs)) {
         if (global.isNodeModule) {
             glob.push('node_modules/sourcejs/' + item + '/**/info.json');
         } else {
-            glob.push('../' + item + '/**/info.json');
+            glob.push(relativePathFromUserToApp + '/' + item + '/**/info.json');
         }
     });
 }
@@ -86,9 +87,10 @@ var getThumbnailPath = module.exports.getThumbnailPath = function(specDir, custo
     var thumbnail;
     var thumbnailPathFromSpecDir = customThumbnailPath || config.thumbnail;
 
-    var absoluteThumbNailPath = path.join(specDir, thumbnailPathFromSpecDir).replace(/\\/g, '/');
+    var absoluteThumbNailPath = path.join(specDir, thumbnailPathFromSpecDir);
+
     if (fs.existsSync(absoluteThumbNailPath)) {
-        thumbnail = path.join(getRelativeSpecPath(specDir), thumbnailPathFromSpecDir);
+        thumbnail = path.join(getRelativeSpecPath(specDir), thumbnailPathFromSpecDir).replace(/\\/g, '/');
     }
 
     return thumbnail;
@@ -168,7 +170,7 @@ var fileTree = function(workingDir) {
     // Allow to run app without existing specsRoot
     if (!fs.existsSync(workingDir) && workingDir === config.specsRoot) {
         global.log.warn('Running SourceJS without user dir. This set-up should be used only for running tests.');
-        workingDir = global.pathToApp;
+        workingDir = normalizedPathToApp;
     }
 
     var files = globArray(glob, {
@@ -177,8 +179,14 @@ var fileTree = function(workingDir) {
 
     files.forEach(function(file){
         var realFilePath = path.join(workingDir, file);
-        var specPath = path.dirname(realFilePath);
-        var specId = path.dirname(file).replace('node_modules/sourcejs/', '').replace('../', '');
+        var specPath = path.dirname(realFilePath).replace(/\\/g, '/');
+        var specId;
+
+        if (global.isNodeModule) {
+            specId = path.dirname(file).replace('node_modules/sourcejs/', '');
+        } else {
+            specId = path.dirname(file).replace(relativePathFromUserToApp + '/','');
+        }
 
         specId = specId === '.' ? '' : specId + '/';
 
diff --git a/core/lib/getUserPath.js b/core/lib/getUserPath.js
index 04a5129..0bf2828 100644
--- a/core/lib/getUserPath.js
+++ b/core/lib/getUserPath.js
@@ -16,5 +16,7 @@ module.exports = function(customGlobalopts, customPathToApp){
     var _isNodeModule = module.exports.isNodeModule = isNodeModule(pathToApp);
     var relativeUserPath = _isNodeModule ? '../..' : globalOpts.core.common.pathToUser;
 
-    return path.join(pathToApp, relativeUserPath);
+    return path.join(pathToApp, relativeUserPath).replace(/^\w:\\/, function (match) {
+	    return match.toUpperCase();
+	});
 };
\ No newline at end of file
diff --git a/core/lib/isNodeModule.js b/core/lib/isNodeModule.js
index 89032d3..aa1cae5 100644
--- a/core/lib/isNodeModule.js
+++ b/core/lib/isNodeModule.js
@@ -11,7 +11,7 @@ if (typeof global.isNodeModule === 'undefined') {
         var assumedSourceNpmPath = path.join('node_modules', fs.readJsonSync(path.join(pathToApp, 'package.json')).name);
 
         return relativePathToApp === assumedSourceNpmPath;
-    }
+    };
 } else {
     module.exports = function() {
         return global.isNodeModule;
diff --git a/core/lib/specUtils.js b/core/lib/specUtils.js
index 0536244..11a5d80 100644
--- a/core/lib/specUtils.js
+++ b/core/lib/specUtils.js
@@ -112,15 +112,15 @@ module.exports.getSpecFromDir = function(dirPath, specFiles) {
 module.exports.getFullPathToSpec = function(urlPath){
     var pathToSpec = parseSpecUrlPath(urlPath).pathToSpec;
     var cleanPath = urlPath.replace(/\/+$/, '').replace(/\//, '');
-    var specPath = path.join(global.userPath, pathToSpec).replace(/\\/g, '/');
+    var specPath = path.join(global.userPath, pathToSpec);
 
     // Including non-standard paths, outside default static route
     global.opts.core.common.includedDirs.forEach(function(item){
         if (cleanPath.split('/')[0] === item) {
-            specPath = specPath.replace(global.userPath, global.pathToApp + '/');
+            specPath = specPath.replace(global.userPath, global.pathToApp);
         }
     });
 
     // remove trailing slash
-    return specPath.replace(/\/+$/, '');
+    return path.normalize(specPath).replace(/\/+$/, '');
 };

From 9a08615649a474c201238723e03b020b50092f43 Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Sun, 22 Nov 2015 13:22:04 +0100
Subject: [PATCH 051/104] use PORT env (for heroku)

---
 app.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app.js b/app.js
index f40cdaa..5322525 100644
--- a/app.js
+++ b/app.js
@@ -28,7 +28,7 @@ global.opts = loadOptions();
 // Arguments parse */
 commander
     .option('-l, --log [string]', 'Log level (default: ' + global.opts.core.common.defaultLogLevel + ').',  global.opts.core.common.defaultLogLevel)
-    .option('-p, --port [number]', 'Server port (default: ' + global.opts.core.server.port + ').')
+    .option('-p, --port [number]', 'Server port (default: ' + global.opts.core.server.port + '). Note: `process.env.PORT` will override this option if present.')
     .option('--hostname [string]', 'Server hostname  (default: ' + global.opts.core.server.hostname + ').')
     .option('--test', 'Run app with tests.')
     .option('--no-watch', 'Run with disabled watcher.')
@@ -67,6 +67,11 @@ if (!commander.watch) {
     });
     global.opts.core.watch.enabled = false;
 }
+
+if (process.env.PORT) {
+    global.opts.core.server.port = parseInt(process.env.PORT);
+    console.log('Using defined app PORT from environment variable: ' + process.env.PORT);
+}
 /* /Globals */
 
 

From 2af70fa15e75205dc7b5cf5b49966091cc087e6d Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Sun, 22 Nov 2015 16:01:29 +0100
Subject: [PATCH 052/104] allow passing any options

---
 app.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app.js b/app.js
index 5322525..a115c9c 100644
--- a/app.js
+++ b/app.js
@@ -27,6 +27,7 @@ global.opts = loadOptions();
 
 // Arguments parse */
 commander
+    .allowUnknownOption()
     .option('-l, --log [string]', 'Log level (default: ' + global.opts.core.common.defaultLogLevel + ').',  global.opts.core.common.defaultLogLevel)
     .option('-p, --port [number]', 'Server port (default: ' + global.opts.core.server.port + '). Note: `process.env.PORT` will override this option if present.')
     .option('--hostname [string]', 'Server hostname  (default: ' + global.opts.core.server.hostname + ').')

From 2faddb61bbae0f3667dd97952ac73c0a9ee4c7bf Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Sun, 22 Nov 2015 18:24:36 +0100
Subject: [PATCH 053/104] expose prod build command

---
 package.json | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 1eac42a..c2ddc34 100644
--- a/package.json
+++ b/package.json
@@ -33,6 +33,9 @@
     "grunt-contrib-clean": "^0.6.0",
     "grunt-contrib-copy": "^0.8.1",
     "grunt-contrib-less": "^1.0.1",
+    "grunt-contrib-cssmin": "^0.14.0",
+    "grunt-contrib-htmlmin": "^0.5.0",
+    "grunt-contrib-uglify": "^0.9.2",
     "grunt-newer": "^1.1.1",
     "gulp-watch": "operatino/gulp-watch#4.3.5-latest-fsevents",
     "load-grunt-parent-tasks": "^0.1.1",
@@ -53,6 +56,7 @@
   "scripts": {
     "postinstall": "grunt update && node ./core/trackInstall",
     "build": "grunt update",
+    "build:prod": "grunt build",
     "lint": "grunt jshint",
     "start": "node app",
     "watch": "grunt watch-all",
@@ -68,10 +72,7 @@
     "chai": "^3.2.0",
     "cross-spawn": "^0.4.0",
     "grunt-casperjs": "^2.1.0",
-    "grunt-contrib-cssmin": "^0.14.0",
-    "grunt-contrib-htmlmin": "^0.5.0",
     "grunt-contrib-jshint": "^0.11.3",
-    "grunt-contrib-uglify": "^0.9.2",
     "grunt-contrib-watch": "^0.6.1",
     "grunt-jsdoc": "^1.0.0",
     "grunt-mocha-test": "^0.12.7",

From f1b1236a7bd8bfbc501c9c1e015655aaec34f2ef Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Sun, 13 Dec 2015 15:17:18 +0100
Subject: [PATCH 054/104] make unflat produce only objects

---
 core/lib/flattenTillSpec.js |  8 ++++++++
 core/unflat.js              | 26 +++++++++-----------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/core/lib/flattenTillSpec.js b/core/lib/flattenTillSpec.js
index 91f454c..536391c 100644
--- a/core/lib/flattenTillSpec.js
+++ b/core/lib/flattenTillSpec.js
@@ -12,7 +12,15 @@ module.exports = function(data) {
     var output = {};
     var _data = data;
 
+    if (!_data) {
+        console.warn('flattenTillSpec: no data provided, can\'t flatten.');
+
+        return output;
+    }
+
     var step = function(object, prev) {
+        if (!object) return;
+
         Object.keys(object).forEach(function (key) {
             var value = object[key];
 
diff --git a/core/unflat.js b/core/unflat.js
index 4b3d65f..5917e1f 100644
--- a/core/unflat.js
+++ b/core/unflat.js
@@ -3,36 +3,28 @@
 function unflatten(target, opts) {
     opts = opts || {};
 
-    var delimiter = opts.delimiter || '.',
-        result = {};
+    var delimiter = opts.delimiter || '.';
+    var result = {};
 
     if (Object.prototype.toString.call(target) !== '[object Object]') {
         return target;
     }
 
-    // safely ensure that the key is
-    // an integer.
-    function getkey(key) {
-        var parsedKey = Number(key);
-
-        return (isNaN(parsedKey) || key.indexOf('.') !== -1)? key : parsedKey;
-    }
-
     Object.keys(target).forEach(function(key) {
-        var split = key.split(delimiter),
-            key1 = getkey(split.shift()),
-            key2 = getkey(split[0]),
-            recipient = result;
+        var split = key.split(delimiter);
+        var key1 = split.shift();
+        var key2 = split[0];
+        var recipient = result;
 
         while (key2 !== undefined) {
             if (recipient[key1] === undefined) {
-                recipient[key1] = ( (typeof key2 === 'number' && !opts.object)? [] : {});
+                recipient[key1] = {};
             }
 
             recipient = recipient[key1];
             if (split.length > 0) {
-                key1 = getkey(split.shift());
-                key2 = getkey(split[0]);
+                key1 = split.shift();
+                key2 = split[0];
             }
         }
 

From 093042b9a88c8c859c391f9b45da3602dcec0f94 Mon Sep 17 00:00:00 2001
From: Norbert de Langen <norbert@macaw.nl>
Date: Sun, 17 Jan 2016 19:00:43 +0100
Subject: [PATCH 055/104] CORRECTION in documentation: split tag content into
 multiple tags

documentation suggested that you were supposed to combine multiple tags into a single string inside an array.
In this branch at least this is not the case, an array is expected with strings in it, 1 entry per tag.
---
 docs/info-json/readme.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/info-json/readme.md b/docs/info-json/readme.md
index 4de9fdd..15cbd4d 100644
--- a/docs/info-json/readme.md
+++ b/docs/info-json/readme.md
@@ -8,7 +8,7 @@ List of used options in `info.json`:
 {
     "title": "Info.json - Spec Description",
     "author": "Robert Haritonov",
-    "tag": ["tags, for, search"],
+    "tag": ["tags", "for", "search"],
     "info": "Spec description.",
     "role": "navigation",
     "template": ["custom" | "$(context)/template.ejs"],
@@ -42,4 +42,4 @@ Feel free to add any custom meta information to `info.json` file for your needs
 
 `sourcejs` - this field accepts a local configuration object for configuring spec level context options.
 
-Read more about engine configuration capabilities in [Engine Configuration](/docs/configuration) doc.
\ No newline at end of file
+Read more about engine configuration capabilities in [Engine Configuration](/docs/configuration) doc.

From 76d33c0413f37a3493764d68fb003538a5dfb075 Mon Sep 17 00:00:00 2001
From: Norbert de Langen <norbert@macaw.nl>
Date: Sun, 17 Jan 2016 19:56:59 +0100
Subject: [PATCH 056/104] CHANGE the use of the info.json 'keyword' property to
 the already more widely known 'tag' property.

CHANGE the construction of the autocompleteConfig in search.js to use the tag property instead of the keyword-property.
CHANGE all references in /docs/**/info.json to the keyword property to the tag-property.
---
 assets/js/modules/search.js    | 12 ++++++------
 docs/api/load-events/info.json |  2 +-
 docs/api/plugins/info.json     |  4 ++--
 docs/api/rest-api/info.json    |  2 +-
 docs/auth/info.json            |  2 +-
 docs/configuration/info.json   |  2 +-
 docs/info-json/info.json       |  2 +-
 docs/spec-helpers/info.json    |  2 +-
 docs/spec/info.json            |  4 ++--
 9 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/assets/js/modules/search.js b/assets/js/modules/search.js
index 27f5f49..4556037 100644
--- a/assets/js/modules/search.js
+++ b/assets/js/modules/search.js
@@ -72,18 +72,18 @@ Search.prototype.prepareAutoCompleteData = function() {
             // Skip hidden specs
             if (targetPage.tag && targetPage.tag.indexOf('hidden') > -1) continue;
 
-            var keywords = targetPage.keywords;
-            var keywordsPageName = pagesData[page] && pagesData[page]['name']
+            var tag = targetPage.tag;
+            var pageName = pagesData[page] && pagesData[page]['name']
                 ? pagesData[page]['name']
                 : ""; //get cat name
-            var prepareKeywords = '';
+            var tags = '';
             var autocompleteValue = targetPage.title;
 
-            if (keywords && keywords !== '') {
-                prepareKeywords += ', ' + keywords;
+            if (tag && tag.length) {
+                tags += ', ' + tag.join(' ');
             }
 
-            autocompleteValue += ' (' + keywordsPageName + prepareKeywords + ')';
+            autocompleteValue += ' (' + pageName + tags + ')';
             this.data[this.data.length] = new AutocomleteDataItem(autocompleteValue, targetPage.url);
         }
     }
diff --git a/docs/api/load-events/info.json b/docs/api/load-events/info.json
index 424ec8b..453ae79 100644
--- a/docs/api/load-events/info.json
+++ b/docs/api/load-events/info.json
@@ -1,5 +1,5 @@
 {
-    "keywords": "events, spec loaded",
+    "tag": ["events", "spec", "loaded"],
     "title": "Spec Load Event",
     "template": "doc"
 }
diff --git a/docs/api/plugins/info.json b/docs/api/plugins/info.json
index 5d02fbc..a11e136 100644
--- a/docs/api/plugins/info.json
+++ b/docs/api/plugins/info.json
@@ -1,5 +1,5 @@
 {
-    "keywords": "plugins, middlewares",
+    "tag": ["plugins", "middlewares"],
     "title": "Writing SourceJS Plugins and Middlewares",
     "template": "doc"
-}
\ No newline at end of file
+}
diff --git a/docs/api/rest-api/info.json b/docs/api/rest-api/info.json
index 61d61f5..46f9723 100644
--- a/docs/api/rest-api/info.json
+++ b/docs/api/rest-api/info.json
@@ -1,5 +1,5 @@
 {
-    "keywords": "api, rest",
+    "tag": ["api", "rest"],
     "title": "REST API",
     "template": "doc"
 }
diff --git a/docs/auth/info.json b/docs/auth/info.json
index e46e283..89618f4 100644
--- a/docs/auth/info.json
+++ b/docs/auth/info.json
@@ -1,5 +1,5 @@
 {
-    "keywords": "auth, github",
+    "tag": ["auth", "github"],
     "title": "Using Github Auth",
     "template": "doc"
 }
diff --git a/docs/configuration/info.json b/docs/configuration/info.json
index 02857e0..1ebc864 100644
--- a/docs/configuration/info.json
+++ b/docs/configuration/info.json
@@ -1,5 +1,5 @@
 {
     "title": "Engine Configuration",
-    "keywords": "options, options.js, sourcejs-options, context",
+    "tag": ["options", "options.js", "sourcejs-options", "context"],
     "template": "doc"
 }
diff --git a/docs/info-json/info.json b/docs/info-json/info.json
index 0088bb3..03a0d84 100644
--- a/docs/info-json/info.json
+++ b/docs/info-json/info.json
@@ -1,5 +1,5 @@
 {
     "title": "Info.json - Spec Description",
-    "keywords": "spec meta, template, specFile",
+    "tag": ["tag", "title", "thumbnailPath", "specFile", "template", "role", "info", "spec meta"],
     "template": "doc"
 }
diff --git a/docs/spec-helpers/info.json b/docs/spec-helpers/info.json
index ca0bdee..f321287 100644
--- a/docs/spec-helpers/info.json
+++ b/docs/spec-helpers/info.json
@@ -1,5 +1,5 @@
 {
-    "keywords": "ejs, include",
+    "tag": ["ejs", "include"],
     "title": "Spec Rendering Helpers",
     "template": "doc"
 }
diff --git a/docs/spec/info.json b/docs/spec/info.json
index 1976658..5d91445 100644
--- a/docs/spec/info.json
+++ b/docs/spec/info.json
@@ -1,5 +1,5 @@
 {
-    "keywords": "create spec, spec markup",
+    "tag": ["create spec", "spec markup"],
     "template": "doc",
     "title": "Spec Page Documentation"
-}
\ No newline at end of file
+}

From 3d171a12ab5a8a58b21b463ce232efa8f0c56669 Mon Sep 17 00:00:00 2001
From: Norbert de Langen <norbert@macaw.nl>
Date: Fri, 29 Jan 2016 12:52:13 +0100
Subject: [PATCH 057/104] CHANGE the concatenation of all the tags to generate
 an output like this: `pageName, tag1, tag2`

---
 assets/js/modules/search.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/js/modules/search.js b/assets/js/modules/search.js
index 4556037..2be50e7 100644
--- a/assets/js/modules/search.js
+++ b/assets/js/modules/search.js
@@ -80,7 +80,7 @@ Search.prototype.prepareAutoCompleteData = function() {
             var autocompleteValue = targetPage.title;
 
             if (tag && tag.length) {
-                tags += ', ' + tag.join(' ');
+                tags += ', ' + tag.join(', ');
             }
 
             autocompleteValue += ' (' + pageName + tags + ')';

From 5a04d3d92fbaf6428e427bb40d66813f6c2a920e Mon Sep 17 00:00:00 2001
From: Matt Layton <mattlayt@gmail.com>
Date: Mon, 8 Feb 2016 10:03:49 +0000
Subject: [PATCH 058/104] Allow code definition blocks to be ignored

---
 assets/js/modules/codeSource.js |  8 ++++++--
 docs/spec/index.src.html        | 10 ++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/assets/js/modules/codeSource.js b/assets/js/modules/codeSource.js
index 931e7ea..c679347 100644
--- a/assets/js/modules/codeSource.js
+++ b/assets/js/modules/codeSource.js
@@ -170,7 +170,9 @@ define([
             };
 
             var afterActivation = function() {
-                var sources = $('.' + SourceCode);
+                var sources = $('.' + SourceCode).filter(function() {
+                    return !$(this).next().hasClass('source_ignore');
+                });
                 sources.addClass(SourceCodeShow);
 
                 //Scroll to section
@@ -192,7 +194,9 @@ define([
                 if (!prepared) {
                     fillCodeContainers();
                     prepareCodeBlocks();
-                    $('pre').removeAttr('style');
+                    $('pre').filter(function() {
+                        return !$(this).closest('.source_source-code').next().hasClass('source_ignore');
+                    }).removeAttr('style');
                     prepared = true;
                 }
                 afterActivation();
diff --git a/docs/spec/index.src.html b/docs/spec/index.src.html
index 2584533..a8dcea0 100755
--- a/docs/spec/index.src.html
+++ b/docs/spec/index.src.html
@@ -100,6 +100,16 @@ <h3>Show source code</h3>
 
     <p>By default (before 0.6.0) all code blocks are hidden by default, and are shown after toggling "Show source code" in menu. To define block as visible by default, add <code>.source_visible</code> class next to <code>.src-*</code></p>
 
+    <h3>Hide source code (permanent)</h3>
+
+    <p>There may be times when you wan't to avoid exposing the source code for a particular example. This can be achieved by adding the <code>.source_ignore</code> class to the <code>.source_example</code>.</p>
+
+    <code class="src-html source_visible">
+        &lt;div class="source_example source_ignore"&gt;
+            &lt;button&gt;Presentational-only example&lt;/button&gt;
+        &lt;/div&gt;
+    </code>
+
 </section>
 
 <section class="source_section">

From d9db4a24f7b20c5c8a566b22b7ff71ce25977036 Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Sun, 20 Mar 2016 20:06:20 +0100
Subject: [PATCH 059/104] remove node 0.10 from appveyor CI conf

---
 appveyor.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index c96b1ce..49ecf7d 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -3,7 +3,6 @@
 
 environment:
   matrix:
-    - nodejs_version: 0.10
     - nodejs_version: 0.12
     - nodejs_version: 4
 

From b30c03f08c85575ae3c9034314988cb84c269f85 Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Sun, 20 Mar 2016 20:06:20 +0100
Subject: [PATCH 060/104] remove node 0.10 from appveyor CI conf

---
 appveyor.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index c96b1ce..49ecf7d 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -3,7 +3,6 @@
 
 environment:
   matrix:
-    - nodejs_version: 0.10
     - nodejs_version: 0.12
     - nodejs_version: 4
 

From 8c4cd37c4aa68c5c2d6afb49609173fadc37ec2b Mon Sep 17 00:00:00 2001
From: Norbert de Langen <norbert@macaw.nl>
Date: Sun, 14 Feb 2016 16:45:49 +0100
Subject: [PATCH 061/104] ADD breadcrumb to SourceJS Core

CHANGE the displayed title of breadcrumb item to the spec's info.json title. (+12 squashed commits)
Squashed commits:
[a928793] CHANGE the way 25px padding is placed on header & footer

.source_col-main {} now focusses on max-width, and not on padding. Changing it this way means it's easier to align additional blocks in the page.
replaced all indentations to 4 spaces.
[2d905f2] ADD breadcrumb to sourceJS Core
[85a95dd] CLEANUP, remove unused code
[052a3b0] REFACTOR breadcrumbs

MOVE breadcrumb template to core/views
MOVE breadcrumb styling into own file
CHANGE breadcrumb middleware to use viewResolver
CHANGE breadcrumb middleware to load template async
[f0cdc73] pass rendered breadcrumbs as part of `req.specData`
[a22caeb] ADD breadcrumb to loader.js
[3a42c44] ADD breadcrumb ejs placeholder in the spec templates
[28afeac] ADD a middleware for breadcrumbs
[0d85ddb] MOVED breadcrumb template in it's own file
[ced1947] CHANGE wrap.js so error output is 'escaped' & ADD log for the error
[ce693e3] REVERT adding breadcrumb functionality to wrap.js
[da43a90] ADD breadcrumb to header via wrap middleware

CHANGE the way 25px padding is placed on header & footer

.source_col-main {} now focusses on max-width, and not on padding. Changing it this way means it's easier to align additional blocks in the page.
replaced all indentations to 4 spaces.

CHANGE the displayed title of breadcrumb item to the spec's info.json title.

FIX merge conflict regression
---
 assets/css/base/grids.less         | 56 ++++++++++----------
 assets/css/defaults.less           |  3 +-
 assets/css/project/breadcrumb.less | 49 +++++++++++++++++
 assets/css/project/footer.less     | 62 +++++++++++-----------
 assets/css/project/header.less     | 85 +++++++++++++++---------------
 assets/templates/header.inc.html   |  2 +-
 core/middlewares/breadcrumb.js     | 77 +++++++++++++++++++++++++++
 core/middlewares/loader.js         |  8 ++-
 core/middlewares/wrap.js           |  9 ++--
 core/views/breadcrumb.ejs          |  7 +++
 core/views/doc.ejs                 |  3 +-
 core/views/navigation.ejs          |  3 +-
 core/views/spec.ejs                |  3 +-
 13 files changed, 256 insertions(+), 111 deletions(-)
 create mode 100644 assets/css/project/breadcrumb.less
 create mode 100644 core/middlewares/breadcrumb.js
 create mode 100644 core/views/breadcrumb.ejs

diff --git a/assets/css/base/grids.less b/assets/css/base/grids.less
index bf80d83..62921b9 100644
--- a/assets/css/base/grids.less
+++ b/assets/css/base/grids.less
@@ -2,56 +2,56 @@
 ---------------------------------------------------------------------------------- */
 
 .source_col-main {
-	margin: 0 auto;
-	padding: 0 @layout_col-main--padding;
-	max-width: @layout_col-main--max-width;
-	box-sizing: content-box;
-	}
+    margin: 0 auto;
+    padding: 0;
+    max-width: @layout_col-main--max-width;
+    box-sizing: content-box;
+}
 
 .source_col {
-	display: inline-block;
+    display: inline-block;
 
-	vertical-align: top;
-	width: 33%;
-	padding-right: 25px;
+    vertical-align: top;
+    width: 33%;
+    padding-right: 25px;
 
-	box-sizing: border-box;
+    box-sizing: border-box;
 
     &.__15 {
-		width: 20%;
-		}
+        width: 20%;
+    }
 
     &.__14 {
-		width: 24.5%;
-		}
+        width: 24.5%;
+    }
 
     &__23 {
-		width: 66.2%;
-		}
+        width: 66.2%;
+    }
 
     &.__right {
-		float: right;
-		padding-right: 0;
-		}
+        float: right;
+        padding-right: 0;
+    }
 
-	}
+}
 
 /* Justified layout
 -------------------------------------------------- */
 
-/* justified inline data  */
+/* justified inline data    */
 .jcol-l,
 .jcol-r {
-	display: inline-block;
-	width: 50%;
-	vertical-align: middle;
+    display: inline-block;
+    width: 50%;
+    vertical-align: middle;
 
-	text-align: left;
-	}
+    text-align: left;
+}
 
 .jcol-r {
-	text-align: right;
-	}
+    text-align: right;
+}
 
 /* /Justified layout */
 
diff --git a/assets/css/defaults.less b/assets/css/defaults.less
index 77b775e..12dd05c 100644
--- a/assets/css/defaults.less
+++ b/assets/css/defaults.less
@@ -22,6 +22,7 @@
 @import url('project/layout.less');
 @import url('project/header.less');
 @import url('project/footer.less');
+@import url('project/breadcrumb.less');
 @import url('project/catalog.less');
 @import url('project/navigation.less');
 @import url('project/info.less');
@@ -39,4 +40,4 @@
 @import url('cosmetic/links.less');
 @import url('cosmetic/helpers.less');
 
-/*# sourceMappingURL=defaults.css.map */
\ No newline at end of file
+/*# sourceMappingURL=defaults.css.map */
diff --git a/assets/css/project/breadcrumb.less b/assets/css/project/breadcrumb.less
new file mode 100644
index 0000000..c396f74
--- /dev/null
+++ b/assets/css/project/breadcrumb.less
@@ -0,0 +1,49 @@
+/* Breadcrumb
+-------------------------------------------------- */
+
+.source_breadcrumb {
+    display: block;
+    vertical-align: 1px;
+    background: #f1f2f3;
+    margin: 0 -25px;
+    padding: 10px 25px;
+
+    white-space: nowrap;
+    overflow: hidden;
+    overflow-x: auto;
+    -webkit-overflow-scrolling: touch;
+}
+
+.source_breadcrumb_lst {
+    margin: 0;
+    padding: 0;
+    list-style: none;
+}
+
+.source_breadcrumb_i {
+    display: inline-block;
+    margin: 0 5px;
+
+    font-family: Arial, Helvetica, sans-serif;
+    font-size: 14px;
+    line-height: 1.5;
+    white-space: nowrap;
+
+    &:first-child {
+        margin-left: 0;
+    }
+    &:last-child {
+        margin-right: 0;
+
+        &:after {
+          display: none;
+        }
+    }
+}
+.source_breadcrumb_i:after {
+    display: inline-block;;
+    margin: 0 0 0 13px;
+    content: '/';
+    color: rgba(0,0,0,0.3);
+}
+/* /Breadcrumb */
diff --git a/assets/css/project/footer.less b/assets/css/project/footer.less
index c9a4552..f7e5508 100644
--- a/assets/css/project/footer.less
+++ b/assets/css/project/footer.less
@@ -2,47 +2,47 @@
 ---------------------------------------------------------------------------------- */
 
 .source_footer {
-	position: relative;
-	z-index: 11; /* Higher than nav */
+    position: relative;
+    z-index: 11; /* Higher than nav */
 
-	margin: 0 -25px;
+    margin: 0 -25px;
 
-	-ms-flex-preferred-size: auto;
+    -ms-flex-preferred-size: auto;
 
-	border-top: 1px solid #eee;
-	padding: 30px 0;
-	background: @black;
+    border-top: 1px solid #eee;
+    padding: 30px 25px;
+    background: @black;
 
-	box-sizing: border-box;
+    box-sizing: border-box;
 
     font-family: @font-family-main;
-	font-size: @fz-size-xs;
+    font-size: @fz-size-xs;
     line-height: 1.5;
-	color: @gray;
-	}
-
-	.source_footer h2 {
-		.reset();
-		margin-bottom: 10px;
-		font-weight: normal;
-		font-size: 15px;
-		color: #666;
-		}
-
-    .source_footer .source_ul {
-        color: @gray;
-        margin: 0;
-        list-style: none;
-        }
+    color: @gray;
+}
+
+.source_footer h2 {
+    .reset();
+    margin-bottom: 10px;
+    font-weight: normal;
+    font-size: 15px;
+    color: #666;
+}
+
+.source_footer .source_ul {
+    color: @gray;
+    margin: 0;
+    list-style: none;
+}
 
 .source_footer_copy {
-	margin-top: 40px;
-	line-height: 2;
-	}
+    margin-top: 40px;
+    line-height: 2;
+}
 
 .source_footer_version {
-	color: @color-aux2;
-	}
+    color: @color-aux2;
+}
 
 /* /Footer
----------------------------------------------------------------------------------- */
\ No newline at end of file
+---------------------------------------------------------------------------------- */
diff --git a/assets/css/project/header.less b/assets/css/project/header.less
index 6cea823..86e30a5 100644
--- a/assets/css/project/header.less
+++ b/assets/css/project/header.less
@@ -5,18 +5,17 @@
     position: relative;
     margin: -50px -25px 0;
 
-	height: 50px;
-	min-width: 990px;
-	padding-top: 11px;
-	padding-bottom: 10px;
-	z-index: 9999; /* overlap all */
-	top: 0; left: 0; right: 0;
+    height: 50px;
+    min-width: 990px;
+    padding: 11px 25px 10px 25px;
+    z-index: 9999; /* overlap all */
+    top: 0; left: 0; right: 0;
 
-	background: @black;
+    background: @black;
 
-	box-sizing: border-box;
+    box-sizing: border-box;
 
-	transition: opacity .2s;
+    transition: opacity .2s;
 
     white-space: nowrap;
 
@@ -24,74 +23,74 @@
     font-size: @fz-size-m;
 
     @media @media_min-step-m {
-	    position: fixed;
+        position: fixed;
         margin: 0;
-	    }
-
+    }
+    
     .source__scrolled-down & {
         opacity: 1;
 
         @media @media_min-step-m {opacity: .1;}
-        }
+    }
 
     .source__scrolled-down &:hover {
         opacity: 1;
-        }
-	}
+    }
+}
 
 
 .source__scrolled-down .source_header__focus,
 .source_header__focus {
-	opacity: 1;
-	}
+    opacity: 1;
+}
 
 .source_header .source_logo {
-	display: inline-block;
-	vertical-align: baseline;
+    display: inline-block;
+    vertical-align: baseline;
 
-	margin-right: 25px;
+    margin-right: 25px;
 
-	line-height: 30px !important;
+    line-height: 30px !important;
 
-	color: #67a9d4;
-	font-size: 24px !important;
+    color: #67a9d4;
+    font-size: 24px !important;
     font-family: 'Museo', Arial;
 
-	text-decoration: none;
+    text-decoration: none;
 
     &:hover {
-		color: #67a9d4;
+        color: #67a9d4;
 
-		text-decoration: underline;
-		}
-	}
+        text-decoration: underline;
+    }
+}
 
 /* Navigation
 -------------------------------------------------- */
 
 .source_header_nav {
-	display: inline-block;
-	vertical-align: 1px;
-	}
+    display: inline-block;
+    vertical-align: 1px;
+}
 
 .source_header_nav_lst {
-	margin: 0;
-	padding: 0;
-	list-style: none;
-	}
+    margin: 0;
+    padding: 0;
+    list-style: none;
+}
 
 .source_header_nav_i {
-	display: inline-block;
-	margin-left: 20px;
+    display: inline-block;
+    margin-left: 20px;
 
-	/* Reset */
-	line-height: 1.5;
+    /* Reset */
+    line-height: 1.5;
 
     &:first-child {
-		margin-left: 0;
-		}
-	}
+        margin-left: 0;
+    }
+}
 /* /Navigation */
 
 /* /Header
----------------------------------------------------------------------------------- */
\ No newline at end of file
+---------------------------------------------------------------------------------- */
diff --git a/assets/templates/header.inc.html b/assets/templates/header.inc.html
index 33a0708..aad4208 100644
--- a/assets/templates/header.inc.html
+++ b/assets/templates/header.inc.html
@@ -22,4 +22,4 @@
             <a class="js-hook source_login"></a>
         </div>
     </div>
-</header>
\ No newline at end of file
+</header>
diff --git a/core/middlewares/breadcrumb.js b/core/middlewares/breadcrumb.js
new file mode 100644
index 0000000..226e0dc
--- /dev/null
+++ b/core/middlewares/breadcrumb.js
@@ -0,0 +1,77 @@
+'use strict';
+
+var fs = require('fs-extra');
+var path = require('path');
+
+var ejs = require(path.join(global.pathToApp, 'core/ejsWithHelpers.js'));
+var viewResolver = require(path.join(global.pathToApp + '/core/lib/viewResolver.js'));
+var specUtils = require(path.join(global.pathToApp,'core/lib/specUtils'));
+
+/**
+* Processing pre-ejs rendering on spec request
+*
+* @param {object} req - Request object
+* @param {object} res - Response object
+* @param {function} next - The callback function
+* */
+exports.process = function(req, res, next) {
+    // Check if spec is request and ejs pre-rendering enabled
+    if (req.specData && req.specData.renderedHtml) {
+        var contextOptions = req.specData.contextOptions;
+
+        // TODO get this from a new option or find an existing option suitable
+        var projectName = null;
+
+        var getData = function (specDir) {
+            var infoFilePath = path.join(specDir, global.opts.core.common.infoFile);
+            return fs.existsSync(infoFilePath) ? fs.readJsonSync(infoFilePath, {throws: false}) : undefined;
+        };
+
+        // breadcrumb data
+        var data = req.path.split('/').reduce(function (result, item) {
+            if (item === '' && result.length === 0) {
+                return result.concat([{
+                    name: projectName || 'Home',
+                    path: '/'
+                }]);
+            } else if (item !== '') {
+                return result.concat([{
+                    name: item,
+                    path: (result[result.length - 1].path + item + '/')
+                }]);
+            } else {
+                return result;
+            }
+        }, []).map(function (item) {
+            item.fullPath = specUtils.getFullPathToSpec(item.path);
+            item.info = getData(item.fullPath) || {};
+            item.title = item.info.name || item.info.title || item.name;
+            return item;
+        });
+
+        // choose the proper template, depending on page type or defined path
+        var viewParam = 'breadcrumb';
+
+        var templatePath = viewResolver(viewParam, contextOptions.rendering.views, undefined) || viewParam;
+
+        fs.readFile(templatePath, "utf-8", function(err, template){
+            var renderedBreadcrumps;
+
+            try {
+                renderedBreadcrumps = ejs.render(template, {
+                    breadcrumb: data
+                }, {
+                    filename: templatePath
+                });
+            } catch (err) {
+                renderedBreadcrumps = '';
+                global.log.warn('Could not pre-render spec with EJS: ' + templatePath + ' on: ' + req.path, err);
+            } finally {
+                req.specData.breadcrumb = renderedBreadcrumps;
+                next();
+            }
+        });
+    } else {
+        next();
+    }
+};
diff --git a/core/middlewares/loader.js b/core/middlewares/loader.js
index 0545121..6b2d712 100644
--- a/core/middlewares/loader.js
+++ b/core/middlewares/loader.js
@@ -123,6 +123,12 @@ module.exports.process = function(app, globalOptions){
                 group: 'pre-html',
                 indexPath: path.join(appRoot, 'core/middlewares/preRenderEjs.js')
             },
+            breadcrumb: {
+                enabled: true,
+                order: -2,
+                group: 'pre-html',
+                indexPath: path.join(appRoot, 'core/middlewares/breadcrumb.js')
+            },
             mdTag: {
                 enabled: true,
                 order: 0,
@@ -164,4 +170,4 @@ module.exports.process = function(app, globalOptions){
     );
 
     loadMiddlewares(sortMiddlewares(config.loadGroupsOrder, config.list), app);
-};
\ No newline at end of file
+};
diff --git a/core/middlewares/wrap.js b/core/middlewares/wrap.js
index 4efb4b4..ccab7db 100644
--- a/core/middlewares/wrap.js
+++ b/core/middlewares/wrap.js
@@ -15,7 +15,8 @@ var specUtils = require(path.join(global.pathToApp,'core/lib/specUtils'));
  * @param {object} req - Request object
  * @param {object} res - Response object
  * @param {function} next - The callback function
- * */
+ *
+ */
 exports.process = function (req, res, next) {
 
     // Check if we're working with processed file
@@ -90,6 +91,7 @@ exports.process = function (req, res, next) {
                 engineVersion: global.engineVersion,
                 content: content,
                 head: head,
+                breadcrumb: req.specData.breadcrumb || '',
                 info: info
             };
 
@@ -117,7 +119,8 @@ exports.process = function (req, res, next) {
                     filename: templatePath
                 });
             } catch(err){
-                req.specData.renderedHtml = 'Error rendering Spec with EJS: ' + template;
+                console.log('Error: EJS could render specData.renderedHtml');
+                req.specData.renderedHtml = 'Error rendering Spec with EJS: <noscript>' + template + '</noscript>';
             }
 
 
@@ -129,4 +132,4 @@ exports.process = function (req, res, next) {
         // proceed to next middleware
         next();
     }
-};
\ No newline at end of file
+};
diff --git a/core/views/breadcrumb.ejs b/core/views/breadcrumb.ejs
new file mode 100644
index 0000000..334eca5
--- /dev/null
+++ b/core/views/breadcrumb.ejs
@@ -0,0 +1,7 @@
+<nav class="source_breadcrumb">
+    <ul class="source_breadcrumb_lst">
+        <% for(var i=0; i<breadcrumb.length; i++) {%>
+            <li class="source_breadcrumb_i"><a class="source_a_o" href="<%= breadcrumb[i].path %>"><%= breadcrumb[i].name %></a></li>
+        <% } %>
+    </ul>
+</nav>
diff --git a/core/views/doc.ejs b/core/views/doc.ejs
index c967c5d..09e380e 100644
--- a/core/views/doc.ejs
+++ b/core/views/doc.ejs
@@ -24,6 +24,7 @@
 <body class="source_page __spec">
     <div class="source_container">
         <%- header %>
+        <%- breadcrumb %>
         <div class="source_main source_col-main" role="main">
             <h1><%= info.title %></h1>
             <div class="source_header-meta">v.<%- engineVersion %></div>
@@ -32,4 +33,4 @@
         <%- footer %>
     </div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/core/views/navigation.ejs b/core/views/navigation.ejs
index 04eb8a7..b410ee8 100644
--- a/core/views/navigation.ejs
+++ b/core/views/navigation.ejs
@@ -17,10 +17,11 @@
 <body class="source_page __navigation">
     <div class="source_container">
         <%- header %>
+        <%- breadcrumb %>
         <div class="source_main source_col-main" role="main">
             <%- content %>
         </div>
         <%- footer %>
     </div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/core/views/spec.ejs b/core/views/spec.ejs
index ca12e0f..d7b8c44 100644
--- a/core/views/spec.ejs
+++ b/core/views/spec.ejs
@@ -24,8 +24,9 @@
 <body class="source_page __spec">
     <div class="source_container">
         <%- header %>
+        <%- breadcrumb %>
         <div class="source_main source_col-main" role="main"><%- content %></div>
         <%- footer %>
     </div>
 </body>
-</html>
\ No newline at end of file
+</html>

From 69ee8f6717af2355f2207adbc47881c383ef2098 Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Wed, 23 Mar 2016 22:35:07 +0100
Subject: [PATCH 062/104] use more meaningful error messages about EJS
 rendering

---
 core/middlewares/breadcrumb.js | 2 +-
 core/middlewares/wrap.js       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/middlewares/breadcrumb.js b/core/middlewares/breadcrumb.js
index 226e0dc..6d5465c 100644
--- a/core/middlewares/breadcrumb.js
+++ b/core/middlewares/breadcrumb.js
@@ -65,7 +65,7 @@ exports.process = function(req, res, next) {
                 });
             } catch (err) {
                 renderedBreadcrumps = '';
-                global.log.warn('Could not pre-render spec with EJS: ' + templatePath + ' on: ' + req.path, err);
+                global.log.warn('breadcrumb.js: could not render breadcrumbs with EJS: ' + templatePath + ' on: ' + req.path, err);
             } finally {
                 req.specData.breadcrumb = renderedBreadcrumps;
                 next();
diff --git a/core/middlewares/wrap.js b/core/middlewares/wrap.js
index ccab7db..44299d5 100644
--- a/core/middlewares/wrap.js
+++ b/core/middlewares/wrap.js
@@ -119,7 +119,7 @@ exports.process = function (req, res, next) {
                     filename: templatePath
                 });
             } catch(err){
-                console.log('Error: EJS could render specData.renderedHtml');
+                global.log.error('wrap.js: could not render Spec with EJS: ' + templatePath + ' on: ' + req.path, err);
                 req.specData.renderedHtml = 'Error rendering Spec with EJS: <noscript>' + template + '</noscript>';
             }
 

From 1819fb7ef9940998c1225b35ef18cf21ab8cb7a0 Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Wed, 23 Mar 2016 22:35:56 +0100
Subject: [PATCH 063/104] fix human readable breadcrumb titles, fix breadcrumb
 aligment

---
 assets/css/project/breadcrumb.less | 3 ++-
 core/middlewares/breadcrumb.js     | 2 +-
 core/views/breadcrumb.ejs          | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/assets/css/project/breadcrumb.less b/assets/css/project/breadcrumb.less
index c396f74..18bb2ac 100644
--- a/assets/css/project/breadcrumb.less
+++ b/assets/css/project/breadcrumb.less
@@ -15,7 +15,8 @@
 }
 
 .source_breadcrumb_lst {
-    margin: 0;
+    margin-top: 0;
+    margin-bottom: 0;
     padding: 0;
     list-style: none;
 }
diff --git a/core/middlewares/breadcrumb.js b/core/middlewares/breadcrumb.js
index 6d5465c..f75ac99 100644
--- a/core/middlewares/breadcrumb.js
+++ b/core/middlewares/breadcrumb.js
@@ -45,7 +45,7 @@ exports.process = function(req, res, next) {
         }, []).map(function (item) {
             item.fullPath = specUtils.getFullPathToSpec(item.path);
             item.info = getData(item.fullPath) || {};
-            item.title = item.info.name || item.info.title || item.name;
+            item.title = item.info.title || item.name;
             return item;
         });
 
diff --git a/core/views/breadcrumb.ejs b/core/views/breadcrumb.ejs
index 334eca5..588688b 100644
--- a/core/views/breadcrumb.ejs
+++ b/core/views/breadcrumb.ejs
@@ -1,7 +1,7 @@
 <nav class="source_breadcrumb">
-    <ul class="source_breadcrumb_lst">
+    <ul class="source_breadcrumb_lst source_col-main">
         <% for(var i=0; i<breadcrumb.length; i++) {%>
-            <li class="source_breadcrumb_i"><a class="source_a_o" href="<%= breadcrumb[i].path %>"><%= breadcrumb[i].name %></a></li>
+            <li class="source_breadcrumb_i"><a class="source_a_o" href="<%= breadcrumb[i].path %>"><%= breadcrumb[i].title %></a></li>
         <% } %>
     </ul>
 </nav>

From 0bc3b23db5120ea523cbb9590ea28797acec47e7 Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Thu, 24 Mar 2016 15:44:46 +0100
Subject: [PATCH 064/104] hide breadcrumbs navigation if you're in root page

---
 core/views/breadcrumb.ejs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/views/breadcrumb.ejs b/core/views/breadcrumb.ejs
index 588688b..a538197 100644
--- a/core/views/breadcrumb.ejs
+++ b/core/views/breadcrumb.ejs
@@ -1,7 +1,9 @@
+<% if (breadcrumb.length > 1) { %>
 <nav class="source_breadcrumb">
     <ul class="source_breadcrumb_lst source_col-main">
-        <% for(var i=0; i<breadcrumb.length; i++) {%>
+        <% for(var i=0; i < breadcrumb.length; i++) {%>
             <li class="source_breadcrumb_i"><a class="source_a_o" href="<%= breadcrumb[i].path %>"><%= breadcrumb[i].title %></a></li>
         <% } %>
     </ul>
 </nav>
+<% } %>

From cb8d2601b966c79054031f71e4b36c0c57475a6a Mon Sep 17 00:00:00 2001
From: Norbert de Langen <norbert@macaw.nl>
Date: Sun, 27 Mar 2016 15:26:50 +0200
Subject: [PATCH 065/104] UPGRADE lodash to latest version

---
 core/lib/utils.js          |  8 ++++++--
 core/middlewares/loader.js | 16 ++++++++--------
 package.json               |  2 +-
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/core/lib/utils.js b/core/lib/utils.js
index 8535b31..e29ddb8 100644
--- a/core/lib/utils.js
+++ b/core/lib/utils.js
@@ -18,5 +18,9 @@ module.exports.extendOptions = function () {
     args.push(cb);
 
     // Don't merge arrays
-    return _.merge.apply(this, args);
-};
\ No newline at end of file
+    return _.mergeWith.apply(this, args, function (a, b) {
+        if (_.isArray(b)) {
+            return b;
+        }
+    });
+};
diff --git a/core/middlewares/loader.js b/core/middlewares/loader.js
index 6b2d712..4683311 100644
--- a/core/middlewares/loader.js
+++ b/core/middlewares/loader.js
@@ -8,7 +8,7 @@ var appRoot = global.pathToApp;
 var utils = require(path.join(appRoot, 'core/lib/utils'));
 var log = require(path.join(appRoot, 'core/logger')).log;
 
-var gatherMiddlewares = function(dest, filterRegExp, mainJS){
+var gatherMiddlewares = function (dest, filterRegExp, mainJS) {
     var output = {};
 
     if (fs.existsSync(dest)) {
@@ -41,7 +41,7 @@ var gatherMiddlewares = function(dest, filterRegExp, mainJS){
                                     if (overVal >= 0) {
                                         output[middlewareName][key] = overVal;
                                     } else {
-                                        log.warn('Middlewares are restricted to define order with value lower than 0 (zero). Please modify '+ middlewareName+ ' middleware options.');
+                                        log.warn('Middlewares are restricted to define order with value lower than 0 (zero). Please modify ' + middlewareName + ' middleware options.');
                                     }
                                 } else {
                                     output[middlewareName][key] = overVal;
@@ -57,7 +57,7 @@ var gatherMiddlewares = function(dest, filterRegExp, mainJS){
     return output;
 };
 
-var sortMiddlewares = function(groupsOrder, list){
+var sortMiddlewares = function (groupsOrder, list) {
     var output = [];
 
     if (!(groupsOrder && _.isArray(groupsOrder) && list)) return output;
@@ -79,21 +79,21 @@ var sortMiddlewares = function(groupsOrder, list){
 
     // Sort each group
     _.forOwn(groupedList, function (value, key) {
-        groupedList[key] = _.sortByOrder(value, ['order'], ['asc']);
+        groupedList[key] = _.orderBy(value, ['order'], ['asc']);
     });
 
     // Concat groups by order
-    groupsOrder.forEach(function(item){
+    groupsOrder.forEach(function (item) {
         if (groupedList[item]) output = output.concat(groupedList[item]);
     });
 
     return output;
 };
 
-var loadMiddlewares = function(listArr, app){
+var loadMiddlewares = function (listArr, app) {
     if (!_.isArray(listArr) && !app) return;
 
-    listArr.forEach(function(item){
+    listArr.forEach(function (item) {
         if (item && item.indexPath && fs.existsSync(item.indexPath)) {
             log.debug('require middleware', item.indexPath);
             app.use(require(item.indexPath).process);
@@ -101,7 +101,7 @@ var loadMiddlewares = function(listArr, app){
     });
 };
 
-module.exports.process = function(app, globalOptions){
+module.exports.process = function (app, globalOptions) {
     var config = {
         loadGroupsOrder: [
             'request',
diff --git a/package.json b/package.json
index c2ddc34..a4170cb 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
     "gulp-watch": "operatino/gulp-watch#4.3.5-latest-fsevents",
     "load-grunt-parent-tasks": "^0.1.1",
     "load-grunt-tasks": "^3.3.0",
-    "lodash": "^3.10.1",
+    "lodash": "^4.6.1",
     "log4js": "~0.6.20",
     "macaddress": "^0.2.8",
     "marked": "^0.3.2",

From 3cdeb2a75e94d7c08bea5ee2f4742b412dacaada Mon Sep 17 00:00:00 2001
From: Norbert de Langen <norbert@macaw.nl>
Date: Sun, 27 Mar 2016 15:44:13 +0200
Subject: [PATCH 066/104] UPGRADE cheerio, no side-effects detected, all tests
 pass

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c2ddc34..e5823ef 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
   },
   "dependencies": {
     "body-parser": "^1.14.1",
-    "cheerio": "^0.19.0",
+    "cheerio": "^0.20.0",
     "colors": "^1.1.2",
     "commander": "^2.8.1",
     "compression": "^1.6.0",

From b5b55204c99f92f3a486c23ec3fe51246e668bda Mon Sep 17 00:00:00 2001
From: Norbert de Langen <norbert@macaw.nl>
Date: Sun, 27 Mar 2016 17:13:00 +0200
Subject: [PATCH 067/104] UPDATE fs-extra, all tests pass, no side-effects
 found

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c2ddc34..9b57ad6 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
     "express": "^4.13.3",
     "express-session": "^1.10.2",
     "flat": "^1.2.1",
-    "fs-extra": "^0.24.0",
+    "fs-extra": "^0.26.7",
     "fs-finder": "operatino/node-fs-finder#fix-windows-find-up",
     "glob": "^5.0.14",
     "grunt": "~0.4.5",

From 88bc2b0a222ba85124d592aeb350de063738b693 Mon Sep 17 00:00:00 2001
From: Norbert de Langen <norbert@macaw.nl>
Date: Sun, 27 Mar 2016 17:47:44 +0200
Subject: [PATCH 068/104] UPGRADE many little packages, all tests pass no
 side-effects found

---
 package.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index c2ddc34..4fa15c5 100644
--- a/package.json
+++ b/package.json
@@ -16,9 +16,9 @@
     "cheerio": "^0.19.0",
     "colors": "^1.1.2",
     "commander": "^2.8.1",
-    "compression": "^1.6.0",
-    "cookie-parser": "^1.4.0",
-    "device": "^0.3.2",
+    "compression": "^1.6.1",
+    "cookie-parser": "^1.4.1",
+    "device": "^0.3.6",
     "ejs": "operatino/ejs#2.3.4-sandbox-option",
     "everyauth": "^0.4.9",
     "express": "^4.13.3",
@@ -43,15 +43,15 @@
     "lodash": "^3.10.1",
     "log4js": "~0.6.20",
     "macaddress": "^0.2.8",
-    "marked": "^0.3.2",
+    "marked": "^0.3.5",
     "minimatch": "^3.0.0",
-    "pretty-hrtime": "^1.0.0",
+    "pretty-hrtime": "^1.0.2",
     "q": "^1.1.1",
-    "serve-favicon": "^2.2.0",
-    "shortid": "^2.2.2",
+    "serve-favicon": "^2.3.0",
+    "shortid": "^2.2.4",
     "time-grunt": "^1.2.1",
     "tinyforever": "0.0.3",
-    "universal-analytics": "^0.3.9"
+    "universal-analytics": "^0.3.11"
   },
   "scripts": {
     "postinstall": "grunt update && node ./core/trackInstall",

From 1d76a429b2ade756f1e8cbb87763a0b0df3d7980 Mon Sep 17 00:00:00 2001
From: Norbert de Langen <norbert@macaw.nl>
Date: Sun, 27 Mar 2016 20:28:22 +0200
Subject: [PATCH 069/104] UPGRADE glob, all tests pass, no side-effects found

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c2ddc34..5afde5a 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
     "flat": "^1.2.1",
     "fs-extra": "^0.24.0",
     "fs-finder": "operatino/node-fs-finder#fix-windows-find-up",
-    "glob": "^5.0.14",
+    "glob": "^7.0.3",
     "grunt": "~0.4.5",
     "grunt-autoprefixer": "^3.0.3",
     "grunt-cli": "^0.1.13",

From a217fa979b8c21b9b78f5d00c0641b081a612d3b Mon Sep 17 00:00:00 2001
From: Norbert de Langen <norbert@macaw.nl>
Date: Sun, 27 Mar 2016 20:41:21 +0200
Subject: [PATCH 070/104] UPGRADE grunt and plugins to latest versions, all
 tests pass, no side-effects found. I'm surprised to be completely honest.

---
 package.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index c2ddc34..0fb959b 100644
--- a/package.json
+++ b/package.json
@@ -28,15 +28,15 @@
     "fs-finder": "operatino/node-fs-finder#fix-windows-find-up",
     "glob": "^5.0.14",
     "grunt": "~0.4.5",
-    "grunt-autoprefixer": "^3.0.3",
-    "grunt-cli": "^0.1.13",
-    "grunt-contrib-clean": "^0.6.0",
-    "grunt-contrib-copy": "^0.8.1",
-    "grunt-contrib-less": "^1.0.1",
-    "grunt-contrib-cssmin": "^0.14.0",
-    "grunt-contrib-htmlmin": "^0.5.0",
-    "grunt-contrib-uglify": "^0.9.2",
-    "grunt-newer": "^1.1.1",
+    "grunt-autoprefixer": "^3.0.4",
+    "grunt-cli": "^1.1.0",
+    "grunt-contrib-clean": "^1.0.0",
+    "grunt-contrib-copy": "^1.0.0",
+    "grunt-contrib-less": "^1.2.0",
+    "grunt-contrib-cssmin": "^1.0.1",
+    "grunt-contrib-htmlmin": "^1.1.0",
+    "grunt-contrib-uglify": "^1.0.1",
+    "grunt-newer": "^1.1.2",
     "gulp-watch": "operatino/gulp-watch#4.3.5-latest-fsevents",
     "load-grunt-parent-tasks": "^0.1.1",
     "load-grunt-tasks": "^3.3.0",

From 9655b5fbb0c48129d7975b09ab9ca66046369314 Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Sun, 1 May 2016 19:47:22 +0200
Subject: [PATCH 071/104] operatino/namespaced-require-server-transform:
 namespace require, define functions and transform js files on server

---
 assets/js/_require.bundle.js |    2 +-
 assets/js/lib/require.js     | 3575 +++++++++++++++++-----------------
 assets/js/require-config.js  |    2 +-
 core/routes/redirects.js     |   28 +-
 package.json                 |    1 +
 5 files changed, 1823 insertions(+), 1785 deletions(-)

diff --git a/assets/js/_require.bundle.js b/assets/js/_require.bundle.js
index 50236d1..db97c3e 100644
--- a/assets/js/_require.bundle.js
+++ b/assets/js/_require.bundle.js
@@ -3,7 +3,7 @@
 "{%= grunt.file.read('assets/js/require-config.js') %}"
 
 // Extending base js config with npm packages list
-requirejs.config({
+sourcejs.amd.requirejs.config({
     // Create shorthands routes to clint-side npm plugins
     packages: function () {
         var modulesList = "{%= npmPluginsEnabled %}";
diff --git a/assets/js/lib/require.js b/assets/js/lib/require.js
index 8a4e6e1..4d2ffb9 100644
--- a/assets/js/lib/require.js
+++ b/assets/js/lib/require.js
@@ -8,2069 +8,2080 @@
 /*jslint regexp: true, nomen: true, sloppy: true */
 /*global window, navigator, document, importScripts, setTimeout, opera */
 
-var requirejs, require, define;
-(function (global) {
-    var req, s, head, baseElement, dataMain, src,
-        interactiveScript, currentlyAddingScript, mainScript, subPath,
-        version = '2.1.14',
-        commentRegExp = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg,
-        cjsRequireRegExp = /[^.]\s*require\s*\(\s*["']([^'"\s]+)["']\s*\)/g,
-        jsSuffixRegExp = /\.js$/,
-        currDirRegExp = /^\.\//,
-        op = Object.prototype,
-        ostring = op.toString,
-        hasOwn = op.hasOwnProperty,
-        ap = Array.prototype,
-        apsp = ap.splice,
-        isBrowser = !!(typeof window !== 'undefined' && typeof navigator !== 'undefined' && window.document),
-        isWebWorker = !isBrowser && typeof importScripts !== 'undefined',
-        //PS3 indicates loaded and complete, but need to wait for complete
-        //specifically. Sequence is 'loading', 'loaded', execution,
-        // then 'complete'. The UA check is unfortunate, but not sure how
-        //to feature test w/o causing perf issues.
-        readyRegExp = isBrowser && navigator.platform === 'PLAYSTATION 3' ?
-                      /^complete$/ : /^(complete|loaded)$/,
-        defContextName = '_',
-        //Oh the tragedy, detecting opera. See the usage of isOpera for reason.
-        isOpera = typeof opera !== 'undefined' && opera.toString() === '[object Opera]',
-        contexts = {},
-        cfg = {},
-        globalDefQueue = [],
-        useInteractive = false;
-
-    function isFunction(it) {
-        return ostring.call(it) === '[object Function]';
-    }
-
-    function isArray(it) {
-        return ostring.call(it) === '[object Array]';
-    }
-
-    /**
-     * Helper function for iterating over an array. If the func returns
-     * a true value, it will break out of the loop.
-     */
-    function each(ary, func) {
-        if (ary) {
-            var i;
-            for (i = 0; i < ary.length; i += 1) {
-                if (ary[i] && func(ary[i], i, ary)) {
-                    break;
-                }
-            }
+window.sourcejs = window.sourcejs || {};
+
+window.sourcejs.amd = (function () {
+    var requirejs, require, define;
+
+    (function (global) {
+        var req, s, head, baseElement, dataMain, src,
+            interactiveScript, currentlyAddingScript, mainScript, subPath,
+            version = '2.1.14',
+            commentRegExp = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg,
+            cjsRequireRegExp = /[^.]\s*require\s*\(\s*["']([^'"\s]+)["']\s*\)/g,
+            jsSuffixRegExp = /\.js$/,
+            currDirRegExp = /^\.\//,
+            op = Object.prototype,
+            ostring = op.toString,
+            hasOwn = op.hasOwnProperty,
+            ap = Array.prototype,
+            apsp = ap.splice,
+            isBrowser = !!(typeof window !== 'undefined' && typeof navigator !== 'undefined' && window.document),
+            isWebWorker = !isBrowser && typeof importScripts !== 'undefined',
+            //PS3 indicates loaded and complete, but need to wait for complete
+            //specifically. Sequence is 'loading', 'loaded', execution,
+            // then 'complete'. The UA check is unfortunate, but not sure how
+            //to feature test w/o causing perf issues.
+            readyRegExp = isBrowser && navigator.platform === 'PLAYSTATION 3' ?
+                          /^complete$/ : /^(complete|loaded)$/,
+            defContextName = '_',
+            //Oh the tragedy, detecting opera. See the usage of isOpera for reason.
+            isOpera = typeof opera !== 'undefined' && opera.toString() === '[object Opera]',
+            contexts = {},
+            cfg = {},
+            globalDefQueue = [],
+            useInteractive = false;
+
+        function isFunction(it) {
+            return ostring.call(it) === '[object Function]';
         }
-    }
-
-    /**
-     * Helper function for iterating over an array backwards. If the func
-     * returns a true value, it will break out of the loop.
-     */
-    function eachReverse(ary, func) {
-        if (ary) {
-            var i;
-            for (i = ary.length - 1; i > -1; i -= 1) {
-                if (ary[i] && func(ary[i], i, ary)) {
-                    break;
-                }
-            }
+
+        function isArray(it) {
+            return ostring.call(it) === '[object Array]';
         }
-    }
-
-    function hasProp(obj, prop) {
-        return hasOwn.call(obj, prop);
-    }
-
-    function getOwn(obj, prop) {
-        return hasProp(obj, prop) && obj[prop];
-    }
-
-    /**
-     * Cycles over properties in an object and calls a function for each
-     * property value. If the function returns a truthy value, then the
-     * iteration is stopped.
-     */
-    function eachProp(obj, func) {
-        var prop;
-        for (prop in obj) {
-            if (hasProp(obj, prop)) {
-                if (func(obj[prop], prop)) {
-                    break;
+
+        /**
+         * Helper function for iterating over an array. If the func returns
+         * a true value, it will break out of the loop.
+         */
+        function each(ary, func) {
+            if (ary) {
+                var i;
+                for (i = 0; i < ary.length; i += 1) {
+                    if (ary[i] && func(ary[i], i, ary)) {
+                        break;
+                    }
                 }
             }
         }
-    }
-
-    /**
-     * Simple function to mix in properties from source into target,
-     * but only if target does not already have a property of the same name.
-     */
-    function mixin(target, source, force, deepStringMixin) {
-        if (source) {
-            eachProp(source, function (value, prop) {
-                if (force || !hasProp(target, prop)) {
-                    if (deepStringMixin && typeof value === 'object' && value &&
-                        !isArray(value) && !isFunction(value) &&
-                        !(value instanceof RegExp)) {
-
-                        if (!target[prop]) {
-                            target[prop] = {};
-                        }
-                        mixin(target[prop], value, force, deepStringMixin);
-                    } else {
-                        target[prop] = value;
+
+        /**
+         * Helper function for iterating over an array backwards. If the func
+         * returns a true value, it will break out of the loop.
+         */
+        function eachReverse(ary, func) {
+            if (ary) {
+                var i;
+                for (i = ary.length - 1; i > -1; i -= 1) {
+                    if (ary[i] && func(ary[i], i, ary)) {
+                        break;
                     }
                 }
-            });
+            }
         }
-        return target;
-    }
-
-    //Similar to Function.prototype.bind, but the 'this' object is specified
-    //first, since it is easier to read/figure out what 'this' will be.
-    function bind(obj, fn) {
-        return function () {
-            return fn.apply(obj, arguments);
-        };
-    }
-
-    function scripts() {
-        return document.getElementsByTagName('script');
-    }
 
-    function defaultOnError(err) {
-        throw err;
-    }
-
-    //Allow getting a global that is expressed in
-    //dot notation, like 'a.b.c'.
-    function getGlobal(value) {
-        if (!value) {
-            return value;
-        }
-        var g = global;
-        each(value.split('.'), function (part) {
-            g = g[part];
-        });
-        return g;
-    }
-
-    /**
-     * Constructs an error with a pointer to an URL with more information.
-     * @param {String} id the error ID that maps to an ID on a web page.
-     * @param {String} message human readable error.
-     * @param {Error} [err] the original error, if there is one.
-     *
-     * @returns {Error}
-     */
-    function makeError(id, msg, err, requireModules) {
-        var e = new Error(msg + '\nhttp://requirejs.org/docs/errors.html#' + id);
-        e.requireType = id;
-        e.requireModules = requireModules;
-        if (err) {
-            e.originalError = err;
+        function hasProp(obj, prop) {
+            return hasOwn.call(obj, prop);
         }
-        return e;
-    }
-
-    if (typeof define !== 'undefined') {
-        //If a define is already in play via another AMD loader,
-        //do not overwrite.
-        return;
-    }
-
-    if (typeof requirejs !== 'undefined') {
-        if (isFunction(requirejs)) {
-            //Do not overwrite an existing requirejs instance.
-            return;
+
+        function getOwn(obj, prop) {
+            return hasProp(obj, prop) && obj[prop];
         }
-        cfg = requirejs;
-        requirejs = undefined;
-    }
-
-    //Allow for a require config object
-    if (typeof require !== 'undefined' && !isFunction(require)) {
-        //assume it is a config object.
-        cfg = require;
-        require = undefined;
-    }
-
-    function newContext(contextName) {
-        var inCheckLoaded, Module, context, handlers,
-            checkLoadedTimeoutId,
-            config = {
-                //Defaults. Do not set a default for map
-                //config to speed up normalize(), which
-                //will run faster if there is no default.
-                waitSeconds: 7,
-                baseUrl: './',
-                paths: {},
-                bundles: {},
-                pkgs: {},
-                shim: {},
-                config: {}
-            },
-            registry = {},
-            //registry of just enabled modules, to speed
-            //cycle breaking code when lots of modules
-            //are registered, but not activated.
-            enabledRegistry = {},
-            undefEvents = {},
-            defQueue = [],
-            defined = {},
-            urlFetched = {},
-            bundlesMap = {},
-            requireCounter = 1,
-            unnormalizedCounter = 1;
 
         /**
-         * Trims the . and .. from an array of path segments.
-         * It will keep a leading path segment if a .. will become
-         * the first path segment, to help with module name lookups,
-         * which act like paths, but can be remapped. But the end result,
-         * all paths that use this function should look normalized.
-         * NOTE: this method MODIFIES the input array.
-         * @param {Array} ary the array of path segments.
+         * Cycles over properties in an object and calls a function for each
+         * property value. If the function returns a truthy value, then the
+         * iteration is stopped.
          */
-        function trimDots(ary) {
-            var i, part;
-            for (i = 0; i < ary.length; i++) {
-                part = ary[i];
-                if (part === '.') {
-                    ary.splice(i, 1);
-                    i -= 1;
-                } else if (part === '..') {
-                    // If at the start, or previous value is still ..,
-                    // keep them so that when converted to a path it may
-                    // still work when converted to a path, even though
-                    // as an ID it is less than ideal. In larger point
-                    // releases, may be better to just kick out an error.
-                    if (i === 0 || (i == 1 && ary[2] === '..') || ary[i - 1] === '..') {
-                        continue;
-                    } else if (i > 0) {
-                        ary.splice(i - 1, 2);
-                        i -= 2;
+        function eachProp(obj, func) {
+            var prop;
+            for (prop in obj) {
+                if (hasProp(obj, prop)) {
+                    if (func(obj[prop], prop)) {
+                        break;
                     }
                 }
             }
         }
 
         /**
-         * Given a relative module name, like ./something, normalize it to
-         * a real name that can be mapped to a path.
-         * @param {String} name the relative name
-         * @param {String} baseName a real name that the name arg is relative
-         * to.
-         * @param {Boolean} applyMap apply the map config to the value. Should
-         * only be done if this normalization is for a dependency ID.
-         * @returns {String} normalized name
+         * Simple function to mix in properties from source into target,
+         * but only if target does not already have a property of the same name.
          */
-        function normalize(name, baseName, applyMap) {
-            var pkgMain, mapValue, nameParts, i, j, nameSegment, lastIndex,
-                foundMap, foundI, foundStarMap, starI, normalizedBaseParts,
-                baseParts = (baseName && baseName.split('/')),
-                map = config.map,
-                starMap = map && map['*'];
-
-            //Adjust any relative paths.
-            if (name) {
-                name = name.split('/');
-                lastIndex = name.length - 1;
-
-                // If wanting node ID compatibility, strip .js from end
-                // of IDs. Have to do this here, and not in nameToUrl
-                // because node allows either .js or non .js to map
-                // to same file.
-                if (config.nodeIdCompat && jsSuffixRegExp.test(name[lastIndex])) {
-                    name[lastIndex] = name[lastIndex].replace(jsSuffixRegExp, '');
-                }
-
-                // Starts with a '.' so need the baseName
-                if (name[0].charAt(0) === '.' && baseParts) {
-                    //Convert baseName to array, and lop off the last part,
-                    //so that . matches that 'directory' and not name of the baseName's
-                    //module. For instance, baseName of 'one/two/three', maps to
-                    //'one/two/three.js', but we want the directory, 'one/two' for
-                    //this normalization.
-                    normalizedBaseParts = baseParts.slice(0, baseParts.length - 1);
-                    name = normalizedBaseParts.concat(name);
-                }
-
-                trimDots(name);
-                name = name.join('/');
-            }
-
-            //Apply map config if available.
-            if (applyMap && map && (baseParts || starMap)) {
-                nameParts = name.split('/');
-
-                outerLoop: for (i = nameParts.length; i > 0; i -= 1) {
-                    nameSegment = nameParts.slice(0, i).join('/');
-
-                    if (baseParts) {
-                        //Find the longest baseName segment match in the config.
-                        //So, do joins on the biggest to smallest lengths of baseParts.
-                        for (j = baseParts.length; j > 0; j -= 1) {
-                            mapValue = getOwn(map, baseParts.slice(0, j).join('/'));
-
-                            //baseName segment has config, find if it has one for
-                            //this name.
-                            if (mapValue) {
-                                mapValue = getOwn(mapValue, nameSegment);
-                                if (mapValue) {
-                                    //Match, update name to the new value.
-                                    foundMap = mapValue;
-                                    foundI = i;
-                                    break outerLoop;
-                                }
+        function mixin(target, source, force, deepStringMixin) {
+            if (source) {
+                eachProp(source, function (value, prop) {
+                    if (force || !hasProp(target, prop)) {
+                        if (deepStringMixin && typeof value === 'object' && value &&
+                            !isArray(value) && !isFunction(value) &&
+                            !(value instanceof RegExp)) {
+
+                            if (!target[prop]) {
+                                target[prop] = {};
                             }
+                            mixin(target[prop], value, force, deepStringMixin);
+                        } else {
+                            target[prop] = value;
                         }
                     }
-
-                    //Check for a star map match, but just hold on to it,
-                    //if there is a shorter segment match later in a matching
-                    //config, then favor over this star map.
-                    if (!foundStarMap && starMap && getOwn(starMap, nameSegment)) {
-                        foundStarMap = getOwn(starMap, nameSegment);
-                        starI = i;
-                    }
-                }
-
-                if (!foundMap && foundStarMap) {
-                    foundMap = foundStarMap;
-                    foundI = starI;
-                }
-
-                if (foundMap) {
-                    nameParts.splice(0, foundI, foundMap);
-                    name = nameParts.join('/');
-                }
+                });
             }
+            return target;
+        }
 
-            // If the name points to a package's name, use
-            // the package main instead.
-            pkgMain = getOwn(config.pkgs, name);
-
-            return pkgMain ? pkgMain : name;
+        //Similar to Function.prototype.bind, but the 'this' object is specified
+        //first, since it is easier to read/figure out what 'this' will be.
+        function bind(obj, fn) {
+            return function () {
+                return fn.apply(obj, arguments);
+            };
         }
 
-        function removeScript(name) {
-            if (isBrowser) {
-                each(scripts(), function (scriptNode) {
-                    if (scriptNode.getAttribute('data-requiremodule') === name &&
-                            scriptNode.getAttribute('data-requirecontext') === context.contextName) {
-                        scriptNode.parentNode.removeChild(scriptNode);
-                        return true;
-                    }
-                });
-            }
+        function scripts() {
+            return document.getElementsByTagName('script');
         }
 
-        function hasPathFallback(id) {
-            var pathConfig = getOwn(config.paths, id);
-            if (pathConfig && isArray(pathConfig) && pathConfig.length > 1) {
-                //Pop off the first array value, since it failed, and
-                //retry
-                pathConfig.shift();
-                context.require.undef(id);
-
-                //Custom require that does not do map translation, since
-                //ID is "absolute", already mapped/resolved.
-                context.makeRequire(null, {
-                    skipMap: true
-                })([id]);
-
-                return true;
-            }
+        function defaultOnError(err) {
+            throw err;
         }
 
-        //Turns a plugin!resource to [plugin, resource]
-        //with the plugin being undefined if the name
-        //did not have a plugin prefix.
-        function splitPrefix(name) {
-            var prefix,
-                index = name ? name.indexOf('!') : -1;
-            if (index > -1) {
-                prefix = name.substring(0, index);
-                name = name.substring(index + 1, name.length);
+        //Allow getting a global that is expressed in
+        //dot notation, like 'a.b.c'.
+        function getGlobal(value) {
+            if (!value) {
+                return value;
             }
-            return [prefix, name];
+            var g = global;
+            each(value.split('.'), function (part) {
+                g = g[part];
+            });
+            return g;
         }
 
         /**
-         * Creates a module mapping that includes plugin prefix, module
-         * name, and path. If parentModuleMap is provided it will
-         * also normalize the name via require.normalize()
+         * Constructs an error with a pointer to an URL with more information.
+         * @param {String} id the error ID that maps to an ID on a web page.
+         * @param {String} message human readable error.
+         * @param {Error} [err] the original error, if there is one.
          *
-         * @param {String} name the module name
-         * @param {String} [parentModuleMap] parent module map
-         * for the module name, used to resolve relative names.
-         * @param {Boolean} isNormalized: is the ID already normalized.
-         * This is true if this call is done for a define() module ID.
-         * @param {Boolean} applyMap: apply the map config to the ID.
-         * Should only be true if this map is for a dependency.
-         *
-         * @returns {Object}
+         * @returns {Error}
          */
-        function makeModuleMap(name, parentModuleMap, isNormalized, applyMap) {
-            var url, pluginModule, suffix, nameParts,
-                prefix = null,
-                parentName = parentModuleMap ? parentModuleMap.name : null,
-                originalName = name,
-                isDefine = true,
-                normalizedName = '';
-
-            //If no name, then it means it is a require call, generate an
-            //internal name.
-            if (!name) {
-                isDefine = false;
-                name = '_@r' + (requireCounter += 1);
+        function makeError(id, msg, err, requireModules) {
+            var e = new Error(msg + '\nhttp://requirejs.org/docs/errors.html#' + id);
+            e.requireType = id;
+            e.requireModules = requireModules;
+            if (err) {
+                e.originalError = err;
             }
+            return e;
+        }
 
-            nameParts = splitPrefix(name);
-            prefix = nameParts[0];
-            name = nameParts[1];
+        if (typeof define !== 'undefined') {
+            //If a define is already in play via another AMD loader,
+            //do not overwrite.
+            return;
+        }
 
-            if (prefix) {
-                prefix = normalize(prefix, parentName, applyMap);
-                pluginModule = getOwn(defined, prefix);
+        if (typeof requirejs !== 'undefined') {
+            if (isFunction(requirejs)) {
+                //Do not overwrite an existing requirejs instance.
+                return;
             }
+            cfg = requirejs;
+            requirejs = undefined;
+        }
 
-            //Account for relative paths if there is a base name.
-            if (name) {
-                if (prefix) {
-                    if (pluginModule && pluginModule.normalize) {
-                        //Plugin is loaded, use its normalize method.
-                        normalizedName = pluginModule.normalize(name, function (name) {
-                            return normalize(name, parentName, applyMap);
-                        });
-                    } else {
-                        // If nested plugin references, then do not try to
-                        // normalize, as it will not normalize correctly. This
-                        // places a restriction on resourceIds, and the longer
-                        // term solution is not to normalize until plugins are
-                        // loaded and all normalizations to allow for async
-                        // loading of a loader plugin. But for now, fixes the
-                        // common uses. Details in #1131
-                        normalizedName = name.indexOf('!') === -1 ?
-                                         normalize(name, parentName, applyMap) :
-                                         name;
+        //Allow for a require config object
+        if (typeof require !== 'undefined' && !isFunction(require)) {
+            //assume it is a config object.
+            cfg = require;
+            require = undefined;
+        }
+
+        function newContext(contextName) {
+            var inCheckLoaded, Module, context, handlers,
+                checkLoadedTimeoutId,
+                config = {
+                    //Defaults. Do not set a default for map
+                    //config to speed up normalize(), which
+                    //will run faster if there is no default.
+                    waitSeconds: 7,
+                    baseUrl: './',
+                    paths: {},
+                    bundles: {},
+                    pkgs: {},
+                    shim: {},
+                    config: {}
+                },
+                registry = {},
+                //registry of just enabled modules, to speed
+                //cycle breaking code when lots of modules
+                //are registered, but not activated.
+                enabledRegistry = {},
+                undefEvents = {},
+                defQueue = [],
+                defined = {},
+                urlFetched = {},
+                bundlesMap = {},
+                requireCounter = 1,
+                unnormalizedCounter = 1;
+
+            /**
+             * Trims the . and .. from an array of path segments.
+             * It will keep a leading path segment if a .. will become
+             * the first path segment, to help with module name lookups,
+             * which act like paths, but can be remapped. But the end result,
+             * all paths that use this function should look normalized.
+             * NOTE: this method MODIFIES the input array.
+             * @param {Array} ary the array of path segments.
+             */
+            function trimDots(ary) {
+                var i, part;
+                for (i = 0; i < ary.length; i++) {
+                    part = ary[i];
+                    if (part === '.') {
+                        ary.splice(i, 1);
+                        i -= 1;
+                    } else if (part === '..') {
+                        // If at the start, or previous value is still ..,
+                        // keep them so that when converted to a path it may
+                        // still work when converted to a path, even though
+                        // as an ID it is less than ideal. In larger point
+                        // releases, may be better to just kick out an error.
+                        if (i === 0 || (i == 1 && ary[2] === '..') || ary[i - 1] === '..') {
+                            continue;
+                        } else if (i > 0) {
+                            ary.splice(i - 1, 2);
+                            i -= 2;
+                        }
                     }
-                } else {
-                    //A regular module.
-                    normalizedName = normalize(name, parentName, applyMap);
-
-                    //Normalized name may be a plugin ID due to map config
-                    //application in normalize. The map config values must
-                    //already be normalized, so do not need to redo that part.
-                    nameParts = splitPrefix(normalizedName);
-                    prefix = nameParts[0];
-                    normalizedName = nameParts[1];
-                    isNormalized = true;
-
-                    url = context.nameToUrl(normalizedName);
                 }
             }
 
-            //If the id is a plugin id that cannot be determined if it needs
-            //normalization, stamp it with a unique ID so two matching relative
-            //ids that may conflict can be separate.
-            suffix = prefix && !pluginModule && !isNormalized ?
-                     '_unnormalized' + (unnormalizedCounter += 1) :
-                     '';
-
-            return {
-                prefix: prefix,
-                name: normalizedName,
-                parentMap: parentModuleMap,
-                unnormalized: !!suffix,
-                url: url,
-                originalName: originalName,
-                isDefine: isDefine,
-                id: (prefix ?
-                        prefix + '!' + normalizedName :
-                        normalizedName) + suffix
-            };
-        }
+            /**
+             * Given a relative module name, like ./something, normalize it to
+             * a real name that can be mapped to a path.
+             * @param {String} name the relative name
+             * @param {String} baseName a real name that the name arg is relative
+             * to.
+             * @param {Boolean} applyMap apply the map config to the value. Should
+             * only be done if this normalization is for a dependency ID.
+             * @returns {String} normalized name
+             */
+            function normalize(name, baseName, applyMap) {
+                var pkgMain, mapValue, nameParts, i, j, nameSegment, lastIndex,
+                    foundMap, foundI, foundStarMap, starI, normalizedBaseParts,
+                    baseParts = (baseName && baseName.split('/')),
+                    map = config.map,
+                    starMap = map && map['*'];
+
+                //Adjust any relative paths.
+                if (name) {
+                    name = name.split('/');
+                    lastIndex = name.length - 1;
+
+                    // If wanting node ID compatibility, strip .js from end
+                    // of IDs. Have to do this here, and not in nameToUrl
+                    // because node allows either .js or non .js to map
+                    // to same file.
+                    if (config.nodeIdCompat && jsSuffixRegExp.test(name[lastIndex])) {
+                        name[lastIndex] = name[lastIndex].replace(jsSuffixRegExp, '');
+                    }
 
-        function getModule(depMap) {
-            var id = depMap.id,
-                mod = getOwn(registry, id);
+                    // Starts with a '.' so need the baseName
+                    if (name[0].charAt(0) === '.' && baseParts) {
+                        //Convert baseName to array, and lop off the last part,
+                        //so that . matches that 'directory' and not name of the baseName's
+                        //module. For instance, baseName of 'one/two/three', maps to
+                        //'one/two/three.js', but we want the directory, 'one/two' for
+                        //this normalization.
+                        normalizedBaseParts = baseParts.slice(0, baseParts.length - 1);
+                        name = normalizedBaseParts.concat(name);
+                    }
 
-            if (!mod) {
-                mod = registry[id] = new context.Module(depMap);
-            }
+                    trimDots(name);
+                    name = name.join('/');
+                }
 
-            return mod;
-        }
+                //Apply map config if available.
+                if (applyMap && map && (baseParts || starMap)) {
+                    nameParts = name.split('/');
 
-        function on(depMap, name, fn) {
-            var id = depMap.id,
-                mod = getOwn(registry, id);
+                    outerLoop: for (i = nameParts.length; i > 0; i -= 1) {
+                        nameSegment = nameParts.slice(0, i).join('/');
 
-            if (hasProp(defined, id) &&
-                    (!mod || mod.defineEmitComplete)) {
-                if (name === 'defined') {
-                    fn(defined[id]);
-                }
-            } else {
-                mod = getModule(depMap);
-                if (mod.error && name === 'error') {
-                    fn(mod.error);
-                } else {
-                    mod.on(name, fn);
-                }
-            }
-        }
+                        if (baseParts) {
+                            //Find the longest baseName segment match in the config.
+                            //So, do joins on the biggest to smallest lengths of baseParts.
+                            for (j = baseParts.length; j > 0; j -= 1) {
+                                mapValue = getOwn(map, baseParts.slice(0, j).join('/'));
 
-        function onError(err, errback) {
-            var ids = err.requireModules,
-                notified = false;
+                                //baseName segment has config, find if it has one for
+                                //this name.
+                                if (mapValue) {
+                                    mapValue = getOwn(mapValue, nameSegment);
+                                    if (mapValue) {
+                                        //Match, update name to the new value.
+                                        foundMap = mapValue;
+                                        foundI = i;
+                                        break outerLoop;
+                                    }
+                                }
+                            }
+                        }
 
-            if (errback) {
-                errback(err);
-            } else {
-                each(ids, function (id) {
-                    var mod = getOwn(registry, id);
-                    if (mod) {
-                        //Set error on module, so it skips timeout checks.
-                        mod.error = err;
-                        if (mod.events.error) {
-                            notified = true;
-                            mod.emit('error', err);
+                        //Check for a star map match, but just hold on to it,
+                        //if there is a shorter segment match later in a matching
+                        //config, then favor over this star map.
+                        if (!foundStarMap && starMap && getOwn(starMap, nameSegment)) {
+                            foundStarMap = getOwn(starMap, nameSegment);
+                            starI = i;
                         }
                     }
-                });
 
-                if (!notified) {
-                    req.onError(err);
+                    if (!foundMap && foundStarMap) {
+                        foundMap = foundStarMap;
+                        foundI = starI;
+                    }
+
+                    if (foundMap) {
+                        nameParts.splice(0, foundI, foundMap);
+                        name = nameParts.join('/');
+                    }
                 }
-            }
-        }
 
-        /**
-         * Internal method to transfer globalQueue items to this context's
-         * defQueue.
-         */
-        function takeGlobalQueue() {
-            //Push all the globalDefQueue items into the context's defQueue
-            if (globalDefQueue.length) {
-                //Array splice in the values since the context code has a
-                //local var ref to defQueue, so cannot just reassign the one
-                //on context.
-                apsp.apply(defQueue,
-                           [defQueue.length, 0].concat(globalDefQueue));
-                globalDefQueue = [];
+                // If the name points to a package's name, use
+                // the package main instead.
+                pkgMain = getOwn(config.pkgs, name);
+
+                return pkgMain ? pkgMain : name;
             }
-        }
 
-        handlers = {
-            'require': function (mod) {
-                if (mod.require) {
-                    return mod.require;
-                } else {
-                    return (mod.require = context.makeRequire(mod.map));
-                }
-            },
-            'exports': function (mod) {
-                mod.usingExports = true;
-                if (mod.map.isDefine) {
-                    if (mod.exports) {
-                        return (defined[mod.map.id] = mod.exports);
-                    } else {
-                        return (mod.exports = defined[mod.map.id] = {});
-                    }
-                }
-            },
-            'module': function (mod) {
-                if (mod.module) {
-                    return mod.module;
-                } else {
-                    return (mod.module = {
-                        id: mod.map.id,
-                        uri: mod.map.url,
-                        config: function () {
-                            return  getOwn(config.config, mod.map.id) || {};
-                        },
-                        exports: mod.exports || (mod.exports = {})
+            function removeScript(name) {
+                if (isBrowser) {
+                    each(scripts(), function (scriptNode) {
+                        if (scriptNode.getAttribute('data-requiremodule') === name &&
+                                scriptNode.getAttribute('data-requirecontext') === context.contextName) {
+                            scriptNode.parentNode.removeChild(scriptNode);
+                            return true;
+                        }
                     });
                 }
             }
-        };
-
-        function cleanRegistry(id) {
-            //Clean up machinery used for waiting modules.
-            delete registry[id];
-            delete enabledRegistry[id];
-        }
 
-        function breakCycle(mod, traced, processed) {
-            var id = mod.map.id;
-
-            if (mod.error) {
-                mod.emit('error', mod.error);
-            } else {
-                traced[id] = true;
-                each(mod.depMaps, function (depMap, i) {
-                    var depId = depMap.id,
-                        dep = getOwn(registry, depId);
-
-                    //Only force things that have not completed
-                    //being defined, so still in the registry,
-                    //and only if it has not been matched up
-                    //in the module already.
-                    if (dep && !mod.depMatched[i] && !processed[depId]) {
-                        if (getOwn(traced, depId)) {
-                            mod.defineDep(i, defined[depId]);
-                            mod.check(); //pass false?
-                        } else {
-                            breakCycle(dep, traced, processed);
-                        }
-                    }
-                });
-                processed[id] = true;
+            function hasPathFallback(id) {
+                var pathConfig = getOwn(config.paths, id);
+                if (pathConfig && isArray(pathConfig) && pathConfig.length > 1) {
+                    //Pop off the first array value, since it failed, and
+                    //retry
+                    pathConfig.shift();
+                    context.require.undef(id);
+
+                    //Custom require that does not do map translation, since
+                    //ID is "absolute", already mapped/resolved.
+                    context.makeRequire(null, {
+                        skipMap: true
+                    })([id]);
+
+                    return true;
+                }
             }
-        }
 
-        function checkLoaded() {
-            var err, usingPathFallback,
-                waitInterval = config.waitSeconds * 1000,
-                //It is possible to disable the wait interval by using waitSeconds of 0.
-                expired = waitInterval && (context.startTime + waitInterval) < new Date().getTime(),
-                noLoads = [],
-                reqCalls = [],
-                stillLoading = false,
-                needCycleCheck = true;
-
-            //Do not bother if this call was a result of a cycle break.
-            if (inCheckLoaded) {
-                return;
+            //Turns a plugin!resource to [plugin, resource]
+            //with the plugin being undefined if the name
+            //did not have a plugin prefix.
+            function splitPrefix(name) {
+                var prefix,
+                    index = name ? name.indexOf('!') : -1;
+                if (index > -1) {
+                    prefix = name.substring(0, index);
+                    name = name.substring(index + 1, name.length);
+                }
+                return [prefix, name];
             }
 
-            inCheckLoaded = true;
-
-            //Figure out the state of all the modules.
-            eachProp(enabledRegistry, function (mod) {
-                var map = mod.map,
-                    modId = map.id;
-
-                //Skip things that are not enabled or in error state.
-                if (!mod.enabled) {
-                    return;
+            /**
+             * Creates a module mapping that includes plugin prefix, module
+             * name, and path. If parentModuleMap is provided it will
+             * also normalize the name via require.normalize()
+             *
+             * @param {String} name the module name
+             * @param {String} [parentModuleMap] parent module map
+             * for the module name, used to resolve relative names.
+             * @param {Boolean} isNormalized: is the ID already normalized.
+             * This is true if this call is done for a define() module ID.
+             * @param {Boolean} applyMap: apply the map config to the ID.
+             * Should only be true if this map is for a dependency.
+             *
+             * @returns {Object}
+             */
+            function makeModuleMap(name, parentModuleMap, isNormalized, applyMap) {
+                var url, pluginModule, suffix, nameParts,
+                    prefix = null,
+                    parentName = parentModuleMap ? parentModuleMap.name : null,
+                    originalName = name,
+                    isDefine = true,
+                    normalizedName = '';
+
+                //If no name, then it means it is a require call, generate an
+                //internal name.
+                if (!name) {
+                    isDefine = false;
+                    name = '_@r' + (requireCounter += 1);
                 }
 
-                if (!map.isDefine) {
-                    reqCalls.push(mod);
+                nameParts = splitPrefix(name);
+                prefix = nameParts[0];
+                name = nameParts[1];
+
+                if (prefix) {
+                    prefix = normalize(prefix, parentName, applyMap);
+                    pluginModule = getOwn(defined, prefix);
                 }
 
-                if (!mod.error) {
-                    //If the module should be executed, and it has not
-                    //been inited and time is up, remember it.
-                    if (!mod.inited && expired) {
-                        if (hasPathFallback(modId)) {
-                            usingPathFallback = true;
-                            stillLoading = true;
+                //Account for relative paths if there is a base name.
+                if (name) {
+                    if (prefix) {
+                        if (pluginModule && pluginModule.normalize) {
+                            //Plugin is loaded, use its normalize method.
+                            normalizedName = pluginModule.normalize(name, function (name) {
+                                return normalize(name, parentName, applyMap);
+                            });
                         } else {
-                            noLoads.push(modId);
-                            removeScript(modId);
-                        }
-                    } else if (!mod.inited && mod.fetched && map.isDefine) {
-                        stillLoading = true;
-                        if (!map.prefix) {
-                            //No reason to keep looking for unfinished
-                            //loading. If the only stillLoading is a
-                            //plugin resource though, keep going,
-                            //because it may be that a plugin resource
-                            //is waiting on a non-plugin cycle.
-                            return (needCycleCheck = false);
+                            // If nested plugin references, then do not try to
+                            // normalize, as it will not normalize correctly. This
+                            // places a restriction on resourceIds, and the longer
+                            // term solution is not to normalize until plugins are
+                            // loaded and all normalizations to allow for async
+                            // loading of a loader plugin. But for now, fixes the
+                            // common uses. Details in #1131
+                            normalizedName = name.indexOf('!') === -1 ?
+                                             normalize(name, parentName, applyMap) :
+                                             name;
                         }
+                    } else {
+                        //A regular module.
+                        normalizedName = normalize(name, parentName, applyMap);
+
+                        //Normalized name may be a plugin ID due to map config
+                        //application in normalize. The map config values must
+                        //already be normalized, so do not need to redo that part.
+                        nameParts = splitPrefix(normalizedName);
+                        prefix = nameParts[0];
+                        normalizedName = nameParts[1];
+                        isNormalized = true;
+
+                        url = context.nameToUrl(normalizedName);
                     }
                 }
-            });
 
-            if (expired && noLoads.length) {
-                //If wait time expired, throw error of unloaded modules.
-                err = makeError('timeout', 'Load timeout for modules: ' + noLoads, null, noLoads);
-                err.contextName = context.contextName;
-                return onError(err);
+                //If the id is a plugin id that cannot be determined if it needs
+                //normalization, stamp it with a unique ID so two matching relative
+                //ids that may conflict can be separate.
+                suffix = prefix && !pluginModule && !isNormalized ?
+                         '_unnormalized' + (unnormalizedCounter += 1) :
+                         '';
+
+                return {
+                    prefix: prefix,
+                    name: normalizedName,
+                    parentMap: parentModuleMap,
+                    unnormalized: !!suffix,
+                    url: url,
+                    originalName: originalName,
+                    isDefine: isDefine,
+                    id: (prefix ?
+                            prefix + '!' + normalizedName :
+                            normalizedName) + suffix
+                };
             }
 
-            //Not expired, check for a cycle.
-            if (needCycleCheck) {
-                each(reqCalls, function (mod) {
-                    breakCycle(mod, {}, {});
-                });
-            }
+            function getModule(depMap) {
+                var id = depMap.id,
+                    mod = getOwn(registry, id);
 
-            //If still waiting on loads, and the waiting load is something
-            //other than a plugin resource, or there are still outstanding
-            //scripts, then just try back later.
-            if ((!expired || usingPathFallback) && stillLoading) {
-                //Something is still waiting to load. Wait for it, but only
-                //if a timeout is not already in effect.
-                if ((isBrowser || isWebWorker) && !checkLoadedTimeoutId) {
-                    checkLoadedTimeoutId = setTimeout(function () {
-                        checkLoadedTimeoutId = 0;
-                        checkLoaded();
-                    }, 50);
+                if (!mod) {
+                    mod = registry[id] = new context.Module(depMap);
                 }
-            }
-
-            inCheckLoaded = false;
-        }
 
-        Module = function (map) {
-            this.events = getOwn(undefEvents, map.id) || {};
-            this.map = map;
-            this.shim = getOwn(config.shim, map.id);
-            this.depExports = [];
-            this.depMaps = [];
-            this.depMatched = [];
-            this.pluginMaps = {};
-            this.depCount = 0;
-
-            /* this.exports this.factory
-               this.depMaps = [],
-               this.enabled, this.fetched
-            */
-        };
+                return mod;
+            }
 
-        Module.prototype = {
-            init: function (depMaps, factory, errback, options) {
-                options = options || {};
+            function on(depMap, name, fn) {
+                var id = depMap.id,
+                    mod = getOwn(registry, id);
 
-                //Do not do more inits if already done. Can happen if there
-                //are multiple define calls for the same module. That is not
-                //a normal, common case, but it is also not unexpected.
-                if (this.inited) {
-                    return;
+                if (hasProp(defined, id) &&
+                        (!mod || mod.defineEmitComplete)) {
+                    if (name === 'defined') {
+                        fn(defined[id]);
+                    }
+                } else {
+                    mod = getModule(depMap);
+                    if (mod.error && name === 'error') {
+                        fn(mod.error);
+                    } else {
+                        mod.on(name, fn);
+                    }
                 }
+            }
 
-                this.factory = factory;
+            function onError(err, errback) {
+                var ids = err.requireModules,
+                    notified = false;
 
                 if (errback) {
-                    //Register for errors on this module.
-                    this.on('error', errback);
-                } else if (this.events.error) {
-                    //If no errback already, but there are error listeners
-                    //on this module, set up an errback to pass to the deps.
-                    errback = bind(this, function (err) {
-                        this.emit('error', err);
+                    errback(err);
+                } else {
+                    each(ids, function (id) {
+                        var mod = getOwn(registry, id);
+                        if (mod) {
+                            //Set error on module, so it skips timeout checks.
+                            mod.error = err;
+                            if (mod.events.error) {
+                                notified = true;
+                                mod.emit('error', err);
+                            }
+                        }
                     });
+
+                    if (!notified) {
+                        req.onError(err);
+                    }
                 }
+            }
 
-                //Do a copy of the dependency array, so that
-                //source inputs are not modified. For example
-                //"shim" deps are passed in here directly, and
-                //doing a direct modification of the depMaps array
-                //would affect that config.
-                this.depMaps = depMaps && depMaps.slice(0);
+            /**
+             * Internal method to transfer globalQueue items to this context's
+             * defQueue.
+             */
+            function takeGlobalQueue() {
+                //Push all the globalDefQueue items into the context's defQueue
+                if (globalDefQueue.length) {
+                    //Array splice in the values since the context code has a
+                    //local var ref to defQueue, so cannot just reassign the one
+                    //on context.
+                    apsp.apply(defQueue,
+                               [defQueue.length, 0].concat(globalDefQueue));
+                    globalDefQueue = [];
+                }
+            }
 
-                this.errback = errback;
+            handlers = {
+                'require': function (mod) {
+                    if (mod.require) {
+                        return mod.require;
+                    } else {
+                        return (mod.require = context.makeRequire(mod.map));
+                    }
+                },
+                'exports': function (mod) {
+                    mod.usingExports = true;
+                    if (mod.map.isDefine) {
+                        if (mod.exports) {
+                            return (defined[mod.map.id] = mod.exports);
+                        } else {
+                            return (mod.exports = defined[mod.map.id] = {});
+                        }
+                    }
+                },
+                'module': function (mod) {
+                    if (mod.module) {
+                        return mod.module;
+                    } else {
+                        return (mod.module = {
+                            id: mod.map.id,
+                            uri: mod.map.url,
+                            config: function () {
+                                return  getOwn(config.config, mod.map.id) || {};
+                            },
+                            exports: mod.exports || (mod.exports = {})
+                        });
+                    }
+                }
+            };
 
-                //Indicate this module has be initialized
-                this.inited = true;
+            function cleanRegistry(id) {
+                //Clean up machinery used for waiting modules.
+                delete registry[id];
+                delete enabledRegistry[id];
+            }
 
-                this.ignore = options.ignore;
+            function breakCycle(mod, traced, processed) {
+                var id = mod.map.id;
 
-                //Could have option to init this module in enabled mode,
-                //or could have been previously marked as enabled. However,
-                //the dependencies are not known until init is called. So
-                //if enabled previously, now trigger dependencies as enabled.
-                if (options.enabled || this.enabled) {
-                    //Enable this module and dependencies.
-                    //Will call this.check()
-                    this.enable();
+                if (mod.error) {
+                    mod.emit('error', mod.error);
                 } else {
-                    this.check();
-                }
-            },
-
-            defineDep: function (i, depExports) {
-                //Because of cycles, defined callback for a given
-                //export can be called more than once.
-                if (!this.depMatched[i]) {
-                    this.depMatched[i] = true;
-                    this.depCount -= 1;
-                    this.depExports[i] = depExports;
+                    traced[id] = true;
+                    each(mod.depMaps, function (depMap, i) {
+                        var depId = depMap.id,
+                            dep = getOwn(registry, depId);
+
+                        //Only force things that have not completed
+                        //being defined, so still in the registry,
+                        //and only if it has not been matched up
+                        //in the module already.
+                        if (dep && !mod.depMatched[i] && !processed[depId]) {
+                            if (getOwn(traced, depId)) {
+                                mod.defineDep(i, defined[depId]);
+                                mod.check(); //pass false?
+                            } else {
+                                breakCycle(dep, traced, processed);
+                            }
+                        }
+                    });
+                    processed[id] = true;
                 }
-            },
+            }
 
-            fetch: function () {
-                if (this.fetched) {
+            function checkLoaded() {
+                var err, usingPathFallback,
+                    waitInterval = config.waitSeconds * 1000,
+                    //It is possible to disable the wait interval by using waitSeconds of 0.
+                    expired = waitInterval && (context.startTime + waitInterval) < new Date().getTime(),
+                    noLoads = [],
+                    reqCalls = [],
+                    stillLoading = false,
+                    needCycleCheck = true;
+
+                //Do not bother if this call was a result of a cycle break.
+                if (inCheckLoaded) {
                     return;
                 }
-                this.fetched = true;
 
-                context.startTime = (new Date()).getTime();
-
-                var map = this.map;
-
-                //If the manager is for a plugin managed resource,
-                //ask the plugin to load it now.
-                if (this.shim) {
-                    context.makeRequire(this.map, {
-                        enableBuildCallback: true
-                    })(this.shim.deps || [], bind(this, function () {
-                        return map.prefix ? this.callPlugin() : this.load();
-                    }));
-                } else {
-                    //Regular dependency.
-                    return map.prefix ? this.callPlugin() : this.load();
-                }
-            },
+                inCheckLoaded = true;
 
-            load: function () {
-                var url = this.map.url;
+                //Figure out the state of all the modules.
+                eachProp(enabledRegistry, function (mod) {
+                    var map = mod.map,
+                        modId = map.id;
 
-                //Regular dependency.
-                if (!urlFetched[url]) {
-                    urlFetched[url] = true;
-                    context.load(this.map.id, url);
-                }
-            },
+                    //Skip things that are not enabled or in error state.
+                    if (!mod.enabled) {
+                        return;
+                    }
 
-            /**
-             * Checks if the module is ready to define itself, and if so,
-             * define it.
-             */
-            check: function () {
-                if (!this.enabled || this.enabling) {
-                    return;
-                }
+                    if (!map.isDefine) {
+                        reqCalls.push(mod);
+                    }
 
-                var err, cjsModule,
-                    id = this.map.id,
-                    depExports = this.depExports,
-                    exports = this.exports,
-                    factory = this.factory;
-
-                if (!this.inited) {
-                    this.fetch();
-                } else if (this.error) {
-                    this.emit('error', this.error);
-                } else if (!this.defining) {
-                    //The factory could trigger another require call
-                    //that would result in checking this module to
-                    //define itself again. If already in the process
-                    //of doing that, skip this work.
-                    this.defining = true;
-
-                    if (this.depCount < 1 && !this.defined) {
-                        if (isFunction(factory)) {
-                            //If there is an error listener, favor passing
-                            //to that instead of throwing an error. However,
-                            //only do it for define()'d  modules. require
-                            //errbacks should not be called for failures in
-                            //their callbacks (#699). However if a global
-                            //onError is set, use that.
-                            if ((this.events.error && this.map.isDefine) ||
-                                req.onError !== defaultOnError) {
-                                try {
-                                    exports = context.execCb(id, factory, depExports, exports);
-                                } catch (e) {
-                                    err = e;
-                                }
+                    if (!mod.error) {
+                        //If the module should be executed, and it has not
+                        //been inited and time is up, remember it.
+                        if (!mod.inited && expired) {
+                            if (hasPathFallback(modId)) {
+                                usingPathFallback = true;
+                                stillLoading = true;
                             } else {
-                                exports = context.execCb(id, factory, depExports, exports);
+                                noLoads.push(modId);
+                                removeScript(modId);
                             }
-
-                            // Favor return value over exports. If node/cjs in play,
-                            // then will not have a return value anyway. Favor
-                            // module.exports assignment over exports object.
-                            if (this.map.isDefine && exports === undefined) {
-                                cjsModule = this.module;
-                                if (cjsModule) {
-                                    exports = cjsModule.exports;
-                                } else if (this.usingExports) {
-                                    //exports already set the defined value.
-                                    exports = this.exports;
-                                }
+                        } else if (!mod.inited && mod.fetched && map.isDefine) {
+                            stillLoading = true;
+                            if (!map.prefix) {
+                                //No reason to keep looking for unfinished
+                                //loading. If the only stillLoading is a
+                                //plugin resource though, keep going,
+                                //because it may be that a plugin resource
+                                //is waiting on a non-plugin cycle.
+                                return (needCycleCheck = false);
                             }
+                        }
+                    }
+                });
 
-                            if (err) {
-                                err.requireMap = this.map;
-                                err.requireModules = this.map.isDefine ? [this.map.id] : null;
-                                err.requireType = this.map.isDefine ? 'define' : 'require';
-                                return onError((this.error = err));
-                            }
+                if (expired && noLoads.length) {
+                    //If wait time expired, throw error of unloaded modules.
+                    err = makeError('timeout', 'Load timeout for modules: ' + noLoads, null, noLoads);
+                    err.contextName = context.contextName;
+                    return onError(err);
+                }
 
-                        } else {
-                            //Just a literal value
-                            exports = factory;
-                        }
+                //Not expired, check for a cycle.
+                if (needCycleCheck) {
+                    each(reqCalls, function (mod) {
+                        breakCycle(mod, {}, {});
+                    });
+                }
 
-                        this.exports = exports;
+                //If still waiting on loads, and the waiting load is something
+                //other than a plugin resource, or there are still outstanding
+                //scripts, then just try back later.
+                if ((!expired || usingPathFallback) && stillLoading) {
+                    //Something is still waiting to load. Wait for it, but only
+                    //if a timeout is not already in effect.
+                    if ((isBrowser || isWebWorker) && !checkLoadedTimeoutId) {
+                        checkLoadedTimeoutId = setTimeout(function () {
+                            checkLoadedTimeoutId = 0;
+                            checkLoaded();
+                        }, 50);
+                    }
+                }
 
-                        if (this.map.isDefine && !this.ignore) {
-                            defined[id] = exports;
+                inCheckLoaded = false;
+            }
 
-                            if (req.onResourceLoad) {
-                                req.onResourceLoad(context, this.map, this.depMaps);
-                            }
-                        }
+            Module = function (map) {
+                this.events = getOwn(undefEvents, map.id) || {};
+                this.map = map;
+                this.shim = getOwn(config.shim, map.id);
+                this.depExports = [];
+                this.depMaps = [];
+                this.depMatched = [];
+                this.pluginMaps = {};
+                this.depCount = 0;
+
+                /* this.exports this.factory
+                   this.depMaps = [],
+                   this.enabled, this.fetched
+                */
+            };
 
-                        //Clean up
-                        cleanRegistry(id);
+            Module.prototype = {
+                init: function (depMaps, factory, errback, options) {
+                    options = options || {};
 
-                        this.defined = true;
+                    //Do not do more inits if already done. Can happen if there
+                    //are multiple define calls for the same module. That is not
+                    //a normal, common case, but it is also not unexpected.
+                    if (this.inited) {
+                        return;
                     }
 
-                    //Finished the define stage. Allow calling check again
-                    //to allow define notifications below in the case of a
-                    //cycle.
-                    this.defining = false;
+                    this.factory = factory;
 
-                    if (this.defined && !this.defineEmitted) {
-                        this.defineEmitted = true;
-                        this.emit('defined', this.exports);
-                        this.defineEmitComplete = true;
+                    if (errback) {
+                        //Register for errors on this module.
+                        this.on('error', errback);
+                    } else if (this.events.error) {
+                        //If no errback already, but there are error listeners
+                        //on this module, set up an errback to pass to the deps.
+                        errback = bind(this, function (err) {
+                            this.emit('error', err);
+                        });
                     }
 
-                }
-            },
-
-            callPlugin: function () {
-                var map = this.map,
-                    id = map.id,
-                    //Map already normalized the prefix.
-                    pluginMap = makeModuleMap(map.prefix);
-
-                //Mark this as a dependency for this plugin, so it
-                //can be traced for cycles.
-                this.depMaps.push(pluginMap);
-
-                on(pluginMap, 'defined', bind(this, function (plugin) {
-                    var load, normalizedMap, normalizedMod,
-                        bundleId = getOwn(bundlesMap, this.map.id),
-                        name = this.map.name,
-                        parentName = this.map.parentMap ? this.map.parentMap.name : null,
-                        localRequire = context.makeRequire(map.parentMap, {
-                            enableBuildCallback: true
-                        });
+                    //Do a copy of the dependency array, so that
+                    //source inputs are not modified. For example
+                    //"shim" deps are passed in here directly, and
+                    //doing a direct modification of the depMaps array
+                    //would affect that config.
+                    this.depMaps = depMaps && depMaps.slice(0);
 
-                    //If current map is not normalized, wait for that
-                    //normalized name to load instead of continuing.
-                    if (this.map.unnormalized) {
-                        //Normalize the ID if the plugin allows it.
-                        if (plugin.normalize) {
-                            name = plugin.normalize(name, function (name) {
-                                return normalize(name, parentName, true);
-                            }) || '';
-                        }
+                    this.errback = errback;
 
-                        //prefix and name should already be normalized, no need
-                        //for applying map config again either.
-                        normalizedMap = makeModuleMap(map.prefix + '!' + name,
-                                                      this.map.parentMap);
-                        on(normalizedMap,
-                            'defined', bind(this, function (value) {
-                                this.init([], function () { return value; }, null, {
-                                    enabled: true,
-                                    ignore: true
-                                });
-                            }));
+                    //Indicate this module has be initialized
+                    this.inited = true;
 
-                        normalizedMod = getOwn(registry, normalizedMap.id);
-                        if (normalizedMod) {
-                            //Mark this as a dependency for this plugin, so it
-                            //can be traced for cycles.
-                            this.depMaps.push(normalizedMap);
+                    this.ignore = options.ignore;
 
-                            if (this.events.error) {
-                                normalizedMod.on('error', bind(this, function (err) {
-                                    this.emit('error', err);
-                                }));
-                            }
-                            normalizedMod.enable();
-                        }
+                    //Could have option to init this module in enabled mode,
+                    //or could have been previously marked as enabled. However,
+                    //the dependencies are not known until init is called. So
+                    //if enabled previously, now trigger dependencies as enabled.
+                    if (options.enabled || this.enabled) {
+                        //Enable this module and dependencies.
+                        //Will call this.check()
+                        this.enable();
+                    } else {
+                        this.check();
+                    }
+                },
+
+                defineDep: function (i, depExports) {
+                    //Because of cycles, defined callback for a given
+                    //export can be called more than once.
+                    if (!this.depMatched[i]) {
+                        this.depMatched[i] = true;
+                        this.depCount -= 1;
+                        this.depExports[i] = depExports;
+                    }
+                },
 
+                fetch: function () {
+                    if (this.fetched) {
                         return;
                     }
+                    this.fetched = true;
 
-                    //If a paths config, then just load that file instead to
-                    //resolve the plugin, as it is built into that paths layer.
-                    if (bundleId) {
-                        this.map.url = context.nameToUrl(bundleId);
-                        this.load();
+                    context.startTime = (new Date()).getTime();
+
+                    var map = this.map;
+
+                    //If the manager is for a plugin managed resource,
+                    //ask the plugin to load it now.
+                    if (this.shim) {
+                        context.makeRequire(this.map, {
+                            enableBuildCallback: true
+                        })(this.shim.deps || [], bind(this, function () {
+                            return map.prefix ? this.callPlugin() : this.load();
+                        }));
+                    } else {
+                        //Regular dependency.
+                        return map.prefix ? this.callPlugin() : this.load();
+                    }
+                },
+
+                load: function () {
+                    var url = this.map.url;
+
+                    //Regular dependency.
+                    if (!urlFetched[url]) {
+                        urlFetched[url] = true;
+                        context.load(this.map.id, url);
+                    }
+                },
+
+                /**
+                 * Checks if the module is ready to define itself, and if so,
+                 * define it.
+                 */
+                check: function () {
+                    if (!this.enabled || this.enabling) {
                         return;
                     }
 
-                    load = bind(this, function (value) {
-                        this.init([], function () { return value; }, null, {
-                            enabled: true
-                        });
-                    });
+                    var err, cjsModule,
+                        id = this.map.id,
+                        depExports = this.depExports,
+                        exports = this.exports,
+                        factory = this.factory;
+
+                    if (!this.inited) {
+                        this.fetch();
+                    } else if (this.error) {
+                        this.emit('error', this.error);
+                    } else if (!this.defining) {
+                        //The factory could trigger another require call
+                        //that would result in checking this module to
+                        //define itself again. If already in the process
+                        //of doing that, skip this work.
+                        this.defining = true;
+
+                        if (this.depCount < 1 && !this.defined) {
+                            if (isFunction(factory)) {
+                                //If there is an error listener, favor passing
+                                //to that instead of throwing an error. However,
+                                //only do it for define()'d  modules. require
+                                //errbacks should not be called for failures in
+                                //their callbacks (#699). However if a global
+                                //onError is set, use that.
+                                if ((this.events.error && this.map.isDefine) ||
+                                    req.onError !== defaultOnError) {
+                                    try {
+                                        exports = context.execCb(id, factory, depExports, exports);
+                                    } catch (e) {
+                                        err = e;
+                                    }
+                                } else {
+                                    exports = context.execCb(id, factory, depExports, exports);
+                                }
 
-                    load.error = bind(this, function (err) {
-                        this.inited = true;
-                        this.error = err;
-                        err.requireModules = [id];
+                                // Favor return value over exports. If node/cjs in play,
+                                // then will not have a return value anyway. Favor
+                                // module.exports assignment over exports object.
+                                if (this.map.isDefine && exports === undefined) {
+                                    cjsModule = this.module;
+                                    if (cjsModule) {
+                                        exports = cjsModule.exports;
+                                    } else if (this.usingExports) {
+                                        //exports already set the defined value.
+                                        exports = this.exports;
+                                    }
+                                }
+
+                                if (err) {
+                                    err.requireMap = this.map;
+                                    err.requireModules = this.map.isDefine ? [this.map.id] : null;
+                                    err.requireType = this.map.isDefine ? 'define' : 'require';
+                                    return onError((this.error = err));
+                                }
 
-                        //Remove temp unnormalized modules for this module,
-                        //since they will never be resolved otherwise now.
-                        eachProp(registry, function (mod) {
-                            if (mod.map.id.indexOf(id + '_unnormalized') === 0) {
-                                cleanRegistry(mod.map.id);
+                            } else {
+                                //Just a literal value
+                                exports = factory;
                             }
-                        });
 
-                        onError(err);
-                    });
+                            this.exports = exports;
 
-                    //Allow plugins to load other code without having to know the
-                    //context or how to 'complete' the load.
-                    load.fromText = bind(this, function (text, textAlt) {
-                        /*jslint evil: true */
-                        var moduleName = map.name,
-                            moduleMap = makeModuleMap(moduleName),
-                            hasInteractive = useInteractive;
-
-                        //As of 2.1.0, support just passing the text, to reinforce
-                        //fromText only being called once per resource. Still
-                        //support old style of passing moduleName but discard
-                        //that moduleName in favor of the internal ref.
-                        if (textAlt) {
-                            text = textAlt;
-                        }
+                            if (this.map.isDefine && !this.ignore) {
+                                defined[id] = exports;
 
-                        //Turn off interactive script matching for IE for any define
-                        //calls in the text, then turn it back on at the end.
-                        if (hasInteractive) {
-                            useInteractive = false;
-                        }
+                                if (req.onResourceLoad) {
+                                    req.onResourceLoad(context, this.map, this.depMaps);
+                                }
+                            }
 
-                        //Prime the system by creating a module instance for
-                        //it.
-                        getModule(moduleMap);
+                            //Clean up
+                            cleanRegistry(id);
 
-                        //Transfer any config to this other module.
-                        if (hasProp(config.config, id)) {
-                            config.config[moduleName] = config.config[id];
+                            this.defined = true;
                         }
 
-                        try {
-                            req.exec(text);
-                        } catch (e) {
-                            return onError(makeError('fromtexteval',
-                                             'fromText eval for ' + id +
-                                            ' failed: ' + e,
-                                             e,
-                                             [id]));
-                        }
+                        //Finished the define stage. Allow calling check again
+                        //to allow define notifications below in the case of a
+                        //cycle.
+                        this.defining = false;
 
-                        if (hasInteractive) {
-                            useInteractive = true;
+                        if (this.defined && !this.defineEmitted) {
+                            this.defineEmitted = true;
+                            this.emit('defined', this.exports);
+                            this.defineEmitComplete = true;
                         }
 
-                        //Mark this as a dependency for the plugin
-                        //resource
-                        this.depMaps.push(moduleMap);
+                    }
+                },
+
+                callPlugin: function () {
+                    var map = this.map,
+                        id = map.id,
+                        //Map already normalized the prefix.
+                        pluginMap = makeModuleMap(map.prefix);
+
+                    //Mark this as a dependency for this plugin, so it
+                    //can be traced for cycles.
+                    this.depMaps.push(pluginMap);
+
+                    on(pluginMap, 'defined', bind(this, function (plugin) {
+                        var load, normalizedMap, normalizedMod,
+                            bundleId = getOwn(bundlesMap, this.map.id),
+                            name = this.map.name,
+                            parentName = this.map.parentMap ? this.map.parentMap.name : null,
+                            localRequire = context.makeRequire(map.parentMap, {
+                                enableBuildCallback: true
+                            });
+
+                        //If current map is not normalized, wait for that
+                        //normalized name to load instead of continuing.
+                        if (this.map.unnormalized) {
+                            //Normalize the ID if the plugin allows it.
+                            if (plugin.normalize) {
+                                name = plugin.normalize(name, function (name) {
+                                    return normalize(name, parentName, true);
+                                }) || '';
+                            }
 
-                        //Support anonymous modules.
-                        context.completeLoad(moduleName);
+                            //prefix and name should already be normalized, no need
+                            //for applying map config again either.
+                            normalizedMap = makeModuleMap(map.prefix + '!' + name,
+                                                          this.map.parentMap);
+                            on(normalizedMap,
+                                'defined', bind(this, function (value) {
+                                    this.init([], function () { return value; }, null, {
+                                        enabled: true,
+                                        ignore: true
+                                    });
+                                }));
 
-                        //Bind the value of that module to the value for this
-                        //resource ID.
-                        localRequire([moduleName], load);
-                    });
+                            normalizedMod = getOwn(registry, normalizedMap.id);
+                            if (normalizedMod) {
+                                //Mark this as a dependency for this plugin, so it
+                                //can be traced for cycles.
+                                this.depMaps.push(normalizedMap);
+
+                                if (this.events.error) {
+                                    normalizedMod.on('error', bind(this, function (err) {
+                                        this.emit('error', err);
+                                    }));
+                                }
+                                normalizedMod.enable();
+                            }
 
-                    //Use parentName here since the plugin's name is not reliable,
-                    //could be some weird string with no path that actually wants to
-                    //reference the parentName's path.
-                    plugin.load(map.name, localRequire, load, config);
-                }));
-
-                context.enable(pluginMap, this);
-                this.pluginMaps[pluginMap.id] = pluginMap;
-            },
-
-            enable: function () {
-                enabledRegistry[this.map.id] = this;
-                this.enabled = true;
-
-                //Set flag mentioning that the module is enabling,
-                //so that immediate calls to the defined callbacks
-                //for dependencies do not trigger inadvertent load
-                //with the depCount still being zero.
-                this.enabling = true;
-
-                //Enable each dependency
-                each(this.depMaps, bind(this, function (depMap, i) {
-                    var id, mod, handler;
-
-                    if (typeof depMap === 'string') {
-                        //Dependency needs to be converted to a depMap
-                        //and wired up to this module.
-                        depMap = makeModuleMap(depMap,
-                                               (this.map.isDefine ? this.map : this.map.parentMap),
-                                               false,
-                                               !this.skipMap);
-                        this.depMaps[i] = depMap;
-
-                        handler = getOwn(handlers, depMap.id);
-
-                        if (handler) {
-                            this.depExports[i] = handler(this);
                             return;
                         }
 
-                        this.depCount += 1;
-
-                        on(depMap, 'defined', bind(this, function (depExports) {
-                            this.defineDep(i, depExports);
-                            this.check();
-                        }));
-
-                        if (this.errback) {
-                            on(depMap, 'error', bind(this, this.errback));
+                        //If a paths config, then just load that file instead to
+                        //resolve the plugin, as it is built into that paths layer.
+                        if (bundleId) {
+                            this.map.url = context.nameToUrl(bundleId);
+                            this.load();
+                            return;
                         }
-                    }
 
-                    id = depMap.id;
-                    mod = registry[id];
+                        load = bind(this, function (value) {
+                            this.init([], function () { return value; }, null, {
+                                enabled: true
+                            });
+                        });
 
-                    //Skip special modules like 'require', 'exports', 'module'
-                    //Also, don't call enable if it is already enabled,
-                    //important in circular dependency cases.
-                    if (!hasProp(handlers, id) && mod && !mod.enabled) {
-                        context.enable(depMap, this);
-                    }
-                }));
-
-                //Enable each plugin that is used in
-                //a dependency
-                eachProp(this.pluginMaps, bind(this, function (pluginMap) {
-                    var mod = getOwn(registry, pluginMap.id);
-                    if (mod && !mod.enabled) {
-                        context.enable(pluginMap, this);
-                    }
-                }));
+                        load.error = bind(this, function (err) {
+                            this.inited = true;
+                            this.error = err;
+                            err.requireModules = [id];
 
-                this.enabling = false;
+                            //Remove temp unnormalized modules for this module,
+                            //since they will never be resolved otherwise now.
+                            eachProp(registry, function (mod) {
+                                if (mod.map.id.indexOf(id + '_unnormalized') === 0) {
+                                    cleanRegistry(mod.map.id);
+                                }
+                            });
 
-                this.check();
-            },
+                            onError(err);
+                        });
 
-            on: function (name, cb) {
-                var cbs = this.events[name];
-                if (!cbs) {
-                    cbs = this.events[name] = [];
-                }
-                cbs.push(cb);
-            },
+                        //Allow plugins to load other code without having to know the
+                        //context or how to 'complete' the load.
+                        load.fromText = bind(this, function (text, textAlt) {
+                            /*jslint evil: true */
+                            var moduleName = map.name,
+                                moduleMap = makeModuleMap(moduleName),
+                                hasInteractive = useInteractive;
+
+                            //As of 2.1.0, support just passing the text, to reinforce
+                            //fromText only being called once per resource. Still
+                            //support old style of passing moduleName but discard
+                            //that moduleName in favor of the internal ref.
+                            if (textAlt) {
+                                text = textAlt;
+                            }
 
-            emit: function (name, evt) {
-                each(this.events[name], function (cb) {
-                    cb(evt);
-                });
-                if (name === 'error') {
-                    //Now that the error handler was triggered, remove
-                    //the listeners, since this broken Module instance
-                    //can stay around for a while in the registry.
-                    delete this.events[name];
-                }
-            }
-        };
+                            //Turn off interactive script matching for IE for any define
+                            //calls in the text, then turn it back on at the end.
+                            if (hasInteractive) {
+                                useInteractive = false;
+                            }
 
-        function callGetModule(args) {
-            //Skip modules already defined.
-            if (!hasProp(defined, args[0])) {
-                getModule(makeModuleMap(args[0], null, true)).init(args[1], args[2]);
-            }
-        }
+                            //Prime the system by creating a module instance for
+                            //it.
+                            getModule(moduleMap);
 
-        function removeListener(node, func, name, ieName) {
-            //Favor detachEvent because of IE9
-            //issue, see attachEvent/addEventListener comment elsewhere
-            //in this file.
-            if (node.detachEvent && !isOpera) {
-                //Probably IE. If not it will throw an error, which will be
-                //useful to know.
-                if (ieName) {
-                    node.detachEvent(ieName, func);
-                }
-            } else {
-                node.removeEventListener(name, func, false);
-            }
-        }
+                            //Transfer any config to this other module.
+                            if (hasProp(config.config, id)) {
+                                config.config[moduleName] = config.config[id];
+                            }
 
-        /**
-         * Given an event from a script node, get the requirejs info from it,
-         * and then removes the event listeners on the node.
-         * @param {Event} evt
-         * @returns {Object}
-         */
-        function getScriptData(evt) {
-            //Using currentTarget instead of target for Firefox 2.0's sake. Not
-            //all old browsers will be supported, but this one was easy enough
-            //to support and still makes sense.
-            var node = evt.currentTarget || evt.srcElement;
-
-            //Remove the listeners once here.
-            removeListener(node, context.onScriptLoad, 'load', 'onreadystatechange');
-            removeListener(node, context.onScriptError, 'error');
-
-            return {
-                node: node,
-                id: node && node.getAttribute('data-requiremodule')
-            };
-        }
+                            try {
+                                req.exec(text);
+                            } catch (e) {
+                                return onError(makeError('fromtexteval',
+                                                 'fromText eval for ' + id +
+                                                ' failed: ' + e,
+                                                 e,
+                                                 [id]));
+                            }
 
-        function intakeDefines() {
-            var args;
+                            if (hasInteractive) {
+                                useInteractive = true;
+                            }
 
-            //Any defined modules in the global queue, intake them now.
-            takeGlobalQueue();
+                            //Mark this as a dependency for the plugin
+                            //resource
+                            this.depMaps.push(moduleMap);
 
-            //Make sure any remaining defQueue items get properly processed.
-            while (defQueue.length) {
-                args = defQueue.shift();
-                if (args[0] === null) {
-                    return onError(makeError('mismatch', 'Mismatched anonymous define() module: ' + args[args.length - 1]));
-                } else {
-                    //args are id, deps, factory. Should be normalized by the
-                    //define() function.
-                    callGetModule(args);
-                }
-            }
-        }
+                            //Support anonymous modules.
+                            context.completeLoad(moduleName);
 
-        context = {
-            config: config,
-            contextName: contextName,
-            registry: registry,
-            defined: defined,
-            urlFetched: urlFetched,
-            defQueue: defQueue,
-            Module: Module,
-            makeModuleMap: makeModuleMap,
-            nextTick: req.nextTick,
-            onError: onError,
+                            //Bind the value of that module to the value for this
+                            //resource ID.
+                            localRequire([moduleName], load);
+                        });
 
-            /**
-             * Set a configuration for the context.
-             * @param {Object} cfg config object to integrate.
-             */
-            configure: function (cfg) {
-                //Make sure the baseUrl ends in a slash.
-                if (cfg.baseUrl) {
-                    if (cfg.baseUrl.charAt(cfg.baseUrl.length - 1) !== '/') {
-                        cfg.baseUrl += '/';
-                    }
-                }
+                        //Use parentName here since the plugin's name is not reliable,
+                        //could be some weird string with no path that actually wants to
+                        //reference the parentName's path.
+                        plugin.load(map.name, localRequire, load, config);
+                    }));
 
-                //Save off the paths since they require special processing,
-                //they are additive.
-                var shim = config.shim,
-                    objs = {
-                        paths: true,
-                        bundles: true,
-                        config: true,
-                        map: true
-                    };
-
-                eachProp(cfg, function (value, prop) {
-                    if (objs[prop]) {
-                        if (!config[prop]) {
-                            config[prop] = {};
-                        }
-                        mixin(config[prop], value, true, true);
-                    } else {
-                        config[prop] = value;
-                    }
-                });
+                    context.enable(pluginMap, this);
+                    this.pluginMaps[pluginMap.id] = pluginMap;
+                },
+
+                enable: function () {
+                    enabledRegistry[this.map.id] = this;
+                    this.enabled = true;
+
+                    //Set flag mentioning that the module is enabling,
+                    //so that immediate calls to the defined callbacks
+                    //for dependencies do not trigger inadvertent load
+                    //with the depCount still being zero.
+                    this.enabling = true;
+
+                    //Enable each dependency
+                    each(this.depMaps, bind(this, function (depMap, i) {
+                        var id, mod, handler;
+
+                        if (typeof depMap === 'string') {
+                            //Dependency needs to be converted to a depMap
+                            //and wired up to this module.
+                            depMap = makeModuleMap(depMap,
+                                                   (this.map.isDefine ? this.map : this.map.parentMap),
+                                                   false,
+                                                   !this.skipMap);
+                            this.depMaps[i] = depMap;
+
+                            handler = getOwn(handlers, depMap.id);
+
+                            if (handler) {
+                                this.depExports[i] = handler(this);
+                                return;
+                            }
+
+                            this.depCount += 1;
+
+                            on(depMap, 'defined', bind(this, function (depExports) {
+                                this.defineDep(i, depExports);
+                                this.check();
+                            }));
 
-                //Reverse map the bundles
-                if (cfg.bundles) {
-                    eachProp(cfg.bundles, function (value, prop) {
-                        each(value, function (v) {
-                            if (v !== prop) {
-                                bundlesMap[v] = prop;
+                            if (this.errback) {
+                                on(depMap, 'error', bind(this, this.errback));
                             }
-                        });
-                    });
-                }
+                        }
 
-                //Merge shim
-                if (cfg.shim) {
-                    eachProp(cfg.shim, function (value, id) {
-                        //Normalize the structure
-                        if (isArray(value)) {
-                            value = {
-                                deps: value
-                            };
+                        id = depMap.id;
+                        mod = registry[id];
+
+                        //Skip special modules like 'require', 'exports', 'module'
+                        //Also, don't call enable if it is already enabled,
+                        //important in circular dependency cases.
+                        if (!hasProp(handlers, id) && mod && !mod.enabled) {
+                            context.enable(depMap, this);
                         }
-                        if ((value.exports || value.init) && !value.exportsFn) {
-                            value.exportsFn = context.makeShimExports(value);
+                    }));
+
+                    //Enable each plugin that is used in
+                    //a dependency
+                    eachProp(this.pluginMaps, bind(this, function (pluginMap) {
+                        var mod = getOwn(registry, pluginMap.id);
+                        if (mod && !mod.enabled) {
+                            context.enable(pluginMap, this);
                         }
-                        shim[id] = value;
-                    });
-                    config.shim = shim;
-                }
+                    }));
 
-                //Adjust packages if necessary.
-                if (cfg.packages) {
-                    each(cfg.packages, function (pkgObj) {
-                        var location, name;
+                    this.enabling = false;
 
-                        pkgObj = typeof pkgObj === 'string' ? { name: pkgObj } : pkgObj;
+                    this.check();
+                },
 
-                        name = pkgObj.name;
-                        location = pkgObj.location;
-                        if (location) {
-                            config.paths[name] = pkgObj.location;
-                        }
+                on: function (name, cb) {
+                    var cbs = this.events[name];
+                    if (!cbs) {
+                        cbs = this.events[name] = [];
+                    }
+                    cbs.push(cb);
+                },
 
-                        //Save pointer to main module ID for pkg name.
-                        //Remove leading dot in main, so main paths are normalized,
-                        //and remove any trailing .js, since different package
-                        //envs have different conventions: some use a module name,
-                        //some use a file name.
-                        config.pkgs[name] = pkgObj.name + '/' + (pkgObj.main || 'main')
-                                     .replace(currDirRegExp, '')
-                                     .replace(jsSuffixRegExp, '');
+                emit: function (name, evt) {
+                    each(this.events[name], function (cb) {
+                        cb(evt);
                     });
-                }
-
-                //If there are any "waiting to execute" modules in the registry,
-                //update the maps for them, since their info, like URLs to load,
-                //may have changed.
-                eachProp(registry, function (mod, id) {
-                    //If module already has init called, since it is too
-                    //late to modify them, and ignore unnormalized ones
-                    //since they are transient.
-                    if (!mod.inited && !mod.map.unnormalized) {
-                        mod.map = makeModuleMap(id);
+                    if (name === 'error') {
+                        //Now that the error handler was triggered, remove
+                        //the listeners, since this broken Module instance
+                        //can stay around for a while in the registry.
+                        delete this.events[name];
                     }
-                });
+                }
+            };
 
-                //If a deps array or a config callback is specified, then call
-                //require with those args. This is useful when require is defined as a
-                //config object before require.js is loaded.
-                if (cfg.deps || cfg.callback) {
-                    context.require(cfg.deps || [], cfg.callback);
+            function callGetModule(args) {
+                //Skip modules already defined.
+                if (!hasProp(defined, args[0])) {
+                    getModule(makeModuleMap(args[0], null, true)).init(args[1], args[2]);
                 }
-            },
+            }
 
-            makeShimExports: function (value) {
-                function fn() {
-                    var ret;
-                    if (value.init) {
-                        ret = value.init.apply(global, arguments);
+            function removeListener(node, func, name, ieName) {
+                //Favor detachEvent because of IE9
+                //issue, see attachEvent/addEventListener comment elsewhere
+                //in this file.
+                if (node.detachEvent && !isOpera) {
+                    //Probably IE. If not it will throw an error, which will be
+                    //useful to know.
+                    if (ieName) {
+                        node.detachEvent(ieName, func);
                     }
-                    return ret || (value.exports && getGlobal(value.exports));
+                } else {
+                    node.removeEventListener(name, func, false);
                 }
-                return fn;
-            },
+            }
 
-            makeRequire: function (relMap, options) {
-                options = options || {};
+            /**
+             * Given an event from a script node, get the requirejs info from it,
+             * and then removes the event listeners on the node.
+             * @param {Event} evt
+             * @returns {Object}
+             */
+            function getScriptData(evt) {
+                //Using currentTarget instead of target for Firefox 2.0's sake. Not
+                //all old browsers will be supported, but this one was easy enough
+                //to support and still makes sense.
+                var node = evt.currentTarget || evt.srcElement;
 
-                function localRequire(deps, callback, errback) {
-                    var id, map, requireMod;
+                //Remove the listeners once here.
+                removeListener(node, context.onScriptLoad, 'load', 'onreadystatechange');
+                removeListener(node, context.onScriptError, 'error');
 
-                    if (options.enableBuildCallback && callback && isFunction(callback)) {
-                        callback.__requireJsBuild = true;
-                    }
+                return {
+                    node: node,
+                    id: node && node.getAttribute('data-requiremodule')
+                };
+            }
 
-                    if (typeof deps === 'string') {
-                        if (isFunction(callback)) {
-                            //Invalid call
-                            return onError(makeError('requireargs', 'Invalid require call'), errback);
-                        }
+            function intakeDefines() {
+                var args;
 
-                        //If require|exports|module are requested, get the
-                        //value for them from the special handlers. Caveat:
-                        //this only works while module is being defined.
-                        if (relMap && hasProp(handlers, deps)) {
-                            return handlers[deps](registry[relMap.id]);
-                        }
+                //Any defined modules in the global queue, intake them now.
+                takeGlobalQueue();
 
-                        //Synchronous access to one module. If require.get is
-                        //available (as in the Node adapter), prefer that.
-                        if (req.get) {
-                            return req.get(context, deps, relMap, localRequire);
-                        }
+                //Make sure any remaining defQueue items get properly processed.
+                while (defQueue.length) {
+                    args = defQueue.shift();
+                    if (args[0] === null) {
+                        return onError(makeError('mismatch', 'Mismatched anonymous define() module: ' + args[args.length - 1]));
+                    } else {
+                        //args are id, deps, factory. Should be normalized by the
+                        //define() function.
+                        callGetModule(args);
+                    }
+                }
+            }
 
-                        //Normalize module name, if it contains . or ..
-                        map = makeModuleMap(deps, relMap, false, true);
-                        id = map.id;
+            context = {
+                config: config,
+                contextName: contextName,
+                registry: registry,
+                defined: defined,
+                urlFetched: urlFetched,
+                defQueue: defQueue,
+                Module: Module,
+                makeModuleMap: makeModuleMap,
+                nextTick: req.nextTick,
+                onError: onError,
+
+                /**
+                 * Set a configuration for the context.
+                 * @param {Object} cfg config object to integrate.
+                 */
+                configure: function (cfg) {
+                    //Make sure the baseUrl ends in a slash.
+                    if (cfg.baseUrl) {
+                        if (cfg.baseUrl.charAt(cfg.baseUrl.length - 1) !== '/') {
+                            cfg.baseUrl += '/';
+                        }
+                    }
 
-                        if (!hasProp(defined, id)) {
-                            return onError(makeError('notloaded', 'Module name "' +
-                                        id +
-                                        '" has not been loaded yet for context: ' +
-                                        contextName +
-                                        (relMap ? '' : '. Use require([])')));
+                    //Save off the paths since they require special processing,
+                    //they are additive.
+                    var shim = config.shim,
+                        objs = {
+                            paths: true,
+                            bundles: true,
+                            config: true,
+                            map: true
+                        };
+
+                    eachProp(cfg, function (value, prop) {
+                        if (objs[prop]) {
+                            if (!config[prop]) {
+                                config[prop] = {};
+                            }
+                            mixin(config[prop], value, true, true);
+                        } else {
+                            config[prop] = value;
                         }
-                        return defined[id];
+                    });
+
+                    //Reverse map the bundles
+                    if (cfg.bundles) {
+                        eachProp(cfg.bundles, function (value, prop) {
+                            each(value, function (v) {
+                                if (v !== prop) {
+                                    bundlesMap[v] = prop;
+                                }
+                            });
+                        });
                     }
 
-                    //Grab defines waiting in the global queue.
-                    intakeDefines();
+                    //Merge shim
+                    if (cfg.shim) {
+                        eachProp(cfg.shim, function (value, id) {
+                            //Normalize the structure
+                            if (isArray(value)) {
+                                value = {
+                                    deps: value
+                                };
+                            }
+                            if ((value.exports || value.init) && !value.exportsFn) {
+                                value.exportsFn = context.makeShimExports(value);
+                            }
+                            shim[id] = value;
+                        });
+                        config.shim = shim;
+                    }
 
-                    //Mark all the dependencies as needing to be loaded.
-                    context.nextTick(function () {
-                        //Some defines could have been added since the
-                        //require call, collect them.
-                        intakeDefines();
+                    //Adjust packages if necessary.
+                    if (cfg.packages) {
+                        each(cfg.packages, function (pkgObj) {
+                            var location, name;
 
-                        requireMod = getModule(makeModuleMap(null, relMap));
+                            pkgObj = typeof pkgObj === 'string' ? { name: pkgObj } : pkgObj;
 
-                        //Store if map config should be applied to this require
-                        //call for dependencies.
-                        requireMod.skipMap = options.skipMap;
+                            name = pkgObj.name;
+                            location = pkgObj.location;
+                            if (location) {
+                                config.paths[name] = pkgObj.location;
+                            }
 
-                        requireMod.init(deps, callback, errback, {
-                            enabled: true
+                            //Save pointer to main module ID for pkg name.
+                            //Remove leading dot in main, so main paths are normalized,
+                            //and remove any trailing .js, since different package
+                            //envs have different conventions: some use a module name,
+                            //some use a file name.
+                            config.pkgs[name] = pkgObj.name + '/' + (pkgObj.main || 'main')
+                                         .replace(currDirRegExp, '')
+                                         .replace(jsSuffixRegExp, '');
                         });
+                    }
 
-                        checkLoaded();
+                    //If there are any "waiting to execute" modules in the registry,
+                    //update the maps for them, since their info, like URLs to load,
+                    //may have changed.
+                    eachProp(registry, function (mod, id) {
+                        //If module already has init called, since it is too
+                        //late to modify them, and ignore unnormalized ones
+                        //since they are transient.
+                        if (!mod.inited && !mod.map.unnormalized) {
+                            mod.map = makeModuleMap(id);
+                        }
                     });
 
-                    return localRequire;
-                }
+                    //If a deps array or a config callback is specified, then call
+                    //require with those args. This is useful when require is defined as a
+                    //config object before require.js is loaded.
+                    if (cfg.deps || cfg.callback) {
+                        context.require(cfg.deps || [], cfg.callback);
+                    }
+                },
 
-                mixin(localRequire, {
-                    isBrowser: isBrowser,
-
-                    /**
-                     * Converts a module name + .extension into an URL path.
-                     * *Requires* the use of a module name. It does not support using
-                     * plain URLs like nameToUrl.
-                     */
-                    toUrl: function (moduleNamePlusExt) {
-                        var ext,
-                            index = moduleNamePlusExt.lastIndexOf('.'),
-                            segment = moduleNamePlusExt.split('/')[0],
-                            isRelative = segment === '.' || segment === '..';
-
-                        //Have a file extension alias, and it is not the
-                        //dots from a relative path.
-                        if (index !== -1 && (!isRelative || index > 1)) {
-                            ext = moduleNamePlusExt.substring(index, moduleNamePlusExt.length);
-                            moduleNamePlusExt = moduleNamePlusExt.substring(0, index);
+                makeShimExports: function (value) {
+                    function fn() {
+                        var ret;
+                        if (value.init) {
+                            ret = value.init.apply(global, arguments);
                         }
-
-                        return context.nameToUrl(normalize(moduleNamePlusExt,
-                                                relMap && relMap.id, true), ext,  true);
-                    },
-
-                    defined: function (id) {
-                        return hasProp(defined, makeModuleMap(id, relMap, false, true).id);
-                    },
-
-                    specified: function (id) {
-                        id = makeModuleMap(id, relMap, false, true).id;
-                        return hasProp(defined, id) || hasProp(registry, id);
+                        return ret || (value.exports && getGlobal(value.exports));
                     }
-                });
+                    return fn;
+                },
 
-                //Only allow undef on top level require calls
-                if (!relMap) {
-                    localRequire.undef = function (id) {
-                        //Bind any waiting define() calls to this context,
-                        //fix for #408
-                        takeGlobalQueue();
+                makeRequire: function (relMap, options) {
+                    options = options || {};
 
-                        var map = makeModuleMap(id, relMap, true),
-                            mod = getOwn(registry, id);
+                    function localRequire(deps, callback, errback) {
+                        var id, map, requireMod;
 
-                        removeScript(id);
+                        if (options.enableBuildCallback && callback && isFunction(callback)) {
+                            callback.__requireJsBuild = true;
+                        }
 
-                        delete defined[id];
-                        delete urlFetched[map.url];
-                        delete undefEvents[id];
+                        if (typeof deps === 'string') {
+                            if (isFunction(callback)) {
+                                //Invalid call
+                                return onError(makeError('requireargs', 'Invalid require call'), errback);
+                            }
 
-                        //Clean queued defines too. Go backwards
-                        //in array so that the splices do not
-                        //mess up the iteration.
-                        eachReverse(defQueue, function(args, i) {
-                            if(args[0] === id) {
-                                defQueue.splice(i, 1);
+                            //If require|exports|module are requested, get the
+                            //value for them from the special handlers. Caveat:
+                            //this only works while module is being defined.
+                            if (relMap && hasProp(handlers, deps)) {
+                                return handlers[deps](registry[relMap.id]);
                             }
-                        });
 
-                        if (mod) {
-                            //Hold on to listeners in case the
-                            //module will be attempted to be reloaded
-                            //using a different config.
-                            if (mod.events.defined) {
-                                undefEvents[id] = mod.events;
+                            //Synchronous access to one module. If require.get is
+                            //available (as in the Node adapter), prefer that.
+                            if (req.get) {
+                                return req.get(context, deps, relMap, localRequire);
                             }
 
-                            cleanRegistry(id);
+                            //Normalize module name, if it contains . or ..
+                            map = makeModuleMap(deps, relMap, false, true);
+                            id = map.id;
+
+                            if (!hasProp(defined, id)) {
+                                return onError(makeError('notloaded', 'Module name "' +
+                                            id +
+                                            '" has not been loaded yet for context: ' +
+                                            contextName +
+                                            (relMap ? '' : '. Use require([])')));
+                            }
+                            return defined[id];
                         }
-                    };
-                }
 
-                return localRequire;
-            },
+                        //Grab defines waiting in the global queue.
+                        intakeDefines();
 
-            /**
-             * Called to enable a module if it is still in the registry
-             * awaiting enablement. A second arg, parent, the parent module,
-             * is passed in for context, when this method is overridden by
-             * the optimizer. Not shown here to keep code compact.
-             */
-            enable: function (depMap) {
-                var mod = getOwn(registry, depMap.id);
-                if (mod) {
-                    getModule(depMap).enable();
-                }
-            },
+                        //Mark all the dependencies as needing to be loaded.
+                        context.nextTick(function () {
+                            //Some defines could have been added since the
+                            //require call, collect them.
+                            intakeDefines();
 
-            /**
-             * Internal method used by environment adapters to complete a load event.
-             * A load event could be a script load or just a load pass from a synchronous
-             * load call.
-             * @param {String} moduleName the name of the module to potentially complete.
-             */
-            completeLoad: function (moduleName) {
-                var found, args, mod,
-                    shim = getOwn(config.shim, moduleName) || {},
-                    shExports = shim.exports;
+                            requireMod = getModule(makeModuleMap(null, relMap));
 
-                takeGlobalQueue();
+                            //Store if map config should be applied to this require
+                            //call for dependencies.
+                            requireMod.skipMap = options.skipMap;
 
-                while (defQueue.length) {
-                    args = defQueue.shift();
-                    if (args[0] === null) {
-                        args[0] = moduleName;
-                        //If already found an anonymous module and bound it
-                        //to this name, then this is some other anon module
-                        //waiting for its completeLoad to fire.
-                        if (found) {
-                            break;
-                        }
-                        found = true;
-                    } else if (args[0] === moduleName) {
-                        //Found matching define call for this script!
-                        found = true;
+                            requireMod.init(deps, callback, errback, {
+                                enabled: true
+                            });
+
+                            checkLoaded();
+                        });
+
+                        return localRequire;
                     }
 
-                    callGetModule(args);
-                }
+                    mixin(localRequire, {
+                        isBrowser: isBrowser,
+
+                        /**
+                         * Converts a module name + .extension into an URL path.
+                         * *Requires* the use of a module name. It does not support using
+                         * plain URLs like nameToUrl.
+                         */
+                        toUrl: function (moduleNamePlusExt) {
+                            var ext,
+                                index = moduleNamePlusExt.lastIndexOf('.'),
+                                segment = moduleNamePlusExt.split('/')[0],
+                                isRelative = segment === '.' || segment === '..';
+
+                            //Have a file extension alias, and it is not the
+                            //dots from a relative path.
+                            if (index !== -1 && (!isRelative || index > 1)) {
+                                ext = moduleNamePlusExt.substring(index, moduleNamePlusExt.length);
+                                moduleNamePlusExt = moduleNamePlusExt.substring(0, index);
+                            }
 
-                //Do this after the cycle of callGetModule in case the result
-                //of those calls/init calls changes the registry.
-                mod = getOwn(registry, moduleName);
+                            return context.nameToUrl(normalize(moduleNamePlusExt,
+                                                    relMap && relMap.id, true), ext,  true);
+                        },
 
-                if (!found && !hasProp(defined, moduleName) && mod && !mod.inited) {
-                    if (config.enforceDefine && (!shExports || !getGlobal(shExports))) {
-                        if (hasPathFallback(moduleName)) {
-                            return;
-                        } else {
-                            return onError(makeError('nodefine',
-                                             'No define call for ' + moduleName,
-                                             null,
-                                             [moduleName]));
+                        defined: function (id) {
+                            return hasProp(defined, makeModuleMap(id, relMap, false, true).id);
+                        },
+
+                        specified: function (id) {
+                            id = makeModuleMap(id, relMap, false, true).id;
+                            return hasProp(defined, id) || hasProp(registry, id);
                         }
-                    } else {
-                        //A script that does not call define(), so just simulate
-                        //the call for it.
-                        callGetModule([moduleName, (shim.deps || []), shim.exportsFn]);
-                    }
-                }
+                    });
 
-                checkLoaded();
-            },
+                    //Only allow undef on top level require calls
+                    if (!relMap) {
+                        localRequire.undef = function (id) {
+                            //Bind any waiting define() calls to this context,
+                            //fix for #408
+                            takeGlobalQueue();
 
-            /**
-             * Converts a module name to a file path. Supports cases where
-             * moduleName may actually be just an URL.
-             * Note that it **does not** call normalize on the moduleName,
-             * it is assumed to have already been normalized. This is an
-             * internal API, not a public one. Use toUrl for the public API.
-             */
-            nameToUrl: function (moduleName, ext, skipExt) {
-                var paths, syms, i, parentModule, url,
-                    parentPath, bundleId,
-                    pkgMain = getOwn(config.pkgs, moduleName);
+                            var map = makeModuleMap(id, relMap, true),
+                                mod = getOwn(registry, id);
 
-                if (pkgMain) {
-                    moduleName = pkgMain;
-                }
+                            removeScript(id);
 
-                bundleId = getOwn(bundlesMap, moduleName);
+                            delete defined[id];
+                            delete urlFetched[map.url];
+                            delete undefEvents[id];
 
-                if (bundleId) {
-                    return context.nameToUrl(bundleId, ext, skipExt);
-                }
+                            //Clean queued defines too. Go backwards
+                            //in array so that the splices do not
+                            //mess up the iteration.
+                            eachReverse(defQueue, function(args, i) {
+                                if(args[0] === id) {
+                                    defQueue.splice(i, 1);
+                                }
+                            });
+
+                            if (mod) {
+                                //Hold on to listeners in case the
+                                //module will be attempted to be reloaded
+                                //using a different config.
+                                if (mod.events.defined) {
+                                    undefEvents[id] = mod.events;
+                                }
 
-                //If a colon is in the URL, it indicates a protocol is used and it is just
-                //an URL to a file, or if it starts with a slash, contains a query arg (i.e. ?)
-                //or ends with .js, then assume the user meant to use an url and not a module id.
-                //The slash is important for protocol-less URLs as well as full paths.
-                if (req.jsExtRegExp.test(moduleName)) {
-                    //Just a plain path, not module name lookup, so just return it.
-                    //Add extension if it is included. This is a bit wonky, only non-.js things pass
-                    //an extension, this method probably needs to be reworked.
-                    url = moduleName + (ext || '');
-                } else {
-                    //A module that needs to be converted to a path.
-                    paths = config.paths;
-
-                    syms = moduleName.split('/');
-                    //For each module name segment, see if there is a path
-                    //registered for it. Start with most specific name
-                    //and work up from it.
-                    for (i = syms.length; i > 0; i -= 1) {
-                        parentModule = syms.slice(0, i).join('/');
-
-                        parentPath = getOwn(paths, parentModule);
-                        if (parentPath) {
-                            //If an array, it means there are a few choices,
-                            //Choose the one that is desired
-                            if (isArray(parentPath)) {
-                                parentPath = parentPath[0];
+                                cleanRegistry(id);
+                            }
+                        };
+                    }
+
+                    return localRequire;
+                },
+
+                /**
+                 * Called to enable a module if it is still in the registry
+                 * awaiting enablement. A second arg, parent, the parent module,
+                 * is passed in for context, when this method is overridden by
+                 * the optimizer. Not shown here to keep code compact.
+                 */
+                enable: function (depMap) {
+                    var mod = getOwn(registry, depMap.id);
+                    if (mod) {
+                        getModule(depMap).enable();
+                    }
+                },
+
+                /**
+                 * Internal method used by environment adapters to complete a load event.
+                 * A load event could be a script load or just a load pass from a synchronous
+                 * load call.
+                 * @param {String} moduleName the name of the module to potentially complete.
+                 */
+                completeLoad: function (moduleName) {
+                    var found, args, mod,
+                        shim = getOwn(config.shim, moduleName) || {},
+                        shExports = shim.exports;
+
+                    takeGlobalQueue();
+
+                    while (defQueue.length) {
+                        args = defQueue.shift();
+                        if (args[0] === null) {
+                            args[0] = moduleName;
+                            //If already found an anonymous module and bound it
+                            //to this name, then this is some other anon module
+                            //waiting for its completeLoad to fire.
+                            if (found) {
+                                break;
                             }
-                            syms.splice(0, i, parentPath);
-                            break;
+                            found = true;
+                        } else if (args[0] === moduleName) {
+                            //Found matching define call for this script!
+                            found = true;
                         }
+
+                        callGetModule(args);
                     }
 
-                    //Join the path parts together, then figure out if baseUrl is needed.
-                    url = syms.join('/');
-                    url += (ext || (/^data\:|\?/.test(url) || skipExt ? '' : '.js'));
-                    url = (url.charAt(0) === '/' || url.match(/^[\w\+\.\-]+:/) ? '' : config.baseUrl) + url;
-                }
+                    //Do this after the cycle of callGetModule in case the result
+                    //of those calls/init calls changes the registry.
+                    mod = getOwn(registry, moduleName);
+
+                    if (!found && !hasProp(defined, moduleName) && mod && !mod.inited) {
+                        if (config.enforceDefine && (!shExports || !getGlobal(shExports))) {
+                            if (hasPathFallback(moduleName)) {
+                                return;
+                            } else {
+                                return onError(makeError('nodefine',
+                                                 'No define call for ' + moduleName,
+                                                 null,
+                                                 [moduleName]));
+                            }
+                        } else {
+                            //A script that does not call define(), so just simulate
+                            //the call for it.
+                            callGetModule([moduleName, (shim.deps || []), shim.exportsFn]);
+                        }
+                    }
 
-                return config.urlArgs ? url +
-                                        ((url.indexOf('?') === -1 ? '?' : '&') +
-                                         config.urlArgs) : url;
-            },
+                    checkLoaded();
+                },
+
+                /**
+                 * Converts a module name to a file path. Supports cases where
+                 * moduleName may actually be just an URL.
+                 * Note that it **does not** call normalize on the moduleName,
+                 * it is assumed to have already been normalized. This is an
+                 * internal API, not a public one. Use toUrl for the public API.
+                 */
+                nameToUrl: function (moduleName, ext, skipExt) {
+                    var paths, syms, i, parentModule, url,
+                        parentPath, bundleId,
+                        pkgMain = getOwn(config.pkgs, moduleName);
+
+                    if (pkgMain) {
+                        moduleName = pkgMain;
+                    }
 
-            //Delegates to req.load. Broken out as a separate function to
-            //allow overriding in the optimizer.
-            load: function (id, url) {
-                req.load(context, id, url);
-            },
+                    bundleId = getOwn(bundlesMap, moduleName);
 
-            /**
-             * Executes a module callback function. Broken out as a separate function
-             * solely to allow the build system to sequence the files in the built
-             * layer in the right sequence.
-             *
-             * @private
-             */
-            execCb: function (name, callback, args, exports) {
-                return callback.apply(exports, args);
-            },
+                    if (bundleId) {
+                        return context.nameToUrl(bundleId, ext, skipExt);
+                    }
 
-            /**
-             * callback for script loads, used to check status of loading.
-             *
-             * @param {Event} evt the event from the browser for the script
-             * that was loaded.
-             */
-            onScriptLoad: function (evt) {
-                //Using currentTarget instead of target for Firefox 2.0's sake. Not
-                //all old browsers will be supported, but this one was easy enough
-                //to support and still makes sense.
-                if (evt.type === 'load' ||
-                        (readyRegExp.test((evt.currentTarget || evt.srcElement).readyState))) {
-                    //Reset interactive script so a script node is not held onto for
-                    //to long.
-                    interactiveScript = null;
+                    //If a colon is in the URL, it indicates a protocol is used and it is just
+                    //an URL to a file, or if it starts with a slash, contains a query arg (i.e. ?)
+                    //or ends with .js, then assume the user meant to use an url and not a module id.
+                    //The slash is important for protocol-less URLs as well as full paths.
+                    if (req.jsExtRegExp.test(moduleName)) {
+                        //Just a plain path, not module name lookup, so just return it.
+                        //Add extension if it is included. This is a bit wonky, only non-.js things pass
+                        //an extension, this method probably needs to be reworked.
+                        url = moduleName + (ext || '');
+                    } else {
+                        //A module that needs to be converted to a path.
+                        paths = config.paths;
+
+                        syms = moduleName.split('/');
+                        //For each module name segment, see if there is a path
+                        //registered for it. Start with most specific name
+                        //and work up from it.
+                        for (i = syms.length; i > 0; i -= 1) {
+                            parentModule = syms.slice(0, i).join('/');
+
+                            parentPath = getOwn(paths, parentModule);
+                            if (parentPath) {
+                                //If an array, it means there are a few choices,
+                                //Choose the one that is desired
+                                if (isArray(parentPath)) {
+                                    parentPath = parentPath[0];
+                                }
+                                syms.splice(0, i, parentPath);
+                                break;
+                            }
+                        }
+
+                        //Join the path parts together, then figure out if baseUrl is needed.
+                        url = syms.join('/');
+                        url += (ext || (/^data\:|\?/.test(url) || skipExt ? '' : '.js'));
+                        url = (url.charAt(0) === '/' || url.match(/^[\w\+\.\-]+:/) ? '' : config.baseUrl) + url;
+                    }
+
+                    return config.urlArgs ? url +
+                                            ((url.indexOf('?') === -1 ? '?' : '&') +
+                                             config.urlArgs) : url;
+                },
+
+                //Delegates to req.load. Broken out as a separate function to
+                //allow overriding in the optimizer.
+                load: function (id, url) {
+                    req.load(context, id, url);
+                },
+
+                /**
+                 * Executes a module callback function. Broken out as a separate function
+                 * solely to allow the build system to sequence the files in the built
+                 * layer in the right sequence.
+                 *
+                 * @private
+                 */
+                execCb: function (name, callback, args, exports) {
+                    return callback.apply(exports, args);
+                },
+
+                /**
+                 * callback for script loads, used to check status of loading.
+                 *
+                 * @param {Event} evt the event from the browser for the script
+                 * that was loaded.
+                 */
+                onScriptLoad: function (evt) {
+                    //Using currentTarget instead of target for Firefox 2.0's sake. Not
+                    //all old browsers will be supported, but this one was easy enough
+                    //to support and still makes sense.
+                    if (evt.type === 'load' ||
+                            (readyRegExp.test((evt.currentTarget || evt.srcElement).readyState))) {
+                        //Reset interactive script so a script node is not held onto for
+                        //to long.
+                        interactiveScript = null;
+
+                        //Pull out the name of the module and the context.
+                        var data = getScriptData(evt);
+                        context.completeLoad(data.id);
+                    }
+                },
 
-                    //Pull out the name of the module and the context.
+                /**
+                 * Callback for script errors.
+                 */
+                onScriptError: function (evt) {
                     var data = getScriptData(evt);
-                    context.completeLoad(data.id);
+                    if (!hasPathFallback(data.id)) {
+                        return onError(makeError('scripterror', 'Script error for: ' + data.id, evt, [data.id]));
+                    }
                 }
-            },
+            };
 
-            /**
-             * Callback for script errors.
-             */
-            onScriptError: function (evt) {
-                var data = getScriptData(evt);
-                if (!hasPathFallback(data.id)) {
-                    return onError(makeError('scripterror', 'Script error for: ' + data.id, evt, [data.id]));
+            context.require = context.makeRequire();
+            return context;
+        }
+
+        /**
+         * Main entry point.
+         *
+         * If the only argument to require is a string, then the module that
+         * is represented by that string is fetched for the appropriate context.
+         *
+         * If the first argument is an array, then it will be treated as an array
+         * of dependency string names to fetch. An optional function callback can
+         * be specified to execute when all of those dependencies are available.
+         *
+         * Make a local req variable to help Caja compliance (it assumes things
+         * on a require that are not standardized), and to give a short
+         * name for minification/local scope use.
+         */
+        req = requirejs = function (deps, callback, errback, optional) {
+
+            //Find the right context, use default
+            var context, config,
+                contextName = defContextName;
+
+            // Determine if have config object in the call.
+            if (!isArray(deps) && typeof deps !== 'string') {
+                // deps is a config object
+                config = deps;
+                if (isArray(callback)) {
+                    // Adjust args if there are dependencies
+                    deps = callback;
+                    callback = errback;
+                    errback = optional;
+                } else {
+                    deps = [];
                 }
             }
-        };
 
-        context.require = context.makeRequire();
-        return context;
-    }
-
-    /**
-     * Main entry point.
-     *
-     * If the only argument to require is a string, then the module that
-     * is represented by that string is fetched for the appropriate context.
-     *
-     * If the first argument is an array, then it will be treated as an array
-     * of dependency string names to fetch. An optional function callback can
-     * be specified to execute when all of those dependencies are available.
-     *
-     * Make a local req variable to help Caja compliance (it assumes things
-     * on a require that are not standardized), and to give a short
-     * name for minification/local scope use.
-     */
-    req = requirejs = function (deps, callback, errback, optional) {
-
-        //Find the right context, use default
-        var context, config,
-            contextName = defContextName;
-
-        // Determine if have config object in the call.
-        if (!isArray(deps) && typeof deps !== 'string') {
-            // deps is a config object
-            config = deps;
-            if (isArray(callback)) {
-                // Adjust args if there are dependencies
-                deps = callback;
-                callback = errback;
-                errback = optional;
-            } else {
-                deps = [];
+            if (config && config.context) {
+                contextName = config.context;
             }
-        }
 
-        if (config && config.context) {
-            contextName = config.context;
-        }
+            context = getOwn(contexts, contextName);
+            if (!context) {
+                context = contexts[contextName] = req.s.newContext(contextName);
+            }
 
-        context = getOwn(contexts, contextName);
-        if (!context) {
-            context = contexts[contextName] = req.s.newContext(contextName);
-        }
+            if (config) {
+                context.configure(config);
+            }
 
-        if (config) {
-            context.configure(config);
-        }
+            return context.require(deps, callback, errback);
+        };
 
-        return context.require(deps, callback, errback);
-    };
+        /**
+         * Support require.config() to make it easier to cooperate with other
+         * AMD loaders on globally agreed names.
+         */
+        req.config = function (config) {
+            return req(config);
+        };
 
-    /**
-     * Support require.config() to make it easier to cooperate with other
-     * AMD loaders on globally agreed names.
-     */
-    req.config = function (config) {
-        return req(config);
-    };
+        /**
+         * Execute something after the current tick
+         * of the event loop. Override for other envs
+         * that have a better solution than setTimeout.
+         * @param  {Function} fn function to execute later.
+         */
+        req.nextTick = typeof setTimeout !== 'undefined' ? function (fn) {
+            setTimeout(fn, 4);
+        } : function (fn) { fn(); };
 
-    /**
-     * Execute something after the current tick
-     * of the event loop. Override for other envs
-     * that have a better solution than setTimeout.
-     * @param  {Function} fn function to execute later.
-     */
-    req.nextTick = typeof setTimeout !== 'undefined' ? function (fn) {
-        setTimeout(fn, 4);
-    } : function (fn) { fn(); };
-
-    /**
-     * Export require as a global, but only if it does not already exist.
-     */
-    if (!require) {
-        require = req;
-    }
-
-    req.version = version;
-
-    //Used to filter out dependencies that are already paths.
-    req.jsExtRegExp = /^\/|:|\?|\.js$/;
-    req.isBrowser = isBrowser;
-    s = req.s = {
-        contexts: contexts,
-        newContext: newContext
-    };
+        /**
+         * Export require as a global, but only if it does not already exist.
+         */
+        if (!require) {
+            require = req;
+        }
+
+        req.version = version;
 
-    //Create default context.
-    req({});
-
-    //Exports some context-sensitive methods on global require.
-    each([
-        'toUrl',
-        'undef',
-        'defined',
-        'specified'
-    ], function (prop) {
-        //Reference from contexts instead of early binding to default context,
-        //so that during builds, the latest instance of the default context
-        //with its config gets used.
-        req[prop] = function () {
-            var ctx = contexts[defContextName];
-            return ctx.require[prop].apply(ctx, arguments);
+        //Used to filter out dependencies that are already paths.
+        req.jsExtRegExp = /^\/|:|\?|\.js$/;
+        req.isBrowser = isBrowser;
+        s = req.s = {
+            contexts: contexts,
+            newContext: newContext
         };
-    });
-
-    if (isBrowser) {
-        head = s.head = document.getElementsByTagName('head')[0];
-        //If BASE tag is in play, using appendChild is a problem for IE6.
-        //When that browser dies, this can be removed. Details in this jQuery bug:
-        //http://dev.jquery.com/ticket/2709
-        baseElement = document.getElementsByTagName('base')[0];
-        if (baseElement) {
-            head = s.head = baseElement.parentNode;
-        }
-    }
-
-    /**
-     * Any errors that require explicitly generates will be passed to this
-     * function. Intercept/override it if you want custom error handling.
-     * @param {Error} err the error object.
-     */
-    req.onError = defaultOnError;
-
-    /**
-     * Creates the node for the load command. Only used in browser envs.
-     */
-    req.createNode = function (config, moduleName, url) {
-        var node = config.xhtml ?
-                document.createElementNS('http://www.w3.org/1999/xhtml', 'html:script') :
-                document.createElement('script');
-        node.type = config.scriptType || 'text/javascript';
-        node.charset = 'utf-8';
-        node.async = true;
-        return node;
-    };
 
-    /**
-     * Does the request to load a module for the browser case.
-     * Make this a separate function to allow other environments
-     * to override it.
-     *
-     * @param {Object} context the require context to find state.
-     * @param {String} moduleName the name of the module.
-     * @param {Object} url the URL to the module.
-     */
-    req.load = function (context, moduleName, url) {
-        var config = (context && context.config) || {},
-            node;
-        if (isBrowser) {
-            //In the browser so use a script tag
-            node = req.createNode(config, moduleName, url);
-
-            node.setAttribute('data-requirecontext', context.contextName);
-            node.setAttribute('data-requiremodule', moduleName);
-
-            //Set up load listener. Test attachEvent first because IE9 has
-            //a subtle issue in its addEventListener and script onload firings
-            //that do not match the behavior of all other browsers with
-            //addEventListener support, which fire the onload event for a
-            //script right after the script execution. See:
-            //https://connect.microsoft.com/IE/feedback/details/648057/script-onload-event-is-not-fired-immediately-after-script-execution
-            //UNFORTUNATELY Opera implements attachEvent but does not follow the script
-            //script execution mode.
-            if (node.attachEvent &&
-                    //Check if node.attachEvent is artificially added by custom script or
-                    //natively supported by browser
-                    //read https://github.com/jrburke/requirejs/issues/187
-                    //if we can NOT find [native code] then it must NOT natively supported.
-                    //in IE8, node.attachEvent does not have toString()
-                    //Note the test for "[native code" with no closing brace, see:
-                    //https://github.com/jrburke/requirejs/issues/273
-                    !(node.attachEvent.toString && node.attachEvent.toString().indexOf('[native code') < 0) &&
-                    !isOpera) {
-                //Probably IE. IE (at least 6-8) do not fire
-                //script onload right after executing the script, so
-                //we cannot tie the anonymous define call to a name.
-                //However, IE reports the script as being in 'interactive'
-                //readyState at the time of the define call.
-                useInteractive = true;
-
-                node.attachEvent('onreadystatechange', context.onScriptLoad);
-                //It would be great to add an error handler here to catch
-                //404s in IE9+. However, onreadystatechange will fire before
-                //the error handler, so that does not help. If addEventListener
-                //is used, then IE will fire error before load, but we cannot
-                //use that pathway given the connect.microsoft.com issue
-                //mentioned above about not doing the 'script execute,
-                //then fire the script load event listener before execute
-                //next script' that other browsers do.
-                //Best hope: IE10 fixes the issues,
-                //and then destroys all installs of IE 6-9.
-                //node.attachEvent('onerror', context.onScriptError);
-            } else {
-                node.addEventListener('load', context.onScriptLoad, false);
-                node.addEventListener('error', context.onScriptError, false);
-            }
-            node.src = url;
+        //Create default context.
+        req({});
+
+        //Exports some context-sensitive methods on global require.
+        each([
+            'toUrl',
+            'undef',
+            'defined',
+            'specified'
+        ], function (prop) {
+            //Reference from contexts instead of early binding to default context,
+            //so that during builds, the latest instance of the default context
+            //with its config gets used.
+            req[prop] = function () {
+                var ctx = contexts[defContextName];
+                return ctx.require[prop].apply(ctx, arguments);
+            };
+        });
 
-            //For some cache cases in IE 6-8, the script executes before the end
-            //of the appendChild execution, so to tie an anonymous define
-            //call to the module name (which is stored on the node), hold on
-            //to a reference to this node, but clear after the DOM insertion.
-            currentlyAddingScript = node;
+        if (isBrowser) {
+            head = s.head = document.getElementsByTagName('head')[0];
+            //If BASE tag is in play, using appendChild is a problem for IE6.
+            //When that browser dies, this can be removed. Details in this jQuery bug:
+            //http://dev.jquery.com/ticket/2709
+            baseElement = document.getElementsByTagName('base')[0];
             if (baseElement) {
-                head.insertBefore(node, baseElement);
-            } else {
-                head.appendChild(node);
-            }
-            currentlyAddingScript = null;
-
-            return node;
-        } else if (isWebWorker) {
-            try {
-                //In a web worker, use importScripts. This is not a very
-                //efficient use of importScripts, importScripts will block until
-                //its script is downloaded and evaluated. However, if web workers
-                //are in play, the expectation that a build has been done so that
-                //only one script needs to be loaded anyway. This may need to be
-                //reevaluated if other use cases become common.
-                importScripts(url);
-
-                //Account for anonymous modules
-                context.completeLoad(moduleName);
-            } catch (e) {
-                context.onError(makeError('importscripts',
-                                'importScripts failed for ' +
-                                    moduleName + ' at ' + url,
-                                e,
-                                [moduleName]));
+                head = s.head = baseElement.parentNode;
             }
         }
-    };
 
-    function getInteractiveScript() {
-        if (interactiveScript && interactiveScript.readyState === 'interactive') {
-            return interactiveScript;
-        }
+        /**
+         * Any errors that require explicitly generates will be passed to this
+         * function. Intercept/override it if you want custom error handling.
+         * @param {Error} err the error object.
+         */
+        req.onError = defaultOnError;
+
+        /**
+         * Creates the node for the load command. Only used in browser envs.
+         */
+        req.createNode = function (config, moduleName, url) {
+            var node = config.xhtml ?
+                    document.createElementNS('http://www.w3.org/1999/xhtml', 'html:script') :
+                    document.createElement('script');
+            node.type = config.scriptType || 'text/javascript';
+            node.charset = 'utf-8';
+            node.async = true;
+            return node;
+        };
 
-        eachReverse(scripts(), function (script) {
-            if (script.readyState === 'interactive') {
-                return (interactiveScript = script);
+        /**
+         * Does the request to load a module for the browser case.
+         * Make this a separate function to allow other environments
+         * to override it.
+         *
+         * @param {Object} context the require context to find state.
+         * @param {String} moduleName the name of the module.
+         * @param {Object} url the URL to the module.
+         */
+        req.load = function (context, moduleName, url) {
+            var config = (context && context.config) || {},
+                node;
+            if (isBrowser) {
+                //In the browser so use a script tag
+                node = req.createNode(config, moduleName, url);
+
+                node.setAttribute('data-requirecontext', context.contextName);
+                node.setAttribute('data-requiremodule', moduleName);
+
+                //Set up load listener. Test attachEvent first because IE9 has
+                //a subtle issue in its addEventListener and script onload firings
+                //that do not match the behavior of all other browsers with
+                //addEventListener support, which fire the onload event for a
+                //script right after the script execution. See:
+                //https://connect.microsoft.com/IE/feedback/details/648057/script-onload-event-is-not-fired-immediately-after-script-execution
+                //UNFORTUNATELY Opera implements attachEvent but does not follow the script
+                //script execution mode.
+                if (node.attachEvent &&
+                        //Check if node.attachEvent is artificially added by custom script or
+                        //natively supported by browser
+                        //read https://github.com/jrburke/requirejs/issues/187
+                        //if we can NOT find [native code] then it must NOT natively supported.
+                        //in IE8, node.attachEvent does not have toString()
+                        //Note the test for "[native code" with no closing brace, see:
+                        //https://github.com/jrburke/requirejs/issues/273
+                        !(node.attachEvent.toString && node.attachEvent.toString().indexOf('[native code') < 0) &&
+                        !isOpera) {
+                    //Probably IE. IE (at least 6-8) do not fire
+                    //script onload right after executing the script, so
+                    //we cannot tie the anonymous define call to a name.
+                    //However, IE reports the script as being in 'interactive'
+                    //readyState at the time of the define call.
+                    useInteractive = true;
+
+                    node.attachEvent('onreadystatechange', context.onScriptLoad);
+                    //It would be great to add an error handler here to catch
+                    //404s in IE9+. However, onreadystatechange will fire before
+                    //the error handler, so that does not help. If addEventListener
+                    //is used, then IE will fire error before load, but we cannot
+                    //use that pathway given the connect.microsoft.com issue
+                    //mentioned above about not doing the 'script execute,
+                    //then fire the script load event listener before execute
+                    //next script' that other browsers do.
+                    //Best hope: IE10 fixes the issues,
+                    //and then destroys all installs of IE 6-9.
+                    //node.attachEvent('onerror', context.onScriptError);
+                } else {
+                    node.addEventListener('load', context.onScriptLoad, false);
+                    node.addEventListener('error', context.onScriptError, false);
+                }
+                node.src = url;
+
+                //For some cache cases in IE 6-8, the script executes before the end
+                //of the appendChild execution, so to tie an anonymous define
+                //call to the module name (which is stored on the node), hold on
+                //to a reference to this node, but clear after the DOM insertion.
+                currentlyAddingScript = node;
+                if (baseElement) {
+                    head.insertBefore(node, baseElement);
+                } else {
+                    head.appendChild(node);
+                }
+                currentlyAddingScript = null;
+
+                return node;
+            } else if (isWebWorker) {
+                try {
+                    //In a web worker, use importScripts. This is not a very
+                    //efficient use of importScripts, importScripts will block until
+                    //its script is downloaded and evaluated. However, if web workers
+                    //are in play, the expectation that a build has been done so that
+                    //only one script needs to be loaded anyway. This may need to be
+                    //reevaluated if other use cases become common.
+                    importScripts(url);
+
+                    //Account for anonymous modules
+                    context.completeLoad(moduleName);
+                } catch (e) {
+                    context.onError(makeError('importscripts',
+                                    'importScripts failed for ' +
+                                        moduleName + ' at ' + url,
+                                    e,
+                                    [moduleName]));
+                }
             }
-        });
-        return interactiveScript;
-    }
-
-    //Look for a data-main script attribute, which could also adjust the baseUrl.
-    if (isBrowser && !cfg.skipDataMain) {
-        //Figure out baseUrl. Get it from the script tag with require.js in it.
-        eachReverse(scripts(), function (script) {
-            //Set the 'head' where we can append children by
-            //using the script's parent.
-            if (!head) {
-                head = script.parentNode;
+        };
+
+        function getInteractiveScript() {
+            if (interactiveScript && interactiveScript.readyState === 'interactive') {
+                return interactiveScript;
             }
 
-            //Look for a data-main attribute to set main script for the page
-            //to load. If it is there, the path to data main becomes the
-            //baseUrl, if it is not already set.
-            dataMain = script.getAttribute('data-main');
-            if (dataMain) {
-                //Preserve dataMain in case it is a path (i.e. contains '?')
-                mainScript = dataMain;
-
-                //Set final baseUrl if there is not already an explicit one.
-                if (!cfg.baseUrl) {
-                    //Pull off the directory of data-main for use as the
-                    //baseUrl.
-                    src = mainScript.split('/');
-                    mainScript = src.pop();
-                    subPath = src.length ? src.join('/')  + '/' : './';
-
-                    cfg.baseUrl = subPath;
+            eachReverse(scripts(), function (script) {
+                if (script.readyState === 'interactive') {
+                    return (interactiveScript = script);
                 }
+            });
+            return interactiveScript;
+        }
 
-                //Strip off any trailing .js since mainScript is now
-                //like a module name.
-                mainScript = mainScript.replace(jsSuffixRegExp, '');
+        //Look for a data-main script attribute, which could also adjust the baseUrl.
+        if (isBrowser && !cfg.skipDataMain) {
+            //Figure out baseUrl. Get it from the script tag with require.js in it.
+            eachReverse(scripts(), function (script) {
+                //Set the 'head' where we can append children by
+                //using the script's parent.
+                if (!head) {
+                    head = script.parentNode;
+                }
 
-                 //If mainScript is still a path, fall back to dataMain
-                if (req.jsExtRegExp.test(mainScript)) {
+                //Look for a data-main attribute to set main script for the page
+                //to load. If it is there, the path to data main becomes the
+                //baseUrl, if it is not already set.
+                dataMain = script.getAttribute('data-main');
+                if (dataMain) {
+                    //Preserve dataMain in case it is a path (i.e. contains '?')
                     mainScript = dataMain;
-                }
 
-                //Put the data-main script in the files to load.
-                cfg.deps = cfg.deps ? cfg.deps.concat(mainScript) : [mainScript];
+                    //Set final baseUrl if there is not already an explicit one.
+                    if (!cfg.baseUrl) {
+                        //Pull off the directory of data-main for use as the
+                        //baseUrl.
+                        src = mainScript.split('/');
+                        mainScript = src.pop();
+                        subPath = src.length ? src.join('/')  + '/' : './';
 
-                return true;
-            }
-        });
-    }
-
-    /**
-     * The function that handles definitions of modules. Differs from
-     * require() in that a string for the module should be the first argument,
-     * and the function to execute after dependencies are loaded should
-     * return a value to define the module corresponding to the first argument's
-     * name.
-     */
-    define = function (name, deps, callback) {
-        var node, context;
-
-        //Allow for anonymous modules
-        if (typeof name !== 'string') {
-            //Adjust args appropriately
-            callback = deps;
-            deps = name;
-            name = null;
-        }
+                        cfg.baseUrl = subPath;
+                    }
+
+                    //Strip off any trailing .js since mainScript is now
+                    //like a module name.
+                    mainScript = mainScript.replace(jsSuffixRegExp, '');
+
+                     //If mainScript is still a path, fall back to dataMain
+                    if (req.jsExtRegExp.test(mainScript)) {
+                        mainScript = dataMain;
+                    }
+
+                    //Put the data-main script in the files to load.
+                    cfg.deps = cfg.deps ? cfg.deps.concat(mainScript) : [mainScript];
 
-        //This module may not have dependencies
-        if (!isArray(deps)) {
-            callback = deps;
-            deps = null;
+                    return true;
+                }
+            });
         }
 
-        //If no name, and callback is a function, then figure out if it a
-        //CommonJS thing with dependencies.
-        if (!deps && isFunction(callback)) {
-            deps = [];
-            //Remove comments from the callback string,
-            //look for require calls, and pull them into the dependencies,
-            //but only if there are function args.
-            if (callback.length) {
-                callback
-                    .toString()
-                    .replace(commentRegExp, '')
-                    .replace(cjsRequireRegExp, function (match, dep) {
-                        deps.push(dep);
-                    });
+        /**
+         * The function that handles definitions of modules. Differs from
+         * require() in that a string for the module should be the first argument,
+         * and the function to execute after dependencies are loaded should
+         * return a value to define the module corresponding to the first argument's
+         * name.
+         */
+        define = function (name, deps, callback) {
+            var node, context;
+
+            //Allow for anonymous modules
+            if (typeof name !== 'string') {
+                //Adjust args appropriately
+                callback = deps;
+                deps = name;
+                name = null;
+            }
 
-                //May be a CommonJS thing even without require calls, but still
-                //could use exports, and module. Avoid doing exports and module
-                //work though if it just needs require.
-                //REQUIRES the function to expect the CommonJS variables in the
-                //order listed below.
-                deps = (callback.length === 1 ? ['require'] : ['require', 'exports', 'module']).concat(deps);
+            //This module may not have dependencies
+            if (!isArray(deps)) {
+                callback = deps;
+                deps = null;
             }
-        }
 
-        //If in IE 6-8 and hit an anonymous define() call, do the interactive
-        //work.
-        if (useInteractive) {
-            node = currentlyAddingScript || getInteractiveScript();
-            if (node) {
-                if (!name) {
-                    name = node.getAttribute('data-requiremodule');
+            //If no name, and callback is a function, then figure out if it a
+            //CommonJS thing with dependencies.
+            if (!deps && isFunction(callback)) {
+                deps = [];
+                //Remove comments from the callback string,
+                //look for require calls, and pull them into the dependencies,
+                //but only if there are function args.
+                if (callback.length) {
+                    callback
+                        .toString()
+                        .replace(commentRegExp, '')
+                        .replace(cjsRequireRegExp, function (match, dep) {
+                            deps.push(dep);
+                        });
+
+                    //May be a CommonJS thing even without require calls, but still
+                    //could use exports, and module. Avoid doing exports and module
+                    //work though if it just needs require.
+                    //REQUIRES the function to expect the CommonJS variables in the
+                    //order listed below.
+                    deps = (callback.length === 1 ? ['require'] : ['require', 'exports', 'module']).concat(deps);
                 }
-                context = contexts[node.getAttribute('data-requirecontext')];
             }
-        }
 
-        //Always save off evaluating the def call until the script onload handler.
-        //This allows multiple modules to be in a file without prematurely
-        //tracing dependencies, and allows for anonymous module support,
-        //where the module name is not known until the script onload event
-        //occurs. If no context, use the global queue, and get it processed
-        //in the onscript load callback.
-        (context ? context.defQueue : globalDefQueue).push([name, deps, callback]);
-    };
+            //If in IE 6-8 and hit an anonymous define() call, do the interactive
+            //work.
+            if (useInteractive) {
+                node = currentlyAddingScript || getInteractiveScript();
+                if (node) {
+                    if (!name) {
+                        name = node.getAttribute('data-requiremodule');
+                    }
+                    context = contexts[node.getAttribute('data-requirecontext')];
+                }
+            }
 
-    define.amd = {
-        jQuery: true
-    };
+            //Always save off evaluating the def call until the script onload handler.
+            //This allows multiple modules to be in a file without prematurely
+            //tracing dependencies, and allows for anonymous module support,
+            //where the module name is not known until the script onload event
+            //occurs. If no context, use the global queue, and get it processed
+            //in the onscript load callback.
+            (context ? context.defQueue : globalDefQueue).push([name, deps, callback]);
+        };
 
+        define.amd = {
+            jQuery: true
+        };
 
-    /**
-     * Executes the text. Normally just uses eval, but can be modified
-     * to use a better, environment-specific call. Only used for transpiling
-     * loader plugins, not for plain JS modules.
-     * @param {String} text the text to execute/evaluate.
-     */
-    req.exec = function (text) {
-        /*jslint evil: true */
-        return eval(text);
-    };
 
-    //Set up with config info.
-    req(cfg);
-}(this));
\ No newline at end of file
+        /**
+         * Executes the text. Normally just uses eval, but can be modified
+         * to use a better, environment-specific call. Only used for transpiling
+         * loader plugins, not for plain JS modules.
+         * @param {String} text the text to execute/evaluate.
+         */
+        req.exec = function (text) {
+            /*jslint evil: true */
+            return eval(text);
+        };
+
+        //Set up with config info.
+        req(cfg);
+    }(this));
+
+    return {
+        requirejs: requirejs,
+        require: require,
+        define: define
+    };
+}());
\ No newline at end of file
diff --git a/assets/js/require-config.js b/assets/js/require-config.js
index f8b64eb..efb389c 100644
--- a/assets/js/require-config.js
+++ b/assets/js/require-config.js
@@ -1,6 +1,6 @@
 // Joined to require.bundle.js
 
-requirejs.config({
+sourcejs.amd.requirejs.config({
     paths: {
         // /source/assets requests are routed to /assets
         source: '/source/assets/js',
diff --git a/core/routes/redirects.js b/core/routes/redirects.js
index 9e4ae8d..9f9b4ba 100644
--- a/core/routes/redirects.js
+++ b/core/routes/redirects.js
@@ -9,6 +9,32 @@
 var path = require('path');
 var express = require('express');
 var pathToApp = path.dirname(require.main.filename);
+var interceptor = require('express-interceptor');
+
+var finalParagraphInterceptor = interceptor(function (req, res) {
+    return {
+        isInterceptable: function () {
+            // console.log('res.originalUrl', req.originalUrl, /\/source\/assets\/js/.test(req.originalUrl) && !(/\/require.bundle.js$/.test(req.originalUrl)));
+
+            return /\/source\/assets\/js/.test(req.originalUrl) && !(/\/require.bundle.js$/.test(req.originalUrl));
+        },
+        // Appends a paragraph at the end of the response body
+        intercept: function (body, send) {
+            if (
+                (/require\(/.test(body) && !(/sourcejs\.amd\.require\(/.test(body))) ||
+                (/define\(/.test(body) && !(/sourcejs\.amd\.define\(/.test(body)))
+            ) {
+                body = '// Modified on static serve from `redirects.js` \n (function(require, define){\n' + body + '\n}(sourcejs.amd.require, sourcejs.amd.define))';
+
+                global.log.warn('Deprecation Notice: please update "' + req.originalUrl + '" to use sourcejs.amd.require/sourcejs.amd.define namespace for Requirejs modules.');
+            }
+
+            send(body);
+        }
+    };
+});
+
+global.app.use(finalParagraphInterceptor);
 
 
 /*
@@ -25,7 +51,7 @@ var pathToApp = path.dirname(require.main.filename);
 // Check overrides from user folder
 global.app.use('/source/assets', express.static(path.join(pathToApp, global.opts.core.common.pathToUser, 'source/assets')));
 
-// Check if there's minified assets
+// Check if minified assets available
 global.app.use('/source/assets', express.static(path.join(pathToApp,'build/assets')));
 global.app.use('/assets', express.static(path.join(pathToApp, 'build', global.opts.core.common.pathToUser, 'assets')));
 
diff --git a/package.json b/package.json
index c2ddc34..478a45d 100644
--- a/package.json
+++ b/package.json
@@ -22,6 +22,7 @@
     "ejs": "operatino/ejs#2.3.4-sandbox-option",
     "everyauth": "^0.4.9",
     "express": "^4.13.3",
+    "express-interceptor": "^1.2.0",
     "express-session": "^1.10.2",
     "flat": "^1.2.1",
     "fs-extra": "^0.24.0",

From d21688322655bc2a66347fa2d0df1d3c8cb7b6d2 Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Sun, 1 May 2016 20:48:17 +0200
Subject: [PATCH 072/104] operatino/namespaced-require-server-transform: hide
 internal jquery from global scope

---
 .../js/{require-config.js => _require-config.js}   | 14 ++++++++++++++
 assets/js/_require.bundle.js                       |  3 +--
 assets/js/lib/jquery-private.js                    |  3 +++
 assets/js/lib/jquery.mb.browser.js                 |  6 ++++++
 assets/js/lib/text.js                              |  4 ++--
 assets/js/modules/browser.js                       |  7 +++++--
 assets/js/modules/headerFooter.js                  |  5 ++++-
 assets/js/modules/moduleLoader.js                  |  3 ++-
 assets/js/modules/navHighlight.js                  |  5 +++--
 9 files changed, 40 insertions(+), 10 deletions(-)
 rename assets/js/{require-config.js => _require-config.js} (53%)
 create mode 100644 assets/js/lib/jquery-private.js

diff --git a/assets/js/require-config.js b/assets/js/_require-config.js
similarity index 53%
rename from assets/js/require-config.js
rename to assets/js/_require-config.js
index efb389c..17e56c2 100644
--- a/assets/js/require-config.js
+++ b/assets/js/_require-config.js
@@ -8,6 +8,9 @@ sourcejs.amd.requirejs.config({
         sourceLib: '/source/assets/js/lib',
         sourceTemplates: '/source/assets/templates',
 
+        // libs
+        jquery: '/source/assets/js/lib/jquery-2.1.4.min',
+
         // Require.js plugins
         text: '/source/assets/js/lib/text',
 
@@ -15,5 +18,16 @@ sourcejs.amd.requirejs.config({
         js: '/assets/js',
         plugins: '/plugins',
         node_modules: '/node_modules'
+    },
+
+    map: {
+      // '*' means all modules will get 'jquery-private'
+      // for their 'jquery' dependency.
+      '*': { 'jquery': 'sourceLib/jquery-private' },
+
+      // 'jquery-private' wants the real jQuery module
+      // though. If this line was not here, there would
+      // be an unresolvable cyclic dependency.
+      'sourceLib/jquery-private': { 'jquery': 'jquery' }
     }
 });
\ No newline at end of file
diff --git a/assets/js/_require.bundle.js b/assets/js/_require.bundle.js
index db97c3e..9e9a947 100644
--- a/assets/js/_require.bundle.js
+++ b/assets/js/_require.bundle.js
@@ -1,6 +1,5 @@
 "{%= grunt.file.read('assets/js/lib/require.js') %}"
-"{%= grunt.file.read('assets/js/lib/jquery-2.1.4.min.js') %}"
-"{%= grunt.file.read('assets/js/require-config.js') %}"
+"{%= grunt.file.read('assets/js/_require-config.js') %}"
 
 // Extending base js config with npm packages list
 sourcejs.amd.requirejs.config({
diff --git a/assets/js/lib/jquery-private.js b/assets/js/lib/jquery-private.js
new file mode 100644
index 0000000..24a005b
--- /dev/null
+++ b/assets/js/lib/jquery-private.js
@@ -0,0 +1,3 @@
+sourcejs.amd.define(['jquery'], function (jq) {
+    return jq.noConflict(true);
+});
\ No newline at end of file
diff --git a/assets/js/lib/jquery.mb.browser.js b/assets/js/lib/jquery.mb.browser.js
index 16d2ff0..d3e4d4d 100755
--- a/assets/js/lib/jquery.mb.browser.js
+++ b/assets/js/lib/jquery.mb.browser.js
@@ -18,4 +18,10 @@
  *  *****************************************************************************
  */
 
+sourcejs.amd.define([
+    'jquery'
+], function(jQuery) {
+
 var nAgt=navigator.userAgent;if(!jQuery.browser){jQuery.browser={},jQuery.browser.mozilla=!1,jQuery.browser.webkit=!1,jQuery.browser.opera=!1,jQuery.browser.safari=!1,jQuery.browser.chrome=!1,jQuery.browser.msie=!1,jQuery.browser.ua=nAgt,jQuery.browser.name=navigator.appName,jQuery.browser.fullVersion=""+parseFloat(navigator.appVersion),jQuery.browser.majorVersion=parseInt(navigator.appVersion,10);var nameOffset,verOffset,ix;if(-1!=(verOffset=nAgt.indexOf("Opera")))jQuery.browser.opera=!0,jQuery.browser.name="Opera",jQuery.browser.fullVersion=nAgt.substring(verOffset+6),-1!=(verOffset=nAgt.indexOf("Version"))&&(jQuery.browser.fullVersion=nAgt.substring(verOffset+8));else if(-1!=(verOffset=nAgt.indexOf("OPR")))jQuery.browser.opera=!0,jQuery.browser.name="Opera",jQuery.browser.fullVersion=nAgt.substring(verOffset+4);else if(-1!=(verOffset=nAgt.indexOf("MSIE")))jQuery.browser.msie=!0,jQuery.browser.name="Microsoft Internet Explorer",jQuery.browser.fullVersion=nAgt.substring(verOffset+5);else if(-1!=nAgt.indexOf("Trident")){jQuery.browser.msie=!0,jQuery.browser.name="Microsoft Internet Explorer";var start=nAgt.indexOf("rv:")+3,end=start+4;jQuery.browser.fullVersion=nAgt.substring(start,end)}else-1!=(verOffset=nAgt.indexOf("Chrome"))?(jQuery.browser.webkit=!0,jQuery.browser.chrome=!0,jQuery.browser.name="Chrome",jQuery.browser.fullVersion=nAgt.substring(verOffset+7)):-1!=(verOffset=nAgt.indexOf("Safari"))?(jQuery.browser.webkit=!0,jQuery.browser.safari=!0,jQuery.browser.name="Safari",jQuery.browser.fullVersion=nAgt.substring(verOffset+7),-1!=(verOffset=nAgt.indexOf("Version"))&&(jQuery.browser.fullVersion=nAgt.substring(verOffset+8))):-1!=(verOffset=nAgt.indexOf("AppleWebkit"))?(jQuery.browser.webkit=!0,jQuery.browser.name="Safari",jQuery.browser.fullVersion=nAgt.substring(verOffset+7),-1!=(verOffset=nAgt.indexOf("Version"))&&(jQuery.browser.fullVersion=nAgt.substring(verOffset+8))):-1!=(verOffset=nAgt.indexOf("Firefox"))?(jQuery.browser.mozilla=!0,jQuery.browser.name="Firefox",jQuery.browser.fullVersion=nAgt.substring(verOffset+8)):(nameOffset=nAgt.lastIndexOf(" ")+1)<(verOffset=nAgt.lastIndexOf("/"))&&(jQuery.browser.name=nAgt.substring(nameOffset,verOffset),jQuery.browser.fullVersion=nAgt.substring(verOffset+1),jQuery.browser.name.toLowerCase()==jQuery.browser.name.toUpperCase()&&(jQuery.browser.name=navigator.appName));-1!=(ix=jQuery.browser.fullVersion.indexOf(";"))&&(jQuery.browser.fullVersion=jQuery.browser.fullVersion.substring(0,ix)),-1!=(ix=jQuery.browser.fullVersion.indexOf(" "))&&(jQuery.browser.fullVersion=jQuery.browser.fullVersion.substring(0,ix)),jQuery.browser.majorVersion=parseInt(""+jQuery.browser.fullVersion,10),isNaN(jQuery.browser.majorVersion)&&(jQuery.browser.fullVersion=""+parseFloat(navigator.appVersion),jQuery.browser.majorVersion=parseInt(navigator.appVersion,10)),jQuery.browser.version=jQuery.browser.majorVersion}jQuery.browser.android=/Android/i.test(nAgt),jQuery.browser.blackberry=/BlackBerry|BB|PlayBook/i.test(nAgt),jQuery.browser.ios=/iPhone|iPad|iPod|webOS/i.test(nAgt),jQuery.browser.operaMobile=/Opera Mini/i.test(nAgt),jQuery.browser.windowsMobile=/IEMobile|Windows Phone/i.test(nAgt),jQuery.browser.kindle=/Kindle|Silk/i.test(nAgt),jQuery.browser.mobile=jQuery.browser.android||jQuery.browser.blackberry||jQuery.browser.ios||jQuery.browser.windowsMobile||jQuery.browser.operaMobile||jQuery.browser.kindle,jQuery.isMobile=jQuery.browser.mobile,jQuery.isTablet=jQuery.browser.mobile&&jQuery(window).width()>765,jQuery.isAndroidDefault=jQuery.browser.android&&!/chrome/i.test(nAgt);
+
+});
diff --git a/assets/js/lib/text.js b/assets/js/lib/text.js
index 17921b6..69b0be2 100755
--- a/assets/js/lib/text.js
+++ b/assets/js/lib/text.js
@@ -8,7 +8,7 @@
   define, window, process, Packages,
   java, location, Components, FileUtils */
 
-define(['module'], function (module) {
+sourcejs.amd.define(['module'], function (module) {
     'use strict';
 
     var text, fs, Cc, Ci, xpcIsWindows,
@@ -207,7 +207,7 @@ define(['module'], function (module) {
             if (buildMap.hasOwnProperty(moduleName)) {
                 var content = text.jsEscape(buildMap[moduleName]);
                 write.asModule(pluginName + "!" + moduleName,
-                               "define(function () { return '" +
+                               "sourcejs.amd.define(function () { return '" +
                                    content +
                                "';});\n");
             }
diff --git a/assets/js/modules/browser.js b/assets/js/modules/browser.js
index 19f4afb..13c5a5c 100644
--- a/assets/js/modules/browser.js
+++ b/assets/js/modules/browser.js
@@ -1,6 +1,9 @@
-"use strict";
+'use strict';
 
-define(["sourceLib/jquery.mb.browser"], function() {
+define([
+    'jquery',
+    'sourceLib/jquery.mb.browser'
+], function($) {
     //Browser context classes
     var browserClasses = {
         msie: "ie",
diff --git a/assets/js/modules/headerFooter.js b/assets/js/modules/headerFooter.js
index e09a1ad..e064d1b 100644
--- a/assets/js/modules/headerFooter.js
+++ b/assets/js/modules/headerFooter.js
@@ -1,4 +1,7 @@
-define(['source/load-options'], function(options) {
+define([
+    'jquery',
+    'source/load-options'
+], function($, options) {
 
     'use strict';
 
diff --git a/assets/js/modules/moduleLoader.js b/assets/js/modules/moduleLoader.js
index a21e25c..553afaf 100644
--- a/assets/js/modules/moduleLoader.js
+++ b/assets/js/modules/moduleLoader.js
@@ -1,6 +1,7 @@
 define([
+    'jquery',
 	'sourceModules/module'
-	], function (module) {
+	], function ($, module) {
 
     'use strict';
 
diff --git a/assets/js/modules/navHighlight.js b/assets/js/modules/navHighlight.js
index e056c9d..97e2eba 100644
--- a/assets/js/modules/navHighlight.js
+++ b/assets/js/modules/navHighlight.js
@@ -6,11 +6,12 @@
 *
 * */
 
-"use strict";
 
 define([
+	'jquery',
     'sourceModules/module'
-    ], function (module) {
+    ], function ($, module) {
+	'use strict';
 
 	function NavHighlight() {
 		var defaults = {

From 4adada7db3d57f37b25821c9f42b91bae6b76df5 Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Sun, 1 May 2016 20:57:43 +0200
Subject: [PATCH 073/104] operatino/namespaced-require-server-transform: rename
 internal lib require/define calls

---
 assets/js/clarify.js                 | 2 +-
 assets/js/enter-the-source.js        | 2 +-
 assets/js/lib/modalbox.js            | 4 ++--
 assets/js/load-options.js            | 2 +-
 assets/js/modules/auth.js            | 2 +-
 assets/js/modules/browser.js         | 2 +-
 assets/js/modules/clarifyInSpec.js   | 2 +-
 assets/js/modules/codeSource.js      | 2 +-
 assets/js/modules/couch.js           | 2 +-
 assets/js/modules/css.js             | 2 +-
 assets/js/modules/globalNav.js       | 2 +-
 assets/js/modules/headerFooter.js    | 2 +-
 assets/js/modules/htmlAPISync.js     | 2 +-
 assets/js/modules/inlineOptions.js   | 2 +-
 assets/js/modules/innerNavigation.js | 2 +-
 assets/js/modules/loadEvents.js      | 2 +-
 assets/js/modules/module.js          | 2 +-
 assets/js/modules/moduleLoader.js    | 4 ++--
 assets/js/modules/navHighlight.js    | 2 +-
 assets/js/modules/ntf.js             | 2 +-
 assets/js/modules/parseFileTree.js   | 2 +-
 assets/js/modules/scrollToHash.js    | 2 +-
 assets/js/modules/search.js          | 2 +-
 assets/js/modules/sectionFolding.js  | 4 ++--
 assets/js/modules/sections.js        | 2 +-
 assets/js/modules/specDecorations.js | 2 +-
 assets/js/modules/trimSpaces.js      | 2 +-
 assets/js/modules/utils.js           | 2 +-
 core/routes/redirects.js             | 4 +++-
 29 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/assets/js/clarify.js b/assets/js/clarify.js
index a3d1236..8170678 100644
--- a/assets/js/clarify.js
+++ b/assets/js/clarify.js
@@ -4,7 +4,7 @@
 * @license MIT license: http://github.com/sourcejs/source/wiki/MIT-License
 * */
 
-require([
+sourcejs.amd.require([
     "jquery",
     'text!/api/options',
     "sourceModules/utils",
diff --git a/assets/js/enter-the-source.js b/assets/js/enter-the-source.js
index 72707c2..95f080f 100644
--- a/assets/js/enter-the-source.js
+++ b/assets/js/enter-the-source.js
@@ -4,7 +4,7 @@
 * @license MIT license: http://github.com/sourcejs/source/wiki/MIT-License
 * */
 
-require([
+sourcejs.amd.require([
     "jquery",
     "source/load-options", // TODO: remove when all modules inherit Module()
     "sourceModules/browser",
diff --git a/assets/js/lib/modalbox.js b/assets/js/lib/modalbox.js
index 913ee55..10eab23 100644
--- a/assets/js/lib/modalbox.js
+++ b/assets/js/lib/modalbox.js
@@ -1,5 +1,5 @@
 "use strict";
-define([
+sourcejs.amd.define([
     'jquery',
     'sourceModules/module',
     'sourceLib/lodash'
@@ -10,7 +10,7 @@ var context; // instance of box
 var ModalBox = function(config, data) {
     var isNewInstance = !context;
     context = context || this;
-    context.data = data ? data : initialBlocksData;    
+    context.data = data ? data : initialBlocksData;
 
     if (!isNewInstance) {
         context.render();
diff --git a/assets/js/load-options.js b/assets/js/load-options.js
index 668cd59..2a0d63b 100644
--- a/assets/js/load-options.js
+++ b/assets/js/load-options.js
@@ -4,7 +4,7 @@
  *
  * */
 
-define([
+sourcejs.amd.define([
     'jquery',
     'text!/api/options',
     'sourceModules/inlineOptions'
diff --git a/assets/js/modules/auth.js b/assets/js/modules/auth.js
index dd5a117..99f159b 100644
--- a/assets/js/modules/auth.js
+++ b/assets/js/modules/auth.js
@@ -1,4 +1,4 @@
-define([
+sourcejs.amd.define([
     'jquery',
     'sourceModules/module'
 ], function($, Module) {
diff --git a/assets/js/modules/browser.js b/assets/js/modules/browser.js
index 13c5a5c..ec3ea5e 100644
--- a/assets/js/modules/browser.js
+++ b/assets/js/modules/browser.js
@@ -1,6 +1,6 @@
 'use strict';
 
-define([
+sourcejs.amd.define([
     'jquery',
     'sourceLib/jquery.mb.browser'
 ], function($) {
diff --git a/assets/js/modules/clarifyInSpec.js b/assets/js/modules/clarifyInSpec.js
index cda8d6a..851d469 100644
--- a/assets/js/modules/clarifyInSpec.js
+++ b/assets/js/modules/clarifyInSpec.js
@@ -8,7 +8,7 @@
 
 'use strict';
 
-define([
+sourcejs.amd.define([
     'jquery',
     'sourceModules/module',
     'sourceModules/sections',
diff --git a/assets/js/modules/codeSource.js b/assets/js/modules/codeSource.js
index c679347..dac0950 100644
--- a/assets/js/modules/codeSource.js
+++ b/assets/js/modules/codeSource.js
@@ -4,7 +4,7 @@
  *
  * */
 
-define([
+sourcejs.amd.define([
     "jquery",
     "source/load-options",
     "sourceModules/utils",
diff --git a/assets/js/modules/couch.js b/assets/js/modules/couch.js
index cde812f..81791aa 100644
--- a/assets/js/modules/couch.js
+++ b/assets/js/modules/couch.js
@@ -7,7 +7,7 @@
 *
 * */
 
-define([
+sourcejs.amd.define([
     'jquery',
     'sourceModules/module',
     'sourceModules/utils',
diff --git a/assets/js/modules/css.js b/assets/js/modules/css.js
index c854bd2..16a22c8 100644
--- a/assets/js/modules/css.js
+++ b/assets/js/modules/css.js
@@ -1,6 +1,6 @@
 'use strict';
 
-define(["source/load-options"], function(options) {
+sourcejs.amd.define(["source/load-options"], function(options) {
     function Css (url, cat) {
         this.url = url;
         this.cat = cat || 'plugin';
diff --git a/assets/js/modules/globalNav.js b/assets/js/modules/globalNav.js
index 55f93dc..59f664c 100644
--- a/assets/js/modules/globalNav.js
+++ b/assets/js/modules/globalNav.js
@@ -4,7 +4,7 @@
 *
 * */
 
-define([
+sourcejs.amd.define([
     "jquery",
     "sourceModules/module",
     "sourceModules/utils",
diff --git a/assets/js/modules/headerFooter.js b/assets/js/modules/headerFooter.js
index e064d1b..09a5872 100644
--- a/assets/js/modules/headerFooter.js
+++ b/assets/js/modules/headerFooter.js
@@ -1,4 +1,4 @@
-define([
+sourcejs.amd.define([
     'jquery',
     'source/load-options'
 ], function($, options) {
diff --git a/assets/js/modules/htmlAPISync.js b/assets/js/modules/htmlAPISync.js
index e798396..89ab6f4 100644
--- a/assets/js/modules/htmlAPISync.js
+++ b/assets/js/modules/htmlAPISync.js
@@ -1,6 +1,6 @@
 'use strict';
 
-define([
+sourcejs.amd.define([
     "jquery",
     "sourceModules/module",
     "sourceModules/utils",
diff --git a/assets/js/modules/inlineOptions.js b/assets/js/modules/inlineOptions.js
index e62eaaa..43c385b 100644
--- a/assets/js/modules/inlineOptions.js
+++ b/assets/js/modules/inlineOptions.js
@@ -1,4 +1,4 @@
-define(function() {
+sourcejs.amd.define(function() {
 
     'use strict';
 
diff --git a/assets/js/modules/innerNavigation.js b/assets/js/modules/innerNavigation.js
index 82cf750..954da02 100644
--- a/assets/js/modules/innerNavigation.js
+++ b/assets/js/modules/innerNavigation.js
@@ -1,6 +1,6 @@
 'use strict';
 
-define([
+sourcejs.amd.define([
     "jquery",
     "sourceModules/module",
     "sourceModules/utils",
diff --git a/assets/js/modules/loadEvents.js b/assets/js/modules/loadEvents.js
index dd48b5b..1071e28 100644
--- a/assets/js/modules/loadEvents.js
+++ b/assets/js/modules/loadEvents.js
@@ -4,7 +4,7 @@
 *
 */
 
-define(["sourceModules/module", "sourceModules/utils"], function(module, utils) {
+sourcejs.amd.define(["sourceModules/module", "sourceModules/utils"], function(module, utils) {
 
     'use strict';
 
diff --git a/assets/js/modules/module.js b/assets/js/modules/module.js
index 536f991..8842ad4 100644
--- a/assets/js/modules/module.js
+++ b/assets/js/modules/module.js
@@ -1,4 +1,4 @@
-define(["source/load-options"], function (options) {
+sourcejs.amd.define(["source/load-options"], function (options) {
 
     'use strict';
 
diff --git a/assets/js/modules/moduleLoader.js b/assets/js/modules/moduleLoader.js
index 553afaf..865858e 100644
--- a/assets/js/modules/moduleLoader.js
+++ b/assets/js/modules/moduleLoader.js
@@ -1,4 +1,4 @@
-define([
+sourcejs.amd.define([
     'jquery',
 	'sourceModules/module'
 	], function ($, module) {
@@ -47,7 +47,7 @@ define([
                     var targetObj = optionsBase[typeEnabled][item];
 
                     if (targetObj){
-                        require([path + item]);
+                        sourcejs.amd.require([path + item]);
                     }
                 }
             }
diff --git a/assets/js/modules/navHighlight.js b/assets/js/modules/navHighlight.js
index 97e2eba..c0cc5f8 100644
--- a/assets/js/modules/navHighlight.js
+++ b/assets/js/modules/navHighlight.js
@@ -7,7 +7,7 @@
 * */
 
 
-define([
+sourcejs.amd.define([
 	'jquery',
     'sourceModules/module'
     ], function ($, module) {
diff --git a/assets/js/modules/ntf.js b/assets/js/modules/ntf.js
index 20976a7..35a0579 100644
--- a/assets/js/modules/ntf.js
+++ b/assets/js/modules/ntf.js
@@ -1,6 +1,6 @@
 'use strict';
 
-define([
+sourcejs.amd.define([
     'jquery',
     'sourceModules/module'
 ], function($, module) {
diff --git a/assets/js/modules/parseFileTree.js b/assets/js/modules/parseFileTree.js
index 58e88ed..6b55d59 100644
--- a/assets/js/modules/parseFileTree.js
+++ b/assets/js/modules/parseFileTree.js
@@ -9,7 +9,7 @@
 
 'use strict';
 
-define([
+sourcejs.amd.define([
     'jquery',
     'sourceModules/module',
     'text!/api/specs/raw',
diff --git a/assets/js/modules/scrollToHash.js b/assets/js/modules/scrollToHash.js
index 068390e..0ee05c5 100644
--- a/assets/js/modules/scrollToHash.js
+++ b/assets/js/modules/scrollToHash.js
@@ -1,5 +1,5 @@
 //In separate module, to trace script ready state
-define([
+sourcejs.amd.define([
     "jquery",
     "sourceModules/utils",
     "sourceModules/loadEvents",
diff --git a/assets/js/modules/search.js b/assets/js/modules/search.js
index 2be50e7..f60008f 100644
--- a/assets/js/modules/search.js
+++ b/assets/js/modules/search.js
@@ -4,7 +4,7 @@
 *
 * */
 
-define([
+sourcejs.amd.define([
     'jquery',
     'sourceModules/module',
     'sourceLib/autocomplete',
diff --git a/assets/js/modules/sectionFolding.js b/assets/js/modules/sectionFolding.js
index fcd5130..4e1d977 100644
--- a/assets/js/modules/sectionFolding.js
+++ b/assets/js/modules/sectionFolding.js
@@ -6,7 +6,7 @@
 *
 * */
 
-define([
+sourcejs.amd.define([
     "jquery",
     "source/load-options",
     "sourceModules/utils",
@@ -105,7 +105,7 @@ define([
             // TODO: remove mustache check from core
             if (options.pluginsOptions && options.pluginsOptions.mustache) {
                 // Need to use absolute path to get same scope with requires from inline scripts
-                require(['/plugins/mustache/js/mustache.js'], function(templater){
+                sourcejs.amd.require(['/plugins/mustache/js/mustache.js'], function(templater){
                     if (typeof templater.PostponedTemplates !== 'undefined') {
 
                         if ($target.attr('data-rendered') === 'true') {
diff --git a/assets/js/modules/sections.js b/assets/js/modules/sections.js
index c51c48e..4f8a932 100644
--- a/assets/js/modules/sections.js
+++ b/assets/js/modules/sections.js
@@ -6,7 +6,7 @@
  *
  * */
 
-define([
+sourcejs.amd.define([
     "jquery",
     "sourceModules/module"
     ], function ($, module) {
diff --git a/assets/js/modules/specDecorations.js b/assets/js/modules/specDecorations.js
index d4e92f9..d8a04cb 100644
--- a/assets/js/modules/specDecorations.js
+++ b/assets/js/modules/specDecorations.js
@@ -1,4 +1,4 @@
-define([
+sourcejs.amd.define([
     "jquery",
     "source/load-options",
     "sourceModules/browser"
diff --git a/assets/js/modules/trimSpaces.js b/assets/js/modules/trimSpaces.js
index b30a333..061ce53 100644
--- a/assets/js/modules/trimSpaces.js
+++ b/assets/js/modules/trimSpaces.js
@@ -6,7 +6,7 @@
 *
 * */
 
-define([
+sourcejs.amd.define([
     "source/load-options",
     "sourceModules/codeSource"
     ], function(options) {
diff --git a/assets/js/modules/utils.js b/assets/js/modules/utils.js
index 8983f39..9a40503 100644
--- a/assets/js/modules/utils.js
+++ b/assets/js/modules/utils.js
@@ -4,7 +4,7 @@
 *
 * */
 
-define([
+sourcejs.amd.define([
     'jquery',
     'sourceModules/module'
     ], function ($, module) {
diff --git a/core/routes/redirects.js b/core/routes/redirects.js
index 9f9b4ba..259654e 100644
--- a/core/routes/redirects.js
+++ b/core/routes/redirects.js
@@ -26,7 +26,9 @@ var finalParagraphInterceptor = interceptor(function (req, res) {
             ) {
                 body = '// Modified on static serve from `redirects.js` \n (function(require, define){\n' + body + '\n}(sourcejs.amd.require, sourcejs.amd.define))';
 
-                global.log.warn('Deprecation Notice: please update "' + req.originalUrl + '" to use sourcejs.amd.require/sourcejs.amd.define namespace for Requirejs modules.');
+                if (!(/\/source\/assets\/js\/lib/.test(req.originalUrl))) {
+                    global.log.warn('Deprecation Notice: please update "' + req.originalUrl + '" to use sourcejs.amd.require/sourcejs.amd.define namespace for Requirejs modules.');
+                }
             }
 
             send(body);

From 3fde5fa6d6615b123742961c4a23f6c8395fa50c Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Mon, 2 May 2016 09:17:27 +0200
Subject: [PATCH 074/104] operatino/namespaced-require-server-transform: fix
 linting and tests

---
 .jshintrc                |  2 +-
 docs/spec/index.src.html | 14 ++++++--------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/.jshintrc b/.jshintrc
index 05c8cb5..6bc7f03 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -19,5 +19,5 @@
 	"browser": true,
 	"scripturl": true,
 	"jquery": true,
-	"predef": [ "define", "Prism", "SourceGetSections"]
+	"predef": [ "sourcejs", "Prism", "SourceGetSections"]
 }
diff --git a/docs/spec/index.src.html b/docs/spec/index.src.html
index a8dcea0..2814b98 100755
--- a/docs/spec/index.src.html
+++ b/docs/spec/index.src.html
@@ -45,13 +45,11 @@ <h2>Spec Section Heading</h2>
     <h3>Show source code</h3>
 
     <!-- Inline JS -->
-    <!--
     <script>
-        require(['jquery'], function($){
-            var makeSome;
-        });
+        (function () {
+            console.log('Say hi from inline js.')
+        })();
     </script>
-    -->
     <!-- /Inline JS -->
 
     <code class="src-html">
@@ -91,9 +89,9 @@ <h3>Show source code</h3>
     <code class="src-html source_visible">
         &lt;code class="src-js"&gt;
             <script>
-                require(['jquery'], function($){
-                    var makeSome;
-                });
+                (function () {
+                    console.log('Say hi from inline js.')
+                })();
             </script>
         &lt;/code&gt;
     </code>

From 79fe5d39a2eb5a2187fe9ff270ba26ae5295fbac Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Mon, 2 May 2016 22:22:25 +0200
Subject: [PATCH 075/104] handle error on loading user app.js

---
 app.js | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/app.js b/app.js
index a115c9c..f788e88 100644
--- a/app.js
+++ b/app.js
@@ -179,10 +179,16 @@ require('./core/api/optionsApi');
 // User extenstions
 require("./core/loadPlugins.js");
 
-try {
-    // User additional functionality
-    require(userPath + "/core/app.js");
-} catch(e){}
+// User extended app.js
+var pathToUserAppExtension = path.join(userPath, 'core/app.js');
+
+if (fs.existsSync(pathToUserAppExtension)) {
+    try {
+        require(pathToUserAppExtension);
+    } catch(e){
+        log.warn('Error loading user app.js from ' + pathToUserAppExtension, e);
+    }
+}
 
 
 // Watchers

From bbdc754adc65464a734c4016931b68f32b34ca25 Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Mon, 2 May 2016 22:53:31 +0200
Subject: [PATCH 076/104] operatino/namespaced-require-server-transform:
 privatize lodash and prism

---
 assets/js/_require-config.js    |  17 +-
 assets/js/lib/lodash-private.js |   3 +
 assets/js/lib/prism/prism.js    | 759 ++++++++++++++++----------------
 3 files changed, 397 insertions(+), 382 deletions(-)
 create mode 100644 assets/js/lib/lodash-private.js

diff --git a/assets/js/_require-config.js b/assets/js/_require-config.js
index 17e56c2..053fa3c 100644
--- a/assets/js/_require-config.js
+++ b/assets/js/_require-config.js
@@ -10,6 +10,7 @@ sourcejs.amd.requirejs.config({
 
         // libs
         jquery: '/source/assets/js/lib/jquery-2.1.4.min',
+        lodash: '/source/assets/js/lib/lodash',
 
         // Require.js plugins
         text: '/source/assets/js/lib/text',
@@ -21,13 +22,15 @@ sourcejs.amd.requirejs.config({
     },
 
     map: {
-      // '*' means all modules will get 'jquery-private'
-      // for their 'jquery' dependency.
-      '*': { 'jquery': 'sourceLib/jquery-private' },
+      // '*' means all modules will use private versions
+      '*': {
+          'jquery': 'sourceLib/jquery-private',
+          'lodash': 'sourceLib/lodash-private',
+          'sourceLib/lodash': 'sourceLib/lodash-private'
+      },
 
-      // 'jquery-private' wants the real jQuery module
-      // though. If this line was not here, there would
-      // be an unresolvable cyclic dependency.
-      'sourceLib/jquery-private': { 'jquery': 'jquery' }
+      // but private version should first render the original ones
+      'sourceLib/jquery-private': { 'jquery': 'jquery' },
+      'sourceLib/lodash-private': { 'lodash': 'lodash' }
     }
 });
\ No newline at end of file
diff --git a/assets/js/lib/lodash-private.js b/assets/js/lib/lodash-private.js
new file mode 100644
index 0000000..15a730c
--- /dev/null
+++ b/assets/js/lib/lodash-private.js
@@ -0,0 +1,3 @@
+sourcejs.amd.define(['lodash'], function (lodash) {
+    return lodash.noConflict(true);
+});
\ No newline at end of file
diff --git a/assets/js/lib/prism/prism.js b/assets/js/lib/prism/prism.js
index 4a1bbe8..21d2f34 100644
--- a/assets/js/lib/prism/prism.js
+++ b/assets/js/lib/prism/prism.js
@@ -4,501 +4,510 @@
  * @author Lea Verou http://lea.verou.me
  */
 
-(function(){
+/**
+ * Modified in SourceJS to use custom `define` namespace and localize Prism global
+ */
 
-// Private helper vars
-    var lang = /\bsrc?-(?!\*)(\w+)\b/i;
+sourcejs.amd.define([], function(){
+    var Prism;
 
-    var _ = self.Prism = {
-        util: {
-            type: function (o) {
-                return Object.prototype.toString.call(o).match(/\[object (\w+)\]/)[1];
-            },
+    (function(){
 
-            // Deep clone a language definition (e.g. to extend it)
-            clone: function (o) {
-                var type = _.util.type(o);
+    // Private helper vars
+        var lang = /\bsrc?-(?!\*)(\w+)\b/i;
+        var _ = Prism = {
+            util: {
+                type: function (o) {
+                    return Object.prototype.toString.call(o).match(/\[object (\w+)\]/)[1];
+                },
+
+                // Deep clone a language definition (e.g. to extend it)
+                clone: function (o) {
+                    var type = _.util.type(o);
 
-                switch (type) {
-                    case 'Object':
-                        var clone = {};
+                    switch (type) {
+                        case 'Object':
+                            var clone = {};
 
-                        for (var key in o) {
-                            if (o.hasOwnProperty(key)) {
-                                clone[key] = _.util.clone(o[key]);
+                            for (var key in o) {
+                                if (o.hasOwnProperty(key)) {
+                                    clone[key] = _.util.clone(o[key]);
+                                }
                             }
-                        }
 
-                        return clone;
+                            return clone;
 
-                    case 'Array':
-                        return o.slice();
-                }
+                        case 'Array':
+                            return o.slice();
+                    }
 
-                return o;
-            }
-        },
+                    return o;
+                }
+            },
 
-        languages: {
-            extend: function (id, redef) {
-                var lang = _.util.clone(_.languages[id]);
+            languages: {
+                extend: function (id, redef) {
+                    var lang = _.util.clone(_.languages[id]);
 
-                for (var key in redef) {
-                    lang[key] = redef[key];
-                }
+                    for (var key in redef) {
+                        lang[key] = redef[key];
+                    }
 
-                return lang;
-            },
+                    return lang;
+                },
 
-            // Insert a token before another token in a language literal
-            insertBefore: function (inside, before, insert, root) {
-                root = root || _.languages;
-                var grammar = root[inside];
-                var ret = {};
+                // Insert a token before another token in a language literal
+                insertBefore: function (inside, before, insert, root) {
+                    root = root || _.languages;
+                    var grammar = root[inside];
+                    var ret = {};
 
-                for (var token in grammar) {
+                    for (var token in grammar) {
 
-                    if (grammar.hasOwnProperty(token)) {
+                        if (grammar.hasOwnProperty(token)) {
 
-                        if (token == before) {
+                            if (token == before) {
 
-                            for (var newToken in insert) {
+                                for (var newToken in insert) {
 
-                                if (insert.hasOwnProperty(newToken)) {
-                                    ret[newToken] = insert[newToken];
+                                    if (insert.hasOwnProperty(newToken)) {
+                                        ret[newToken] = insert[newToken];
+                                    }
                                 }
                             }
+
+                            ret[token] = grammar[token];
                         }
+                    }
 
-                        ret[token] = grammar[token];
+                    return root[inside] = ret;
+                },
+
+                // Traverse a language definition with Depth First Search
+                DFS: function(o, callback) {
+                    for (var i in o) {
+                        callback.call(o, i, o[i]);
+
+                        if (_.util.type(o) === 'Object') {
+                            _.languages.DFS(o[i], callback);
+                        }
                     }
                 }
+            },
+
+            highlightAll: function(async, callback) {
+    //            var elements = document.querySelectorAll('code[class*="language-"], [class*="language-"] code, code[class*="lang-"], [class*="lang-"] code');
+                var elements = document.querySelectorAll('pre[class*="src"] code');
 
-                return root[inside] = ret;
+                for (var i=0, element; element = elements[i++];) {
+                    _.highlightElement(element, async === true, callback);
+                }
             },
 
-            // Traverse a language definition with Depth First Search
-            DFS: function(o, callback) {
-                for (var i in o) {
-                    callback.call(o, i, o[i]);
+            highlightElement: function(element, async, callback) {
+                // Find language
+                var language, grammar, parent = element;
 
-                    if (_.util.type(o) === 'Object') {
-                        _.languages.DFS(o[i], callback);
-                    }
+                while (parent && !lang.test(parent.className)) {
+                    parent = parent.parentNode;
                 }
-            }
-        },
 
-        highlightAll: function(async, callback) {
-//            var elements = document.querySelectorAll('code[class*="language-"], [class*="language-"] code, code[class*="lang-"], [class*="lang-"] code');
-            var elements = document.querySelectorAll('pre[class*="src"] code');
+                if (parent) {
+                    language = (parent.className.match(lang) || [,''])[1];
+                    grammar = _.languages[language];
+                }
 
-            for (var i=0, element; element = elements[i++];) {
-                _.highlightElement(element, async === true, callback);
-            }
-        },
+                if (!grammar) {
+                    return;
+                }
 
-        highlightElement: function(element, async, callback) {
-            // Find language
-            var language, grammar, parent = element;
+                // Set language on the element, if not present
+    //            element.className = element.className.replace(lang, '').replace(/\s+/g, ' ') + 'lang-' + language;
 
-            while (parent && !lang.test(parent.className)) {
-                parent = parent.parentNode;
-            }
+                // Set language on the parent, for styling
+                parent = element.parentNode;
 
-            if (parent) {
-                language = (parent.className.match(lang) || [,''])[1];
-                grammar = _.languages[language];
-            }
+                if (/pre/i.test(parent.nodeName)) {
+                    parent.className = parent.className.replace(lang, '').replace(/\s+/g, ' ') + ' src-' + language;
+                }
 
-            if (!grammar) {
-                return;
-            }
+                var code = element.textContent;
 
-            // Set language on the element, if not present
-//            element.className = element.className.replace(lang, '').replace(/\s+/g, ' ') + 'lang-' + language;
+                if(!code) {
+                    return;
+                }
 
-            // Set language on the parent, for styling
-            parent = element.parentNode;
+                code = code.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/\u00a0/g, ' ');
 
-            if (/pre/i.test(parent.nodeName)) {
-                parent.className = parent.className.replace(lang, '').replace(/\s+/g, ' ') + ' src-' + language;
-            }
+                var env = {
+                    element: element,
+                    language: language,
+                    grammar: grammar,
+                    code: code
+                };
 
-            var code = element.textContent;
+                _.hooks.run('before-highlight', env);
 
-            if(!code) {
-                return;
-            }
+                if (async && self.Worker) {
+                    var worker = new Worker(_.filename);
 
-            code = code.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/\u00a0/g, ' ');
+                    worker.onmessage = function(evt) {
+                        env.highlightedCode = Token.stringify(JSON.parse(evt.data), language);
 
-            var env = {
-                element: element,
-                language: language,
-                grammar: grammar,
-                code: code
-            };
+                        _.hooks.run('before-insert', env);
 
-            _.hooks.run('before-highlight', env);
+                        env.element.innerHTML = env.highlightedCode;
 
-            if (async && self.Worker) {
-                var worker = new Worker(_.filename);
+                        callback && callback.call(env.element);
+                        _.hooks.run('after-highlight', env);
+                    };
 
-                worker.onmessage = function(evt) {
-                    env.highlightedCode = Token.stringify(JSON.parse(evt.data), language);
+                    worker.postMessage(JSON.stringify({
+                        language: env.language,
+                        code: env.code
+                    }));
+                }
+                else {
+                    env.highlightedCode = _.highlight(env.code, env.grammar, env.language)
 
                     _.hooks.run('before-insert', env);
 
                     env.element.innerHTML = env.highlightedCode;
 
-                    callback && callback.call(env.element);
+                    callback && callback.call(element);
+
                     _.hooks.run('after-highlight', env);
-                };
+                }
+            },
 
-                worker.postMessage(JSON.stringify({
-                    language: env.language,
-                    code: env.code
-                }));
-            }
-            else {
-                env.highlightedCode = _.highlight(env.code, env.grammar, env.language)
+            highlight: function (text, grammar, language) {
+                return Token.stringify(_.tokenize(text, grammar), language);
+            },
 
-                _.hooks.run('before-insert', env);
+            tokenize: function(text, grammar, language) {
+                var Token = _.Token;
 
-                env.element.innerHTML = env.highlightedCode;
+                var strarr = [text];
 
-                callback && callback.call(element);
+                var rest = grammar.rest;
 
-                _.hooks.run('after-highlight', env);
-            }
-        },
+                if (rest) {
+                    for (var token in rest) {
+                        grammar[token] = rest[token];
+                    }
 
-        highlight: function (text, grammar, language) {
-            return Token.stringify(_.tokenize(text, grammar), language);
-        },
+                    delete grammar.rest;
+                }
 
-        tokenize: function(text, grammar, language) {
-            var Token = _.Token;
+                tokenloop: for (var token in grammar) {
+                    if(!grammar.hasOwnProperty(token) || !grammar[token]) {
+                        continue;
+                    }
 
-            var strarr = [text];
+                    var pattern = grammar[token],
+                        inside = pattern.inside,
+                        lookbehind = !!pattern.lookbehind,
+                        lookbehindLength = 0;
 
-            var rest = grammar.rest;
+                    pattern = pattern.pattern || pattern;
 
-            if (rest) {
-                for (var token in rest) {
-                    grammar[token] = rest[token];
-                }
+                    for (var i=0; i<strarr.length; i++) { // Don’t cache length as it changes during the loop
 
-                delete grammar.rest;
-            }
+                        var str = strarr[i];
 
-            tokenloop: for (var token in grammar) {
-                if(!grammar.hasOwnProperty(token) || !grammar[token]) {
-                    continue;
-                }
+                        if (strarr.length > text.length) {
+                            // Something went terribly wrong, ABORT, ABORT!
+                            break tokenloop;
+                        }
+
+                        if (str instanceof Token) {
+                            continue;
+                        }
 
-                var pattern = grammar[token],
-                    inside = pattern.inside,
-                    lookbehind = !!pattern.lookbehind,
-                    lookbehindLength = 0;
+                        pattern.lastIndex = 0;
 
-                pattern = pattern.pattern || pattern;
+                        var match = pattern.exec(str);
 
-                for (var i=0; i<strarr.length; i++) { // Don’t cache length as it changes during the loop
+                        if (match) {
+                            if(lookbehind) {
+                                lookbehindLength = match[1].length;
+                            }
 
-                    var str = strarr[i];
+                            var from = match.index - 1 + lookbehindLength,
+                                match = match[0].slice(lookbehindLength),
+                                len = match.length,
+                                to = from + len,
+                                before = str.slice(0, from + 1),
+                                after = str.slice(to + 1);
 
-                    if (strarr.length > text.length) {
-                        // Something went terribly wrong, ABORT, ABORT!
-                        break tokenloop;
-                    }
+                            var args = [i, 1];
 
-                    if (str instanceof Token) {
-                        continue;
-                    }
+                            if (before) {
+                                args.push(before);
+                            }
 
-                    pattern.lastIndex = 0;
+                            var wrapped = new Token(token, inside? _.tokenize(match, inside) : match);
 
-                    var match = pattern.exec(str);
+                            args.push(wrapped);
 
-                    if (match) {
-                        if(lookbehind) {
-                            lookbehindLength = match[1].length;
+                            if (after) {
+                                args.push(after);
+                            }
+
+                            Array.prototype.splice.apply(strarr, args);
                         }
+                    }
+                }
+
+                return strarr;
+            },
 
-                        var from = match.index - 1 + lookbehindLength,
-                            match = match[0].slice(lookbehindLength),
-                            len = match.length,
-                            to = from + len,
-                            before = str.slice(0, from + 1),
-                            after = str.slice(to + 1);
+            hooks: {
+                all: {},
 
-                        var args = [i, 1];
+                add: function (name, callback) {
+                    var hooks = _.hooks.all;
 
-                        if (before) {
-                            args.push(before);
-                        }
+                    hooks[name] = hooks[name] || [];
 
-                        var wrapped = new Token(token, inside? _.tokenize(match, inside) : match);
+                    hooks[name].push(callback);
+                },
 
-                        args.push(wrapped);
+                run: function (name, env) {
+                    var callbacks = _.hooks.all[name];
 
-                        if (after) {
-                            args.push(after);
-                        }
+                    if (!callbacks || !callbacks.length) {
+                        return;
+                    }
 
-                        Array.prototype.splice.apply(strarr, args);
+                    for (var i=0, callback; callback = callbacks[i++];) {
+                        callback(env);
                     }
                 }
             }
+        };
 
-            return strarr;
-        },
+        var Token = _.Token = function(type, content) {
+            this.type = type;
+            this.content = content;
+        };
 
-        hooks: {
-            all: {},
+        Token.stringify = function(o, language, parent) {
+            if (typeof o == 'string') {
+                return o;
+            }
 
-            add: function (name, callback) {
-                var hooks = _.hooks.all;
+            if (Object.prototype.toString.call(o) == '[object Array]') {
+                return o.map(function(element) {
+                    return Token.stringify(element, language, o);
+                }).join('');
+            }
 
-                hooks[name] = hooks[name] || [];
+            var env = {
+                type: o.type,
+                content: Token.stringify(o.content, language, parent),
+                prism_tag: 'span',
+                classes: ['token', o.type],
+                attributes: {},
+                language: language,
+                parent: parent
+            };
 
-                hooks[name].push(callback);
-            },
+            if (env.type == 'comment') {
+                env.attributes['spellcheck'] = 'true';
+            }
 
-            run: function (name, env) {
-                var callbacks = _.hooks.all[name];
+            _.hooks.run('wrap', env);
 
-                if (!callbacks || !callbacks.length) {
-                    return;
-                }
+            var attributes = '';
 
-                for (var i=0, callback; callback = callbacks[i++];) {
-                    callback(env);
-                }
+            for (var name in env.attributes) {
+                attributes += name + '="' + (env.attributes[name] || '') + '"';
             }
-        }
-    };
 
-    var Token = _.Token = function(type, content) {
-        this.type = type;
-        this.content = content;
-    };
-
-    Token.stringify = function(o, language, parent) {
-        if (typeof o == 'string') {
-            return o;
-        }
-
-        if (Object.prototype.toString.call(o) == '[object Array]') {
-            return o.map(function(element) {
-                return Token.stringify(element, language, o);
-            }).join('');
-        }
+            return '<' + env.prism_tag + ' class="' + env.classes.join(' ') + '" ' + attributes + '>' + env.content + '</' + env.prism_tag + '>';
 
-        var env = {
-            type: o.type,
-            content: Token.stringify(o.content, language, parent),
-            prism_tag: 'span',
-            classes: ['token', o.type],
-            attributes: {},
-            language: language,
-            parent: parent
         };
 
-        if (env.type == 'comment') {
-            env.attributes['spellcheck'] = 'true';
-        }
-
-        _.hooks.run('wrap', env);
+        if (!self.document) {
+            // In worker
+            self.addEventListener('message', function(evt) {
+                var message = JSON.parse(evt.data),
+                    lang = message.language,
+                    code = message.code;
 
-        var attributes = '';
+                self.postMessage(JSON.stringify(_.tokenize(code, _.languages[lang])));
+                self.close();
+            }, false);
 
-        for (var name in env.attributes) {
-            attributes += name + '="' + (env.attributes[name] || '') + '"';
+            return;
         }
 
-        return '<' + env.prism_tag + ' class="' + env.classes.join(' ') + '" ' + attributes + '>' + env.content + '</' + env.prism_tag + '>';
+    // Get current script and highlight
+        var script = document.getElementsByTagName('script');
 
-    };
+        script = script[script.length - 1];
 
-    if (!self.document) {
-        // In worker
-        self.addEventListener('message', function(evt) {
-            var message = JSON.parse(evt.data),
-                lang = message.language,
-                code = message.code;
+        if (script) {
+            _.filename = script.src;
 
-            self.postMessage(JSON.stringify(_.tokenize(code, _.languages[lang])));
-            self.close();
-        }, false);
+            if (document.addEventListener && !script.hasAttribute('data-manual')) {
+                document.addEventListener('DOMContentLoaded', _.highlightAll);
+            }
+        }
 
-        return;
-    }
+    })();
 
-// Get current script and highlight
-    var script = document.getElementsByTagName('script');
+    Prism.languages.html = {
+        'comment': /&lt;!--[\w\W]*?-->/g,
+        'prolog': /&lt;\?.+?\?>/,
+        'doctype': /&lt;!DOCTYPE.+?>/,
+        'cdata': /&lt;!\[CDATA\[[\w\W]*?]]>/i,
+        'prism_tag': {
+            pattern: /&lt;\/?[\w:-]+\s*(?:\s+[\w:-]+(?:=(?:("|')(\\?[\w\W])*?\1|\w+))?\s*)*\/?>/gi,
+            inside: {
+                'prism_tag': {
+                    pattern: /^&lt;\/?[\w:-]+/i,
+                    inside: {
+                        'punctuation': /^&lt;\/?/,
+                        'namespace': /^[\w-]+?:/
+                    }
+                },
+                'attr-value': {
+                    pattern: /=(?:('|")[\w\W]*?(\1)|[^\s>]+)/gi,
+                    inside: {
+                        'punctuation': /=|>|"/g
+                    }
+                },
+                'punctuation': /\/?>/g,
+                'attr-name': {
+                    pattern: /[\w:-]+/g,
+                    inside: {
+                        'namespace': /^[\w-]+?:/
+                    }
+                }
 
-    script = script[script.length - 1];
+            }
+        },
+        'entity': /&amp;#?[\da-z]{1,8};/gi
+    };
 
-    if (script) {
-        _.filename = script.src;
+    // Plugin to make entity title show the real entity, idea by Roman Komarov
+    Prism.hooks.add('wrap', function(env) {
 
-        if (document.addEventListener && !script.hasAttribute('data-manual')) {
-            document.addEventListener('DOMContentLoaded', _.highlightAll);
+        if (env.type === 'entity') {
+            env.attributes['title'] = env.content.replace(/&amp;/, '&');
         }
-    }
+    });;
+    Prism.languages.css = {
+        'comment': /\/\*[\w\W]*?\*\//g,
+        'atrule': {
+            pattern: /@[\w-]+?.*?(;|(?=\s*{))/gi,
+            inside: {
+                'punctuation': /[;:]/g
+            }
+        },
+        'url': /url\((["']?).*?\1\)/gi,
+        'selector': /[^\{\}\s][^\{\};]*(?=\s*\{)/g,
+        'property': /(\b|\B)[\w-]+(?=\s*:)/ig,
+        'string': /("|')(\\?.)*?\1/g,
+        'important': /\B!important\b/gi,
+        'ignore': /&(lt|gt|amp);/gi,
+        'punctuation': /[\{\};:]/g
+    };
 
-})();
-
-Prism.languages.html = {
-    'comment': /&lt;!--[\w\W]*?-->/g,
-    'prolog': /&lt;\?.+?\?>/,
-    'doctype': /&lt;!DOCTYPE.+?>/,
-    'cdata': /&lt;!\[CDATA\[[\w\W]*?]]>/i,
-    'prism_tag': {
-        pattern: /&lt;\/?[\w:-]+\s*(?:\s+[\w:-]+(?:=(?:("|')(\\?[\w\W])*?\1|\w+))?\s*)*\/?>/gi,
-        inside: {
-            'prism_tag': {
-                pattern: /^&lt;\/?[\w:-]+/i,
-                inside: {
-                    'punctuation': /^&lt;\/?/,
-                    'namespace': /^[\w-]+?:/
-                }
-            },
-            'attr-value': {
-                pattern: /=(?:('|")[\w\W]*?(\1)|[^\s>]+)/gi,
+    if (Prism.languages.html) {
+        Prism.languages.insertBefore('html', 'prism_tag', {
+            'style': {
+                pattern: /(&lt;|<)style[\w\W]*?(>|&gt;)[\w\W]*?(&lt;|<)\/style(>|&gt;)/ig,
                 inside: {
-                    'punctuation': /=|>|"/g
-                }
-            },
-            'punctuation': /\/?>/g,
-            'attr-name': {
-                pattern: /[\w:-]+/g,
-                inside: {
-                    'namespace': /^[\w-]+?:/
+                    'prism_tag': {
+                        pattern: /(&lt;|<)style[\w\W]*?(>|&gt;)|(&lt;|<)\/style(>|&gt;)/ig,
+                        inside: Prism.languages.html.prism_tag.inside
+                    },
+                    rest: Prism.languages.css
                 }
             }
+        });
+    };
+    Prism.languages.clike = {
+        'comment': {
+            pattern: /(^|[^\\])(\/\*[\w\W]*?\*\/|(^|[^:])\/\/.*?(\r?\n|$))/g,
+            lookbehind: true
+        },
+        'string': /("|')(\\?.)*?\1/g,
+        'class-name': {
+            pattern: /((?:(?:class|interface|extends|implements|trait|instanceof|new)\s+)|(?:catch\s+\())[a-z0-9_\.\\]+/ig,
+            lookbehind: true,
+            inside: {
+                punctuation: /(\.|\\)/
+            }
+        },
+        'keyword': /\b(if|else|while|do|for|return|in|instanceof|function|new|try|throw|catch|finally|null|break|continue)\b/g,
+        'boolean': /\b(true|false)\b/g,
+        'function': {
+            pattern: /[a-z0-9_]+\(/ig,
+            inside: {
+                punctuation: /\(/
+            }
+        },
+        'number': /\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?)\b/g,
+        'operator': /[-+]{1,2}|!|&lt;=?|>=?|={1,3}|(&amp;){1,2}|\|?\||\?|\*|\/|\~|\^|\%/g,
+        'ignore': /&(lt|gt|amp);/gi,
+        'punctuation': /[{}[\];(),.:]/g
+    };
+    ;
+    Prism.languages.js = Prism.languages.extend('clike', {
+        'keyword': /\b(var|let|if|else|while|do|for|return|in|instanceof|function|new|with|typeof|try|throw|catch|finally|null|break|continue)\b/g,
+        'number': /\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?|NaN|-?Infinity)\b/g
+    });
 
+    Prism.languages.insertBefore('js', 'keyword', {
+        'regex': {
+            pattern: /(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/[gim]{0,3}(?=\s*($|[\r\n,.;})]))/g,
+            lookbehind: true
         }
-    },
-    'entity': /&amp;#?[\da-z]{1,8};/gi
-};
-
-// Plugin to make entity title show the real entity, idea by Roman Komarov
-Prism.hooks.add('wrap', function(env) {
+    });
 
-    if (env.type === 'entity') {
-        env.attributes['title'] = env.content.replace(/&amp;/, '&');
+    if (Prism.languages.html) {
+        Prism.languages.insertBefore('html', 'prism_tag', {
+            'script': {
+                pattern: /(&lt;|<)script[\w\W]*?(>|&gt;)[\w\W]*?(&lt;|<)\/script(>|&gt;)/ig,
+                inside: {
+                    'prism_tag': {
+                        pattern: /(&lt;|<)script[\w\W]*?(>|&gt;)|(&lt;|<)\/script(>|&gt;)/ig,
+                        inside: Prism.languages.html.prism_tag.inside
+                    },
+                    rest: Prism.languages.js
+                }
+            }
+        });
     }
-});;
-Prism.languages.css = {
-    'comment': /\/\*[\w\W]*?\*\//g,
-    'atrule': {
-        pattern: /@[\w-]+?.*?(;|(?=\s*{))/gi,
-        inside: {
-            'punctuation': /[;:]/g
-        }
-    },
-    'url': /url\((["']?).*?\1\)/gi,
-    'selector': /[^\{\}\s][^\{\};]*(?=\s*\{)/g,
-    'property': /(\b|\B)[\w-]+(?=\s*:)/ig,
-    'string': /("|')(\\?.)*?\1/g,
-    'important': /\B!important\b/gi,
-    'ignore': /&(lt|gt|amp);/gi,
-    'punctuation': /[\{\};:]/g
-};
-
-if (Prism.languages.html) {
-    Prism.languages.insertBefore('html', 'prism_tag', {
-        'style': {
-            pattern: /(&lt;|<)style[\w\W]*?(>|&gt;)[\w\W]*?(&lt;|<)\/style(>|&gt;)/ig,
+    ;
+    Prism.languages.bash = Prism.languages.extend('clike', {
+        'comment': {
+            pattern: /(^|[^"{\\])(#.*?(\r?\n|$))/g,
+            lookbehind: true
+        },
+        'string': {
+            //allow multiline string
+            pattern: /("|')(\\?[\s\S])*?\1/g,
             inside: {
-                'prism_tag': {
-                    pattern: /(&lt;|<)style[\w\W]*?(>|&gt;)|(&lt;|<)\/style(>|&gt;)/ig,
-                    inside: Prism.languages.html.prism_tag.inside
-                },
-                rest: Prism.languages.css
+                //'property' class reused for bash variables
+                'property': /\$([a-zA-Z0-9_#\?\-\*!@]+|\{[^\}]+\})/g
             }
-        }
+        },
+        'keyword': /\b(if|then|else|elif|fi|for|break|continue|while|in|case|function|select|do|done|until|echo|exit|return|set|declare)\b/g
     });
-};
-Prism.languages.clike = {
-    'comment': {
-        pattern: /(^|[^\\])(\/\*[\w\W]*?\*\/|(^|[^:])\/\/.*?(\r?\n|$))/g,
-        lookbehind: true
-    },
-    'string': /("|')(\\?.)*?\1/g,
-    'class-name': {
-        pattern: /((?:(?:class|interface|extends|implements|trait|instanceof|new)\s+)|(?:catch\s+\())[a-z0-9_\.\\]+/ig,
-        lookbehind: true,
-        inside: {
-            punctuation: /(\.|\\)/
-        }
-    },
-    'keyword': /\b(if|else|while|do|for|return|in|instanceof|function|new|try|throw|catch|finally|null|break|continue)\b/g,
-    'boolean': /\b(true|false)\b/g,
-    'function': {
-        pattern: /[a-z0-9_]+\(/ig,
-        inside: {
-            punctuation: /\(/
-        }
-    },
-    'number': /\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?)\b/g,
-    'operator': /[-+]{1,2}|!|&lt;=?|>=?|={1,3}|(&amp;){1,2}|\|?\||\?|\*|\/|\~|\^|\%/g,
-    'ignore': /&(lt|gt|amp);/gi,
-    'punctuation': /[{}[\];(),.:]/g
-};
-;
-Prism.languages.js = Prism.languages.extend('clike', {
-    'keyword': /\b(var|let|if|else|while|do|for|return|in|instanceof|function|new|with|typeof|try|throw|catch|finally|null|break|continue)\b/g,
-    'number': /\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?|NaN|-?Infinity)\b/g
-});
-
-Prism.languages.insertBefore('js', 'keyword', {
-    'regex': {
-        pattern: /(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/[gim]{0,3}(?=\s*($|[\r\n,.;})]))/g,
-        lookbehind: true
-    }
-});
 
-if (Prism.languages.html) {
-    Prism.languages.insertBefore('html', 'prism_tag', {
-        'script': {
-            pattern: /(&lt;|<)script[\w\W]*?(>|&gt;)[\w\W]*?(&lt;|<)\/script(>|&gt;)/ig,
-            inside: {
-                'prism_tag': {
-                    pattern: /(&lt;|<)script[\w\W]*?(>|&gt;)|(&lt;|<)\/script(>|&gt;)/ig,
-                    inside: Prism.languages.html.prism_tag.inside
-                },
-                rest: Prism.languages.js
-            }
-        }
+    Prism.languages.insertBefore('bash', 'keyword', {
+        //'property' class reused for bash variables
+        'property': /\$([a-zA-Z0-9_#\?\-\*!@]+|\{[^}]+\})/g
     });
-}
-;
-Prism.languages.bash = Prism.languages.extend('clike', {
-    'comment': {
-        pattern: /(^|[^"{\\])(#.*?(\r?\n|$))/g,
-        lookbehind: true
-    },
-    'string': {
-        //allow multiline string
-        pattern: /("|')(\\?[\s\S])*?\1/g,
-        inside: {
-            //'property' class reused for bash variables
-            'property': /\$([a-zA-Z0-9_#\?\-\*!@]+|\{[^\}]+\})/g
-        }
-    },
-    'keyword': /\b(if|then|else|elif|fi|for|break|continue|while|in|case|function|select|do|done|until|echo|exit|return|set|declare)\b/g
-});
-
-Prism.languages.insertBefore('bash', 'keyword', {
-    //'property' class reused for bash variables
-    'property': /\$([a-zA-Z0-9_#\?\-\*!@]+|\{[^}]+\})/g
-});
-Prism.languages.insertBefore('bash', 'comment', {
-    //shebang must be before comment, 'important' class from css reused
-    'important': /(^#!\s*\/bin\/bash)|(^#!\s*\/bin\/sh)/g
+    Prism.languages.insertBefore('bash', 'comment', {
+        //shebang must be before comment, 'important' class from css reused
+        'important': /(^#!\s*\/bin\/bash)|(^#!\s*\/bin\/sh)/g
+    });
+
+    return Prism;
 });
\ No newline at end of file

From 475c474bc931d6ad77952e24a2bbc4d40cd6ba2c Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Mon, 2 May 2016 22:54:24 +0200
Subject: [PATCH 077/104] operatino/namespaced-require-server-transform:
 privatize the rest libs

---
 assets/js/lib/codeFormat.js        |    3 +-
 assets/js/lib/jquery.couch.js      | 1966 ++++++++++++++--------------
 assets/js/lib/jquery.mb.browser.js |    4 +
 assets/js/lib/modalbox.js          |  197 +--
 assets/js/lib/require.js           |    5 +
 assets/js/lib/text.js              |    4 +-
 assets/js/modules/codeSource.js    |    2 +-
 7 files changed, 1100 insertions(+), 1081 deletions(-)

diff --git a/assets/js/lib/codeFormat.js b/assets/js/lib/codeFormat.js
index 5369ee7..f0ab1a1 100644
--- a/assets/js/lib/codeFormat.js
+++ b/assets/js/lib/codeFormat.js
@@ -6,8 +6,7 @@
  *
  * */
 
-
-define([
+sourcejs.amd.define([
     "jquery"
 ], function($) {
 
diff --git a/assets/js/lib/jquery.couch.js b/assets/js/lib/jquery.couch.js
index 6abac2c..96911a3 100644
--- a/assets/js/lib/jquery.couch.js
+++ b/assets/js/lib/jquery.couch.js
@@ -11,1069 +11,1079 @@
 // the License.
 
 /**
- * @namespace
- * $.couch is used to communicate with a CouchDB server, the server methods can
- * be called directly without creating an instance. Typically all methods are
- * passed an <code>options</code> object which defines a success callback which
- * is called with the data returned from the http request to CouchDB, you can
- * find the other settings that can be used in the <code>options</code> object
- * from <a href="http://api.jquery.com/jQuery.ajax/#jQuery-ajax-settings">
- * jQuery.ajax settings</a>
- * <pre><code>$.couch.activeTasks({
- *   success: function (data) {
- *     console.log(data);
- *   }
- * });</code></pre>
- * Outputs (for example):
- * <pre><code>[
- *  {
- *   "pid" : "<0.11599.0>",
- *   "status" : "Copied 0 of 18369 changes (0%)",
- *   "task" : "recipes",
- *   "type" : "Database Compaction"
- *  }
- *]</code></pre>
+ * Modified in SourceJS to use custom `define` namespace and local jquery
  */
-(function($) {
 
-  $.couch = $.couch || {};
-  /** @lends $.couch */
+sourcejs.amd.define([
+    'jquery'
+], function(jQuery) {
 
   /**
-   * @private
+   * @namespace
+   * $.couch is used to communicate with a CouchDB server, the server methods can
+   * be called directly without creating an instance. Typically all methods are
+   * passed an <code>options</code> object which defines a success callback which
+   * is called with the data returned from the http request to CouchDB, you can
+   * find the other settings that can be used in the <code>options</code> object
+   * from <a href="http://api.jquery.com/jQuery.ajax/#jQuery-ajax-settings">
+   * jQuery.ajax settings</a>
+   * <pre><code>$.couch.activeTasks({
+   *   success: function (data) {
+   *     console.log(data);
+   *   }
+   * });</code></pre>
+   * Outputs (for example):
+   * <pre><code>[
+   *  {
+   *   "pid" : "<0.11599.0>",
+   *   "status" : "Copied 0 of 18369 changes (0%)",
+   *   "task" : "recipes",
+   *   "type" : "Database Compaction"
+   *  }
+   *]</code></pre>
    */
-  function encodeDocId(docID) {
-    var parts = docID.split("/");
-    if (parts[0] == "_design") {
-      parts.shift();
-      return "_design/" + encodeURIComponent(parts.join('/'));
-    }
-    return encodeURIComponent(docID);
-  }
-
-  /**
-   * @private
-   */
-
-  var uuidCache = [];
+  (function($) {
 
-  $.extend($.couch, {
-    urlPrefix: '',
+    $.couch = $.couch || {};
+    /** @lends $.couch */
 
     /**
-     * You can obtain a list of active tasks by using the /_active_tasks URL.
-     * The result is a JSON array of the currently running tasks, with each task
-     * being described with a single object.
-     * @see <a href="http://techzone.couchbase.com/sites/default/files/uploads/
-     * all/documentation/couchbase-api-misc.html#couchbase-api-misc_active-task
-     * s_get">docs for /_active_tasks</a>
-     * @param {ajaxSettings} options <a href="http://api.jquery.com/jQuery.ajax
-     * /#jQuery-ajax-settings">jQuery ajax settings</a>
+     * @private
      */
-    activeTasks: function(options) {
-      ajax(
-        {url: this.urlPrefix + "/_active_tasks"},
-        options,
-        "Active task status could not be retrieved"
-      );
-    },
+    function encodeDocId(docID) {
+      var parts = docID.split("/");
+      if (parts[0] == "_design") {
+        parts.shift();
+        return "_design/" + encodeURIComponent(parts.join('/'));
+      }
+      return encodeURIComponent(docID);
+    }
 
     /**
-     * Returns a list of all the databases in the CouchDB instance
-     * @see <a href="http://techzone.couchbase.com/sites/default/files/uploads/
-     * all/documentation/couchbase-api-misc.html#couchbase-api-misc_active-task
-     * s_get">docs for /_all_dbs</a>
-     * @param {ajaxSettings} options <a href="http://api.jquery.com/jQuery.ajax
-     * /#jQuery-ajax-settings">jQuery ajax settings</a>
+     * @private
      */
-    allDbs: function(options) {
-      ajax(
-        {url: this.urlPrefix + "/_all_dbs"},
-        options,
-        "An error occurred retrieving the list of all databases"
-      );
-    },
 
-    /**
-     * View and edit the CouchDB configuration, called with just the options
-     * parameter the entire config is returned, you can be more specific by
-     * passing the section and option parameters, if you specify a value that
-     * value will be stored in the configuration.
-     * @see <a href="http://techzone.couchbase.com/sites/default/files/uploads/
-     * all/documentation/couchbase-api-config.html#couchbase-api-config_config
-     * -section-key_put">docs for /_config</a>
-     * @param {ajaxSettings} options
-     * <a href="http://api.jquery.com/jQuery.ajax/#jQuery-ajax-settings">
-     * jQuery ajax settings</a>
-     * @param {String} [section] the section of the config
-     * @param {String} [option] the particular config option
-     * @param {String} [value] value to be set
-     */
-    config: function(options, section, option, value) {
-      var req = {url: this.urlPrefix + "/_config/"};
-      if (section) {
-        req.url += encodeURIComponent(section) + "/";
-        if (option) {
-          req.url += encodeURIComponent(option);
-        }
-      }
-      if (value === null) {
-        req.type = "DELETE";        
-      } else if (value !== undefined) {
-        req.type = "PUT";
-        req.data = toJSON(value);
-        req.contentType = "application/json";
-        req.processData = false
-      }
+    var uuidCache = [];
 
-      ajax(req, options,
-        "An error occurred retrieving/updating the server configuration"
-      );
-    },
-    
-    /**
-     * Returns the session information for the currently logged in user.
-     * @param {ajaxSettings} options
-     * <a href="http://api.jquery.com/jQuery.ajax/#jQuery-ajax-settings">
-     * jQuery ajax settings</a>
-     */
-    session: function(options) {
-      options = options || {};
-      ajax({
-        type: "GET", url: this.urlPrefix + "/_session",
-        beforeSend: function(xhr) {
-            xhr.setRequestHeader('Accept', 'application/json');
-        },
-        complete: function(req) {
-          var resp = $.parseJSON(req.responseText);
-          if (req.status == 200) {
-            if (options.success) options.success(resp);
-          } else if (options.error) {
-            options.error(req.status, resp.error, resp.reason);
-          } else {
-            throw "An error occurred getting session info: " + resp.reason;
+    $.extend($.couch, {
+      urlPrefix: '',
+
+      /**
+       * You can obtain a list of active tasks by using the /_active_tasks URL.
+       * The result is a JSON array of the currently running tasks, with each task
+       * being described with a single object.
+       * @see <a href="http://techzone.couchbase.com/sites/default/files/uploads/
+       * all/documentation/couchbase-api-misc.html#couchbase-api-misc_active-task
+       * s_get">docs for /_active_tasks</a>
+       * @param {ajaxSettings} options <a href="http://api.jquery.com/jQuery.ajax
+       * /#jQuery-ajax-settings">jQuery ajax settings</a>
+       */
+      activeTasks: function(options) {
+        ajax(
+          {url: this.urlPrefix + "/_active_tasks"},
+          options,
+          "Active task status could not be retrieved"
+        );
+      },
+
+      /**
+       * Returns a list of all the databases in the CouchDB instance
+       * @see <a href="http://techzone.couchbase.com/sites/default/files/uploads/
+       * all/documentation/couchbase-api-misc.html#couchbase-api-misc_active-task
+       * s_get">docs for /_all_dbs</a>
+       * @param {ajaxSettings} options <a href="http://api.jquery.com/jQuery.ajax
+       * /#jQuery-ajax-settings">jQuery ajax settings</a>
+       */
+      allDbs: function(options) {
+        ajax(
+          {url: this.urlPrefix + "/_all_dbs"},
+          options,
+          "An error occurred retrieving the list of all databases"
+        );
+      },
+
+      /**
+       * View and edit the CouchDB configuration, called with just the options
+       * parameter the entire config is returned, you can be more specific by
+       * passing the section and option parameters, if you specify a value that
+       * value will be stored in the configuration.
+       * @see <a href="http://techzone.couchbase.com/sites/default/files/uploads/
+       * all/documentation/couchbase-api-config.html#couchbase-api-config_config
+       * -section-key_put">docs for /_config</a>
+       * @param {ajaxSettings} options
+       * <a href="http://api.jquery.com/jQuery.ajax/#jQuery-ajax-settings">
+       * jQuery ajax settings</a>
+       * @param {String} [section] the section of the config
+       * @param {String} [option] the particular config option
+       * @param {String} [value] value to be set
+       */
+      config: function(options, section, option, value) {
+        var req = {url: this.urlPrefix + "/_config/"};
+        if (section) {
+          req.url += encodeURIComponent(section) + "/";
+          if (option) {
+            req.url += encodeURIComponent(option);
           }
         }
-      });
-    },
-
-    /**
-     * @private
-     */
-    userDb : function(callback) {
-      $.couch.session({
-        success : function(resp) {
-          var userDb = $.couch.db(resp.info.authentication_db);
-          callback(userDb);
+        if (value === null) {
+          req.type = "DELETE";
+        } else if (value !== undefined) {
+          req.type = "PUT";
+          req.data = toJSON(value);
+          req.contentType = "application/json";
+          req.processData = false
         }
-      });
-    },
 
-    /**
-     * Create a new user on the CouchDB server, <code>user_doc</code> is an
-     * object with a <code>name</code> field and other information you want
-     * to store relating to that user, for example
-     * <code>{"name": "daleharvey"}</code>
-     * @param {Object} user_doc Users details
-     * @param {String} password Users password
-     * @param {ajaxSettings} options
-     * <a href="http://api.jquery.com/jQuery.ajax/#jQuery-ajax-settings">
-      * jQuery ajax settings</a>
-     */
-    signup: function(user_doc, password, options) {      
-      options = options || {};
-      user_doc.password = password;
-      user_doc.roles =  user_doc.roles || [];
-      user_doc.type =  user_doc.type = "user" || [];
-      var user_prefix = "org.couchdb.user:";
-      user_doc._id = user_doc._id || user_prefix + user_doc.name;
+        ajax(req, options,
+          "An error occurred retrieving/updating the server configuration"
+        );
+      },
 
-      $.couch.userDb(function(db) {
-        db.saveDoc(user_doc, options);
-      });
-    },
+      /**
+       * Returns the session information for the currently logged in user.
+       * @param {ajaxSettings} options
+       * <a href="http://api.jquery.com/jQuery.ajax/#jQuery-ajax-settings">
+       * jQuery ajax settings</a>
+       */
+      session: function(options) {
+        options = options || {};
+        ajax({
+          type: "GET", url: this.urlPrefix + "/_session",
+          beforeSend: function(xhr) {
+              xhr.setRequestHeader('Accept', 'application/json');
+          },
+          complete: function(req) {
+            var resp = $.parseJSON(req.responseText);
+            if (req.status == 200) {
+              if (options.success) options.success(resp);
+            } else if (options.error) {
+              options.error(req.status, resp.error, resp.reason);
+            } else {
+              throw "An error occurred getting session info: " + resp.reason;
+            }
+          }
+        });
+      },
 
-    /**
-     * Authenticate against CouchDB, the <code>options</code> parameter is
-      *expected to have <code>name</code> and <code>password</code> fields.
-     * @param {ajaxSettings} options
-     * <a href="http://api.jquery.com/jQuery.ajax/#jQuery-ajax-settings">
-     * jQuery ajax settings</a>
-     */
-    login: function(options) {
-      options = options || {};
-      $.ajax({
-        type: "POST", url: this.urlPrefix + "/_session", dataType: "json",
-        data: {name: options.name, password: options.password},
-        beforeSend: function(xhr) {
-            xhr.setRequestHeader('Accept', 'application/json');
-        },
-        complete: function(req) {
-          var resp = $.parseJSON(req.responseText);
-          if (req.status == 200) {
-            if (options.success) options.success(resp);
-          } else if (options.error) {
-            options.error(req.status, resp.error, resp.reason);
-          } else {
-            throw 'An error occurred logging in: ' + resp.reason;
+      /**
+       * @private
+       */
+      userDb : function(callback) {
+        $.couch.session({
+          success : function(resp) {
+            var userDb = $.couch.db(resp.info.authentication_db);
+            callback(userDb);
           }
-        }
-      });
-    },
+        });
+      },
 
+      /**
+       * Create a new user on the CouchDB server, <code>user_doc</code> is an
+       * object with a <code>name</code> field and other information you want
+       * to store relating to that user, for example
+       * <code>{"name": "daleharvey"}</code>
+       * @param {Object} user_doc Users details
+       * @param {String} password Users password
+       * @param {ajaxSettings} options
+       * <a href="http://api.jquery.com/jQuery.ajax/#jQuery-ajax-settings">
+        * jQuery ajax settings</a>
+       */
+      signup: function(user_doc, password, options) {
+        options = options || {};
+        user_doc.password = password;
+        user_doc.roles =  user_doc.roles || [];
+        user_doc.type =  user_doc.type = "user" || [];
+        var user_prefix = "org.couchdb.user:";
+        user_doc._id = user_doc._id || user_prefix + user_doc.name;
 
-    /**
-     * Delete your current CouchDB user session
-     * @param {ajaxSettings} options
-     * <a href="http://api.jquery.com/jQuery.ajax/#jQuery-ajax-settings">
-     * jQuery ajax settings</a>
-     */
-    logout: function(options) {
-      options = options || {};
-      $.ajax({
-        type: "DELETE", url: this.urlPrefix + "/_session", dataType: "json",
-        username : "_", password : "_",
-        beforeSend: function(xhr) {
-            xhr.setRequestHeader('Accept', 'application/json');
-        },
-        complete: function(req) {
-          var resp = $.parseJSON(req.responseText);
-          if (req.status == 200) {
-            if (options.success) options.success(resp);
-          } else if (options.error) {
-            options.error(req.status, resp.error, resp.reason);
-          } else {
-            throw 'An error occurred logging out: ' + resp.reason;
-          }
-        }
-      });
-    },
+        $.couch.userDb(function(db) {
+          db.saveDoc(user_doc, options);
+        });
+      },
 
-    /**
-     * @namespace
-     * $.couch.db is used to communicate with a specific CouchDB database
-     * <pre><code>var $db = $.couch.db("mydatabase");
-     *$db.allApps({
-     *  success: function (data) {
-     *    ... process data ...
-     *  }
-     *});
-     * </code></pre>
-     */
-    db: function(name, db_opts) {
-      db_opts = db_opts || {};
-      var rawDocs = {};
-      function maybeApplyVersion(doc) {
-        if (doc._id && doc._rev && rawDocs[doc._id] &&
-            rawDocs[doc._id].rev == doc._rev) {
-          // todo: can we use commonjs require here?
-          if (typeof Base64 == "undefined") {
-            throw 'Base64 support not found.';
-          } else {
-            doc._attachments = doc._attachments || {};
-            doc._attachments["rev-"+doc._rev.split("-")[0]] = {
-              content_type :"application/json",
-              data : Base64.encode(rawDocs[doc._id].raw)
-            };
-            return true;
+      /**
+       * Authenticate against CouchDB, the <code>options</code> parameter is
+        *expected to have <code>name</code> and <code>password</code> fields.
+       * @param {ajaxSettings} options
+       * <a href="http://api.jquery.com/jQuery.ajax/#jQuery-ajax-settings">
+       * jQuery ajax settings</a>
+       */
+      login: function(options) {
+        options = options || {};
+        $.ajax({
+          type: "POST", url: this.urlPrefix + "/_session", dataType: "json",
+          data: {name: options.name, password: options.password},
+          beforeSend: function(xhr) {
+              xhr.setRequestHeader('Accept', 'application/json');
+          },
+          complete: function(req) {
+            var resp = $.parseJSON(req.responseText);
+            if (req.status == 200) {
+              if (options.success) options.success(resp);
+            } else if (options.error) {
+              options.error(req.status, resp.error, resp.reason);
+            } else {
+              throw 'An error occurred logging in: ' + resp.reason;
+            }
           }
-        }
-      };
-      return /** @lends $.couch.db */{
-        name: name,
-        uri: this.urlPrefix + "/" + encodeURIComponent(name) + "/",
+        });
+      },
 
-        /**
-         * Request compaction of the specified database.
-         * @see <a href="http://techzone.couchbase.com/sites/default/files/
-         * uploads/all/documentation/couchbase-api-db.html#couchbase-api-db_
-         * db-compact_post">docs for /db/_compact</a>
-         * @param {ajaxSettings} options
-         * <a href="http://api.jquery.com/jQuery.ajax/#jQuery-ajax-settings">
-         * jQuery ajax settings</a>
-         */
-        compact: function(options) {
-          $.extend(options, {successStatus: 202});
-          ajax({
-              type: "POST", url: this.uri + "_compact",
-              data: "", processData: false
-            },
-            options,
-            "The database could not be compacted"
-          );
-        },
 
-        /**
-         * Cleans up the cached view output on disk for a given view.
-         * @see <a href="http://techzone.couchbase.com/sites/default/files/
-         * uploads/all/documentation/couchbase-api-db.html#couchbase-api-db
-         * _db-view-cleanup_post">docs for /db/_compact</a>
-         * @param {ajaxSettings} options <a href="http://api.jquery.com/
-         * jQuery.ajax/#jQuery-ajax-settings">jQuery ajax settings</a>
-         */
-        viewCleanup: function(options) {
-          $.extend(options, {successStatus: 202});
-          ajax({
-              type: "POST", url: this.uri + "_view_cleanup",
-              data: "", processData: false
-            },
-            options,
-            "The views could not be cleaned up"
-          );
-        },
+      /**
+       * Delete your current CouchDB user session
+       * @param {ajaxSettings} options
+       * <a href="http://api.jquery.com/jQuery.ajax/#jQuery-ajax-settings">
+       * jQuery ajax settings</a>
+       */
+      logout: function(options) {
+        options = options || {};
+        $.ajax({
+          type: "DELETE", url: this.urlPrefix + "/_session", dataType: "json",
+          username : "_", password : "_",
+          beforeSend: function(xhr) {
+              xhr.setRequestHeader('Accept', 'application/json');
+          },
+          complete: function(req) {
+            var resp = $.parseJSON(req.responseText);
+            if (req.status == 200) {
+              if (options.success) options.success(resp);
+            } else if (options.error) {
+              options.error(req.status, resp.error, resp.reason);
+            } else {
+              throw 'An error occurred logging out: ' + resp.reason;
+            }
+          }
+        });
+      },
 
-        /**
-         * Compacts the view indexes associated with the specified design
-         * document. You can use this in place of the full database compaction
-         * if you know a specific set of view indexes have been affected by a
-         * recent database change.
-         * @see <a href="http://techzone.couchbase.com/sites/default/files/upl
-         * oads/all/documentation/couchbase-api-db.html#couchbase-api-db_db-
-         * compact-design-doc_post">docs for /db/_compact/design-doc</a>
-         * @param {String} groupname Name of design-doc to compact
-         * @param {ajaxSettings} options <a href="http://api.jquery.com/
-         * jQuery.ajax/#jQuery-ajax-settings">jQuery ajax settings</a>
-         */
-        compactView: function(groupname, options) {
-          $.extend(options, {successStatus: 202});
-          ajax({
-              type: "POST", url: this.uri + "_compact/" + groupname,
-              data: "", processData: false
-            },
-            options,
-            "The view could not be compacted"
-          );
-        },
+      /**
+       * @namespace
+       * $.couch.db is used to communicate with a specific CouchDB database
+       * <pre><code>var $db = $.couch.db("mydatabase");
+       *$db.allApps({
+       *  success: function (data) {
+       *    ... process data ...
+       *  }
+       *});
+       * </code></pre>
+       */
+      db: function(name, db_opts) {
+        db_opts = db_opts || {};
+        var rawDocs = {};
+        function maybeApplyVersion(doc) {
+          if (doc._id && doc._rev && rawDocs[doc._id] &&
+              rawDocs[doc._id].rev == doc._rev) {
+            // todo: can we use commonjs require here?
+            if (typeof Base64 == "undefined") {
+              throw 'Base64 support not found.';
+            } else {
+              doc._attachments = doc._attachments || {};
+              doc._attachments["rev-"+doc._rev.split("-")[0]] = {
+                content_type :"application/json",
+                data : Base64.encode(rawDocs[doc._id].raw)
+              };
+              return true;
+            }
+          }
+        };
+        return /** @lends $.couch.db */{
+          name: name,
+          uri: this.urlPrefix + "/" + encodeURIComponent(name) + "/",
 
-        /**
-         * Create a new database
-         * @see <a href="http://techzone.couchbase.com/sites/default/files/
-         * uploads/all/documentation/couchbase-api-db.html#couchbase-api-db_
-         * db_put">docs for PUT /db/</a>
-         * @param {ajaxSettings} options <a href="http://api.jquery.com/
-         * jQuery.ajax/#jQuery-ajax-settings">jQuery ajax settings</a>
-         */
-        create: function(options) {
-          $.extend(options, {successStatus: 201});
-          ajax({
-              type: "PUT", url: this.uri, contentType: "application/json",
-              data: "", processData: false
-            },
-            options,
-            "The database could not be created"
-          );
-        },
+          /**
+           * Request compaction of the specified database.
+           * @see <a href="http://techzone.couchbase.com/sites/default/files/
+           * uploads/all/documentation/couchbase-api-db.html#couchbase-api-db_
+           * db-compact_post">docs for /db/_compact</a>
+           * @param {ajaxSettings} options
+           * <a href="http://api.jquery.com/jQuery.ajax/#jQuery-ajax-settings">
+           * jQuery ajax settings</a>
+           */
+          compact: function(options) {
+            $.extend(options, {successStatus: 202});
+            ajax({
+                type: "POST", url: this.uri + "_compact",
+                data: "", processData: false
+              },
+              options,
+              "The database could not be compacted"
+            );
+          },
 
-        /**
-         * Deletes the specified database, and all the documents and
-         * attachments contained within it.
-         * @see <a href="http://techzone.couchbase.com/sites/default/files/
-         * uploads/all/documentation/couchbase-api-db.html#couchbase-api-db_
-         * db_delete">docs for DELETE /db/</a>
-         * @param {ajaxSettings} options <a href="http://api.jquery.com/
-         * jQuery.ajax/#jQuery-ajax-settings">jQuery ajax settings</a>
-         */
-        drop: function(options) {
-          ajax(
-            {type: "DELETE", url: this.uri},
-            options,
-            "The database could not be deleted"
-          );
-        },
+          /**
+           * Cleans up the cached view output on disk for a given view.
+           * @see <a href="http://techzone.couchbase.com/sites/default/files/
+           * uploads/all/documentation/couchbase-api-db.html#couchbase-api-db
+           * _db-view-cleanup_post">docs for /db/_compact</a>
+           * @param {ajaxSettings} options <a href="http://api.jquery.com/
+           * jQuery.ajax/#jQuery-ajax-settings">jQuery ajax settings</a>
+           */
+          viewCleanup: function(options) {
+            $.extend(options, {successStatus: 202});
+            ajax({
+                type: "POST", url: this.uri + "_view_cleanup",
+                data: "", processData: false
+              },
+              options,
+              "The views could not be cleaned up"
+            );
+          },
 
-        /**
-         * Gets information about the specified database.
-         * @see <a href="http://techzone.couchbase.com/sites/default/files/
-         * uploads/all/documentation/couchbase-api-db.html#couchbase-api-db
-         * _db_get">docs for GET /db/</a>
-         * @param {ajaxSettings} options <a href="http://api.jquery.com/
-         * jQuery.ajax/#jQuery-ajax-settings">jQuery ajax settings</a>
-         */
-        info: function(options) {
-          ajax(
-            {url: this.uri},
-            options,
-            "Database information could not be retrieved"
-          );
-        },
+          /**
+           * Compacts the view indexes associated with the specified design
+           * document. You can use this in place of the full database compaction
+           * if you know a specific set of view indexes have been affected by a
+           * recent database change.
+           * @see <a href="http://techzone.couchbase.com/sites/default/files/upl
+           * oads/all/documentation/couchbase-api-db.html#couchbase-api-db_db-
+           * compact-design-doc_post">docs for /db/_compact/design-doc</a>
+           * @param {String} groupname Name of design-doc to compact
+           * @param {ajaxSettings} options <a href="http://api.jquery.com/
+           * jQuery.ajax/#jQuery-ajax-settings">jQuery ajax settings</a>
+           */
+          compactView: function(groupname, options) {
+            $.extend(options, {successStatus: 202});
+            ajax({
+                type: "POST", url: this.uri + "_compact/" + groupname,
+                data: "", processData: false
+              },
+              options,
+              "The view could not be compacted"
+            );
+          },
 
-        /**
-         * @namespace
-         * $.couch.db.changes provides an API for subscribing to the changes
-         * feed
-         * <pre><code>var $changes = $.couch.db("mydatabase").changes();
-         *$changes.onChange = function (data) {
-         *    ... process data ...
-         * }
-         * $changes.stop();
-         * </code></pre>
-         */
-        changes: function(since, options) {
+          /**
+           * Create a new database
+           * @see <a href="http://techzone.couchbase.com/sites/default/files/
+           * uploads/all/documentation/couchbase-api-db.html#couchbase-api-db_
+           * db_put">docs for PUT /db/</a>
+           * @param {ajaxSettings} options <a href="http://api.jquery.com/
+           * jQuery.ajax/#jQuery-ajax-settings">jQuery ajax settings</a>
+           */
+          create: function(options) {
+            $.extend(options, {successStatus: 201});
+            ajax({
+                type: "PUT", url: this.uri, contentType: "application/json",
+                data: "", processData: false
+              },
+              options,
+              "The database could not be created"
+            );
+          },
 
-          options = options || {};
-          // set up the promise object within a closure for this handler
-          var timeout = 100, db = this, active = true,
-            listeners = [],
-            promise = /** @lends $.couch.db.changes */ {
-              /**
-               * Add a listener callback
-               * @see <a href="http://techzone.couchbase.com/sites/default/
-               * files/uploads/all/documentation/couchbase-api-db.html#couch
-               * base-api-db_db-changes_get">docs for /db/_changes</a>
-               * @param {Function} fun Callback function to run when
-               * notified of changes.
-               */
-            onChange : function(fun) {
-              listeners.push(fun);
-            },
-              /**
-               * Stop subscribing to the changes feed
-               */
-            stop : function() {
-              active = false;
-            }
-          };
-          // call each listener when there is a change
-          function triggerListeners(resp) {
-            $.each(listeners, function() {
-              this(resp);
-            });
-          };
-          // when there is a change, call any listeners, then check for
-          // another change
-          options.success = function(resp) {
-            timeout = 100;
-            if (active) {
-              since = resp.last_seq;
-              triggerListeners(resp);
-              getChangesSince();
-            };
-          };
-          options.error = function() {
-            if (active) {
-              setTimeout(getChangesSince, timeout);
-              timeout = timeout * 2;
-            }
-          };
-          // actually make the changes request
-          function getChangesSince() {
-            var opts = $.extend({heartbeat : 10 * 1000}, options, {
-              feed : "longpoll",
-              since : since
-            });
+          /**
+           * Deletes the specified database, and all the documents and
+           * attachments contained within it.
+           * @see <a href="http://techzone.couchbase.com/sites/default/files/
+           * uploads/all/documentation/couchbase-api-db.html#couchbase-api-db_
+           * db_delete">docs for DELETE /db/</a>
+           * @param {ajaxSettings} options <a href="http://api.jquery.com/
+           * jQuery.ajax/#jQuery-ajax-settings">jQuery ajax settings</a>
+           */
+          drop: function(options) {
             ajax(
-              {url: db.uri + "_changes"+encodeOptions(opts)},
+              {type: "DELETE", url: this.uri},
               options,
-              "Error connecting to "+db.uri+"/_changes."
+              "The database could not be deleted"
             );
-          }
-          // start the first request
-          if (since) {
-            getChangesSince();
-          } else {
-            db.info({
-              success : function(info) {
-                since = info.update_seq;
+          },
+
+          /**
+           * Gets information about the specified database.
+           * @see <a href="http://techzone.couchbase.com/sites/default/files/
+           * uploads/all/documentation/couchbase-api-db.html#couchbase-api-db
+           * _db_get">docs for GET /db/</a>
+           * @param {ajaxSettings} options <a href="http://api.jquery.com/
+           * jQuery.ajax/#jQuery-ajax-settings">jQuery ajax settings</a>
+           */
+          info: function(options) {
+            ajax(
+              {url: this.uri},
+              options,
+              "Database information could not be retrieved"
+            );
+          },
+
+          /**
+           * @namespace
+           * $.couch.db.changes provides an API for subscribing to the changes
+           * feed
+           * <pre><code>var $changes = $.couch.db("mydatabase").changes();
+           *$changes.onChange = function (data) {
+           *    ... process data ...
+           * }
+           * $changes.stop();
+           * </code></pre>
+           */
+          changes: function(since, options) {
+
+            options = options || {};
+            // set up the promise object within a closure for this handler
+            var timeout = 100, db = this, active = true,
+              listeners = [],
+              promise = /** @lends $.couch.db.changes */ {
+                /**
+                 * Add a listener callback
+                 * @see <a href="http://techzone.couchbase.com/sites/default/
+                 * files/uploads/all/documentation/couchbase-api-db.html#couch
+                 * base-api-db_db-changes_get">docs for /db/_changes</a>
+                 * @param {Function} fun Callback function to run when
+                 * notified of changes.
+                 */
+              onChange : function(fun) {
+                listeners.push(fun);
+              },
+                /**
+                 * Stop subscribing to the changes feed
+                 */
+              stop : function() {
+                active = false;
+              }
+            };
+            // call each listener when there is a change
+            function triggerListeners(resp) {
+              $.each(listeners, function() {
+                this(resp);
+              });
+            };
+            // when there is a change, call any listeners, then check for
+            // another change
+            options.success = function(resp) {
+              timeout = 100;
+              if (active) {
+                since = resp.last_seq;
+                triggerListeners(resp);
                 getChangesSince();
+              };
+            };
+            options.error = function() {
+              if (active) {
+                setTimeout(getChangesSince, timeout);
+                timeout = timeout * 2;
               }
-            });
-          }
-          return promise;
-        },
+            };
+            // actually make the changes request
+            function getChangesSince() {
+              var opts = $.extend({heartbeat : 10 * 1000}, options, {
+                feed : "longpoll",
+                since : since
+              });
+              ajax(
+                {url: db.uri + "_changes"+encodeOptions(opts)},
+                options,
+                "Error connecting to "+db.uri+"/_changes."
+              );
+            }
+            // start the first request
+            if (since) {
+              getChangesSince();
+            } else {
+              db.info({
+                success : function(info) {
+                  since = info.update_seq;
+                  getChangesSince();
+                }
+              });
+            }
+            return promise;
+          },
 
-        /**
-         * Fetch all the docs in this db, you can specify an array of keys to
-         * fetch by passing the <code>keys</code> field in the
-         * <code>options</code>
-         * parameter.
-         * @see <a href="http://techzone.couchbase.com/sites/default/files/
-         * uploads/all/documentation/couchbase-api-db.html#couchbase-api-db_
-         * db-all-docs_get">docs for /db/all_docs/</a>
-         * @param {ajaxSettings} options <a href="http://api.jquery.com/
-         * jQuery.ajax/#jQuery-ajax-settings">jQuery ajax settings</a>
-         */
-        allDocs: function(options) {
-          var type = "GET";
-          var data = null;
-          if (options["keys"]) {
-            type = "POST";
-            var keys = options["keys"];
-            delete options["keys"];
-            data = toJSON({ "keys": keys });
-          }
-          ajax({
-              type: type,
-              data: data,
-              url: this.uri + "_all_docs" + encodeOptions(options)
-            },
-            options,
-            "An error occurred retrieving a list of all documents"
-          );
-        },
+          /**
+           * Fetch all the docs in this db, you can specify an array of keys to
+           * fetch by passing the <code>keys</code> field in the
+           * <code>options</code>
+           * parameter.
+           * @see <a href="http://techzone.couchbase.com/sites/default/files/
+           * uploads/all/documentation/couchbase-api-db.html#couchbase-api-db_
+           * db-all-docs_get">docs for /db/all_docs/</a>
+           * @param {ajaxSettings} options <a href="http://api.jquery.com/
+           * jQuery.ajax/#jQuery-ajax-settings">jQuery ajax settings</a>
+           */
+          allDocs: function(options) {
+            var type = "GET";
+            var data = null;
+            if (options["keys"]) {
+              type = "POST";
+              var keys = options["keys"];
+              delete options["keys"];
+              data = toJSON({ "keys": keys });
+            }
+            ajax({
+                type: type,
+                data: data,
+                url: this.uri + "_all_docs" + encodeOptions(options)
+              },
+              options,
+              "An error occurred retrieving a list of all documents"
+            );
+          },
 
-        /**
-         * Fetch all the design docs in this db
-         * @param {ajaxSettings} options <a href="http://api.jquery.com/
-         * jQuery.ajax/#jQuery-ajax-settings">jQuery ajax settings</a>
-         */
-        allDesignDocs: function(options) {
-          this.allDocs($.extend(
-            {startkey:"_design", endkey:"_design0"}, options));
-        },
+          /**
+           * Fetch all the design docs in this db
+           * @param {ajaxSettings} options <a href="http://api.jquery.com/
+           * jQuery.ajax/#jQuery-ajax-settings">jQuery ajax settings</a>
+           */
+          allDesignDocs: function(options) {
+            this.allDocs($.extend(
+              {startkey:"_design", endkey:"_design0"}, options));
+          },
 
-        /**
-         * Fetch all the design docs with an index.html, <code>options</code>
-         * parameter expects an <code>eachApp</code> field which is a callback
-         * called on each app found.
-         * @param {ajaxSettings} options <a href="http://api.jquery.com/
-         * jQuery.ajax/#jQuery-ajax-settings">jQuery ajax settings</a>
-         */
-        allApps: function(options) {
-          options = options || {};
-          var self = this;
-          if (options.eachApp) {
-            this.allDesignDocs({
-              success: function(resp) {
-                $.each(resp.rows, function() {
-                  self.openDoc(this.id, {
-                    success: function(ddoc) {
-                      var index, appPath, appName = ddoc._id.split('/');
-                      appName.shift();
-                      appName = appName.join('/');
-                      index = ddoc.couchapp && ddoc.couchapp.index;
-                      if (index) {
-                        appPath = ['', name, ddoc._id, index].join('/');
-                      } else if (ddoc._attachments &&
-                                 ddoc._attachments["index.html"]) {
-                        appPath = ['', name, ddoc._id, "index.html"].join('/');
+          /**
+           * Fetch all the design docs with an index.html, <code>options</code>
+           * parameter expects an <code>eachApp</code> field which is a callback
+           * called on each app found.
+           * @param {ajaxSettings} options <a href="http://api.jquery.com/
+           * jQuery.ajax/#jQuery-ajax-settings">jQuery ajax settings</a>
+           */
+          allApps: function(options) {
+            options = options || {};
+            var self = this;
+            if (options.eachApp) {
+              this.allDesignDocs({
+                success: function(resp) {
+                  $.each(resp.rows, function() {
+                    self.openDoc(this.id, {
+                      success: function(ddoc) {
+                        var index, appPath, appName = ddoc._id.split('/');
+                        appName.shift();
+                        appName = appName.join('/');
+                        index = ddoc.couchapp && ddoc.couchapp.index;
+                        if (index) {
+                          appPath = ['', name, ddoc._id, index].join('/');
+                        } else if (ddoc._attachments &&
+                                   ddoc._attachments["index.html"]) {
+                          appPath = ['', name, ddoc._id, "index.html"].join('/');
+                        }
+                        if (appPath) options.eachApp(appName, appPath, ddoc);
                       }
-                      if (appPath) options.eachApp(appName, appPath, ddoc);
-                    }
+                    });
                   });
-                });
-              }
-            });
-          } else {
-            throw 'Please provide an eachApp function for allApps()';
-          }
-        },
+                }
+              });
+            } else {
+              throw 'Please provide an eachApp function for allApps()';
+            }
+          },
 
-        /**
-         * Returns the specified doc from the specified db.
-         * @see <a href="http://techzone.couchbase.com/sites/default/files/
-         * uploads/all/documentation/couchbase-api-dbdoc.html#couchbase-api-
-         * dbdoc_db-doc_get">docs for GET /db/doc</a>
-         * @param {String} docId id of document to fetch
-         * @param {ajaxSettings} options <a href="http://api.jquery.com/
-         * jQuery.ajax/#jQuery-ajax-settings">jQuery ajax settings</a>
-         * @param {ajaxSettings} ajaxOptions <a href="http://api.jquery.com/
-         * jQuery.ajax/#jQuery-ajax-settings">jQuery ajax settings</a>
-         */
-        openDoc: function(docId, options, ajaxOptions) {
-          options = options || {};
-          if (db_opts.attachPrevRev || options.attachPrevRev) {
-            $.extend(options, {
-              beforeSuccess : function(req, doc) {
-                rawDocs[doc._id] = {
-                  rev : doc._rev,
-                  raw : req.responseText
-                };
-              }
-            });
-          } else {
-            $.extend(options, {
-              beforeSuccess : function(req, doc) {
-                if (doc["jquery.couch.attachPrevRev"]) {
+          /**
+           * Returns the specified doc from the specified db.
+           * @see <a href="http://techzone.couchbase.com/sites/default/files/
+           * uploads/all/documentation/couchbase-api-dbdoc.html#couchbase-api-
+           * dbdoc_db-doc_get">docs for GET /db/doc</a>
+           * @param {String} docId id of document to fetch
+           * @param {ajaxSettings} options <a href="http://api.jquery.com/
+           * jQuery.ajax/#jQuery-ajax-settings">jQuery ajax settings</a>
+           * @param {ajaxSettings} ajaxOptions <a href="http://api.jquery.com/
+           * jQuery.ajax/#jQuery-ajax-settings">jQuery ajax settings</a>
+           */
+          openDoc: function(docId, options, ajaxOptions) {
+            options = options || {};
+            if (db_opts.attachPrevRev || options.attachPrevRev) {
+              $.extend(options, {
+                beforeSuccess : function(req, doc) {
                   rawDocs[doc._id] = {
                     rev : doc._rev,
                     raw : req.responseText
                   };
                 }
-              }
-            });
-          }
-          ajax({url: this.uri + encodeDocId(docId) + encodeOptions(options)},
-            options,
-            "The document could not be retrieved",
-            ajaxOptions
-          );
-        },
+              });
+            } else {
+              $.extend(options, {
+                beforeSuccess : function(req, doc) {
+                  if (doc["jquery.couch.attachPrevRev"]) {
+                    rawDocs[doc._id] = {
+                      rev : doc._rev,
+                      raw : req.responseText
+                    };
+                  }
+                }
+              });
+            }
+            ajax({url: this.uri + encodeDocId(docId) + encodeOptions(options)},
+              options,
+              "The document could not be retrieved",
+              ajaxOptions
+            );
+          },
 
-        /**
-         * Create a new document in the specified database, using the supplied
-         * JSON document structure. If the JSON structure includes the _id
-         * field, then the document will be created with the specified document
-         * ID. If the _id field is not specified, a new unique ID will be
-         * generated.
-         * @see <a href="http://techzone.couchbase.com/sites/default/files/
-         * uploads/all/documentation/couchbase-api-dbdoc.html#couchbase-api-
-         * dbdoc_db_post">docs for GET /db/doc</a>
-         * @param {String} doc document to save
-         * @param {ajaxSettings} options <a href="http://api.jquery.com/
-         * jQuery.ajax/#jQuery-ajax-settings">jQuery ajax settings</a>
-         */
-        saveDoc: function(doc, options) {
-          options = options || {};
-          var db = this;
-          var beforeSend = fullCommit(options);
-          if (doc._id === undefined) {
-            var method = "POST";
-            var uri = this.uri;
-          } else {
-            var method = "PUT";
-            var uri = this.uri + encodeDocId(doc._id);
-          }
-          var versioned = maybeApplyVersion(doc);
-          $.ajax({
-            type: method, url: uri + encodeOptions(options),
-            contentType: "application/json",
-            dataType: "json", data: toJSON(doc),
-            beforeSend : beforeSend,
-            complete: function(req) {
-              var resp = $.parseJSON(req.responseText);
-              if (req.status == 200 || req.status == 201 || req.status == 202) {
-                doc._id = resp.id;
-                doc._rev = resp.rev;
-                if (versioned) {
-                  db.openDoc(doc._id, {
-                    attachPrevRev : true,
-                    success : function(d) {
-                      doc._attachments = d._attachments;
-                      if (options.success) options.success(resp);
-                    }
-                  });
+          /**
+           * Create a new document in the specified database, using the supplied
+           * JSON document structure. If the JSON structure includes the _id
+           * field, then the document will be created with the specified document
+           * ID. If the _id field is not specified, a new unique ID will be
+           * generated.
+           * @see <a href="http://techzone.couchbase.com/sites/default/files/
+           * uploads/all/documentation/couchbase-api-dbdoc.html#couchbase-api-
+           * dbdoc_db_post">docs for GET /db/doc</a>
+           * @param {String} doc document to save
+           * @param {ajaxSettings} options <a href="http://api.jquery.com/
+           * jQuery.ajax/#jQuery-ajax-settings">jQuery ajax settings</a>
+           */
+          saveDoc: function(doc, options) {
+            options = options || {};
+            var db = this;
+            var beforeSend = fullCommit(options);
+            if (doc._id === undefined) {
+              var method = "POST";
+              var uri = this.uri;
+            } else {
+              var method = "PUT";
+              var uri = this.uri + encodeDocId(doc._id);
+            }
+            var versioned = maybeApplyVersion(doc);
+            $.ajax({
+              type: method, url: uri + encodeOptions(options),
+              contentType: "application/json",
+              dataType: "json", data: toJSON(doc),
+              beforeSend : beforeSend,
+              complete: function(req) {
+                var resp = $.parseJSON(req.responseText);
+                if (req.status == 200 || req.status == 201 || req.status == 202) {
+                  doc._id = resp.id;
+                  doc._rev = resp.rev;
+                  if (versioned) {
+                    db.openDoc(doc._id, {
+                      attachPrevRev : true,
+                      success : function(d) {
+                        doc._attachments = d._attachments;
+                        if (options.success) options.success(resp);
+                      }
+                    });
+                  } else {
+                    if (options.success) options.success(resp);
+                  }
+                } else if (options.error) {
+                  options.error(req.status, resp.error, resp.reason);
                 } else {
-                  if (options.success) options.success(resp);
+                  throw "The document could not be saved: " + resp.reason;
                 }
-              } else if (options.error) {
-                options.error(req.status, resp.error, resp.reason);
-              } else {
-                throw "The document could not be saved: " + resp.reason;
               }
-            }
-          });
-        },
+            });
+          },
 
-        /**
-         * Save a list of documents
-         * @see <a href="http://techzone.couchbase.com/sites/default/files/
-         * uploads/all/documentation/couchbase-api-db.html#couchbase-api-db_
-         * db-bulk-docs_post">docs for /db/_bulk_docs</a>
-         * @param {Object[]} docs List of documents to save
-         * @param {ajaxSettings} options <a href="http://api.jquery.com/
-         * jQuery.ajax/#jQuery-ajax-settings">jQuery ajax settings</a>
-         */
-        bulkSave: function(docs, options) {
-          var beforeSend = fullCommit(options);
-          $.extend(options, {successStatus: 201, beforeSend : beforeSend});
-          ajax({
-              type: "POST",
-              url: this.uri + "_bulk_docs" + encodeOptions(options),
-              contentType: "application/json", data: toJSON(docs)
-            },
-            options,
-            "The documents could not be saved"
-          );
-        },
+          /**
+           * Save a list of documents
+           * @see <a href="http://techzone.couchbase.com/sites/default/files/
+           * uploads/all/documentation/couchbase-api-db.html#couchbase-api-db_
+           * db-bulk-docs_post">docs for /db/_bulk_docs</a>
+           * @param {Object[]} docs List of documents to save
+           * @param {ajaxSettings} options <a href="http://api.jquery.com/
+           * jQuery.ajax/#jQuery-ajax-settings">jQuery ajax settings</a>
+           */
+          bulkSave: function(docs, options) {
+            var beforeSend = fullCommit(options);
+            $.extend(options, {successStatus: 201, beforeSend : beforeSend});
+            ajax({
+                type: "POST",
+                url: this.uri + "_bulk_docs" + encodeOptions(options),
+                contentType: "application/json", data: toJSON(docs)
+              },
+              options,
+              "The documents could not be saved"
+            );
+          },
 
-        /**
-         * Deletes the specified document from the database. You must supply
-         * the current (latest) revision and <code>id</code> of the document
-         * to delete eg <code>removeDoc({_id:"mydoc", _rev: "1-2345"})</code>
-         * @see <a href="http://techzone.couchbase.com/sites/default/files/
-         * uploads/all/documentation/couchbase-api-dbdoc.html#couchbase-api
-         * -dbdoc_db-doc_delete">docs for DELETE /db/doc</a>
-         * @param {Object} doc Document to delete
-         * @param {ajaxSettings} options <a href="http://api.jquery.com/
-         * jQuery.ajax/#jQuery-ajax-settings">jQuery ajax settings</a>
-         */
-        removeDoc: function(doc, options) {
-          ajax({
-              type: "DELETE",
-              url: this.uri +
-                   encodeDocId(doc._id) +
-                   encodeOptions({rev: doc._rev})
-            },
-            options,
-            "The document could not be deleted"
-          );
-        },
+          /**
+           * Deletes the specified document from the database. You must supply
+           * the current (latest) revision and <code>id</code> of the document
+           * to delete eg <code>removeDoc({_id:"mydoc", _rev: "1-2345"})</code>
+           * @see <a href="http://techzone.couchbase.com/sites/default/files/
+           * uploads/all/documentation/couchbase-api-dbdoc.html#couchbase-api
+           * -dbdoc_db-doc_delete">docs for DELETE /db/doc</a>
+           * @param {Object} doc Document to delete
+           * @param {ajaxSettings} options <a href="http://api.jquery.com/
+           * jQuery.ajax/#jQuery-ajax-settings">jQuery ajax settings</a>
+           */
+          removeDoc: function(doc, options) {
+            ajax({
+                type: "DELETE",
+                url: this.uri +
+                     encodeDocId(doc._id) +
+                     encodeOptions({rev: doc._rev})
+              },
+              options,
+              "The document could not be deleted"
+            );
+          },
 
-        /**
-         * Remove a set of documents
-         * @see <a href="http://techzone.couchbase.com/sites/default/files/
-         * uploads/all/documentation/couchbase-api-db.html#couchbase-api-db_
-         * db-bulk-docs_post">docs for /db/_bulk_docs</a>
-         * @param {String[]} docs List of document id's to remove
-         * @param {ajaxSettings} options <a href="http://api.jquery.com/
-         * jQuery.ajax/#jQuery-ajax-settings">jQuery ajax settings</a>
-         */
-        bulkRemove: function(docs, options){
-          docs.docs = $.each(
-            docs.docs, function(i, doc){
-              doc._deleted = true;
-            }
-          );
-          $.extend(options, {successStatus: 201});
-          ajax({
-              type: "POST",
-              url: this.uri + "_bulk_docs" + encodeOptions(options),
-              data: toJSON(docs)
-            },
-            options,
-            "The documents could not be deleted"
-          );
-        },
+          /**
+           * Remove a set of documents
+           * @see <a href="http://techzone.couchbase.com/sites/default/files/
+           * uploads/all/documentation/couchbase-api-db.html#couchbase-api-db_
+           * db-bulk-docs_post">docs for /db/_bulk_docs</a>
+           * @param {String[]} docs List of document id's to remove
+           * @param {ajaxSettings} options <a href="http://api.jquery.com/
+           * jQuery.ajax/#jQuery-ajax-settings">jQuery ajax settings</a>
+           */
+          bulkRemove: function(docs, options){
+            docs.docs = $.each(
+              docs.docs, function(i, doc){
+                doc._deleted = true;
+              }
+            );
+            $.extend(options, {successStatus: 201});
+            ajax({
+                type: "POST",
+                url: this.uri + "_bulk_docs" + encodeOptions(options),
+                data: toJSON(docs)
+              },
+              options,
+              "The documents could not be deleted"
+            );
+          },
 
-        /**
-         * The COPY command (which is non-standard HTTP) copies an existing
-         * document to a new or existing document.
-         * @see <a href="http://techzone.couchbase.com/sites/default/files/
-         * uploads/all/documentation/couchbase-api-dbdoc.html#couchbase-api-
-         * dbdoc_db-doc_copy">docs for COPY /db/doc</a>
-         * @param {String[]} docId document id to copy
-         * @param {ajaxSettings} options <a href="http://api.jquery.com/
-         * jQuery.ajax/#jQuery-ajax-settings">jQuery ajax settings</a>
-         * @param {ajaxSettings} options <a href="http://api.jquery.com/
-         * jQuery.ajax/#jQuery-ajax-settings">jQuery ajax settings</a>
-         */
-        copyDoc: function(docId, options, ajaxOptions) {
-          ajaxOptions = $.extend(ajaxOptions, {
-            complete: function(req) {
-              var resp = $.parseJSON(req.responseText);
-              if (req.status == 201) {
-                if (options.success) options.success(resp);
-              } else if (options.error) {
-                options.error(req.status, resp.error, resp.reason);
-              } else {
-                throw "The document could not be copied: " + resp.reason;
+          /**
+           * The COPY command (which is non-standard HTTP) copies an existing
+           * document to a new or existing document.
+           * @see <a href="http://techzone.couchbase.com/sites/default/files/
+           * uploads/all/documentation/couchbase-api-dbdoc.html#couchbase-api-
+           * dbdoc_db-doc_copy">docs for COPY /db/doc</a>
+           * @param {String[]} docId document id to copy
+           * @param {ajaxSettings} options <a href="http://api.jquery.com/
+           * jQuery.ajax/#jQuery-ajax-settings">jQuery ajax settings</a>
+           * @param {ajaxSettings} options <a href="http://api.jquery.com/
+           * jQuery.ajax/#jQuery-ajax-settings">jQuery ajax settings</a>
+           */
+          copyDoc: function(docId, options, ajaxOptions) {
+            ajaxOptions = $.extend(ajaxOptions, {
+              complete: function(req) {
+                var resp = $.parseJSON(req.responseText);
+                if (req.status == 201) {
+                  if (options.success) options.success(resp);
+                } else if (options.error) {
+                  options.error(req.status, resp.error, resp.reason);
+                } else {
+                  throw "The document could not be copied: " + resp.reason;
+                }
               }
+            });
+            ajax({
+                type: "COPY",
+                url: this.uri + encodeDocId(docId)
+              },
+              options,
+              "The document could not be copied",
+              ajaxOptions
+            );
+          },
+
+          /**
+           * Creates (and executes) a temporary view based on the view function
+           * supplied in the JSON request.
+           * @see <a href="http://techzone.couchbase.com/sites/default/files/
+           * uploads/all/documentation/couchbase-api-db.html#couchbase-api-db
+           * _db-temp-view_post">docs for /db/_temp_view</a>
+           * @param {Function} mapFun Map function
+           * @param {Function} reduceFun Reduce function
+           * @param {Function} language Language the map / reduce funs are
+           * implemented in
+           * @param {ajaxSettings} options <a href="http://api.jquery.com/
+           * jQuery.ajax/#jQuery-ajax-settings">jQuery ajax settings</a>
+           */
+          query: function(mapFun, reduceFun, language, options) {
+            language = language || "javascript";
+            if (typeof(mapFun) !== "string") {
+              mapFun = mapFun.toSource ? mapFun.toSource()
+                : "(" + mapFun.toString() + ")";
             }
-          });
-          ajax({
-              type: "COPY",
-              url: this.uri + encodeDocId(docId)
-            },
-            options,
-            "The document could not be copied",
-            ajaxOptions
-          );
-        },
+            var body = {language: language, map: mapFun};
+            if (reduceFun != null) {
+              if (typeof(reduceFun) !== "string")
+                reduceFun = reduceFun.toSource ? reduceFun.toSource()
+                  : "(" + reduceFun.toString() + ")";
+              body.reduce = reduceFun;
+            }
+            ajax({
+                type: "POST",
+                url: this.uri + "_temp_view" + encodeOptions(options),
+                contentType: "application/json", data: toJSON(body)
+              },
+              options,
+              "An error occurred querying the database"
+            );
+          },
 
-        /**
-         * Creates (and executes) a temporary view based on the view function
-         * supplied in the JSON request.
-         * @see <a href="http://techzone.couchbase.com/sites/default/files/
-         * uploads/all/documentation/couchbase-api-db.html#couchbase-api-db
-         * _db-temp-view_post">docs for /db/_temp_view</a>
-         * @param {Function} mapFun Map function
-         * @param {Function} reduceFun Reduce function
-         * @param {Function} language Language the map / reduce funs are
-         * implemented in
-         * @param {ajaxSettings} options <a href="http://api.jquery.com/
-         * jQuery.ajax/#jQuery-ajax-settings">jQuery ajax settings</a>
-         */
-        query: function(mapFun, reduceFun, language, options) {
-          language = language || "javascript";
-          if (typeof(mapFun) !== "string") {
-            mapFun = mapFun.toSource ? mapFun.toSource()
-              : "(" + mapFun.toString() + ")";
-          }
-          var body = {language: language, map: mapFun};
-          if (reduceFun != null) {
-            if (typeof(reduceFun) !== "string")
-              reduceFun = reduceFun.toSource ? reduceFun.toSource()
-                : "(" + reduceFun.toString() + ")";
-            body.reduce = reduceFun;
-          }
-          ajax({
-              type: "POST",
-              url: this.uri + "_temp_view" + encodeOptions(options),
-              contentType: "application/json", data: toJSON(body)
-            },
-            options,
-            "An error occurred querying the database"
-          );
-        },
+          /**
+           * Fetch a _list view output, you can specify a list of
+           * <code>keys</code> in the options object to recieve only those keys.
+           * @see <a href="http://techzone.couchbase.com/sites/default/files/
+           * uploads/all/documentation/couchbase-api-design.html#couchbase-api
+           * -design_db-design-designdoc-list-listname-viewname_get">
+           * docs for /db/_design/design-doc/_list/l1/v1</a>
+           * @param {String} list Listname in the form of ddoc/listname
+           * @param {String} view View to run list against
+           * @param {options} CouchDB <a href="http://wiki.apache.org/couchdb/
+           * HTTP_view_API">View Options</a>
+           * @param {ajaxSettings} options <a href="http://api.jquery.com/
+           * jQuery.ajax/#jQuery-ajax-settings">jQuery ajax settings</a>
+           */
+          list: function(list, view, options, ajaxOptions) {
+            var list = list.split('/');
+            var options = options || {};
+            var type = 'GET';
+            var data = null;
+            if (options['keys']) {
+              type = 'POST';
+              var keys = options['keys'];
+              delete options['keys'];
+              data = toJSON({'keys': keys });
+            }
+            ajax({
+                type: type,
+                data: data,
+                url: this.uri + '_design/' + list[0] +
+                     '/_list/' + list[1] + '/' + view + encodeOptions(options)
+                },
+                ajaxOptions, 'An error occured accessing the list'
+            );
+          },
 
-        /**
-         * Fetch a _list view output, you can specify a list of
-         * <code>keys</code> in the options object to recieve only those keys.
-         * @see <a href="http://techzone.couchbase.com/sites/default/files/
-         * uploads/all/documentation/couchbase-api-design.html#couchbase-api
-         * -design_db-design-designdoc-list-listname-viewname_get">
-         * docs for /db/_design/design-doc/_list/l1/v1</a>
-         * @param {String} list Listname in the form of ddoc/listname
-         * @param {String} view View to run list against
-         * @param {options} CouchDB <a href="http://wiki.apache.org/couchdb/
-         * HTTP_view_API">View Options</a>
-         * @param {ajaxSettings} options <a href="http://api.jquery.com/
-         * jQuery.ajax/#jQuery-ajax-settings">jQuery ajax settings</a>
-         */
-        list: function(list, view, options, ajaxOptions) {
-          var list = list.split('/');
-          var options = options || {};
-          var type = 'GET';
-          var data = null;
-          if (options['keys']) {
-            type = 'POST';
-            var keys = options['keys'];
-            delete options['keys'];
-            data = toJSON({'keys': keys });
-          }
-          ajax({
-              type: type,
-              data: data,
-              url: this.uri + '_design/' + list[0] +
-                   '/_list/' + list[1] + '/' + view + encodeOptions(options)
+          /**
+           * Executes the specified view-name from the specified design-doc
+           * design document, you can specify a list of <code>keys</code>
+           * in the options object to recieve only those keys.
+           * @see <a href="http://techzone.couchbase.com/sites/default/files/
+           * uploads/all/documentation/couchbase-api-design.html#couchbase-api-
+           * design_db-design-designdoc-view-viewname_get">docs for /db/
+           * _design/design-doc/_list/l1/v1</a>
+           * @param {String} name View to run list against (string should have
+           * the design-doc name followed by a slash and the view name)
+           * @param {ajaxSettings} options <a href="http://api.jquery.com/
+           * jQuery.ajax/#jQuery-ajax-settings">jQuery ajax settings</a>
+           */
+          view: function(name, options) {
+            var name = name.split('/');
+            var options = options || {};
+            var type = "GET";
+            var data= null;
+            if (options["keys"]) {
+              type = "POST";
+              var keys = options["keys"];
+              delete options["keys"];
+              data = toJSON({ "keys": keys });
+            }
+            ajax({
+                type: type,
+                data: data,
+                url: this.uri + "_design/" + name[0] +
+                     "/_view/" + name[1] + encodeOptions(options)
               },
-              ajaxOptions, 'An error occured accessing the list'
-          );
-        },
+              options, "An error occurred accessing the view"
+            );
+          },
 
-        /**
-         * Executes the specified view-name from the specified design-doc
-         * design document, you can specify a list of <code>keys</code>
-         * in the options object to recieve only those keys.
-         * @see <a href="http://techzone.couchbase.com/sites/default/files/
-         * uploads/all/documentation/couchbase-api-design.html#couchbase-api-
-         * design_db-design-designdoc-view-viewname_get">docs for /db/
-         * _design/design-doc/_list/l1/v1</a>
-         * @param {String} name View to run list against (string should have 
-         * the design-doc name followed by a slash and the view name)
-         * @param {ajaxSettings} options <a href="http://api.jquery.com/
-         * jQuery.ajax/#jQuery-ajax-settings">jQuery ajax settings</a>
-         */
-        view: function(name, options) {
-          var name = name.split('/');
-          var options = options || {};
-          var type = "GET";
-          var data= null;
-          if (options["keys"]) {
-            type = "POST";
-            var keys = options["keys"];
-            delete options["keys"];
-            data = toJSON({ "keys": keys });
-          }
-          ajax({
-              type: type,
-              data: data,
-              url: this.uri + "_design/" + name[0] +
-                   "/_view/" + name[1] + encodeOptions(options)
+          /**
+           * Fetch an arbitrary CouchDB database property
+           * @see <a href="http://techzone.couchbase.com/sites/default/files/
+           * uploads/all/documentation/couchbase-api.html">docs for /db/_prop</a>
+           * @param {String} propName Propery name to fetch
+           * @param {ajaxSettings} options <a href="http://api.jquery.com/
+           * jQuery.ajax/#jQuery-ajax-settings">jQuery ajax settings</a>
+           * @param {ajaxSettings} ajaxOptions <a href="http://api.jquery.com/
+           * jQuery.ajax/#jQuery-ajax-settings">jQuery ajax settings</a>
+           */
+          getDbProperty: function(propName, options, ajaxOptions) {
+            ajax({url: this.uri + propName + encodeOptions(options)},
+              options,
+              "The property could not be retrieved",
+              ajaxOptions
+            );
+          },
+
+          /**
+           * Set an arbitrary CouchDB database property
+           * @see <a href="http://techzone.couchbase.com/sites/default/files/
+           * uploads/all/documentation/couchbase-api.html">docs for /db/_prop</a>
+           * @param {String} propName Propery name to fetch
+           * @param {String} propValue Propery value to set
+           * @param {ajaxSettings} options <a href="http://api.jquery.com/
+           * jQuery.ajax/#jQuery-ajax-settings">jQuery ajax settings</a>
+           * @param {ajaxSettings} ajaxOptions <a href="http://api.jquery.com/
+           * jQuery.ajax/#jQuery-ajax-settings">jQuery ajax settings</a>
+           */
+          setDbProperty: function(propName, propValue, options, ajaxOptions) {
+            ajax({
+              type: "PUT",
+              url: this.uri + propName + encodeOptions(options),
+              data : JSON.stringify(propValue)
             },
-            options, "An error occurred accessing the view"
-          );
-        },
+              options,
+              "The property could not be updated",
+              ajaxOptions
+            );
+          }
+        };
+      },
 
-        /**
-         * Fetch an arbitrary CouchDB database property
-         * @see <a href="http://techzone.couchbase.com/sites/default/files/
-         * uploads/all/documentation/couchbase-api.html">docs for /db/_prop</a>
-         * @param {String} propName Propery name to fetch
-         * @param {ajaxSettings} options <a href="http://api.jquery.com/
-         * jQuery.ajax/#jQuery-ajax-settings">jQuery ajax settings</a>
-         * @param {ajaxSettings} ajaxOptions <a href="http://api.jquery.com/
-         * jQuery.ajax/#jQuery-ajax-settings">jQuery ajax settings</a>
-         */
-        getDbProperty: function(propName, options, ajaxOptions) {
-          ajax({url: this.uri + propName + encodeOptions(options)},
-            options,
-            "The property could not be retrieved",
-            ajaxOptions
-          );
-        },
+      encodeDocId: encodeDocId,
 
-        /**
-         * Set an arbitrary CouchDB database property
-         * @see <a href="http://techzone.couchbase.com/sites/default/files/
-         * uploads/all/documentation/couchbase-api.html">docs for /db/_prop</a>
-         * @param {String} propName Propery name to fetch
-         * @param {String} propValue Propery value to set
-         * @param {ajaxSettings} options <a href="http://api.jquery.com/
-         * jQuery.ajax/#jQuery-ajax-settings">jQuery ajax settings</a>
-         * @param {ajaxSettings} ajaxOptions <a href="http://api.jquery.com/
-         * jQuery.ajax/#jQuery-ajax-settings">jQuery ajax settings</a>
-         */
-        setDbProperty: function(propName, propValue, options, ajaxOptions) {
-          ajax({
-            type: "PUT", 
-            url: this.uri + propName + encodeOptions(options),
-            data : JSON.stringify(propValue)
+      /**
+       * Accessing the root of a CouchDB instance returns meta information about
+       * the instance. The response is a JSON structure containing information
+       * about the server, including a welcome message and the version of the
+       * server.
+       * @see <a href="http://techzone.couchbase.com/sites/default/files/uploads/
+       * all/documentation/couchbase-api-misc.html#couchbase-api-misc_root_get">
+       * docs for GET /</a>
+       * @param {ajaxSettings} options <a href="http://api.jquery.com/
+       * jQuery.ajax/#jQuery-ajax-settings">jQuery ajax settings</a>
+       */
+      info: function(options) {
+        ajax(
+          {url: this.urlPrefix + "/"},
+          options,
+          "Server information could not be retrieved"
+        );
+      },
+
+      /**
+       * Request, configure, or stop, a replication operation.
+       * @see <a href="http://techzone.couchbase.com/sites/default/files/
+       * uploads/all/documentation/couchbase-api-misc.html#couchbase-api-
+       * misc_replicate_post">docs for POST /_replicate</a>
+       * @param {String} source Path or url to source database
+       * @param {String} target Path or url to target database
+       * @param {ajaxSettings} ajaxOptions <a href="http://api.jquery.com/
+       * jQuery.ajax/#jQuery-ajax-settings">jQuery ajax settings</a>
+       * @param {Object} repOpts Additional replication options
+       */
+      replicate: function(source, target, ajaxOptions, repOpts) {
+        repOpts = $.extend({source: source, target: target}, repOpts);
+        if (repOpts.continuous && !repOpts.cancel) {
+          ajaxOptions.successStatus = 202;
+        }
+        ajax({
+            type: "POST", url: this.urlPrefix + "/_replicate",
+            data: JSON.stringify(repOpts),
+            contentType: "application/json"
           },
-            options,
-            "The property could not be updated",
-            ajaxOptions
+          ajaxOptions,
+          "Replication failed"
+        );
+      },
+
+      /**
+       * Fetch a new UUID
+       * @see <a href="http://techzone.couchbase.com/sites/default/files/
+       * uploads/all/documentation/couchbase-api-misc.html#couchbase-api-
+       * misc_uuids_get">docs for /_uuids</a>
+       * @param {Int} cacheNum Number of uuids to keep cached for future use
+       */
+      newUUID: function(cacheNum) {
+        if (cacheNum === undefined) {
+          cacheNum = 1;
+        }
+        if (!uuidCache.length) {
+          ajax({url: this.urlPrefix + "/_uuids", data: {count: cacheNum}, async:
+                false}, {
+              success: function(resp) {
+                uuidCache = resp.uuids;
+              }
+            },
+            "Failed to retrieve UUID batch."
           );
         }
-      };
-    },
-
-    encodeDocId: encodeDocId, 
+        return uuidCache.shift();
+      }
+    });
 
     /**
-     * Accessing the root of a CouchDB instance returns meta information about
-     * the instance. The response is a JSON structure containing information
-     * about the server, including a welcome message and the version of the
-     * server.
-     * @see <a href="http://techzone.couchbase.com/sites/default/files/uploads/
-     * all/documentation/couchbase-api-misc.html#couchbase-api-misc_root_get">
-     * docs for GET /</a>
-     * @param {ajaxSettings} options <a href="http://api.jquery.com/
-     * jQuery.ajax/#jQuery-ajax-settings">jQuery ajax settings</a>
+     * @private
      */
-    info: function(options) {
-      ajax(
-        {url: this.urlPrefix + "/"},
-        options,
-        "Server information could not be retrieved"
-      );
-    },
+    function ajax(obj, options, errorMessage, ajaxOptions) {
+      var timeStart;
+      var defaultAjaxOpts = {
+        contentType: "application/json",
+        headers:{"Accept": "application/json"}
+      };
 
-    /**
-     * Request, configure, or stop, a replication operation.
-     * @see <a href="http://techzone.couchbase.com/sites/default/files/
-     * uploads/all/documentation/couchbase-api-misc.html#couchbase-api-
-     * misc_replicate_post">docs for POST /_replicate</a>
-     * @param {String} source Path or url to source database
-     * @param {String} target Path or url to target database
-     * @param {ajaxSettings} ajaxOptions <a href="http://api.jquery.com/
-     * jQuery.ajax/#jQuery-ajax-settings">jQuery ajax settings</a>
-     * @param {Object} repOpts Additional replication options
-     */
-    replicate: function(source, target, ajaxOptions, repOpts) {
-      repOpts = $.extend({source: source, target: target}, repOpts);
-      if (repOpts.continuous && !repOpts.cancel) {
-        ajaxOptions.successStatus = 202;
-      }
-      ajax({
-          type: "POST", url: this.urlPrefix + "/_replicate",
-          data: JSON.stringify(repOpts),
-          contentType: "application/json"
+      options = $.extend({successStatus: 200}, options);
+      ajaxOptions = $.extend(defaultAjaxOpts, ajaxOptions);
+      errorMessage = errorMessage || "Unknown error";
+      timeStart = (new Date()).getTime();
+      $.ajax($.extend($.extend({
+        type: "GET", dataType: "json", cache : !$.browser.msie,
+        beforeSend: function(xhr){
+          if(ajaxOptions && ajaxOptions.headers){
+            for (var header in ajaxOptions.headers){
+              xhr.setRequestHeader(header, ajaxOptions.headers[header]);
+            }
+          }
         },
-        ajaxOptions,
-        "Replication failed"
-      );
-    },
+        complete: function(req) {
+          var reqDuration = (new Date()).getTime() - timeStart;
+          try {
+            var resp = $.parseJSON(req.responseText);
+          } catch(e) {
+            if (options.error) {
+              options.error(req.status, req, e);
+            } else {
+              throw errorMessage + ': ' + e;
+            }
+            return;
+          }
+          if (options.ajaxStart) {
+            options.ajaxStart(resp);
+          }
+          if (req.status == options.successStatus) {
+            if (options.beforeSuccess) options.beforeSuccess(req, resp, reqDuration);
+            if (options.success) options.success(resp, reqDuration);
+          } else if (options.error) {
+            options.error(req.status, resp && resp.error ||
+                          errorMessage, resp && resp.reason || "no response",
+                          reqDuration);
+          } else {
+            throw errorMessage + ": " + resp.reason;
+          }
+        }
+      }, obj), ajaxOptions));
+    }
 
     /**
-     * Fetch a new UUID
-     * @see <a href="http://techzone.couchbase.com/sites/default/files/
-     * uploads/all/documentation/couchbase-api-misc.html#couchbase-api-
-     * misc_uuids_get">docs for /_uuids</a>
-     * @param {Int} cacheNum Number of uuids to keep cached for future use
+     * @private
      */
-    newUUID: function(cacheNum) {
-      if (cacheNum === undefined) {
-        cacheNum = 1;
+    function fullCommit(options) {
+      var options = options || {};
+      if (typeof options.ensure_full_commit !== "undefined") {
+        var commit = options.ensure_full_commit;
+        delete options.ensure_full_commit;
+        return function(xhr) {
+          xhr.setRequestHeader('Accept', 'application/json');
+          xhr.setRequestHeader("X-Couch-Full-Commit", commit.toString());
+        };
       }
-      if (!uuidCache.length) {
-        ajax({url: this.urlPrefix + "/_uuids", data: {count: cacheNum}, async:
-              false}, {
-            success: function(resp) {
-              uuidCache = resp.uuids;
-            }
-          },
-          "Failed to retrieve UUID batch."
-        );
-      }
-      return uuidCache.shift();
-    }
-  });
-
-  /**
-   * @private
-   */
-  function ajax(obj, options, errorMessage, ajaxOptions) {
-    var timeStart;
-    var defaultAjaxOpts = {
-      contentType: "application/json",
-      headers:{"Accept": "application/json"}
     };
 
-    options = $.extend({successStatus: 200}, options);
-    ajaxOptions = $.extend(defaultAjaxOpts, ajaxOptions);
-    errorMessage = errorMessage || "Unknown error";
-    timeStart = (new Date()).getTime();
-    $.ajax($.extend($.extend({
-      type: "GET", dataType: "json", cache : !$.browser.msie,
-      beforeSend: function(xhr){
-        if(ajaxOptions && ajaxOptions.headers){
-          for (var header in ajaxOptions.headers){
-            xhr.setRequestHeader(header, ajaxOptions.headers[header]);
-          }
-        }
-      },
-      complete: function(req) {
-        var reqDuration = (new Date()).getTime() - timeStart;
-        try {
-          var resp = $.parseJSON(req.responseText);
-        } catch(e) {
-          if (options.error) {
-            options.error(req.status, req, e);
-          } else {
-            throw errorMessage + ': ' + e;
+    /**
+     * @private
+     */
+    // Convert a options object to an url query string.
+    // ex: {key:'value',key2:'value2'} becomes '?key="value"&key2="value2"'
+    function encodeOptions(options) {
+      var buf = [];
+      if (typeof(options) === "object" && options !== null) {
+        for (var name in options) {
+          if ($.inArray(name,
+                        ["error", "success", "beforeSuccess", "ajaxStart"]) >= 0)
+            continue;
+          var value = options[name];
+          if ($.inArray(name, ["key", "startkey", "endkey"]) >= 0) {
+            value = toJSON(value);
           }
-          return;
-        }
-        if (options.ajaxStart) {
-          options.ajaxStart(resp);
-        }
-        if (req.status == options.successStatus) {
-          if (options.beforeSuccess) options.beforeSuccess(req, resp, reqDuration);
-          if (options.success) options.success(resp, reqDuration);
-        } else if (options.error) {
-          options.error(req.status, resp && resp.error ||
-                        errorMessage, resp && resp.reason || "no response",
-                        reqDuration);
-        } else {
-          throw errorMessage + ": " + resp.reason;
+          buf.push(encodeURIComponent(name) + "=" + encodeURIComponent(value));
         }
       }
-    }, obj), ajaxOptions));
-  }
-
-  /**
-   * @private
-   */
-  function fullCommit(options) {
-    var options = options || {};
-    if (typeof options.ensure_full_commit !== "undefined") {
-      var commit = options.ensure_full_commit;
-      delete options.ensure_full_commit;
-      return function(xhr) {
-        xhr.setRequestHeader('Accept', 'application/json');
-        xhr.setRequestHeader("X-Couch-Full-Commit", commit.toString());
-      };
+      return buf.length ? "?" + buf.join("&") : "";
     }
-  };
 
-  /**
-   * @private
-   */
-  // Convert a options object to an url query string.
-  // ex: {key:'value',key2:'value2'} becomes '?key="value"&key2="value2"'
-  function encodeOptions(options) {
-    var buf = [];
-    if (typeof(options) === "object" && options !== null) {
-      for (var name in options) {
-        if ($.inArray(name,
-                      ["error", "success", "beforeSuccess", "ajaxStart"]) >= 0)
-          continue;
-        var value = options[name];
-        if ($.inArray(name, ["key", "startkey", "endkey"]) >= 0) {
-          value = toJSON(value);
-        }
-        buf.push(encodeURIComponent(name) + "=" + encodeURIComponent(value));
-      }
+    /**
+     * @private
+     */
+    function toJSON(obj) {
+      return obj !== null ? JSON.stringify(obj) : null;
     }
-    return buf.length ? "?" + buf.join("&") : "";
-  }
 
-  /**
-   * @private
-   */
-  function toJSON(obj) {
-    return obj !== null ? JSON.stringify(obj) : null;
-  }
+  })(jQuery);
 
-})(jQuery);
+});
\ No newline at end of file
diff --git a/assets/js/lib/jquery.mb.browser.js b/assets/js/lib/jquery.mb.browser.js
index d3e4d4d..4a8c4a4 100755
--- a/assets/js/lib/jquery.mb.browser.js
+++ b/assets/js/lib/jquery.mb.browser.js
@@ -18,6 +18,10 @@
  *  *****************************************************************************
  */
 
+/**
+ * Modified in SourceJS to use custom `define` namespace and local jquery
+ */
+
 sourcejs.amd.define([
     'jquery'
 ], function(jQuery) {
diff --git a/assets/js/lib/modalbox.js b/assets/js/lib/modalbox.js
index 10eab23..bb90f8c 100644
--- a/assets/js/lib/modalbox.js
+++ b/assets/js/lib/modalbox.js
@@ -1,105 +1,106 @@
-"use strict";
 sourcejs.amd.define([
     'jquery',
     'sourceModules/module',
     'sourceLib/lodash'
     ], function($, module, _) {
 
-var context; // instance of box
-
-var ModalBox = function(config, data) {
-    var isNewInstance = !context;
-    context = context || this;
-    context.data = data ? data : initialBlocksData;
-
-    if (!isNewInstance) {
-        context.render();
-        return context;
-    }
-
-    var modulesOptions = context.options.modulesOptions;
-    modulesOptions.modalBox = $.extend(true, {
-        "classes": {
-            "box": [context.options.mainClass, context.options.colMain, "source_modal_box"].join(' '),
-            "title": "source_modal_title",
-            "body": "source_modal_body",
-            "close": "source_modal_close"
-        },
-        "labels": {
-            "close": "Close extended search results"
-        },
-        "appendTo": ".source_main"
-    }, modulesOptions.modalBox,  config);
-
-    context.init();
-};
-
-ModalBox.prototype = module.createInstance();
-ModalBox.prototype.constructor = ModalBox;
-
-ModalBox.prototype.init = function() {
-    this.render();
-    this.initCloseHandler();
-};
-
-ModalBox.prototype.templates = {
-    box: _.template('<div class="<%= classes.box %>"></div>'),
-    title: _.template('<div class="<%= classes.title %>"></div>'),
-    close: _.template('<div class="<%= classes.close %>" title="<%= labels.close %>"></div>'),
-    body: _.template('<div class="<%= classes.body %>"></div>')
-};
-
-ModalBox.prototype.renderers = {};
-
-ModalBox.prototype.renderers.box = function(element) {
-    $(this.options.modulesOptions.modalBox.appendTo).after(element);
-};
-
-ModalBox.prototype.renderers.close = function(element) {
-    $(element).html(this.data.close ? this.data.close : "");
-    $(this.box).append(element);
-};
-
-ModalBox.prototype.renderers.title = function(element) {
-    $(element).html(this.data.title ? this.data.title : "");
-    $(this.box).append(element);
-};
-
-ModalBox.prototype.renderers.body = function(element) {
-    $(element).html(this.data.body ? this.data.body : "");
-    $(this.box).append(element);
-};
-
-ModalBox.prototype.render = function() {
-    var config = this.options.modulesOptions.modalBox;
-    $.each(context.renderers, function(name, callback) {
-        var element = context[name] = context[name]
-            ? context[name]
-            : $(context.templates[name].call(context, config));
-
-        callback.call(context, element);
-    });
-};
-
-ModalBox.prototype.initCloseHandler = function() {
-    $(this.close).on("click", function(e) {
-        context.hide();
-    });
-};
-
-ModalBox.prototype.show = function() {
-    var config = this.options.modulesOptions.modalBox;
-    $(config.appendTo).hide();
-    $(this.box).show();
-    return this;
-};
-
-ModalBox.prototype.hide = function() {
-    var config = this.options.modulesOptions.modalBox;
-    $(config.appendTo).show();
-    $(this.box).hide();
-    return this;
-};
-
-return ModalBox;
+    "use strict";
+
+    var context; // instance of box
+
+    var ModalBox = function(config, data) {
+        var isNewInstance = !context;
+        context = context || this;
+        context.data = data ? data : initialBlocksData;
+
+        if (!isNewInstance) {
+            context.render();
+            return context;
+        }
+
+        var modulesOptions = context.options.modulesOptions;
+        modulesOptions.modalBox = $.extend(true, {
+            "classes": {
+                "box": [context.options.mainClass, context.options.colMain, "source_modal_box"].join(' '),
+                "title": "source_modal_title",
+                "body": "source_modal_body",
+                "close": "source_modal_close"
+            },
+            "labels": {
+                "close": "Close extended search results"
+            },
+            "appendTo": ".source_main"
+        }, modulesOptions.modalBox,  config);
+
+        context.init();
+    };
+
+    ModalBox.prototype = module.createInstance();
+    ModalBox.prototype.constructor = ModalBox;
+
+    ModalBox.prototype.init = function() {
+        this.render();
+        this.initCloseHandler();
+    };
+
+    ModalBox.prototype.templates = {
+        box: _.template('<div class="<%= classes.box %>"></div>'),
+        title: _.template('<div class="<%= classes.title %>"></div>'),
+        close: _.template('<div class="<%= classes.close %>" title="<%= labels.close %>"></div>'),
+        body: _.template('<div class="<%= classes.body %>"></div>')
+    };
+
+    ModalBox.prototype.renderers = {};
+
+    ModalBox.prototype.renderers.box = function(element) {
+        $(this.options.modulesOptions.modalBox.appendTo).after(element);
+    };
+
+    ModalBox.prototype.renderers.close = function(element) {
+        $(element).html(this.data.close ? this.data.close : "");
+        $(this.box).append(element);
+    };
+
+    ModalBox.prototype.renderers.title = function(element) {
+        $(element).html(this.data.title ? this.data.title : "");
+        $(this.box).append(element);
+    };
+
+    ModalBox.prototype.renderers.body = function(element) {
+        $(element).html(this.data.body ? this.data.body : "");
+        $(this.box).append(element);
+    };
+
+    ModalBox.prototype.render = function() {
+        var config = this.options.modulesOptions.modalBox;
+        $.each(context.renderers, function(name, callback) {
+            var element = context[name] = context[name]
+                ? context[name]
+                : $(context.templates[name].call(context, config));
+
+            callback.call(context, element);
+        });
+    };
+
+    ModalBox.prototype.initCloseHandler = function() {
+        $(this.close).on("click", function(e) {
+            context.hide();
+        });
+    };
+
+    ModalBox.prototype.show = function() {
+        var config = this.options.modulesOptions.modalBox;
+        $(config.appendTo).hide();
+        $(this.box).show();
+        return this;
+    };
+
+    ModalBox.prototype.hide = function() {
+        var config = this.options.modulesOptions.modalBox;
+        $(config.appendTo).show();
+        $(this.box).hide();
+        return this;
+    };
+
+    return ModalBox;
 });
\ No newline at end of file
diff --git a/assets/js/lib/require.js b/assets/js/lib/require.js
index 4d2ffb9..207b25d 100644
--- a/assets/js/lib/require.js
+++ b/assets/js/lib/require.js
@@ -3,6 +3,11 @@
  * Available via the MIT or new BSD license.
  * see: http://github.com/jrburke/requirejs for details
  */
+
+/**
+ * Modified in SourceJS to use custom `define/require/requirejs` namespace
+ */
+
 //Not using strict: uneven strict support in browsers, #392, and causes
 //problems with requirejs.exec()/transpiler plugins that may not be strict.
 /*jslint regexp: true, nomen: true, sloppy: true */
diff --git a/assets/js/lib/text.js b/assets/js/lib/text.js
index 69b0be2..17921b6 100755
--- a/assets/js/lib/text.js
+++ b/assets/js/lib/text.js
@@ -8,7 +8,7 @@
   define, window, process, Packages,
   java, location, Components, FileUtils */
 
-sourcejs.amd.define(['module'], function (module) {
+define(['module'], function (module) {
     'use strict';
 
     var text, fs, Cc, Ci, xpcIsWindows,
@@ -207,7 +207,7 @@ sourcejs.amd.define(['module'], function (module) {
             if (buildMap.hasOwnProperty(moduleName)) {
                 var content = text.jsEscape(buildMap[moduleName]);
                 write.asModule(pluginName + "!" + moduleName,
-                               "sourcejs.amd.define(function () { return '" +
+                               "define(function () { return '" +
                                    content +
                                "';});\n");
             }
diff --git a/assets/js/modules/codeSource.js b/assets/js/modules/codeSource.js
index dac0950..eea3858 100644
--- a/assets/js/modules/codeSource.js
+++ b/assets/js/modules/codeSource.js
@@ -13,7 +13,7 @@ sourcejs.amd.define([
     "sourceLib/codeFormat",
     "sourceModules/innerNavigation",
     "sourceLib/prism/prism"
-], function($, options, utils, Css, browser, codeFormat, innerNavigation) {
+], function($, options, utils, Css, browser, codeFormat, innerNavigation, Prism) {
     'use strict';
 
     if (!(browser.msie && parseInt(browser.version, 10) < 9)) { // and if not ie < 9

From 3cbbea644736fa8761623620860072197069edba Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Mon, 2 May 2016 22:59:41 +0200
Subject: [PATCH 078/104] add .editorconfig

---
 .editorconfig | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 .editorconfig

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..2536d66
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,12 @@
+# http://editorconfig.org
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false

From e50781b28fe077cd99f8a51e3557ab2edf8187cd Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Mon, 2 May 2016 23:12:32 +0200
Subject: [PATCH 079/104] clean mustache plugin reference

---
 assets/js/modules/sectionFolding.js | 30 +----------------------------
 1 file changed, 1 insertion(+), 29 deletions(-)

diff --git a/assets/js/modules/sectionFolding.js b/assets/js/modules/sectionFolding.js
index 4e1d977..9b4e080 100644
--- a/assets/js/modules/sectionFolding.js
+++ b/assets/js/modules/sectionFolding.js
@@ -94,40 +94,12 @@ sourcejs.amd.define([
             $target.addClass(OPEN_SECTION_CLASS);
 
             var sectionID = $target.attr('id');
-            var isRendered = false;
 
             closedSections["section" + sectionID] = false;
 
             if (config) { //Remember options in localStorage
                 updateConfig();
             }
-
-            // TODO: remove mustache check from core
-            if (options.pluginsOptions && options.pluginsOptions.mustache) {
-                // Need to use absolute path to get same scope with requires from inline scripts
-                sourcejs.amd.require(['/plugins/mustache/js/mustache.js'], function(templater){
-                    if (typeof templater.PostponedTemplates !== 'undefined') {
-
-                        if ($target.attr('data-rendered') === 'true') {
-                            isRendered = true;
-                        }
-
-                        if (!isRendered) {
-
-                            for (var arr in templater.PostponedTemplates[sectionID]) {
-                                if (templater.PostponedTemplates[sectionID].hasOwnProperty(arr)) {
-                                    var values = templater.PostponedTemplates[sectionID][arr];
-                                    templater.insertTemplate(values[0], values[1], values[2]);
-                                }
-                            }
-
-                            $target.attr('data-rendered', 'true');
-                        }
-
-                    }
-                });
-            }
-
         };
 
         var closeSpoiler = function (t, config) {
@@ -245,4 +217,4 @@ sourcejs.amd.define([
 
     });
 
-});
\ No newline at end of file
+});

From 6cf7b91e6434d6131f881160374eb965fc66fb97 Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Mon, 2 May 2016 23:14:16 +0200
Subject: [PATCH 080/104] use namespaced jquery in `trimSpaces.js`

---
 assets/js/modules/trimSpaces.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/assets/js/modules/trimSpaces.js b/assets/js/modules/trimSpaces.js
index 061ce53..5302d41 100644
--- a/assets/js/modules/trimSpaces.js
+++ b/assets/js/modules/trimSpaces.js
@@ -7,9 +7,10 @@
 * */
 
 sourcejs.amd.define([
-    "source/load-options",
-    "sourceModules/codeSource"
-    ], function(options) {
+    'jquery',
+    'source/load-options',
+    'sourceModules/codeSource'
+    ], function($, options) {
 
     'use strict';
 
@@ -39,5 +40,4 @@ sourcejs.amd.define([
     };
 
     L_EXAMPLE_CLASS.trimSpaces();
-
-});
\ No newline at end of file
+});

From 6b059655021aec2be2feb7b5e361db0bba581e06 Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Mon, 2 May 2016 23:36:50 +0200
Subject: [PATCH 081/104] load client js from plugins without build

---
 Gruntfile.js                      |  6 +-----
 assets/js/_require.bundle.js      | 19 -------------------
 assets/js/modules/moduleLoader.js | 26 +++++++++++++++++++++++++-
 3 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 8dcf84f..c365b5a 100755
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -250,11 +250,7 @@ module.exports = function(grunt) {
             grunt.file.write(
                 outputFullPath,
                 grunt.template.process(grunt.file.read(pathToFile), {
-                    delimiters: 'customBundleDelimiter',
-                    data: {
-                        // npmPluginsEnabled object is filled from loadOptions.js
-                        npmPluginsEnabled: JSON.stringify(gruntOpts.assets.npmPluginsEnabled, null, 4)
-                    }
+                    delimiters: 'customBundleDelimiter'
                 })
             );
             grunt.log.ok('Writing to '+outputFullPath);
diff --git a/assets/js/_require.bundle.js b/assets/js/_require.bundle.js
index 9e9a947..009d402 100644
--- a/assets/js/_require.bundle.js
+++ b/assets/js/_require.bundle.js
@@ -1,21 +1,2 @@
 "{%= grunt.file.read('assets/js/lib/require.js') %}"
 "{%= grunt.file.read('assets/js/_require-config.js') %}"
-
-// Extending base js config with npm packages list
-sourcejs.amd.requirejs.config({
-    // Create shorthands routes to clint-side npm plugins
-    packages: function () {
-        var modulesList = "{%= npmPluginsEnabled %}";
-
-        var npmPackages = [];
-        for (var module in modulesList) {
-            npmPackages.push({
-                name: module,
-                location: '/node_modules/' + module + '/assets',
-                main: 'index'
-            })
-        }
-
-        return npmPackages;
-    }()
-});
diff --git a/assets/js/modules/moduleLoader.js b/assets/js/modules/moduleLoader.js
index 865858e..318ee47 100644
--- a/assets/js/modules/moduleLoader.js
+++ b/assets/js/modules/moduleLoader.js
@@ -6,8 +6,32 @@ sourcejs.amd.define([
     'use strict';
 
     function ModuleLoader() {
+        var _this = this;
+
         this.loadModules('modules');
         this.loadModules('plugins');
+
+        // Extending RequireJS config with npm packages list
+        sourcejs.amd.requirejs.config({
+            // Create shorthands routes to clint-side npm plugins
+            packages: function () {
+                var modulesList = _this.options.npmPluginsEnabled;
+
+                console.log('modulesList', modulesList);
+
+                var npmPackages = [];
+                for (var module in modulesList) {
+                    npmPackages.push({
+                        name: module,
+                        location: '/node_modules/' + module + '/assets',
+                        main: 'index'
+                    })
+                }
+
+                return npmPackages;
+            }()
+        });
+
         this.loadModules('npmPlugins');
     }
 
@@ -55,4 +79,4 @@ sourcejs.amd.define([
     };
 
     return new ModuleLoader();
-});
\ No newline at end of file
+});

From b4c7ae88415fb69ba9256088680a36c999cee437 Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Mon, 2 May 2016 23:41:56 +0200
Subject: [PATCH 082/104] fix linting in `moduleLoader.js`

---
 assets/js/modules/moduleLoader.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/assets/js/modules/moduleLoader.js b/assets/js/modules/moduleLoader.js
index 318ee47..bcb7e6f 100644
--- a/assets/js/modules/moduleLoader.js
+++ b/assets/js/modules/moduleLoader.js
@@ -14,22 +14,22 @@ sourcejs.amd.define([
         // Extending RequireJS config with npm packages list
         sourcejs.amd.requirejs.config({
             // Create shorthands routes to clint-side npm plugins
-            packages: function () {
+            packages: (function () {
                 var modulesList = _this.options.npmPluginsEnabled;
 
-                console.log('modulesList', modulesList);
-
                 var npmPackages = [];
                 for (var module in modulesList) {
-                    npmPackages.push({
-                        name: module,
-                        location: '/node_modules/' + module + '/assets',
-                        main: 'index'
-                    })
+                    if (modulesList.hasOwnProperty(module)) {
+                        npmPackages.push({
+                            name: module,
+                            location: '/node_modules/' + module + '/assets',
+                            main: 'index'
+                        });
+                    }
                 }
 
                 return npmPackages;
-            }()
+            }())
         });
 
         this.loadModules('npmPlugins');

From 767be0170ed779934952ae3de3641d2b18f702ec Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Mon, 2 May 2016 23:42:29 +0200
Subject: [PATCH 083/104] operatino/namespaced-require-server-transform: move
 interceptor from redirects, and add plugins catch

---
 Gruntfile.js                  |  2 --
 app.js                        |  3 +++
 core/privateAmdTransformer.js | 26 ++++++++++++++++++++++++++
 core/routes/redirects.js      | 31 +------------------------------
 4 files changed, 30 insertions(+), 32 deletions(-)
 create mode 100644 core/privateAmdTransformer.js

diff --git a/Gruntfile.js b/Gruntfile.js
index c365b5a..4375563 100755
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -230,8 +230,6 @@ module.exports = function(grunt) {
     });
 
     grunt.registerTask('resolve-js-bundles', 'Resolving JS imports in _**.bundle.js', function(){
-        var gruntOpts = grunt.config.get('options');
-
         // Setting custom delimiters for grunt.template
         grunt.template.addDelimiters('customBundleDelimiter', '"{%', '%}"');
 
diff --git a/app.js b/app.js
index a115c9c..43d9b37 100644
--- a/app.js
+++ b/app.js
@@ -169,6 +169,9 @@ app.use('/api/updateFileTree', function(req, res){
 });
 
 
+// Intercept static serve to localize requirejs
+app.use(require(path.join(global.pathToApp, 'core/privateAmdTransformer.js')));
+
 // Routes
 require('./core/routes');
 
diff --git a/core/privateAmdTransformer.js b/core/privateAmdTransformer.js
new file mode 100644
index 0000000..faba08b
--- /dev/null
+++ b/core/privateAmdTransformer.js
@@ -0,0 +1,26 @@
+'use strict';
+
+var interceptor = require('express-interceptor');
+
+module.exports = interceptor(function (req) {
+    return {
+        isInterceptable: function () {
+            return (/\/source\/assets\/js/.test(req.originalUrl) && !(/\/require.bundle.js$/.test(req.originalUrl))) ||
+                /\/node_modules\/sourcejs-/.test(req.originalUrl);
+        },
+        intercept: function (body, send) {
+            if (
+                (/require\(/.test(body) && !(/sourcejs\.amd\.require\(/.test(body))) ||
+                (/define\(/.test(body) && !(/sourcejs\.amd\.define\(/.test(body)))
+            ) {
+                body = '// Modified on static serve from `core/privateAmdTransformer.js` \n (function(require, define){\n' + body + '\n}(sourcejs.amd.require, sourcejs.amd.define))';
+
+                if (!(/\/source\/assets\/js\/lib/.test(req.originalUrl))) {
+                    global.log.warn('Deprecation Notice: please update "' + req.originalUrl + '" to use sourcejs.amd.require/sourcejs.amd.define namespace for Requirejs modules. Interception with autofix will be cleaned in the next breaking change release.');
+                }
+            }
+
+            send(body);
+        }
+    };
+});
diff --git a/core/routes/redirects.js b/core/routes/redirects.js
index 259654e..06a3d2d 100644
--- a/core/routes/redirects.js
+++ b/core/routes/redirects.js
@@ -9,35 +9,6 @@
 var path = require('path');
 var express = require('express');
 var pathToApp = path.dirname(require.main.filename);
-var interceptor = require('express-interceptor');
-
-var finalParagraphInterceptor = interceptor(function (req, res) {
-    return {
-        isInterceptable: function () {
-            // console.log('res.originalUrl', req.originalUrl, /\/source\/assets\/js/.test(req.originalUrl) && !(/\/require.bundle.js$/.test(req.originalUrl)));
-
-            return /\/source\/assets\/js/.test(req.originalUrl) && !(/\/require.bundle.js$/.test(req.originalUrl));
-        },
-        // Appends a paragraph at the end of the response body
-        intercept: function (body, send) {
-            if (
-                (/require\(/.test(body) && !(/sourcejs\.amd\.require\(/.test(body))) ||
-                (/define\(/.test(body) && !(/sourcejs\.amd\.define\(/.test(body)))
-            ) {
-                body = '// Modified on static serve from `redirects.js` \n (function(require, define){\n' + body + '\n}(sourcejs.amd.require, sourcejs.amd.define))';
-
-                if (!(/\/source\/assets\/js\/lib/.test(req.originalUrl))) {
-                    global.log.warn('Deprecation Notice: please update "' + req.originalUrl + '" to use sourcejs.amd.require/sourcejs.amd.define namespace for Requirejs modules.');
-                }
-            }
-
-            send(body);
-        }
-    };
-});
-
-global.app.use(finalParagraphInterceptor);
-
 
 /*
 *
@@ -65,4 +36,4 @@ global.app.use('/source/assets', express.static(path.join(pathToApp, 'assets')))
 global.app.use('/docs', express.static(path.join(pathToApp, '/docs')));
 global.app.use('/test', express.static(path.join(pathToApp, '/test')));
 global.app.use('/jsdoc', express.static(path.join(pathToApp, '/jsdoc')));
-global.app.use('/jasmine-test', express.static(path.join(pathToApp, '/assets/test')));
\ No newline at end of file
+global.app.use('/jasmine-test', express.static(path.join(pathToApp, '/assets/test')));

From aaa82de15a9ef3bc4ec50c507212db54c30fba89 Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Tue, 3 May 2016 00:45:19 +0200
Subject: [PATCH 084/104] operatino/namespaced-require-server-transform:
 intercept legacy plugins load

---
 core/privateAmdTransformer.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/privateAmdTransformer.js b/core/privateAmdTransformer.js
index faba08b..34f0766 100644
--- a/core/privateAmdTransformer.js
+++ b/core/privateAmdTransformer.js
@@ -6,7 +6,8 @@ module.exports = interceptor(function (req) {
     return {
         isInterceptable: function () {
             return (/\/source\/assets\/js/.test(req.originalUrl) && !(/\/require.bundle.js$/.test(req.originalUrl))) ||
-                /\/node_modules\/sourcejs-/.test(req.originalUrl);
+                /\/node_modules\/sourcejs-/.test(req.originalUrl) ||
+                /\/plugins\//.test(req.originalUrl);
         },
         intercept: function (body, send) {
             if (

From 803c9828a1fee069216a8e8a89d1f936147007a2 Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Tue, 3 May 2016 00:54:13 +0200
Subject: [PATCH 085/104] add deprecation notice on old plugin structure
 support

---
 assets/js/modules/moduleLoader.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/assets/js/modules/moduleLoader.js b/assets/js/modules/moduleLoader.js
index bcb7e6f..ba45947 100644
--- a/assets/js/modules/moduleLoader.js
+++ b/assets/js/modules/moduleLoader.js
@@ -72,6 +72,10 @@ sourcejs.amd.define([
 
                     if (targetObj){
                         sourcejs.amd.require([path + item]);
+
+                        if (type === 'plugins') {
+                            console.warn('Deprecation notice: module loader will stop supporting local plugins with next breaking release, please move `' + path + item + '` plugin to NPM dependencies, following SourceJS plugin structure https://sourcejs.com/docs/api/plugins.');
+                        }
                     }
                 }
             }

From bd03251207c230aeaf405ffcb78c1b0fdcb4a2e9 Mon Sep 17 00:00:00 2001
From: Norbert de Langen <norbert@macaw.nl>
Date: Fri, 10 Jun 2016 17:04:04 +0200
Subject: [PATCH 086/104] UPDATE dependencies

swapped grunt-casperjs for a personal (updated) package.
We should swap back when original is updated, but the package hasn't been actively maintained lately.
---
 Gruntfile.js |  2 +-
 package.json | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 4375563..2adab2d 100755
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -27,7 +27,7 @@ module.exports = function(grunt) {
     var appPort = grunt.option('app-port') || 8080;
 
     // load all grunt tasks matching the `grunt-*` pattern
-    require(getLoaderPackageName())(grunt);
+    require(getLoaderPackageName())(grunt, {pattern: ['grunt-*', '@*/grunt-*']});
 
     // measuring processing time
     require('time-grunt')(grunt);
diff --git a/package.json b/package.json
index 951093f..0b99323 100644
--- a/package.json
+++ b/package.json
@@ -24,11 +24,11 @@
     "express": "^4.13.3",
     "express-interceptor": "^1.2.0",
     "express-session": "^1.10.2",
-    "flat": "^1.2.1",
-    "fs-extra": "^0.26.7",
+    "flat": "^2.0.0",
+    "fs-extra": "^0.30.0",
     "fs-finder": "operatino/node-fs-finder#fix-windows-find-up",
     "glob": "^7.0.3",
-    "grunt": "~0.4.5",
+    "grunt": "~1.0.1",
     "grunt-autoprefixer": "^3.0.4",
     "grunt-cli": "^1.1.0",
     "grunt-contrib-clean": "^1.0.0",
@@ -69,16 +69,16 @@
     "ci-test-win": "grunt ci-pre-run && node app.js --post-grunt ci-post-run-win --test --log trace --no-watch"
   },
   "devDependencies": {
+    "@ndelangen/grunt-casperjs": "^3.0.0",
     "assert": "^1.3.0",
     "chai": "^3.2.0",
-    "cross-spawn": "^0.4.0",
-    "grunt-casperjs": "^2.1.0",
-    "grunt-contrib-jshint": "^0.11.3",
-    "grunt-contrib-watch": "^0.6.1",
-    "grunt-jsdoc": "^1.0.0",
+    "cross-spawn": "^4.0.0",
+    "grunt-contrib-jshint": "^1.0.0",
+    "grunt-contrib-watch": "^1.0.0",
+    "grunt-jsdoc": "^2.1.0",
     "grunt-mocha-test": "^0.12.7",
     "mocha": "^2.0.1",
-    "should": "^7.1.0",
+    "should": "^9.0.2",
     "supertest": "^1.1.0"
   }
 }

From d66deb3ef24431895b28a29d6725eb7cfca89b9a Mon Sep 17 00:00:00 2001
From: Norbert de Langen <norbert@macaw.nl>
Date: Fri, 10 Jun 2016 17:04:58 +0200
Subject: [PATCH 087/104] FIX more restrictive jshint default config by adding
 exceptions in files that were throwing warnings

---
 assets/js/modules/loadEvents.js     |  4 ++--
 assets/js/modules/sectionsParser.js |  4 +++-
 core/api/index.js                   | 16 ++++++++--------
 core/lib/specUtils.js               |  4 ++--
 core/middlewares/clarify.js         |  6 +++---
 5 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/assets/js/modules/loadEvents.js b/assets/js/modules/loadEvents.js
index 1071e28..79ee220 100644
--- a/assets/js/modules/loadEvents.js
+++ b/assets/js/modules/loadEvents.js
@@ -105,7 +105,7 @@ sourcejs.amd.define(["sourceModules/module", "sourceModules/utils"], function(mo
 					}
 				};
 				/*jshint forin: false */
-				for (var plugin in pluginsSection) {
+				for (var plugin in pluginsSection) { // jshint ignore:line
 					if (!pluginsSection.hasOwnProperty(plugin)) {
 						continue;
 					}
@@ -195,4 +195,4 @@ sourcejs.amd.define(["sourceModules/module", "sourceModules/utils"], function(mo
 	};
 
 	return new LoadEvents();
-});
\ No newline at end of file
+});
diff --git a/assets/js/modules/sectionsParser.js b/assets/js/modules/sectionsParser.js
index 50c9f81..a5e68c8 100644
--- a/assets/js/modules/sectionsParser.js
+++ b/assets/js/modules/sectionsParser.js
@@ -12,6 +12,8 @@ function SourceGetSections() {
     // Defining strict inside func, because PhantomJS stops evaluating this script if it's on top
     'use strict';
 
+	/*jshint latedef: false */
+
     var config = {
         // include params from opt@argument first
         code: 'source_example',
@@ -426,4 +428,4 @@ SourceGetSections.prototype.getSpecResources = function(scope){
     output.cssStyles = this.getStyleContainersHTML(_scope);
 
     return (output.cssLinks || output.scripts || output.cssStyles) ? output : undefined;
-};
\ No newline at end of file
+};
diff --git a/core/api/index.js b/core/api/index.js
index a79b9d7..4b726ca 100644
--- a/core/api/index.js
+++ b/core/api/index.js
@@ -2,7 +2,7 @@
 
 var express = require('express');
 var path = require('path');
-var parseData = require(path.join(global.pathToApp, 'core/lib/parseData'));
+var ParseData = require(path.join(global.pathToApp, 'core/lib/parseData'));
 var utils = require(path.join(global.pathToApp, 'core/lib/utils'));
 var pathToApp = path.dirname(require.main.filename);
 var htmlTree = require(path.join(global.pathToApp, 'core/html-tree'));
@@ -26,7 +26,7 @@ var htmlDataPath = path.join(pathToApp, config.htmlData);
  *
  * @param {Object} req - express request
  * @param {Object} res - express response
- * @param {Object} parseObj - initiated parseData instance
+ * @param {Object} parseObj - initiated ParseData instance
  *
  * Writes result to res object
  */
@@ -89,7 +89,7 @@ var getSpecs = function (req, res, parseObj) {
  *
  * @param {Object} req - express request
  * @param {Object} res - express response
- * @param {Object} parseObj - initiated parseData instance
+ * @param {Object} parseObj - initiated ParseData instance
  *
  * Writes result to res object
  */
@@ -209,12 +209,12 @@ var presentationHandler = function (req, res) {
 /* Main API router */
 var apiRouter = express.Router();
 
-var parseHTMLData = new parseData({
+var parseHTMLData = new ParseData({
     scope: 'html',
     path: htmlDataPath
 });
 
-var parseSpecs = new parseData({
+var parseSpecs = new ParseData({
     scope: 'specs',
     path: specsDataPath
 });
@@ -281,12 +281,12 @@ var apiTestRouter = express.Router();
 var specsDataTestPath = path.join(pathToApp, config.specsTestData);
 var htmlDataTestPath = path.join(pathToApp, config.htmlTestData);
 
-var parseSpecsTest = new parseData({
+var parseSpecsTest = new ParseData({
     scope: 'specs',
     path: specsDataTestPath
 });
 
-var parseHTMLDataTest = new parseData({
+var parseHTMLDataTest = new ParseData({
     scope: 'html',
     path: htmlDataTestPath
 });
@@ -328,4 +328,4 @@ apiTestRouter.route('/specs/html')
 
 // Activating router
 global.app.use('/api-test', apiTestRouter);
-/* /Test API router */
\ No newline at end of file
+/* /Test API router */
diff --git a/core/lib/specUtils.js b/core/lib/specUtils.js
index 11a5d80..0aefd05 100644
--- a/core/lib/specUtils.js
+++ b/core/lib/specUtils.js
@@ -2,7 +2,7 @@
 
 var path = require('path');
 var fs = require('fs-extra');
-var parseData = require(path.join(global.pathToApp, 'core/lib/parseData'));
+var ParseData = require(path.join(global.pathToApp, 'core/lib/parseData'));
 
 
 /**
@@ -55,7 +55,7 @@ var getSpecIDFromUrl = module.exports.getSpecIDFromUrl = function(urlToSpec){
  */
 module.exports.getSpecInfo = function(urlSpecPath) {
     var specsDataPath = path.join(global.pathToApp, global.opts.core.api.specsData);
-    var parseSpecData = new parseData({
+    var parseSpecData = new ParseData({
         scope: 'specs',
         path: specsDataPath
     });
diff --git a/core/middlewares/clarify.js b/core/middlewares/clarify.js
index 2ed8362..204b25c 100644
--- a/core/middlewares/clarify.js
+++ b/core/middlewares/clarify.js
@@ -11,11 +11,11 @@ var ejs = require(path.join(global.pathToApp, 'core/ejsWithHelpers.js'));
 var trackStats = require(path.join(global.pathToApp, 'core/trackStats'));
 var pathToApp = path.dirname(require.main.filename);
 var specUtils = require(path.join(pathToApp, 'core/lib/specUtils'));
-var parseData = require(path.join(pathToApp, 'core/lib/parseData'));
+var ParseData = require(path.join(pathToApp, 'core/lib/parseData'));
 var specsParser = require(path.join(pathToApp, 'core/lib/specPageParser'));
 
 var htmlDataPath = path.join(pathToApp, global.opts.core.api.htmlData);
-var parseHTMLData = new parseData({
+var parseHTMLData = new ParseData({
     scope: 'html',
     path: htmlDataPath
 });
@@ -318,4 +318,4 @@ module.exports.process = function(req, res, next) {
         // redirect to next express middleware
         next();
     }
-};
\ No newline at end of file
+};

From 5f433843812c16f96b206ab96f30bc59e58cde06 Mon Sep 17 00:00:00 2001
From: Norbert de Langen <norbert@macaw.nl>
Date: Fri, 17 Jun 2016 00:52:28 +0200
Subject: [PATCH 088/104] CHANGE docs for 0.6 release

---
 docs/api/index.src.html                       |   4 +-
 docs/api/info.json                            |   7 +-
 docs/auth/info.json                           |   2 +-
 docs/base/info.json                           |   3 +-
 docs/base/readme.md                           | 133 ++++++++++--------
 docs/build-tasks/info.json                    |   5 +-
 docs/build-tasks/readme.md                    |   8 +-
 docs/clarify/info.json                        |   5 +-
 docs/configuration/readme.md                  |  42 +++---
 docs/data-nav/info.json                       |   5 +-
 docs/data-nav/readme.md                       |  24 ++--
 docs/index.src.html                           |  18 ++-
 docs/info-json/info.json                      |   5 -
 docs/markdown/info.json                       |   4 -
 docs/migration/info.json                      |   5 +-
 docs/migration/readme.md                      |   6 +-
 .../examples/buttons.html                     |   0
 docs/spec-ejs/examples/include.html           |   1 +
 docs/spec-ejs/examples/markdown-file.md       |  10 ++
 docs/spec-ejs/examples/mask-one.html          |   2 +
 docs/spec-ejs/examples/mask-two.html          |   3 +
 docs/spec-ejs/examples/three.html             |   2 +
 docs/spec-ejs/info.json                       |   5 +
 docs/spec-ejs/readme.md                       |  81 +++++++++++
 docs/spec-file/examples/buttons.html          |  11 ++
 .../examples/include.html                     |   0
 .../examples/markdown-file.md                 |   0
 .../examples/mask-one.html                    |   0
 .../examples/mask-two.html                    |   0
 .../examples/three.html                       |   0
 docs/spec-file/info.json                      |   5 +
 docs/spec-file/readme.md                      |  33 +++++
 docs/spec-helpers/info.json                   |   5 -
 docs/spec-helpers/readme.md                   | 103 --------------
 .../css/starting.css                          |   0
 .../index.src.html                            |   0
 .../{starting => spec-html-example}/info.json |   0
 docs/{spec => spec-html}/css/spec.css         |   0
 docs/{spec => spec-html}/index.src.html       |   4 +-
 docs/spec-html/info.json                      |   5 +
 docs/spec-json/info.json                      |   5 +
 docs/{info-json => spec-json}/readme.md       |  40 ++++--
 .../css/starting.css                          |   0
 .../info.json                                 |   2 +-
 .../readme.md                                 |   4 +-
 docs/spec-markdown/info.json                  |   5 +
 docs/{markdown => spec-markdown}/readme.md    |  35 +----
 docs/spec/info.json                           |   5 -
 docs/test-specs/styles/index.src.html         |  37 ++++-
 test/functional/clarify.js                    |   6 +-
 test/functional/common.js                     |   4 +-
 test/functional/globalNav.js                  |  14 +-
 test/functional/specpage.js                   |  83 +++++++----
 test/unit/middlewares/clarifySpec.js          |  14 +-
 test/unit/middlewares/mdSpec.js               |  14 +-
 55 files changed, 478 insertions(+), 336 deletions(-)
 delete mode 100644 docs/info-json/info.json
 delete mode 100644 docs/markdown/info.json
 rename docs/{spec-helpers => spec-ejs}/examples/buttons.html (100%)
 create mode 100644 docs/spec-ejs/examples/include.html
 create mode 100644 docs/spec-ejs/examples/markdown-file.md
 create mode 100644 docs/spec-ejs/examples/mask-one.html
 create mode 100644 docs/spec-ejs/examples/mask-two.html
 create mode 100644 docs/spec-ejs/examples/three.html
 create mode 100644 docs/spec-ejs/info.json
 create mode 100644 docs/spec-ejs/readme.md
 create mode 100644 docs/spec-file/examples/buttons.html
 rename docs/{spec-helpers => spec-file}/examples/include.html (100%)
 rename docs/{spec-helpers => spec-file}/examples/markdown-file.md (100%)
 rename docs/{spec-helpers => spec-file}/examples/mask-one.html (100%)
 rename docs/{spec-helpers => spec-file}/examples/mask-two.html (100%)
 rename docs/{spec-helpers => spec-file}/examples/three.html (100%)
 create mode 100644 docs/spec-file/info.json
 create mode 100644 docs/spec-file/readme.md
 delete mode 100644 docs/spec-helpers/info.json
 delete mode 100644 docs/spec-helpers/readme.md
 rename docs/{starting-md => spec-html-example}/css/starting.css (100%)
 rename docs/{starting => spec-html-example}/index.src.html (100%)
 rename docs/{starting => spec-html-example}/info.json (100%)
 rename docs/{spec => spec-html}/css/spec.css (100%)
 rename docs/{spec => spec-html}/index.src.html (97%)
 create mode 100644 docs/spec-html/info.json
 create mode 100644 docs/spec-json/info.json
 rename docs/{info-json => spec-json}/readme.md (57%)
 rename docs/{starting => spec-markdown-example}/css/starting.css (100%)
 rename docs/{starting-md => spec-markdown-example}/info.json (98%)
 rename docs/{starting-md => spec-markdown-example}/readme.md (78%)
 create mode 100644 docs/spec-markdown/info.json
 rename docs/{markdown => spec-markdown}/readme.md (85%)
 delete mode 100644 docs/spec/info.json

diff --git a/docs/api/index.src.html b/docs/api/index.src.html
index d6e5aa7..647771b 100755
--- a/docs/api/index.src.html
+++ b/docs/api/index.src.html
@@ -2,6 +2,4 @@
     <h1>API documentation</h1>
 </div>
 
-<div class="source_catalog" data-nav="/docs/api" data-tag="without-tag"></div>
-
-<a href="/docs" class="source_a_hl">Go to engine documentation</a>
\ No newline at end of file
+<div class="source_catalog" data-nav="/docs/api"></div>
diff --git a/docs/api/info.json b/docs/api/info.json
index d4ed521..021c5a8 100644
--- a/docs/api/info.json
+++ b/docs/api/info.json
@@ -1,4 +1,5 @@
 {
-    "title": "API documentation",
-    "role": "navigation"
-}
\ No newline at end of file
+    "title": "Intergrating: Our API",
+    "role": "navigation",
+	"tag": ["advanced"]
+}
diff --git a/docs/auth/info.json b/docs/auth/info.json
index 89618f4..5665389 100644
--- a/docs/auth/info.json
+++ b/docs/auth/info.json
@@ -1,5 +1,5 @@
 {
-    "tag": ["auth", "github"],
+    "tag": ["auth", "github", "advanced"],
     "title": "Using Github Auth",
     "template": "doc"
 }
diff --git a/docs/base/info.json b/docs/base/info.json
index eb55198..db59423 100644
--- a/docs/base/info.json
+++ b/docs/base/info.json
@@ -1,4 +1,5 @@
 {
     "title": "Main Engine Documentation",
-    "template": "doc"
+    "template": "doc",
+	"tag": ["getting-started"]
 }
diff --git a/docs/base/readme.md b/docs/base/readme.md
index 1885108..3f592b2 100644
--- a/docs/base/readme.md
+++ b/docs/base/readme.md
@@ -6,26 +6,13 @@ SourceJS documentation is rendered by the engine itself and is shipped together
 
 Before you start, please make sure that [Git](http://git-scm.com/downloads) and [Node.js](http://nodejs.org/download/) are already installed on your system. Then install these NMP packages:
 
-```html
-npm install -g yo generator-sourcejs
-```
-
-Having all dependencies in-place you will get a special `yo sourcejs` generator available for new instance initialization:
-
-```html
-mkdir sourcejs && cd sourcejs
-yo sourcejs
-```
-
-To set-up a new engine instance chose the first option `Init SourceJS in this folder`. Generator also helps to bootstrap new Spec pages or plugins.
-
-### From NPM
-
 [![npm version](https://badge.fury.io/js/sourcejs.svg)](http://badge.fury.io/js/sourcejs)
 
-To install SourceJS as a NPM package, first clone clean `user` configuration folder and then execute `npm install`.
+To install SourceJS, first clone clean `user` configuration folder and then execute `npm install`.
 
-```html
+TODO
+
+```bash
 git clone https://github.com/sourcejs/init.git -b npm my-sourcejs && cd my-sourcejs
 npm install sourcejs --save
 npm start
@@ -35,9 +22,9 @@ npm start
 
 ### Run
 
-Installation wizard will offer to start SourceJS right after initialization. To run it manually, trigger this command in newly created folder with SourceJS app:
+To run it trigger this command in newly created folder with SourceJS app:
 
-```html
+```bash
 npm start
 ```
 
@@ -45,15 +32,17 @@ To set an alternative server port, pass `-- -p 8081` option.
 
 Other configuration arguments are described in the help section:
 
-```html
+```bash
 npm start -- -h
 ```
 
 ### Build
 
+TODO : this should no longer be nessesary
+
 During the initial set-up, generator will build everything for you. To re-build the engine, run this command:
 
-```html
+```bash
 npm run build
 ```
 
@@ -61,10 +50,19 @@ It will trigger `npm i` and default build task for updating dependencies and bui
 
 ### Update
 
-For updating SourceJS to a newer version, just pull the latest changes and trigger build:
+To check for updates for all NPM modules run this command:
 
-```html
-git pull && npm run build
+```bash
+npm outdated
+```
+
+This will list all outdated packages. If a new version of SourceJS is availeble, it will be listed.
+
+It's possible to update the version number in your `package.json` file manually, but it's easier to install [npm check updates](https://www.npmjs.org/package/npm-check-updates):
+
+```bash
+npm install -g npm-check-updates
+npm-check-updates -u sourcejs
 ```
 
 ## Creating First Spec
@@ -75,26 +73,35 @@ We treat Spec files as an interface, you can construct Spec page in many ways fo
 
 ### Spec Starting Template
 
-<div class="source_note">
-    After initialization, you get `sourcejs/user` folder, which is the place for all your custom content. All new Specs and configuration of main engine must be done there.
-</div>
-
 The starting template for new Spec pages can be found in `sourcejs/docs/starting` folder. Copy the contents to a new folder in `source/user/specs` and you'll be ready to write a new spec.
 
-<a href="/docs/spec" class="source_a_hl">Check the SourceJS Spec page documentation.</a>
+[Check the SourceJS Spec page documentation.](/docs/spec)
 
 ### Server-side Templating Engines
 
-As we mentioned before, it's easy to use other server-side templating engines like Jade, you only need to create a simple SourceJS middleware ([example](https://github.com/sourcejs/sourcejs-jade)) or process your sources with Grunt/Gulp.
+As we mentioned before, it's also possible to use *other* server-side templating engines like Jade. You need to create a SourceJS middleware that will perform the rendering. Our [sourcjejs-jade Middleware](https://github.com/sourcejs/sourcejs-jade) may serve as an example of such middleware.
 
-By default all files are pre-processed with [EJS](http://ejs.co/), so you're free to use custom EJS features in any spec page - like includes or even plain JavaScript:
+By default all files are pre-processed with [EJS](http://ejs.co/), so you're free to use custom EJS features, which is basicly most JavaScript:
 
 ```html
-&lt;%- include('filename.html') %&gt;
-&lt;% if (info.title === 'Title') {% &gt; Action! &lt;% } %&gt;
+  &lt;% if (info.title === 'Title') {% &gt; Action! &lt;% } %&gt;
 ```
 
-<a href="/docs/spec-helpers" class="source_a_hl">Read more about Spec page generation helpers.</a>
+```html
+<ul>
+  &lt;% [🐷,🐮,🐶,🐭].forEach(item => {% &gt;
+    <li>&lt;%- item %&gt;</li>
+  &lt;% }) %&gt;
+</ul>
+```
+
+And you can even use includes: a very useful EJS feature:
+
+```html
+&lt;%- include('filename.ejs', {info: info}) %&gt;
+```
+
+[Read more about Spec page generation helpers.](/docs/spec-helpers)
 
 ### Client-side Templating Engines
 
@@ -106,7 +113,13 @@ Remember, SourceJS Specs are a simple static pages, that are then enchanted with
 
 Main [project website](http://sourcejs.com) is based on SourceJS platform, as well as all documentation that you're surfing right now. Engine docs are both viewable on [GitHub](https://github.com/sourcejs/Source/tree/master/docs) and in SourceJS environment.
 
-Inspect [Sourcejs.com source code](https://github.com/sourcejs/Sourcejs.com) to get better understanding of the basic `source/user` folder contents with engine configuration.
+### Specs Showcase
+
+Highlighting the variety of different ways for organizing Spec pages we gathered another special bundle. View it's source code at [showcase repo](https://github.com/sourcejs/example-specs-showcase) and compare with [rendered result](http://sourcejs.com/specs/example-specs-showcase/).
+
+Showcase includes both native Specs examples, and ones that are rendered with plugins like [sourcejs-contrib-dss](http://github.com/sourcejs/sourcejs-contrib-dss) and [sourcejs-jade](http://github.com/sourcejs/sourcejs-jade).
+
+[Also check the SourceJS Spec page documentation.](/docs/spec)
 
 ### Bootstrap Bundle
 
@@ -116,30 +129,22 @@ We highly encourage you setting up Bootstrap bundle on your SourceJS instance, a
 
 Read our how-to articles, to get more information about the [SourceJS catalog set-up](https://github.com/sourcejs/blog-howto/tree/master/catalog-setup).
 
-### Specs Showcase
-
-Highlighting the variety of different ways for organizing Spec pages we gathered another special bundle. View it's source code at [showcase repo](https://github.com/sourcejs/example-specs-showcase) and compare with [rendered result](http://sourcejs.com/specs/example-specs-showcase/).
-
-Showcase includes both native Specs examples, and ones that are rendered with plugins like [sourcejs-contrib-dss](http://github.com/sourcejs/sourcejs-contrib-dss) and [sourcejs-jade](http://github.com/sourcejs/sourcejs-jade).
-
-<a href="/docs/spec" class="source_a_hl">Also check the SourceJS Spec page documentation.</a>
-
 ### Style Guide Driven Development
 
 To get more insights about recommended workflow within Style Guide platform check [this example bundle](https://www.youtube.com/watch?v=KeR8Qhgyb6M) together with short screencast.
 
-<div style="max-width: 600px;"><div style="position: relative; padding-bottom: 56.25%;">
+<div style="max-width: 100%;"><div style="position: relative; padding-bottom: 56.25%;">
 <iframe width="100%" height="100%" style="position: absolute;" src="https://www.youtube.com/embed/KeR8Qhgyb6M" frameborder="0" allowfullscreen></iframe>
 </div></div>
 
 
 ## Configuration
 
-SourceJS engine is highly configurable and allows to override almost any options from your instance set-up using personal configuration file `sourcejs/user/options.js`. All default, and safe to change options are described in base configuration file `sourcejs/options.js`.
+SourceJS engine is highly configurable. Engine and Middleware are configured in 1 place:: `options.js`.
 
 With version 0.5.3 we also introduced context level options `sourcejs-options.js`, which allows to configure any catalog specifically for your needs. Read more about it, and other configuration capabilities in [Engine Configuration](/docs/configuration) doc.
 
-## Plugins
+## Middleware
 
 As a Style Guide Platform we focus on flexibility and ease of integration. All SourceJS core modules are easy to configure and replace with your customized version.
 
@@ -147,27 +152,41 @@ Plugins are working in the same way as core modules, but are kept outside the ma
 
 Here is a list of available plugins:
 
-* [sourcejs-slm](https://github.com/venticco/sourcejs-slm) (new)
-* [sourcejs-md-react](https://github.com/mik01aj/sourcejs-md-react) (new)
-* [sourcejs-contrib-browser-sync](https://github.com/sourcejs/sourcejs-contrib-browser-sync) (new)
-* [sourcejs-react](https://github.com/szarouski/sourcejs-react) (new)
-* [sourcejs-contrib-dss](http://github.com/sourcejs/sourcejs-contrib-dss) (new)
-* [sourcejs-spec-status](https://github.com/sourcejs/sourcejs-spec-status)
-* [sourcejs-crowd-voice](https://github.com/sourcejs/sourcejs-crowd-voice)
+### New spec languages:
+* [sourcejs-slm](https://github.com/venticco/sourcejs-slm)
+* [sourcejs-react](https://github.com/szarouski/sourcejs-react)
 * [sourcejs-jade](https://github.com/sourcejs/sourcejs-jade)
+* [sourcejs-dss](http://github.com/sourcejs/sourcejs-contrib-dss)
+
+### New example languages
+* [sourcejs-react-styleguidist](https://github.com/sourcejs/sourcejs-react-styleguidist)
+* [sourcejs-md-react](https://github.com/mik01aj/sourcejs-md-react)
+
+### New Utility
+* [sourcejs-browser-sync](https://github.com/sourcejs/sourcejs-contrib-browser-sync)
+
+### New Spec Parts
 * [sourcejs-comments](https://github.com/sourcejs/sourcejs-comments)
-* [sourcejs-specs-linting](https://github.com/sourcejs/sourcejs-specs-linting)
+* [sourcejs-react-dependencies](https://github.com/ndelangen/sourcejs-react-dependencies)
 * [sourcejs-spec-dependencies](https://github.com/sourcejs/sourcejs-spec-dependencies)
-* [sourcejs-smiles](https://github.com/sourcejs/sourcejs-smiles)
+* [sourcejs-spec-status](https://github.com/sourcejs/sourcejs-spec-status)
+* [sourcejs-crowd-voice](https://github.com/sourcejs/sourcejs-crowd-voice)
+* [sourcejs-specs-linting](https://github.com/sourcejs/sourcejs-specs-linting)
 
-These modules are able to extend both front-end and back-end part of the engine. To install any of official plugin, just use `npm install` in your `sourcejs/user` folder (note that some of them needs additional dependencies like [MongoDB](http://www.mongodb.org/) or [CouchDB](http://couchdb.apache.org/)).
+These modules are able to extend both front-end and back-end part of the engine. To install any middleware, run `npm install <name>`
+
+After install is finished (re)start your SourceJS instance using: `npm start`.
+
+Some Middleware need addition setup!
 
 Follow [this guide](/docs/api/plugins) to learn how to develop own plugins for SourceJS Platform.
 
+If you have created your own middleware, please let us know! If you'd like to add your middleware to the list above, you can submit a Pull-Request.
+
 ## Contact us
 
 Leave your questions and feedback as [issues](https://github.com/sourcejs/Source/issues) on GitHub orr [request a consultation](mailto:r@rhr.me) from SourceJS founders.
 
 If you have any quick questions, or want to share your experience working with SourceJS, drop us a message in Gitter chat:
 
-[![Gitter chat](https://img.shields.io/badge/gitter-join%20chat-1dce73.svg)](https://gitter.im/sourcejs/Source)
\ No newline at end of file
+[![Gitter chat](https://img.shields.io/badge/gitter-join%20chat-1dce73.svg)](https://gitter.im/sourcejs/Source)
diff --git a/docs/build-tasks/info.json b/docs/build-tasks/info.json
index baf6f2b..bf11ec3 100644
--- a/docs/build-tasks/info.json
+++ b/docs/build-tasks/info.json
@@ -1,4 +1,5 @@
 {
-    "title": "Build Tasks",
-    "template": "doc"
+    "title": "Developing SourceJS: Build Tasks",
+    "template": "doc",
+	"tag": ["advanced"]
 }
diff --git a/docs/build-tasks/readme.md b/docs/build-tasks/readme.md
index 6b49eb5..d7d2215 100644
--- a/docs/build-tasks/readme.md
+++ b/docs/build-tasks/readme.md
@@ -1,6 +1,6 @@
-Note that these commands are related only to SourceJS engine build and development cycle.
+Note that these commands are related only to **SourceJS engine build and development** cycle.
 
-For building specs and other project related content use own build tasks from `sourcejs/user` folder.
+For building specs and other project related content use own build tasks.
 
 ## Scripts
 
@@ -8,7 +8,7 @@ All automation tasks are triggered through NPM scripts listed in `package.json`.
 
 Here's a list of most common commands:
 
-```js
+```bash
 $ npm run build
 $ npm start
 
@@ -24,4 +24,4 @@ $ npm run test:func
 
 * `npm run build` - default build command for preparing SourceJS assets, used as a post-install hook and after plugin installation
 * `npm start` - runs the engine
-* `npm run watch` - runs engine sources watcher, used in core client-side modules development
\ No newline at end of file
+* `npm run watch` - runs engine sources watcher, used in core client-side modules development
diff --git a/docs/clarify/info.json b/docs/clarify/info.json
index 6466bf2..cdcc2cb 100644
--- a/docs/clarify/info.json
+++ b/docs/clarify/info.json
@@ -1,4 +1,5 @@
 {
     "title": "Clarify - Spec Section Testing Environment",
-    "template": "doc"
-}
\ No newline at end of file
+    "template": "doc",
+	"tag": ["details"]
+}
diff --git a/docs/configuration/readme.md b/docs/configuration/readme.md
index da22a0c..fb37d2f 100644
--- a/docs/configuration/readme.md
+++ b/docs/configuration/readme.md
@@ -4,34 +4,34 @@ SourceJS engine is highly configurable and allows to override almost any options
 
 Starting from default configuration to spec page overrides, it's possible to re-define options on any level, before it reaches execution phase. This is the priority list of all available configuration levels (starting from default):
 
-* `sourcejs/options.js` - default engine configuration file with examples and documented fields, located next to engine sources
-* `sourcejs/user/options.js` - user level settings, as well as other configuration layers, it follows the same structure as default engine options
-* `sourcejs/user/**/sourcejs-options.js` - context level settings allows to specify custom configuration per catalogue (have some limitations), supports inheritance for child specs and catalogs
+* `/options.js` - user level settings, as well as other configuration layers, it follows the same structure as default engine options
+* `/**/sourcejs-options.js` - context level settings allows to specify custom configuration per catalogue (have some limitations), supports inheritance for child specs and catalogs
 * `info.json` `sourcejs` field - spec context level options, similar to `sourcejs-options.js` but affects only current spec page
 
-Each configuration layer has the same options structure as default reference `sourcejs/options.js`.
+Each configuration layer has the same options structure as default reference `/node_modules/sourcejs/options.js`.
 
 ### Context Options
 
 Following the options priority hierarchy, context options allows to define highest priority configuration per catalog and spec.
 
-`sourcejs-option.js` file could be placed into any catalog in `sourcejs/user` folder and will affect all nested items. In this example, `catalog1/sourcejs-options.js` will affect both `catalog1/component1`, `catalog1/component2` specs and it's children:
+`sourcejs-option.js` file could be placed into any folder and will affect all nested items. In this example, `specs/catalog1/sourcejs-options.js` will affect both `specs/catalog1/component1`, `specs/catalog2/component2` specs and it's children:
 
 ```html
-/user
-    catalog1
-        component1
-        component2
-        sourcejs-options.js
-
-    catalog2
+/
+    specs
+	    catalog1
+	        component1
+	        component2
+	        sourcejs-options.js
+
+	    catalog2
 ```
 
 On each spec page call, engine gathers all the context configuration files up the tree and merges it on top of each other. The same process will happen with spec context level options in `info.json`, with only difference that it won't be shared with child items.
 
 Here's an example of local `info.json` configuration:
 
-```js
+```json
 {
     "title": "Spec Title",
     "sourcejs": {
@@ -42,13 +42,13 @@ Here's an example of local `info.json` configuration:
 }
 ```
 
-Since not all the configuration is dynamic, comparing to user level options, context options allows to change only these groups:
+Since not all the configuration is dynamic, context options allows to change only these groups:
 
 * `assets`
 * `plugins`
 * `rendering`
 
-Note that context options does not allow changing `core` setting, to override them use `sourcejs/user/options.js` level instead. This limitation is defined by the fact, that only user level options are activated during the application start.
+Note that context options does not allow changing `core` setting, to override them use `/options.js` level instead. This limitation is defined by the fact, that only these options are activated during the application start.
 
 ## Patching core assets
 
@@ -56,13 +56,13 @@ Note that context options does not allow changing `core` setting, to override th
     Patching is not recommended approach, it's supposed to be used only for edge cases, before your changes will be merged in SourceJS core.
 </div>
 
-To extend core Front-end assets, that are stored in `sourcejs/assets` we provide a patching feature.
+To extend core Front-end assets, that are stored in `/node_modules/sourcejs/assets` we provide a patching feature.
 
-To use your own version of any core assets, all you need is to place your new files to `sourcejs/user/core/assets` folder. Custom routing will handle the rest:
+To use your own version of any core assets, all you need is to place your new files to `/core/assets` folder. Custom routing will handle the rest:
 
-```html
-sourcejs/assets/js/modules/ntf.js < sourcejs/user/source/assets/js/modules/ntf.js
-sourcejs/assets/js/modules/css.js < sourcejs/user/source/assets/js/modules/css.js
+```
+/node_modules/sourcejs/assets/js/modules/ntf.js < /source/assets/js/modules/ntf.js
+/node_modules/sourcejs/assets/js/modules/css.js < /source/assets/js/modules/css.js
 ```
 
-In this example, on request for `localhost:8080/source/assets/js/modules/ntf.js` engine will provide version from `sourcejs/user/source/assets` folder, instead of version from core `sourcejs/assets`.
\ No newline at end of file
+In this example, on request for `localhost:8080/source/assets/js/modules/ntf.js` engine will provide version from `sourcejs/user/source/assets` folder, instead of version from core `sourcejs/assets`.
diff --git a/docs/data-nav/info.json b/docs/data-nav/info.json
index c90e605..39816e1 100644
--- a/docs/data-nav/info.json
+++ b/docs/data-nav/info.json
@@ -1,4 +1,5 @@
 {
-    "title": "Auto-generated Navigation",
-    "template": "doc"
+    "title": "Creating catalogs",
+    "template": "doc",
+	"tag": ["catalogue", "navigation", "getting-started"]
 }
diff --git a/docs/data-nav/readme.md b/docs/data-nav/readme.md
index 0febd33..4ff0c84 100644
--- a/docs/data-nav/readme.md
+++ b/docs/data-nav/readme.md
@@ -5,7 +5,7 @@ Navigation blocks in SourceJS are automatically generated on client-side, replac
 Copy and modify this HTML snippet to set-up your custom navigation.
 
 ```html
-&lt;div class="source_catalog" data-nav="/docs">&lt;/div>
+​<div class="source_catalog" data-nav="/docs">​</div>
 ```
 
 `data-nav` attribute defines the catalogue to be displayed. Inserting mentioned code in any SourceJS page a navigation like this will be generated:
@@ -18,7 +18,7 @@ Copy and modify this HTML snippet to set-up your custom navigation.
 We recommend using absolute paths as most stable and predictable.
 
 ```html
-&lt;div class="source_catalog" data-nav="/docs/api">&lt;/div>
+​<div class="source_catalog" data-nav="/docs/api">​</div>
 ```
 
 Renders this navigation block:
@@ -31,10 +31,10 @@ Renders this navigation block:
 Relative paths are also supported. During hook initialization, engine will replace `./` with current navigation URL.
 
 ```html
-&lt;div class="source_catalog" data-nav="./api">&lt;/div>
+​<div class="source_catalog" data-nav="./api">​</div>
 ```
 
-Putting this HTML snippet in `localhost:8080/docs` page, it will be resolved to `/docs/api/` catalog, same as with absolute path.
+Putting this HTML snippet in `/docs` page, it will be resolved to `/docs/api/` catalog, same as with absolute path.
 
 This feature is especially useful for nested catalogs and stand-alone collections like [example-specs-showcase](https://github.com/sourcejs/example-specs-showcase/blob/master/index.src.html).
 
@@ -44,7 +44,7 @@ This feature is especially useful for nested catalogs and stand-alone collection
 Auto-generated title and description in navigation block are taked directly from `info.json` meta file.
 
 ```html
-&lt;div class="source_catalog" data-nav="./example">&lt;/div>
+​<div class="source_catalog" data-nav="./example">​</div>
 ```
 
 <div class="source_catalog" data-nav="./example"></div>
@@ -52,10 +52,10 @@ Auto-generated title and description in navigation block are taked directly from
 If there is no description, or you want to leave custom text, just use this extra markup:
 
 ```html
-&lt;div class="source_catalog" data-nav="./example">
-    &lt;h2>Custom Title&lt;/h2>
-    &lt;p>Custom description for catalogue.&lt;p>
-&lt;/div>
+​<div class="source_catalog" data-nav="./example">
+    ​<h2>Custom Title​</h2>
+    ​<p>Custom description for catalogue.​<p>
+​</div>
 ```
 
 <div class="source_catalog" data-nav="./example">
@@ -69,7 +69,7 @@ As it's possible to define different tags for specs in `info.json` [files](/docs
 
 
 ```html
-&lt;div class="source_catalog" data-nav="/docs" data-tag="templates">&lt;/div>
+​<div class="source_catalog" data-nav="/docs" data-tag="templates">​</div>
 ```
 
 <div class="source_catalog" data-nav="/docs" data-tag="templates">
@@ -90,10 +90,10 @@ module.exports = {
     moduleOptions: {
       globalNav: {
         templates: {
-          catalogHeader: _.template('<h2 class="custom-class">&lt;%= catalogMeta.title %&gt;</h2>'),
+          catalogHeader: _.template('<h2 class="custom-class">​<%= catalogMeta.title %​></h2>'),
         }
       }
     }
   }
 }
-```
\ No newline at end of file
+```
diff --git a/docs/index.src.html b/docs/index.src.html
index 250a8e3..db658dd 100644
--- a/docs/index.src.html
+++ b/docs/index.src.html
@@ -2,8 +2,18 @@
     <h1>Documentation and Examples</h1>
 </div>
 
-<div class="source_catalog" data-nav="/docs" data-tag="without-tag"></div>
+<div class="source_catalog" data-nav="/docs" data-tag="getting-started">
+	<h2>Getting started</h2>
+</div>
+
+<div class="source_catalog" data-nav="/docs" data-tag="details">
+	<h2>Detailed explanations</h2>
+</div>
 
-<div class="source_catalog" data-nav="/docs" data-tag="templates">
-    <h2>Templates</h2>
-</div>
\ No newline at end of file
+<div class="source_catalog" data-nav="/docs" data-tag="advanced">
+    <h2>Advanced</h2>
+</div>
+
+<div class="source_catalog" data-nav="/docs" data-tag="other">
+	<h2>Misc</h2>
+</div>
diff --git a/docs/info-json/info.json b/docs/info-json/info.json
deleted file mode 100644
index 03a0d84..0000000
--- a/docs/info-json/info.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "title": "Info.json - Spec Description",
-    "tag": ["tag", "title", "thumbnailPath", "specFile", "template", "role", "info", "spec meta"],
-    "template": "doc"
-}
diff --git a/docs/markdown/info.json b/docs/markdown/info.json
deleted file mode 100644
index 7cbf31f..0000000
--- a/docs/markdown/info.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "title": "Markdown Support",
-  "template": "doc"
-}
\ No newline at end of file
diff --git a/docs/migration/info.json b/docs/migration/info.json
index 5bf1c5e..e7c2a80 100644
--- a/docs/migration/info.json
+++ b/docs/migration/info.json
@@ -1,4 +1,5 @@
 {
     "title": "Migration Notes",
-    "template": "doc"
-}
\ No newline at end of file
+    "template": "doc",
+	"tag": ["other"]
+}
diff --git a/docs/migration/readme.md b/docs/migration/readme.md
index 597b5cc..6fc73af 100644
--- a/docs/migration/readme.md
+++ b/docs/migration/readme.md
@@ -1,7 +1,11 @@
 Here you will find migration instructions from different Source versions
 
+## From 0.5.x to 0.6.x
+
+* It's not recommended to install and use SourceJS as a npm dependency, installation via cloning is deprecated and will be removed in the next version.
+
 ## From 0.4.0-beta to 0.4.0-rc
 
 * Update engine files, run `npm run build` in the root of engine
 * If you have custom `user/core/views`, then add `info.*` namespace to all data in template that is taken from `info.json` (`info.author`, `info.title`, `info.keywords`)
-* Set at your views and `*.html` spec files new path to main client-side file: `/source/assets/js/enter-the-source.js`
\ No newline at end of file
+* Set at your views and `*.html` spec files new path to main client-side file: `/source/assets/js/enter-the-source.js`
diff --git a/docs/spec-helpers/examples/buttons.html b/docs/spec-ejs/examples/buttons.html
similarity index 100%
rename from docs/spec-helpers/examples/buttons.html
rename to docs/spec-ejs/examples/buttons.html
diff --git a/docs/spec-ejs/examples/include.html b/docs/spec-ejs/examples/include.html
new file mode 100644
index 0000000..c04ea0a
--- /dev/null
+++ b/docs/spec-ejs/examples/include.html
@@ -0,0 +1 @@
+This is an included file from `spec-helpers/examples/include.html`.
diff --git a/docs/spec-ejs/examples/markdown-file.md b/docs/spec-ejs/examples/markdown-file.md
new file mode 100644
index 0000000..68d99b6
--- /dev/null
+++ b/docs/spec-ejs/examples/markdown-file.md
@@ -0,0 +1,10 @@
+Processed **Markdown** file.
+
+* list item 1
+* list item 2
+* list item 3
+
+
+1. list item
+2. list item
+3. list item
diff --git a/docs/spec-ejs/examples/mask-one.html b/docs/spec-ejs/examples/mask-one.html
new file mode 100644
index 0000000..2959151
--- /dev/null
+++ b/docs/spec-ejs/examples/mask-one.html
@@ -0,0 +1,2 @@
+This is an included file from `spec-helpers/examples/mask-one.html`.
+<hr/>
diff --git a/docs/spec-ejs/examples/mask-two.html b/docs/spec-ejs/examples/mask-two.html
new file mode 100644
index 0000000..52441e7
--- /dev/null
+++ b/docs/spec-ejs/examples/mask-two.html
@@ -0,0 +1,3 @@
+This is an included file from `spec-helpers/examples/mask-two.html` and it includes `three.html`
+<hr/>
+<%- includeFiles('three.html') %>
diff --git a/docs/spec-ejs/examples/three.html b/docs/spec-ejs/examples/three.html
new file mode 100644
index 0000000..5d08c4d
--- /dev/null
+++ b/docs/spec-ejs/examples/three.html
@@ -0,0 +1,2 @@
+This is an included file from `spec-helpers/examples/three.html`.
+<hr/>
diff --git a/docs/spec-ejs/info.json b/docs/spec-ejs/info.json
new file mode 100644
index 0000000..4435041
--- /dev/null
+++ b/docs/spec-ejs/info.json
@@ -0,0 +1,5 @@
+{
+    "tag": ["ejs", "include", "spec markup", "details"],
+	"title": "Creating Specs: Spec File as EJS",
+    "template": "doc"
+}
diff --git a/docs/spec-ejs/readme.md b/docs/spec-ejs/readme.md
new file mode 100644
index 0000000..e3258b5
--- /dev/null
+++ b/docs/spec-ejs/readme.md
@@ -0,0 +1,81 @@
+SourceJS uses powerful [EJS](http://ejs.co/) templating engine for core UI generation and Specs content processing. This means that any Spec file *can* use the full power of EJS templating logic.
+
+## Intro
+
+```html
+<​% if (info.title === 'Title') {% ​> Action! <​% } %​>
+```
+
+Use plain JavaScript for managing conditions and generating demo content through data loops. All `info.json` file contents are by default available in each Spec scope. Apart from common [meta information](/docs/info-json) available in `info.json` files, it's possible to set any of your own custom data.
+
+```html
+<​h2​><​%- info.title %​><​/h2​>
+
+<​% var buttons = ['btn-group-lg', '', 'btn-group-sm', 'btn-group-xs'] %​>
+
+<​% buttons.forEach(function(modifier){ %​>
+    <​div class="btn-group <​%= modifier %​>" role="group" aria-label="Default button group"​>
+      <​button type="button" class="btn btn-default"​>Left<​/button​>
+      <​button type="button" class="btn btn-default"​>Middle<​/button​>
+      <​button type="button" class="btn btn-default"​>Right<​/button​>
+    <​/div​><​br​><​br​>
+<​% }); %​>
+```
+
+```example
+<%- include('examples/buttons.html') %>
+```
+
+### Includes
+
+Providing a relative path to current Specs, it's easy to include any file.
+
+```html
+<​%- include('examples/include.html') %​>
+```
+
+```example
+<%- include('examples/include.html') %>
+```
+
+Note that by default, SourceJS restricts including files outside project directory for security reasons. To disable this restrictions, change `core.sandboxIncludes` configuration.
+
+<a href="https://github.com/sourcejs/Source/tree/master/docs/spec-helpers/examples" class="source_a_hl">View examples source code.</a>
+
+
+## EJS Custom Helpers
+
+Starting from v.0.5.6, SourceJS provides a set of custom EJS helpers:
+
+* `includeMD(path)` - include and process Markdown file
+* `includeFiles(glob)` - include a set of files by mask (uses [glob](https://github.com/isaacs/node-glob))
+
+Feel free to create Pull Requests with a wider set of helpers.
+
+### includeMD
+
+```html
+<​%- includeMD('examples/markdown-file') %​>
+```
+
+```example
+<%- includeMD('examples/markdown-file') %>
+```
+
+### includeFiles
+
+```html
+<​%- includeFiles('examples/mask-*.html') %​>
+```
+
+```example
+<%- includeFiles('examples/mask-*.html') %>
+```
+
+<a href="https://github.com/sourcejs/Source/tree/master/docs/spec-helpers/examples" class="source_a_hl">View examples source code.</a>
+
+## Extended features
+
+For any other custom Spec content processing, we recommend building own SourceJS plugins. Follow our [instructions](/docs/api/plugins/) and example plugins for fast kick-off.
+
+It's also possible to configure custom build task, that will generate compatible Spec pages via Grunt/Gulp or any other build tool.
diff --git a/docs/spec-file/examples/buttons.html b/docs/spec-file/examples/buttons.html
new file mode 100644
index 0000000..ba03d96
--- /dev/null
+++ b/docs/spec-file/examples/buttons.html
@@ -0,0 +1,11 @@
+<h2><%- info.title %></h2>
+
+<% var buttons = ['btn-group-lg', '', 'btn-group-sm', 'btn-group-xs'] %>
+
+<% buttons.forEach(function(modifier){ %>
+    <div class="btn-group <%= modifier %>" role="group" aria-label="Default button group">
+      <button type="button" class="btn btn-default">Left</button>
+      <button type="button" class="btn btn-default">Middle</button>
+      <button type="button" class="btn btn-default">Right</button>
+    </div><br><br>
+<% }); %>
\ No newline at end of file
diff --git a/docs/spec-helpers/examples/include.html b/docs/spec-file/examples/include.html
similarity index 100%
rename from docs/spec-helpers/examples/include.html
rename to docs/spec-file/examples/include.html
diff --git a/docs/spec-helpers/examples/markdown-file.md b/docs/spec-file/examples/markdown-file.md
similarity index 100%
rename from docs/spec-helpers/examples/markdown-file.md
rename to docs/spec-file/examples/markdown-file.md
diff --git a/docs/spec-helpers/examples/mask-one.html b/docs/spec-file/examples/mask-one.html
similarity index 100%
rename from docs/spec-helpers/examples/mask-one.html
rename to docs/spec-file/examples/mask-one.html
diff --git a/docs/spec-helpers/examples/mask-two.html b/docs/spec-file/examples/mask-two.html
similarity index 100%
rename from docs/spec-helpers/examples/mask-two.html
rename to docs/spec-file/examples/mask-two.html
diff --git a/docs/spec-helpers/examples/three.html b/docs/spec-file/examples/three.html
similarity index 100%
rename from docs/spec-helpers/examples/three.html
rename to docs/spec-file/examples/three.html
diff --git a/docs/spec-file/info.json b/docs/spec-file/info.json
new file mode 100644
index 0000000..e671f57
--- /dev/null
+++ b/docs/spec-file/info.json
@@ -0,0 +1,5 @@
+{
+    "tag": ["ejs", "include", "spec markup", "getting-started"],
+    "title": "Creating specs",
+    "template": "doc"
+}
diff --git a/docs/spec-file/readme.md b/docs/spec-file/readme.md
new file mode 100644
index 0000000..18c37e2
--- /dev/null
+++ b/docs/spec-file/readme.md
@@ -0,0 +1,33 @@
+Spec pages consist of a specFile and a [specInfo](docs/spec-json): `info.json`.
+
+## Intro
+
+Spec pages in SourceJS engine are the main content units. They provide a proper sandbox for demoing rendered components, usage examples and module documentation.
+
+Out of the box you've got 3 options on how you can write your spec pages. Choose whichever makes your development process as easy as possible
+
+* [HTML](/docs/spec-html)
+* [Markdown](/docs/spec-markdown)
+* [EJS](/docs/spec-ejs)
+
+These 3 options are not mutually exclusive, on a single spec page, you can use all 3!
+
+## Plugins
+
+It's really important for us to make SourceJS easy adaptable to any project needs. Having a powerful, and easy-to-develop plugins system hugely improves developers user experience working with Living Style Guides.
+
+Here's a list of all Spec generation focused plugins:
+
+* [sourcejs-jade](https://github.com/sourcejs/sourcejs-jade) - [Jade](http://jade-lang.com/) syntax support
+* [sourcejs-slm](https://github.com/venticco/sourcejs-slm) - [Slim](http://slim-lang.com/) templates support
+* [sourcejs-dss](http://github.com/sourcejs/sourcejs-contrib-dss) - generating documentation out of CSS comments
+* [sourcejs-md-react](https://github.com/mik01aj/sourcejs-md-react) - Markdown helpers for rendering React components
+* [sourcejs-react](https://github.com/szarouski/sourcejs-react) - generate specs from JSX files
+
+Most of the plugins have [live examples](http://sourcejs.com/specs/example-specs-showcase/) on the project website.
+
+## Extended features
+
+For any other custom Spec content processing, we recommend building own SourceJS plugins. Follow our [instructions](/docs/api/plugins/) and example plugins for fast kick-off.
+
+It's also possible to configure custom build task, that will generate compatible Spec pages via Grunt/Gulp or any other build tool.
diff --git a/docs/spec-helpers/info.json b/docs/spec-helpers/info.json
deleted file mode 100644
index f321287..0000000
--- a/docs/spec-helpers/info.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "tag": ["ejs", "include"],
-    "title": "Spec Rendering Helpers",
-    "template": "doc"
-}
diff --git a/docs/spec-helpers/readme.md b/docs/spec-helpers/readme.md
deleted file mode 100644
index e05dde1..0000000
--- a/docs/spec-helpers/readme.md
+++ /dev/null
@@ -1,103 +0,0 @@
-## Intro
-
-Spec pages in SourceJS engine are the main content units. They provide a proper sandbox for demoing rendered components, usage examples and module documentation. Therefore, it's really important to make Spec pages development process as easy as possible.
-
- Apart from plugins, that allow integrating different technologies for generating Specs pages, the engine provides a set of native helpers based on [EJS](http://ejs.co).
-
- Let's dive deeper into each of available Spec generation features.
-
- ## Plugins
-
- It's really important for us to make SourceJS easy adaptable to any project needs. Having a powerful, and easy-to-develop plugins system hugely improves developers user experience working with Living Style Guides.
-
- Here's a list of all Spec generation focused plugins:
-
-* [sourcejs-slm](https://github.com/venticco/sourcejs-slm) - [Slim](http://slim-lang.com/) templates support
-* [sourcejs-md-react](https://github.com/mik01aj/sourcejs-md-react) - Markdown helpers for rendering React components
-* [sourcejs-react](https://github.com/szarouski/sourcejs-react) - generate specs from JSX files
-* [sourcejs-contrib-dss](http://github.com/sourcejs/sourcejs-contrib-dss) - generating documentation out of CSS comments
-* [sourcejs-jade](https://github.com/sourcejs/sourcejs-jade) - [Jade](http://jade-lang.com/) syntax support
-
-Most of the plugins have [live examples](http://sourcejs.com/specs/example-specs-showcase/) on the project website.
-
- ## Native Templating
-
- SourceJS uses powerful [EJS](http://ejs.co/) templating engine for core UI generation and Specs content processing. This means that any Spec file can use the full power of EJS templating logic.
-
- ```html
-&lt;% if (info.title === 'Title') {% &gt; Action! &lt;% } %&gt;
-```
-
-Use plain JavaScript for managing conditions and generating demo content through data loops. All `info.json` file contents are by default available in each Spec scope. Apart from common [meta information](/docs/info-json) available in `info.json` files, it's possible to set any of your own custom data.
-
-```html
-&lt;h2&gt;&lt;%- info.title %&gt;&lt;/h2&gt;
-
-&lt;% var buttons = ['btn-group-lg', '', 'btn-group-sm', 'btn-group-xs'] %&gt;
-
-&lt;% buttons.forEach(function(modifier){ %&gt;
-    &lt;div class="btn-group &lt;%= modifier %&gt;" role="group" aria-label="Default button group"&gt;
-      &lt;button type="button" class="btn btn-default"&gt;Left&lt;/button&gt;
-      &lt;button type="button" class="btn btn-default"&gt;Middle&lt;/button&gt;
-      &lt;button type="button" class="btn btn-default"&gt;Right&lt;/button&gt;
-    &lt;/div&gt;&lt;br&gt;&lt;br&gt;
-&lt;% }); %&gt;
-```
-
-```example
-<%- include('examples/buttons.html') %>
-```
-
-### Includes
-
-Providing a relative path to current Specs, it's easy to include any file.
-
-```html
-&lt;%- include('examples/include.html') %&gt;
-```
-
-```example
-<%- include('examples/include.html') %>
-```
-
-Note that by default, SourceJS restricts including files outside project directory for security reasons. To disable this restrictions, change `core.sandboxIncludes` configuration.
-
-<a href="https://github.com/sourcejs/Source/tree/master/docs/spec-helpers/examples" class="source_a_hl">View examples source code.</a>
-
-
-## EJS Custom Helpers
-
-Starting from v.0.5.6, SourceJS provides a set of custom EJS helpers:
-
-* `includeMD(path)` - include and process Markdown file
-* `includeFiles(glob)` - include a set of files by mask (uses [glob](https://github.com/isaacs/node-glob))
-
-Feel free to create Pull Requests with a wider set of helpers.
-
-### includeMD
-
-```html
-&lt;%- includeMD('examples/markdown-file') %&gt;
-```
-
-```example
-<%- includeMD('examples/markdown-file') %>
-```
-
-### includeFiles
-
-```html
-&lt;%- includeFiles('examples/mask-*.html') %&gt;
-```
-
-```example
-<%- includeFiles('examples/mask-*.html') %>
-```
-
-<a href="https://github.com/sourcejs/Source/tree/master/docs/spec-helpers/examples" class="source_a_hl">View examples source code.</a>
-
-## Extended features
-
-For any other custom Spec content processing, we recommend building own SourceJS plugins. Follow our [instructions](/docs/api/plugins/) and example plugins for fast kick-off.
-
-It's also possible to configure custom build task, that will generate compatible Spec pages via Grunt/Gulp or any other build tool.
\ No newline at end of file
diff --git a/docs/starting-md/css/starting.css b/docs/spec-html-example/css/starting.css
similarity index 100%
rename from docs/starting-md/css/starting.css
rename to docs/spec-html-example/css/starting.css
diff --git a/docs/starting/index.src.html b/docs/spec-html-example/index.src.html
similarity index 100%
rename from docs/starting/index.src.html
rename to docs/spec-html-example/index.src.html
diff --git a/docs/starting/info.json b/docs/spec-html-example/info.json
similarity index 100%
rename from docs/starting/info.json
rename to docs/spec-html-example/info.json
diff --git a/docs/spec/css/spec.css b/docs/spec-html/css/spec.css
similarity index 100%
rename from docs/spec/css/spec.css
rename to docs/spec-html/css/spec.css
diff --git a/docs/spec/index.src.html b/docs/spec-html/index.src.html
similarity index 97%
rename from docs/spec/index.src.html
rename to docs/spec-html/index.src.html
index 2814b98..1c83b40 100755
--- a/docs/spec/index.src.html
+++ b/docs/spec-html/index.src.html
@@ -1,5 +1,5 @@
 <div class="source_info">
-    <p>This page highlights the basic features of SourceJS documentation pages that we call Specs. To create your own Spec, follow this <a href="/docs/base/#creating-first-spec">short guide</a>.</p>
+    <p>This page highlights the basic features of SourceJS documentation pages that we call Specs. If you're starting from scratch and want to create the very first Spec, follow this <a href="/docs/base/#creating-first-spec">short guide</a>.</p>
 
     <p>For text description, SourceJS uses basic HTML markup, and custom CSS class hooks. To render highlighted description block like this, add <code>.source_info</code> class to a any HTML element on page.</p>
 </div>
@@ -167,4 +167,4 @@ <h2>Source code</h2>
 </style>
 <script>
     var forTest = '';
-</script>
\ No newline at end of file
+</script>
diff --git a/docs/spec-html/info.json b/docs/spec-html/info.json
new file mode 100644
index 0000000..7dbca2c
--- /dev/null
+++ b/docs/spec-html/info.json
@@ -0,0 +1,5 @@
+{
+    "tag": ["create spec", "spec markup", "details"],
+    "template": "doc",
+    "title": "Creating Specs: Spec File as HTML"
+}
diff --git a/docs/spec-json/info.json b/docs/spec-json/info.json
new file mode 100644
index 0000000..6c98942
--- /dev/null
+++ b/docs/spec-json/info.json
@@ -0,0 +1,5 @@
+{
+    "title": "Creating Specs: Info.json File",
+    "tag": ["tag", "title", "thumbnailPath", "specFile", "template", "role", "info", "spec meta", "details"],
+    "template": "doc"
+}
diff --git a/docs/info-json/readme.md b/docs/spec-json/readme.md
similarity index 57%
rename from docs/info-json/readme.md
rename to docs/spec-json/readme.md
index 15cbd4d..af8c82b 100644
--- a/docs/info-json/readme.md
+++ b/docs/spec-json/readme.md
@@ -1,8 +1,10 @@
 `info.json` file in spec folder is used for defining page meta information and local options set-up. Use it for customizing global navigation or with your custom fields.
 
-## Used options
+This file is also what the engine is looking for when looking for child-specs in [auto-generated navigation](/docs/data-nav).
 
-List of used options in `info.json`:
+## Engine options
+
+List of options in `info.json` (example):
 
 ```js
 {
@@ -11,35 +13,55 @@ List of used options in `info.json`:
     "tag": ["tags", "for", "search"],
     "info": "Spec description.",
     "role": "navigation",
-    "template": ["custom" | "$(context)/template.ejs"],
+    "template": "$(context)/template.ejs",
     "specFile": "index.custom.hmtl",
-    "thumbnailPath": "custom-thumbnail.png"
+    "thumbnailPath": "custom-thumbnail.png",
     "sourcejs": { "assets" :{} }
 }
 ```
 
-* `title` - the only mandatory parameter, defines spec title in navigation
-* `author` - used in global navigation
+* `title` - the only mandatory parameter, defines spec title in [auto-generated navigation](/docs/data-nav)
+* `author` - shown in [auto-generated navigation](/docs/data-nav)
 * `tag` - tags are used for search, filtering through [API](/docs/api) and [auto-generated navigation](/docs/data-nav)
 * `info` - spec description
 * `role` - set the page role ("navigation" or "spec"), used for setting different `*.src.html` files templates
 * `thumbnailPath` - custom relative path to spec page preview image
 
-Feel free to add any custom meta information to `info.json` file for your needs as well. This info will be then available from [Spec API](/docs/api), in middleware-plugins (`req.specData.info`) and for adding custom [ESJ templating](/docs/base/#server-side-templating-engines).
-
 ### template
 
 `template` field allows defining custom parent template for rendering the spec page. Available values:
 
-* `tpl-name` - `*.ejs` template in `user/core/views` folder
+* `tpl-name` - `*.ejs` template in `/core/views` folder
 * `$(context)/tpl-name.ejs` - path to template relative to current `info.json` location, other available placeholders - `$(sourcejs)`, `$(user)`
 
 ### specFile
 
 `specFile` - allows to define custom spec files source, overriding `options.rendering.specFiles` configuration.
 
+### tag
+
+`tag` - if defined, it should be an array of strings. This allows spec pages to be found by keyword by search.
+
 ### sourcejs
 
 `sourcejs` - this field accepts a local configuration object for configuring spec level context options.
 
 Read more about engine configuration capabilities in [Engine Configuration](/docs/configuration) doc.
+
+## Custom options / properties
+
+Feel free to add **any** custom meta information to `info.json` file for your needs as well. This info will be then available from [Spec API](/docs/api), in middleware-plugins (`req.specData.info`).
+
+It will also be availeble to [EJS](/docs/spec-ejs) during spec rendering:
+
+```js
+{
+    "title": "My own spec!",
+    "yourCustomProperty": "My custom data"
+}
+```
+
+```html
+<​h2​><​%- info.info %​><​/h2​>
+<​h3​><​%- info.yourCustomProperty %​><​/h3​>
+```
diff --git a/docs/starting/css/starting.css b/docs/spec-markdown-example/css/starting.css
similarity index 100%
rename from docs/starting/css/starting.css
rename to docs/spec-markdown-example/css/starting.css
diff --git a/docs/starting-md/info.json b/docs/spec-markdown-example/info.json
similarity index 98%
rename from docs/starting-md/info.json
rename to docs/spec-markdown-example/info.json
index f2bd9a0..7fb4970 100644
--- a/docs/starting-md/info.json
+++ b/docs/spec-markdown-example/info.json
@@ -2,4 +2,4 @@
     "author": "Spec author",
     "title": "Markdown Spec Page Template",
     "tag": ["templates"]
-}
\ No newline at end of file
+}
diff --git a/docs/starting-md/readme.md b/docs/spec-markdown-example/readme.md
similarity index 78%
rename from docs/starting-md/readme.md
rename to docs/spec-markdown-example/readme.md
index 5d7945f..1c23071 100755
--- a/docs/starting-md/readme.md
+++ b/docs/spec-markdown-example/readme.md
@@ -9,7 +9,7 @@ Useful information regarding this spec can be left for your team members here.
 
 ## Spec Section Heading
 
-<a class="source_a_hl" href="/docs/spec">Spec Page Documentation</a>
+[Spec Page Documentation](/docs/spec)
 
 Useful notes.
 
@@ -17,4 +17,4 @@ Useful notes.
 <p>Rendered code examples.</p>
 ```
 
-This spec uses <code>readme.md</code> template, view it's <a href="readme.md">source</a>.
\ No newline at end of file
+This spec uses <code>readme.md</code> template, view it's <a href="readme.md">source</a>.
diff --git a/docs/spec-markdown/info.json b/docs/spec-markdown/info.json
new file mode 100644
index 0000000..0625098
--- /dev/null
+++ b/docs/spec-markdown/info.json
@@ -0,0 +1,5 @@
+{
+  "title": "Creating Specs: Spec File as Markdown",
+  "tag": ["create spec", "spec markup", "details"],
+  "template": "doc"
+}
diff --git a/docs/markdown/readme.md b/docs/spec-markdown/readme.md
similarity index 85%
rename from docs/markdown/readme.md
rename to docs/spec-markdown/readme.md
index c4e45e8..09cbf7a 100644
--- a/docs/markdown/readme.md
+++ b/docs/spec-markdown/readme.md
@@ -22,14 +22,16 @@ In case if Spec folder contains `index.src.html` and `index.md`, first one will
 | Td | value |
 
 ```html
-&#96;``example
+​`​`​`example
 code example
-&#96;``
+​`​`​`
 ```
 
 ```example
 Mark code with `example` keyword to define `.source_example` with your rendered component view.
-<br><br>
+
+<hr />
+
 <a class="btn btn-primary" href="#777">Example button</a>
 ```
 
@@ -37,7 +39,7 @@ Mark code with `example` keyword to define `.source_example` with your rendered
 
 SourceJS code blocks are aligned with standard Markdown style. List of demo code examples:
 
-```
+```code
 Some random code
 .css {
     color:red;
@@ -61,28 +63,3 @@ var test = function(){};
 ```example
 rendered example
 ```
-
-## h2
-
-```example
-code example in h2
-```
-
-### h3
-
-Text
-
-```example
-code example in h3
-```
-
-* list
-* list
-
-#### h4
-
-Text
-
-```example
-code example in h4
-```
diff --git a/docs/spec/info.json b/docs/spec/info.json
deleted file mode 100644
index 5d91445..0000000
--- a/docs/spec/info.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "tag": ["create spec", "spec markup"],
-    "template": "doc",
-    "title": "Spec Page Documentation"
-}
diff --git a/docs/test-specs/styles/index.src.html b/docs/test-specs/styles/index.src.html
index 43ac393..2e60bd6 100755
--- a/docs/test-specs/styles/index.src.html
+++ b/docs/test-specs/styles/index.src.html
@@ -1,4 +1,16 @@
-<div class="source_warn">
+<link rel="stylesheet" href="/docs/data/bootstrap.css">
+
+<style>
+    .foo {
+		color: deeppink;
+	}
+</style>
+
+<script>
+    var foo = "deeppink";
+</script>
+
+<div class="source_warn">
     <%- include('includes/all-tags.html') %>
 </div>
 
@@ -67,11 +79,28 @@ <h2>Spec Section Heading</h2>
 
     <h3>h3</h3>
 
-    some
+    <p>
+		This is a H3
+	</p>
+
+	<div class="source_example">
+		<div class="some-code">
+			<p>Some h3 example</p>
+		</div>
+	</div>
+
 
     <h4>h4</h4>
 
-    some
+	<p>
+		This is a H4
+	</p>
+
+	<div class="source_example">
+		<div class="some-code">
+			<p>Some h4 example</p>
+		</div>
+	</div>
 
 </section>
 
@@ -120,4 +149,4 @@ <h2>Source code</h2>
         This spec uses <code>index.src.html</code> template, view it's <a href="index.src.html">source</a>.
     </p>
 
-</section>
\ No newline at end of file
+</section>
diff --git a/test/functional/clarify.js b/test/functional/clarify.js
index 738e1dd..5338ae7 100644
--- a/test/functional/clarify.js
+++ b/test/functional/clarify.js
@@ -1,5 +1,5 @@
 var appPort = casper.cli.get('app-port') || 8080;
-var url = 'http://127.0.0.1:' + appPort + '/docs/spec/';
+var url = 'http://127.0.0.1:' + appPort + '/docs/test-specs/styles/';
 
 casper.options.viewportSize = {width: 1024, height: 768};
 
@@ -12,7 +12,7 @@ casper.test.begin('Open clarify', 4, function suite(test) {
                 this.click(openClarifyLink);
             },
             function fail() {
-                test.fail('Failed openning clarify link.');
+                test.fail('Failed opening clarify link.');
             }
         );
 
@@ -41,4 +41,4 @@ casper.test.begin('Open clarify', 4, function suite(test) {
             }
         );
     }).run(function() { test.done() }).clear();
-});
\ No newline at end of file
+});
diff --git a/test/functional/common.js b/test/functional/common.js
index ee31bf6..5bb9818 100644
--- a/test/functional/common.js
+++ b/test/functional/common.js
@@ -5,7 +5,7 @@ casper.options.viewportSize = {width: 1024, height: 768};
 
 var urlsToCheck = [
     url,
-    url + '/docs/spec/',
+    url + '/docs/test-specs/styles/',
     url + '/docs/'
 ];
 
@@ -44,4 +44,4 @@ urlsToCheck.forEach(function(item){
 
         }).run(function() { test.done() }).clear();
     });
-});
\ No newline at end of file
+});
diff --git a/test/functional/globalNav.js b/test/functional/globalNav.js
index c5caee1..bc658c9 100644
--- a/test/functional/globalNav.js
+++ b/test/functional/globalNav.js
@@ -15,9 +15,15 @@ casper.test.begin('Check navigaton page', 3, function suite(test) {
                 }, 'Should have more than 5 nav items', [nav]);
 
                 test.assertEval(function (nav) {
-                    return !!document.querySelector(nav + ' .source_catalog_a[href="/docs/base"]') &&
-                        !!document.querySelector(nav + ' .source_catalog_a[href="/docs/clarify"]') &&
-                        !!document.querySelector(nav + ' .source_catalog_a[href="/docs/starting"]');
+                    return (
+						!!document.querySelector(nav + ' .source_catalog_a[href="/docs/base"]') &&
+						!!document.querySelector(nav + ' .source_catalog_a[href="/docs/spec-file"]') &&
+						!!document.querySelector(nav + ' .source_catalog_a[href="/docs/spec-json"]') &&
+						!!document.querySelector(nav + ' .source_catalog_a[href="/docs/spec-html"]') &&
+						!!document.querySelector(nav + ' .source_catalog_a[href="/docs/spec-markdown"]') &&
+						!!document.querySelector(nav + ' .source_catalog_a[href="/docs/spec-ejs"]') &&
+						true
+					);
                 }, 'Right nav items in set', [nav]);
             },
             function fail() {
@@ -30,4 +36,4 @@ casper.test.begin('Check navigaton page', 3, function suite(test) {
         test.assertExists('.source_catalog.__show-preview', 'Show preview toggled');
 
     }).run(function() { test.done() }).clear();
-});
\ No newline at end of file
+});
diff --git a/test/functional/specpage.js b/test/functional/specpage.js
index c2b1d3c..7b0c02a 100644
--- a/test/functional/specpage.js
+++ b/test/functional/specpage.js
@@ -1,39 +1,64 @@
 var appPort = casper.cli.get('app-port') || 8080;
-var url = 'http://127.0.0.1:' + appPort + '/docs/spec/';
+var url = 'http://127.0.0.1:' + appPort + '/docs/test-specs/styles/';
 
 casper.options.viewportSize = {width: 1024, height: 768};
 
-casper.test.begin('Checking inner navigation', 3, function suite(test) {
+casper.test.begin('Checking inner navigation', 8, function suite(test) {
 	casper.start(url).then(function() {
         var _this = this;
         var menu = '.source_nav.__loaded';
+		var section = '.__loaded[id="2"]';
+
 
         this.waitForSelector(menu,
-            function pass() {
-                this.click('.source_nav .source_main_nav_li:nth-child(2) a');
+			function pass() {
+				this.waitForSelector(section,
 
-                test.assertEquals(this.getCurrentUrl(), url+'#2', 'URL with hash is right')
-            },
-            function fail() {
-                test.fail(menu);
-            }
-        );
+	            function pass() {
+					test.assertExists(menu, 'Menu item loaded');
+					test.assertExists(section, 'Section item loaded');
 
-    }).then(function() {
-        var highlighted = '.source_nav .source_main_nav_li:nth-child(2).__active a.__active';
+					var section_top = this.getElementBounds(section).top;
+					var section_info = this.getElementInfo(section);
 
-        this.waitForSelector(highlighted,
-            function pass() {
-                test.assertEval(function () {
-                    return window.pageYOffset > 1000 && window.pageYOffset < 2500;
-                }, 'Page should be scrolled to section');
+					test.assert(section_top > 100, "Section's position should be > 100: " + section_top);
 
-                test.assertExists(highlighted, 'Menu item highlighted');
-            },
-            function fail() {
-                test.fail(highlighted);
-            }
-        );
+	            },
+	            function fail() {
+	                test.fail(section);
+	            }
+	        )},
+			function fail() {
+				test.fail(menu);
+			}
+		);
+
+    }).then(function() {
+		this.click('.source_nav .source_main_nav_li:nth-child(2) a');
+		test.assertEquals(this.getCurrentUrl(), url+'#2', 'URL with hash is right')
+	}).then(function() {
+		var highlighted = '.source_nav .source_main_nav_li:nth-child(2).__active a.__active';
+		var section = '.__loaded[id="2"]';
+
+		this.waitForSelector(highlighted, function pass() {
+			this.waitForSelector(section,
+				function pass() {
+					test.assertExists(highlighted, 'Menu item highlighted');
+					test.assertExists(section, 'Section item loaded');
+
+					var section_top = this.getElementBounds(section).top;
+					test.assert(section_top < 100, "Section's position should be < 100: " + section_top);
+
+					var pageYOffset = this.getGlobal('pageYOffset');
+					test.assert(pageYOffset > 100, 'Page should be scrolled to section');
+				},
+				function fail() {
+					test.fail(section);
+				}
+			);
+		}, function fail() {
+			test.fail(highlighted);
+		});
 
 	}).run(function() { test.done() }).clear();
 });
@@ -68,21 +93,21 @@ casper.test.begin('Code source', 2, function suite(test) {
 	}).run(function() { test.done() }).clear();
 });
 
-casper.test.begin('Hash link openning', 2, function suite(test) {
+casper.test.begin('Hash link opening', 2, function suite(test) {
 	casper.start(url + '#2').then(function() {
         var highlighted = '.source_nav .source_main_nav_li:nth-child(2).__active a.__active';
 
         this.waitForSelector(highlighted,
             function pass() {
-                test.assertEval(function () {
-                    return window.pageYOffset > 1000 && window.pageYOffset < 2500;
-                }, 'Page should be scrolled to section');
+				test.assertExists(highlighted, 'Menu item highlighted');
+
+				var pageYOffset = this.getGlobal('pageYOffset');
+				test.assert(pageYOffset > 100, 'Page should be scrolled to section');
 
-                test.assertExists(highlighted, 'Menu item highlighted');
             },
             function fail() {
                 test.fail(highlighted);
             }
         );
     }).run(function() { test.done() }).clear();
-});
\ No newline at end of file
+});
diff --git a/test/unit/middlewares/clarifySpec.js b/test/unit/middlewares/clarifySpec.js
index f7745a8..262ba16 100644
--- a/test/unit/middlewares/clarifySpec.js
+++ b/test/unit/middlewares/clarifySpec.js
@@ -11,9 +11,9 @@ var loadOptions = require(path.join(pathToMasterApp, 'core/loadOptions'));
 global.opts = loadOptions(path.resolve(pathToMasterApp));
 
 
-describe('Clarify test /docs/spec?clarify=true', function () {
-    describe('GET /docs/spec?clarify=true...', function () {
-        var url = 'http://127.0.0.1:8080/docs/spec/?clarify=true';
+describe('Clarify test /docs/test-specs/styles/?clarify=true', function () {
+    describe('GET /docs/test-specs/styles/?clarify=true...', function () {
+        var url = 'http://127.0.0.1:8080/docs/test-specs/styles/?clarify=true';
         it('should return nothing (&sections=77)', function (done) {
             request(url)
                 .get('&sections=77')
@@ -82,7 +82,7 @@ describe('Clarify test /docs/spec?clarify=true', function () {
                     }
 
                     var $ = cheerio.load(res.text, {decodeEntities: false});
-                    $('[href*="bootstrap.css"]').length.should.equal(1);
+                    $('[href*="bootstrap.css"]').length.should.greaterThan(0);
                     $('body > style').length.should.be.greaterThan(0);
                     $('body > script').length.should.be.greaterThan(0);
 
@@ -131,8 +131,8 @@ describe('Clarify test /docs/spec?clarify=true', function () {
         });
     });
 
-    describe('GET from API /docs/spec?clarify=true&fromApi=true...', function () {
-        var urlFromApi = 'http://localhost:8080/docs/spec/?clarify=true&fromApi=true';
+    describe('GET from API /docs/test-specs/styles?clarify=true&fromApi=true...', function () {
+        var urlFromApi = 'http://localhost:8080/docs/test-specs/styles/?clarify=true&fromApi=true';
 
         it('should return nothing (&sections=77&apiUpdate=true)', function (done) {
             this.timeout(10000);
@@ -151,4 +151,4 @@ describe('Clarify test /docs/spec?clarify=true', function () {
                 });
         });
     });
-});
\ No newline at end of file
+});
diff --git a/test/unit/middlewares/mdSpec.js b/test/unit/middlewares/mdSpec.js
index 2b58a8a..50e5653 100644
--- a/test/unit/middlewares/mdSpec.js
+++ b/test/unit/middlewares/mdSpec.js
@@ -5,12 +5,12 @@ var cheerio = require('cheerio');
 describe('Test .md support', function () {
     var url = 'http://127.0.0.1:8080';
 
-    describe('GET /docs/markdown/', function () {
+    describe('GET /docs/spec-markdown/', function () {
         it('should render h1', function (done) {
             var body = {
             };
             request(url)
-                .get('/docs/markdown/')
+                .get('/docs/spec-markdown/')
                 .expect(200)
                 .send(body)
                 .end(function (err, res) {
@@ -29,12 +29,12 @@ describe('Test .md support', function () {
         });
     });
 
-    describe('GET /docs/markdown/', function () {
+    describe('GET /docs/spec-markdown/', function () {
         it('should render sections', function (done) {
             var body = {
             };
             request(url)
-                .get('/docs/markdown/')
+                .get('/docs/spec-markdown/')
                 .expect(200)
                 .send(body)
                 .end(function (err, res) {
@@ -61,12 +61,12 @@ describe('Test .md support', function () {
         });
     });
 
-    describe('GET /docs/markdown/', function () {
+    describe('GET /docs/spec-markdown/', function () {
         it('should render code', function (done) {
             var body = {
             };
             request(url)
-                .get('/docs/markdown/')
+                .get('/docs/spec-markdown/')
                 .expect(200)
                 .send(body)
                 .end(function (err, res) {
@@ -84,4 +84,4 @@ describe('Test .md support', function () {
                 });
         });
     });
-});
\ No newline at end of file
+});

From dfd46fdb200085eb6a12f949f4f1679333747016 Mon Sep 17 00:00:00 2001
From: Norbert de Langen <norbert@macaw.nl>
Date: Fri, 17 Jun 2016 22:17:44 +0200
Subject: [PATCH 089/104] FIX whitespace - now it's consistent project wide

---
 CONTRIBUTING.md                       |   1 +
 app.js                                |   8 +-
 assets/css/base/buttons.less          |  24 +-
 assets/css/base/navigation.less       |  70 ++---
 assets/css/base/ntf.less              |  42 +--
 assets/css/base/togglers.less         |  74 +++---
 assets/css/cosmetic/helpers.less      |  48 ++--
 assets/css/cosmetic/links.less        | 102 ++++----
 assets/css/project/auth.less          |  52 ++--
 assets/css/project/autocomplete.less  |  86 +++----
 assets/css/project/catalog.less       |  56 ++--
 assets/css/project/clarify.less       |   2 +-
 assets/css/project/examples.less      |  46 ++--
 assets/css/project/info.less          |  36 +--
 assets/css/project/layout.less        |  96 +++----
 assets/css/project/navigation.less    | 148 +++++------
 assets/css/project/search.less        |  76 +++---
 assets/css/project/section.less       | 248 +++++++++---------
 assets/css/project/source-code.less   |  68 ++---
 assets/css/reset.less                 |   4 +-
 assets/js/_require-config.js          |   2 +-
 assets/js/lib/autocomplete.js         |   2 +-
 assets/js/lib/codeFormat.js           |   2 +-
 assets/js/lib/jquery-private.js       |   2 +-
 assets/js/lib/jquery.autocomplete.js  |   2 +-
 assets/js/lib/jquery.mb.browser.js    |   6 +-
 assets/js/lib/modalbox.js             |   2 +-
 assets/js/lib/prism/prism.css         |   4 +-
 assets/js/lib/prism/prism.js          |   2 +-
 assets/js/lib/require.js              |   2 +-
 assets/js/load-options.js             |   2 +-
 assets/js/modules/auth.js             |   4 +-
 assets/js/modules/browser.js          |   2 +-
 assets/js/modules/clarifyInSpec.js    |   2 +-
 assets/js/modules/codeSource.js       |   2 +-
 assets/js/modules/couch.js            |   2 +-
 assets/js/modules/css.js              |   8 +-
 assets/js/modules/headerFooter.js     |   2 +-
 assets/js/modules/htmlAPISync.js      |   2 +-
 assets/js/modules/innerNavigation.js  |  14 +-
 assets/js/modules/loadEvents.js       | 322 +++++++++++------------
 assets/js/modules/module.js           |   2 +-
 assets/js/modules/moduleLoader.js     |   4 +-
 assets/js/modules/navHighlight.js     | 358 +++++++++++++-------------
 assets/js/modules/ntf.js              |   2 +-
 assets/js/modules/parseFileTree.js    |   2 +-
 assets/js/modules/scrollToHash.js     |   2 +-
 assets/js/modules/sectionFolding.js   |  40 +--
 assets/js/modules/sections.js         |   2 +-
 assets/js/modules/sectionsParser.js   |   2 +-
 assets/js/modules/specDecorations.js  |   2 +-
 assets/js/modules/utils.js            |  14 +-
 assets/templates/footer.inc.html      |   4 +-
 assets/templates/nav.inc.html         |  24 +-
 core/api/index.js                     |   6 +-
 core/api/optionsApi.js                |   2 +-
 core/auth.js                          | 132 +++++-----
 core/ejsWithHelpers.js                |   2 +-
 core/file-tree/index.js               |   2 +-
 core/headerFooter.js                  |   2 +-
 core/html-tree/index.js               |   2 +-
 core/lib/configUtils.js               |   2 +-
 core/lib/extendTillSpec.js            |   2 +-
 core/lib/flattenTillSpec.js           |   2 +-
 core/lib/getUserPath.js               |   6 +-
 core/lib/globArray.js                 |   2 +-
 core/lib/isNodeModule.js              |   2 +-
 core/lib/parseData.js                 |   2 +-
 core/lib/pathResolver.js              |   2 +-
 core/lib/processMd.js                 |   2 +-
 core/lib/request.js                   |   2 +-
 core/lib/translit.js                  | 230 ++++++++---------
 core/lib/viewResolver.js              |   2 +-
 core/loadOptions.js                   |   2 +-
 core/loadPlugins.js                   |   2 +-
 core/logger.js                        |   2 +-
 core/middlewares/clarify.js           |   8 +-
 core/middlewares/md.js                |   2 +-
 core/middlewares/mdTag.js             |   2 +-
 core/middlewares/preRenderEjs.js      |   2 +-
 core/middlewares/read.js              |   2 +-
 core/middlewares/send.js              |   2 +-
 core/trackInstall.js                  |   2 +-
 core/trackStats.js                    |   2 +-
 core/unflat.js                        |   2 +-
 core/views/404.ejs                    |   8 +-
 core/views/clean-spec.ejs             |   8 +-
 core/views/doc.ejs                    |   8 +-
 core/views/navigation.ejs             |   6 +-
 core/views/spec.ejs                   |   8 +-
 docs/api/info.json                    |   2 +-
 docs/api/load-events/readme.md        |  14 +-
 docs/base/info.json                   |   2 +-
 docs/build-tasks/info.json            |   2 +-
 docs/clarify/info.json                |   2 +-
 docs/configuration/readme.md          |  10 +-
 docs/data-nav/info.json               |   2 +-
 docs/index.src.html                   |   6 +-
 docs/migration/info.json              |   2 +-
 docs/spec-ejs/info.json               |   2 +-
 docs/spec-html-example/index.src.html |   2 +-
 docs/spec-html/css/spec.css           |   6 +-
 docs/test-specs/styles/index.src.html |  34 +--
 test/functional/clarify.js            |   2 +-
 test/functional/globalNav.js          |  18 +-
 test/functional/search.js             |   8 +-
 test/functional/specpage.js           | 104 ++++----
 test/unit/api/html.js                 |   2 +-
 test/unit/api/specs.js                |   2 +-
 test/unit/ejsHelpersSpec.js           |   2 +-
 test/unit/lib/extendTillSpec.js       |   2 +-
 test/unit/lib/specPageParserSpec.js   |   2 +-
 test/unit/lib/utilsSpec.js            |   2 +-
 113 files changed, 1418 insertions(+), 1417 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 95341d2..200926a 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -26,3 +26,4 @@ All inquiries should be forwarded to [Robert Haritonov](mailto:r@rhr.me).
 Core contributors and maintainers:
 * [Robert Haritonov](https://github.com/operatino)
 * [Ilya Mikhailov](https://github.com/cheshirsky)
+* [Norbert de Langen](https://github.com/ndelangen)
diff --git a/app.js b/app.js
index 524c6c0..f0a1c54 100644
--- a/app.js
+++ b/app.js
@@ -216,18 +216,18 @@ app.use(express.static(userPath));
 
 // Page 404
 app.use(function(req, res){
-	if (req.accepts('html')) {
+    if (req.accepts('html')) {
         if (req.url === '/') {
             res.redirect('/docs');
             return;
         }
 
         var headerFooterHTML = headerFooter.getHeaderAndFooter();
-		res.status(404).render(path.join(__dirname, '/core/views/404.ejs'), {
+        res.status(404).render(path.join(__dirname, '/core/views/404.ejs'), {
             header: headerFooterHTML.header,
             footer: headerFooterHTML.footer
-		});
-	}
+        });
+    }
 });
 /* /Serving content */
 
diff --git a/assets/css/base/buttons.less b/assets/css/base/buttons.less
index 4605ff9..c3604ed 100644
--- a/assets/css/base/buttons.less
+++ b/assets/css/base/buttons.less
@@ -3,19 +3,19 @@
 
 /* TODO: cosmetic changes needed */
 .source_btn {
-	position:relative;
+    position:relative;
 
-	display: inline-block;
-	padding: 4px 17px;
+    display: inline-block;
+    padding: 4px 17px;
 
-	background-color:#65A7D6;
-	border: #5B9ECB solid 1px;
-	border-radius:3px;
+    background-color:#65A7D6;
+    border: #5B9ECB solid 1px;
+    border-radius:3px;
 
-	color:#fff;
-	font-weight:normal;
-	text-decoration:none;
-	font-size: 12px;
+    color:#fff;
+    font-weight:normal;
+    text-decoration:none;
+    font-size: 12px;
 
     &:hover {
         background-color: #5B9ECB;
@@ -23,7 +23,7 @@
     &:active {
         top:1px;
         }
-	}
+    }
 
 /* /Buttons
----------------------------------------------------------------------------------- */
\ No newline at end of file
+---------------------------------------------------------------------------------- */
diff --git a/assets/css/base/navigation.less b/assets/css/base/navigation.less
index 918e75f..cf134f4 100644
--- a/assets/css/base/navigation.less
+++ b/assets/css/base/navigation.less
@@ -2,56 +2,56 @@
 ---------------------------------------------------------------------------------- */
 
 .source_nav {
-	white-space: nowrap;
-	display: none;
+    white-space: nowrap;
+    display: none;
 
-	font-family: @font-family-main;
-	color: @color-main;
+    font-family: @font-family-main;
+    color: @color-main;
 
-	&.__loaded {
-		display: block;
-		}
+    &.__loaded {
+        display: block;
+        }
 
     &:empty {
-		display: none;
-		}
-	}
-
-	@media all and (min-width: 990px) {
-		.source_nav:before {
-			content: '';
-			display: inline-block;
-			vertical-align: middle;
-			height: 100%;
-		}
-	}
+        display: none;
+        }
+    }
+
+    @media all and (min-width: 990px) {
+        .source_nav:before {
+            content: '';
+            display: inline-block;
+            vertical-align: middle;
+            height: 100%;
+        }
+    }
 
 .source_nav_c {
-	display: inline-block;
-	vertical-align: top;
-	border-radius: 10px;
-	width: 100%;
+    display: inline-block;
+    vertical-align: top;
+    border-radius: 10px;
+    width: 100%;
 
-	box-sizing: border-box;
+    box-sizing: border-box;
 
-	padding: 20px 21px 10px;
-	background-color: @light-gray;
-	}
+    padding: 20px 21px 10px;
+    background-color: @light-gray;
+    }
 
 .source_nav_ul {
-	list-style: none;
-	margin: 0;
-	padding: 0;
+    list-style: none;
+    margin: 0;
+    padding: 0;
 
     li:first-child {
-		margin-top: 0;
-		}
+        margin-top: 0;
+        }
 
     a {
-		display: block;
+        display: block;
         line-height: inherit;
-		}
-	}
+        }
+    }
 
 .source_main_nav_ul2 {
     margin: 0;
diff --git a/assets/css/base/ntf.less b/assets/css/base/ntf.less
index fd650de..e2929a4 100644
--- a/assets/css/base/ntf.less
+++ b/assets/css/base/ntf.less
@@ -1,29 +1,29 @@
 .source_ntf {
-	position: fixed; z-index: 50;
-	top: 50px; /* toolbar height */
+    position: fixed; z-index: 50;
+    top: 50px; /* toolbar height */
     left: 0; right: 0;
 
-	font-size: @fz-size-m;
-	font-family: @font-family-main;
-	color: #333;
-	text-align: center;
+    font-size: @fz-size-m;
+    font-family: @font-family-main;
+    color: #333;
+    text-align: center;
 
-	height: 50px;
-	line-height: 48px;
-	white-space: nowrap;
-	overflow: hidden;
+    height: 50px;
+    line-height: 48px;
+    white-space: nowrap;
+    overflow: hidden;
 
-	background: #FFF6DD;
-	border-bottom: 1px solid #ccc;
-	box-shadow: 0 0 6px -2px rgba(0, 0, 0, .3);
+    background: #FFF6DD;
+    border-bottom: 1px solid #ccc;
+    box-shadow: 0 0 6px -2px rgba(0, 0, 0, .3);
 
-	opacity: 0;
-	visibility: hidden;
+    opacity: 0;
+    visibility: hidden;
 
-	transition: opacity .2s, visibility .2s;
-	}
+    transition: opacity .2s, visibility .2s;
+    }
 
-	.source_ntf.__active {
-		opacity: 1;
-		visibility: visible;
-		}
\ No newline at end of file
+    .source_ntf.__active {
+        opacity: 1;
+        visibility: visible;
+        }
diff --git a/assets/css/base/togglers.less b/assets/css/base/togglers.less
index b40e69f..a25cd53 100644
--- a/assets/css/base/togglers.less
+++ b/assets/css/base/togglers.less
@@ -2,53 +2,53 @@
 ---------------------------------------------------------------------------------- */
 
 .source_slider_frame {
-	position: absolute;
-	right: 0;
-	top: 0;
-	display: block;
-	margin: 0 auto;
-	width: 50px;
-	height: 20px;
-
-	background-color: rgb(246, 249, 251);
-	border-radius: 4px;
-	box-shadow: inset 0px 0px 4px 0 rgba(0, 0, 0, 0.25);
+    position: absolute;
+    right: 0;
+    top: 0;
+    display: block;
+    margin: 0 auto;
+    width: 50px;
+    height: 20px;
+
+    background-color: rgb(246, 249, 251);
+    border-radius: 4px;
+    box-shadow: inset 0px 0px 4px 0 rgba(0, 0, 0, 0.25);
     -webkit-touch-callout: none;
-	user-select: none;
-	}
+    user-select: none;
+    }
 
 .source_slider_button {
-	display: block;
-	width: 30px;
-	height: 20px;
-	line-height: 20px;
-
-	background: #EDF2F7;
-	border-radius: 4px;
-	transition: all 0.25s ease-in-out;
-	color: #000;
-	font-family: sans-serif;
-	font-size: 9px;
-	text-align: center;
-	cursor: pointer;
-	box-shadow: inset 0px 0px 4px 0 rgba(0, 0, 0, 0.25);
-	}
+    display: block;
+    width: 30px;
+    height: 20px;
+    line-height: 20px;
+
+    background: #EDF2F7;
+    border-radius: 4px;
+    transition: all 0.25s ease-in-out;
+    color: #000;
+    font-family: sans-serif;
+    font-size: 9px;
+    text-align: center;
+    cursor: pointer;
+    box-shadow: inset 0px 0px 4px 0 rgba(0, 0, 0, 0.25);
+    }
 
 .source_slider_frame__on .source_slider_button {
-	margin-left: 20px;
-	background: #EDF2F7;
-	}
+    margin-left: 20px;
+    background: #EDF2F7;
+    }
 
 .source_slider_frame .source_slider_text_on { display: none; }
 
-	.source_slider_frame__on .source_slider_text_off { display: none; }
+    .source_slider_frame__on .source_slider_text_off { display: none; }
 
-	.source_slider_frame__on .source_slider_text_on { display: block; }
+    .source_slider_frame__on .source_slider_text_on { display: block; }
 
-	.source_slider_frame__on .source_slider_button {
-		background: #73c051;
-		color: #fff;
-		}
+    .source_slider_frame__on .source_slider_button {
+        background: #73c051;
+        color: #fff;
+        }
 
 /* /Togglers
 ---------------------------------------------------------------------------------- */
diff --git a/assets/css/cosmetic/helpers.less b/assets/css/cosmetic/helpers.less
index 85e6199..2f55859 100644
--- a/assets/css/cosmetic/helpers.less
+++ b/assets/css/cosmetic/helpers.less
@@ -2,38 +2,38 @@
 ---------------------------------------------------------------------------------- */
 
 .source_delim {
-	background: none;
-	border: 0 none;
-	border-top: 1px dotted @black;
-	height: 0; padding: 0;
-	margin: 20px 0;
-	}
+    background: none;
+    border: 0 none;
+    border-top: 1px dotted @black;
+    height: 0; padding: 0;
+    margin: 20px 0;
+    }
 
 .source_clear {
-	width: 100%;
-	clear: both;
-	height: 0;
-	font-size:0;
-	line-height:0;
-	}
+    width: 100%;
+    clear: both;
+    height: 0;
+    font-size:0;
+    line-height:0;
+    }
 
 .source_tx {
-	margin: 5px 0 20px;
-	}
+    margin: 5px 0 20px;
+    }
 
 .source_huge {
-	font-size: 1.2em;
-	}
+    font-size: 1.2em;
+    }
 
 .source_ul {
-	margin: 0; padding: 0;
-	margin-left: 18px;
+    margin: 0; padding: 0;
+    margin-left: 18px;
 
-	list-style: outside disc;
-	}
-	.source_ul li {
-		margin: 5px 0;
-		}
+    list-style: outside disc;
+    }
+    .source_ul li {
+        margin: 5px 0;
+        }
 
 /* /Helpers
----------------------------------------------------------------------------------- */
\ No newline at end of file
+---------------------------------------------------------------------------------- */
diff --git a/assets/css/cosmetic/links.less b/assets/css/cosmetic/links.less
index f6fc5ec..b05781d 100644
--- a/assets/css/cosmetic/links.less
+++ b/assets/css/cosmetic/links.less
@@ -38,67 +38,67 @@
 /* TODO: rename classes */
 .source_a_hl, /* Higlight link */
 .source_a_o { /* Regular link */
-  	&:link,
-	&:visited {
-	  	text-decoration:none;
-	  	color: lighten(@blue, 10%);
-		}
+      &:link,
+    &:visited {
+          text-decoration:none;
+          color: lighten(@blue, 10%);
+        }
 
     &:hover {
-		color: @blue;
-		text-decoration: underline;
-		}
-	}
+        color: @blue;
+        text-decoration: underline;
+        }
+    }
 
 .source_a_bl { /* Emphasized link */
-  	&:link,
-	&:visited {
-	  	color: @black;
-		}
-	}
+      &:link,
+    &:visited {
+          color: @black;
+        }
+    }
 
 .source_a_l { /* Inverted link */
-  	&:link,
-	&:visited {
-	  	color: lighten(@black, 40%);
-	  	text-decoration: none;
+      &:link,
+    &:visited {
+          color: lighten(@black, 40%);
+          text-decoration: none;
         line-height: 1.5;
-		}
+        }
 
     &:hover {
-	 	color: #fff;
-		}
-	}
+         color: #fff;
+        }
+    }
 
 .source_a_g { /* Object link */
-  	&:link,
-	&:visited {
-	  	color: @blue;
-	  	text-decoration: none;
-		}
+      &:link,
+    &:visited {
+          color: @blue;
+          text-decoration: none;
+        }
 
     &:hover {
-		color: @blue;
-		text-decoration: underline;
-		}
-	}
+        color: @blue;
+        text-decoration: underline;
+        }
+    }
 
 .source_a_hl { /* Higlight link */
-	font-size: 16px !important;
-	line-height: 2;
+    font-size: 16px !important;
+    line-height: 2;
 
     &:after {
-		content:"\A";
-		white-space:pre;
-		}
-	}
+        content:"\A";
+        white-space:pre;
+        }
+    }
 
 .source_a_d { /* Design link */
-  	&:link,
-	&:visited {
-    	color: @green !important;
-    	font-size: 16px;
-		}
+      &:link,
+    &:visited {
+        color: @green !important;
+        font-size: 16px;
+        }
 
     &:hover {
         color: @green;
@@ -108,18 +108,18 @@
     &:before {
         content: '';
         display: inline;
-	   	padding-right: 25px;
+           padding-right: 25px;
         background: url(/source/assets/i/spec_design_link.svg) 50% no-repeat;
         }
 
     }
 
 .source_a_s { /* Spec link */
-  	&:link,
-	&:visited {
-	  	color: @green !important;
-	  	font-size: 16px;
-		}
+      &:link,
+    &:visited {
+          color: @green !important;
+          font-size: 16px;
+        }
 
     &:hover {
         color: @green;
@@ -129,9 +129,9 @@
     &:before {
         content: '';
         display: inline;
-	  	padding-right: 25px;
+          padding-right: 25px;
         background: url(/source/assets/i/spec_link.svg) 50% no-repeat;
-      	}
+          }
 
     }
 
@@ -143,4 +143,4 @@
     }
 
 /* /Links
----------------------------------------------------------------------------------- */
\ No newline at end of file
+---------------------------------------------------------------------------------- */
diff --git a/assets/css/project/auth.less b/assets/css/project/auth.less
index 994cafc..c37fb55 100644
--- a/assets/css/project/auth.less
+++ b/assets/css/project/auth.less
@@ -1,35 +1,35 @@
 .source_login {
-	display: inline-block;
-	height: 40px;
-	float: right;
+    display: inline-block;
+    height: 40px;
+    float: right;
 
-	margin-top: 2px;
-	vertical-align: top;
-	}
+    margin-top: 2px;
+    vertical-align: top;
+    }
 
 .source_login-avatar {
-	width: 25px;
-	height: 25px;
+    width: 25px;
+    height: 25px;
 
-	border-radius: 50%;
-	border: 1px solid #FFF;
-	cursor: pointer;
-	}
+    border-radius: 50%;
+    border: 1px solid #FFF;
+    cursor: pointer;
+    }
 
-	.source_login-avatar.anonymous {
-		border: 1px solid #333;
-		}
+    .source_login-avatar.anonymous {
+        border: 1px solid #333;
+        }
 
 .source_login-button {
-	display: inline-block;
+    display: inline-block;
 
-	color: #999;
-	text-decoration: none;
-	line-height: 1;
-	cursor: pointer;
-	vertical-align: top;
-	margin: 5px 0px 0px 10px;
-	}
-	.source_login-button:hover {
-		color: #FFF
-		}
\ No newline at end of file
+    color: #999;
+    text-decoration: none;
+    line-height: 1;
+    cursor: pointer;
+    vertical-align: top;
+    margin: 5px 0px 0px 10px;
+    }
+    .source_login-button:hover {
+        color: #FFF
+        }
diff --git a/assets/css/project/autocomplete.less b/assets/css/project/autocomplete.less
index bc6cfd0..21906f4 100644
--- a/assets/css/project/autocomplete.less
+++ b/assets/css/project/autocomplete.less
@@ -1,68 +1,68 @@
 /* Autocomplete
 ---------------------------------------------------------------------------------- */
 .autocomplete-wrapper {
-	border: 1px solid #ccc;
-	border-radius: 4px;
-	background: #FFF;
-	font-size: 12px;
+    border: 1px solid #ccc;
+    border-radius: 4px;
+    background: #FFF;
+    font-size: 12px;
 
-	font-family: @font-family-main;
-	line-height: 1.5;
-	}
+    font-family: @font-family-main;
+    line-height: 1.5;
+    }
 
 .autocomplete-suggestions {
-	overflow: auto;
+    overflow: auto;
 
-	margin-top: 1px;
-	}
+    margin-top: 1px;
+    }
 
-	.autocomplete-suggestions strong {
-		font-weight: normal;
-		text-shadow: 0 0 1px @light-gray;
-		color: #00A0FE;
-		}
+    .autocomplete-suggestions strong {
+        font-weight: normal;
+        text-shadow: 0 0 1px @light-gray;
+        color: #00A0FE;
+        }
 
-	.autocomplete-suggestions span {
-		color: @gray;
-		}
+    .autocomplete-suggestions span {
+        color: @gray;
+        }
 
 .autocomplete-suggestion {
-	padding: 4px 8px;
-	padding-left: 28px;
+    padding: 4px 8px;
+    padding-left: 28px;
 
-	white-space: nowrap;
-	overflow: hidden;
-	max-width: 100%;
+    white-space: nowrap;
+    overflow: hidden;
+    max-width: 100%;
 
-	text-overflow: ellipsis;
-	cursor: pointer;
-	}
+    text-overflow: ellipsis;
+    cursor: pointer;
+    }
 
-	.autocomplete-suggestion > a {
-		color: @black;
-		text-decoration: none;
-		}
+    .autocomplete-suggestion > a {
+        color: @black;
+        text-decoration: none;
+        }
 
 .autocomplete-selected {
-	background: @light-gray;
-	}
+    background: @light-gray;
+    }
 
-	.autocomplete-selected:before,
+    .autocomplete-selected:before,
     .autocomplete-show-all:hover:before,
     .autocomplete-show-all.__active:before {
-		content: "►";
-		color: @gray;
-		margin: 0 6px 0 -18px;
-		}
+        content: "►";
+        color: @gray;
+        margin: 0 6px 0 -18px;
+        }
 
 .autocomplete-show-all {
-	background: @light-gray;
-	}
+    background: @light-gray;
+    }
 
-	.autocomplete-show-all:hover,
+    .autocomplete-show-all:hover,
     .autocomplete-show-all.__active {
-		background: #d1d2d3;
-		}
+        background: #d1d2d3;
+        }
 
 /* /Autocomplete
----------------------------------------------------------------------------------- */
\ No newline at end of file
+---------------------------------------------------------------------------------- */
diff --git a/assets/css/project/catalog.less b/assets/css/project/catalog.less
index 6dbaa9b..2152d3e 100644
--- a/assets/css/project/catalog.less
+++ b/assets/css/project/catalog.less
@@ -69,7 +69,7 @@
 
 .source_catalog > p,
 .source_catalog_tx {
-	margin: 0 0 20px !important;
+    margin: 0 0 20px !important;
 
     color: @gray !important;
     font-size: @fz-size-s !important;
@@ -79,9 +79,9 @@
         }
 
     p {
-		margin: 0 0 10px;
-		}
-	}
+        margin: 0 0 10px;
+        }
+    }
 
 .source_subhead > p,
 .source_subhead .source_catalog_tx {
@@ -90,17 +90,17 @@
     }
 
 .source_catalog_list {
-	list-style: none;
-	margin: 0;
-	padding: 0;
-	}
+    list-style: none;
+    margin: 0;
+    padding: 0;
+    }
 
 .source_catalog_list_i {
-	width: 30%;
-	margin-right: 3% !important;
-	display: inline-block;
-	vertical-align: top;
-	}
+    width: 30%;
+    margin-right: 3% !important;
+    display: inline-block;
+    vertical-align: top;
+    }
 
 .source_catalog.__show-preview .source_catalog_list_i {
     vertical-align: baseline;
@@ -123,15 +123,15 @@
   }
 
 .source_catalog_a {
-	position: relative;
-	display: block;
-	margin-left: -10px;
-	padding: 5px 10px;
+    position: relative;
+    display: block;
+    margin-left: -10px;
+    padding: 5px 10px;
 
-	font-size: @fz-size-m;
-	text-decoration: none;
+    font-size: @fz-size-m;
+    text-decoration: none;
 
-	a&:hover { //tag for weight
+    a&:hover { //tag for weight
         text-decoration: none;
         background-color: @blue__hover !important;
         color: #fff;
@@ -142,7 +142,7 @@
             }
 
         }
-	}
+    }
 
 .source_catalog_update-button,
 .source_catalog_image-tumbler {
@@ -173,14 +173,14 @@
     }
 
 .source_catalog_footer {
-	color: @gray;
-	font-size: 11px;
+    color: @gray;
+    font-size: 11px;
     line-height: 1.5;
-	text-decoration: none !important;
-	}
+    text-decoration: none !important;
+    }
 
 .source_catalog_all {
-	margin: 20px 0 0 0;
+    margin: 20px 0 0 0;
 
     a.source_a_bl {
         color: @gray;
@@ -191,7 +191,7 @@
             }
 
         }
-	}
+    }
 
 .source_catalog-filter {
     float: right;
@@ -244,4 +244,4 @@
         }
     }
 /* /Catalog
----------------------------------------------------------------------------------- */
\ No newline at end of file
+---------------------------------------------------------------------------------- */
diff --git a/assets/css/project/clarify.less b/assets/css/project/clarify.less
index fa5d38d..de7be04 100644
--- a/assets/css/project/clarify.less
+++ b/assets/css/project/clarify.less
@@ -23,7 +23,7 @@
 -------------------------------------------------- */
 
 .source_clarify_content {
-	padding: 0 20px 20px;
+    padding: 0 20px 20px;
     }
 
 /* /Layout */
diff --git a/assets/css/project/examples.less b/assets/css/project/examples.less
index bdc9035..bbebb90 100644
--- a/assets/css/project/examples.less
+++ b/assets/css/project/examples.less
@@ -2,24 +2,24 @@
 ---------------------------------------------------------------------------------- */
 
 .source_example {
-	position: relative;
+    position: relative;
 
-	display: inline-block;
-	vertical-align: top;
+    display: inline-block;
+    vertical-align: top;
 
-	padding: 20px;
-	min-width: 500px;
-	border: 5px solid #f0f0f0;
-	margin: 10px 0 15px;
+    padding: 20px;
+    min-width: 500px;
+    border: 5px solid #f0f0f0;
+    margin: 10px 0 15px;
 
-	background: none;
-	}
-	.source_example:hover {
-		z-index: 20;
-		}
-	.source_example:empty {
-		display: none;
-		}
+    background: none;
+    }
+    .source_example:hover {
+        z-index: 20;
+        }
+    .source_example:empty {
+        display: none;
+        }
 
 .source_example__2 { width: 215px; }
 .source_example__3 { width: 730px; }
@@ -28,9 +28,9 @@
 
 .source_example__auto { width: auto; }
 .source_example__full {
-	width: 100%;
-	box-sizing: border-box;
-	}
+    width: 100%;
+    box-sizing: border-box;
+    }
 
 .source_example__2,
 .source_example__3,
@@ -38,15 +38,15 @@
 .source_example__5,
 .source_example__auto,
 .source_example__full {
-	min-width: 0;
-	}
+    min-width: 0;
+    }
 
 .source_example__3,
 .source_example__4,
 .source_example__5,
 .source_example__full {
-	margin-right: 0;
-	}
+    margin-right: 0;
+    }
 
 /* /Code examples
----------------------------------------------------------------------------------- */
\ No newline at end of file
+---------------------------------------------------------------------------------- */
diff --git a/assets/css/project/info.less b/assets/css/project/info.less
index 8ebae3d..1db657f 100644
--- a/assets/css/project/info.less
+++ b/assets/css/project/info.less
@@ -8,18 +8,18 @@
 .source_note,
 .source_warn,
 .source_info {
-	display: block;
-	position: relative;
+    display: block;
+    position: relative;
     box-sizing: content-box !important;
     margin-top: 20px !important;
     margin-bottom: 20px !important;
     line-height: 1.5;
 
-	border-radius: @border-radius !important;
+    border-radius: @border-radius !important;
 
     @media @media_min-step-m {
         // Legacy
-	    margin-right: @layout_spec--inner-margin-right !important;
+        margin-right: @layout_spec--inner-margin-right !important;
 
         // New spec page modifier
         .source_page.__spec & { margin-right: 0 !important;}
@@ -34,16 +34,16 @@
         }
 
     &:empty {
-		display: none;
-		}
+        display: none;
+        }
 
     p {
-		margin: 0 0 10px !important;
+        margin: 0 0 10px !important;
 
         &:last-child {
-			margin-bottom: 0 !important;
-			}
-		}
+            margin-bottom: 0 !important;
+            }
+        }
 
     th, td {
         border-color: #868686 !important;
@@ -55,23 +55,23 @@
     }
 
 .source_info {
-	background: #FFF6DD !important;
+    background: #FFF6DD !important;
 
-	padding: 15px 25px !important;
-	min-height: 50px !important;
+    padding: 15px 25px !important;
+    min-height: 50px !important;
     margin-top: 15px !important;
     margin-bottom: 15px !important;
-	}
+    }
 
 .source_warn {
-	padding: 10px 10px 10px 35px !important;
+    padding: 10px 10px 10px 35px !important;
 
-	background: #ffe2e5 url(/source/assets/i/warn.png) no-repeat 13px 13px !important;
+    background: #ffe2e5 url(/source/assets/i/warn.png) no-repeat 13px 13px !important;
 
     .source_section & {
         margin-right: 0 !important;
         }
-	}
+    }
 
 .source_note {
     padding: 10px 10px 10px 35px !important;
@@ -100,4 +100,4 @@
     }
 
 /* /Info blocks
----------------------------------------------------------------------------------- */
\ No newline at end of file
+---------------------------------------------------------------------------------- */
diff --git a/assets/css/project/layout.less b/assets/css/project/layout.less
index 6c33509..2132374 100644
--- a/assets/css/project/layout.less
+++ b/assets/css/project/layout.less
@@ -2,62 +2,62 @@
 ---------------------------------------------------------------------------------- */
 
 .source_container {
-	position: relative;
-	padding: 50px 25px 0; /*350px; /* Footer height + margin */
+    position: relative;
+    padding: 50px 25px 0; /*350px; /* Footer height + margin */
 
-	min-height: 100vh;
-	overflow-x: hidden;
-	width: 100%;
+    min-height: 100vh;
+    overflow-x: hidden;
+    width: 100%;
 
-	display: flex;
-	flex-direction: column;
+    display: flex;
+    flex-direction: column;
 
-	box-sizing: border-box;
+    box-sizing: border-box;
 
-	.opera12 & {
-		display: block;
-	}
+    .opera12 & {
+        display: block;
+    }
 
     @media @media_min-step-m {
-	    min-width: 990px;
+        min-width: 990px;
         }
-	}
+    }
 
 .source_main {
-	position: relative;
-	padding: 35px 0 120px;
-	margin-bottom: 40px;
+    position: relative;
+    padding: 35px 0 120px;
+    margin-bottom: 40px;
 
-	flex: 1;
-	-ms-flex: none;
+    flex: 1;
+    -ms-flex: none;
 
-	width: 100%;
-	box-sizing: border-box;
+    width: 100%;
+    box-sizing: border-box;
 
-	counter-reset: h2;
+    counter-reset: h2;
 
     @media @media_min-step-m {
-		.source_page.__spec & {
-			padding-right: @layout_spec--inner-margin-right;
-			}
-		}
-
-	&.__loading:after {
-		content: '';
-		position: absolute;
-		width: 100%;
-		height: 90px;
-		left: 0;
-		bottom: 15px;
-
-		background-image: url(data:image/gif;base64,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);
-		background-repeat: no-repeat;
-		background-position: 50% 0;
-		}
-	}
+        .source_page.__spec & {
+            padding-right: @layout_spec--inner-margin-right;
+            }
+        }
+
+    &.__loading:after {
+        content: '';
+        position: absolute;
+        width: 100%;
+        height: 90px;
+        left: 0;
+        bottom: 15px;
+
+        background-image: url(data:image/gif;base64,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);
+        background-repeat: no-repeat;
+        background-position: 50% 0;
+        }
+    }
 
 .source_main_h1 {
-	margin: 0;
+    margin: 0;
     padding: 10px 0 0 0;
 
     font-size: 36px;
@@ -70,11 +70,11 @@
     }
 
 .source_header-meta {
-	font-size: @fz-size-xs !important;
-	line-height: 1.2 !important;
+    font-size: @fz-size-xs !important;
+    line-height: 1.2 !important;
     color: @color-aux;
-	margin-bottom: 20px;
-	}
+    margin-bottom: 20px;
+    }
 
 .source-main-only(h1,{
     .source_main_h1;
@@ -92,7 +92,7 @@
 
     font-family: @font-family-main;
     font-size: @fz-size-m;
-	color: @gray;
+    color: @gray;
     line-height: 1.5;
 
     // Clearfix
@@ -110,9 +110,9 @@
 .source_main_descr > ul,
 .source_main_descr > p,
 .source_main_descr {
-	margin-bottom: 20px;
-	font-size: @fz-size-m;
-	}
+    margin-bottom: 20px;
+    font-size: @fz-size-m;
+    }
 
 /* /Layout
 ---------------------------------------------------------------------------------- */
diff --git a/assets/css/project/navigation.less b/assets/css/project/navigation.less
index 22010ea..3f89482 100644
--- a/assets/css/project/navigation.less
+++ b/assets/css/project/navigation.less
@@ -4,7 +4,7 @@
 .source_main_nav {
     margin-top: 40px;
 
-	@media @media_min-step-m {
+    @media @media_min-step-m {
         position: fixed;
         z-index: 10;
 
@@ -20,11 +20,11 @@
         transition: top 0.3s;
 
         .source__scrolled-down & {
-        	top: 70px;
-        	}
-		}
+            top: 70px;
+            }
+        }
 
-	@media @media_min-step-l {
+    @media @media_min-step-l {
         position: fixed;
         z-index: 10;
 
@@ -35,108 +35,108 @@
 
         margin-top: 0; //reset
         margin-right: 0; //reset
-		}
-	}
-
-	.source_main_nav:hover {
-		z-index: 20; /* Higher than any other elements */
-		}
-
-	.source_main_nav h2 {
-		font-weight: normal;
-		font-size: 15px;
-		color: @black;
-		margin: 0 0 5px;
-		line-height: 1.5;
-		font-family: inherit;
-		text-rendering: auto;
-		}
-
-	.source_main_nav.__menuScroll {
-		overflow-x: hidden;
-		overflow-y: auto;
-		bottom: 15px;
-		}
-
-	.source_main_nav_i {
-		margin: 10px 0;
-		font-size: @fz-size-xs;
-		}
-		.source_main_nav_i:first-child {
-			margin-top: 0;
-			}
-
-	.source_main_nav_i + .source_main_nav_i {
-		padding-top: 10px;
-		border-top: 1px solid #dfe2e4;
-		}
+        }
+    }
+
+    .source_main_nav:hover {
+        z-index: 20; /* Higher than any other elements */
+        }
+
+    .source_main_nav h2 {
+        font-weight: normal;
+        font-size: 15px;
+        color: @black;
+        margin: 0 0 5px;
+        line-height: 1.5;
+        font-family: inherit;
+        text-rendering: auto;
+        }
+
+    .source_main_nav.__menuScroll {
+        overflow-x: hidden;
+        overflow-y: auto;
+        bottom: 15px;
+        }
+
+    .source_main_nav_i {
+        margin: 10px 0;
+        font-size: @fz-size-xs;
+        }
+        .source_main_nav_i:first-child {
+            margin-top: 0;
+            }
+
+    .source_main_nav_i + .source_main_nav_i {
+        padding-top: 10px;
+        border-top: 1px solid #dfe2e4;
+        }
 
 .source_main_nav_ul {
-	margin-left: -21px; /* menu padding compensation  */
-	margin-right: -21px;
-	}
+    margin-left: -21px; /* menu padding compensation  */
+    margin-right: -21px;
+    }
 
 .source_main_nav_li {
-	line-height: 20px;
-	margin-bottom: 2px;
-	}
+    line-height: 20px;
+    margin-bottom: 2px;
+    }
 
 .source_main_nav_ul2 {
-	padding: 0;
-	}
+    padding: 0;
+    }
 
 .source_main_nav_li2 {
-	color: #666;
-	overflow: hidden;
-	display: none;
-	text-overflow: ellipsis;
-	white-space: nowrap;
-	}
-	.source_main_nav_li.__active .source_main_nav_li2 {
-		display: block;
-		}
+    color: #666;
+    overflow: hidden;
+    display: none;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    }
+    .source_main_nav_li.__active .source_main_nav_li2 {
+        display: block;
+        }
 
 .source_nav_ul .source_main_nav_a {
-	overflow: hidden;
-	text-overflow: ellipsis;
+    overflow: hidden;
+    text-overflow: ellipsis;
     text-decoration: none;
-	padding: 0 21px;
+    padding: 0 21px;
     color: #4792D2;
 
     &:hover {
         color: #1c76c2;
         text-decoration: underline;
         }
-	}
-	.source_main_nav_li2 .source_main_nav_a {
-		padding: 0 37px;
-		}
-	.source_main_nav .source_main_nav_a.__active  { /* for weight */
-		background-color: #8AB5D6;
-		color: #F9FBFD;
-		}
+    }
+    .source_main_nav_li2 .source_main_nav_a {
+        padding: 0 37px;
+        }
+    .source_main_nav .source_main_nav_a.__active  { /* for weight */
+        background-color: #8AB5D6;
+        color: #F9FBFD;
+        }
 
 .source_main_nav_ac_item {
-	position: relative;
-	line-height: 24px;
+    position: relative;
+    line-height: 24px;
 
     &.__simple {
         text-align: right;
         }
-	}
+    }
 
     .source_main_nav_ac_tx {
         line-height: 24px;
         }
 
 .source_main_nav_ac_item.__simple {
-	text-align: right;
+    text-align: right;
     white-space: normal;
-	}
+    }
 
     .source_main_nav_ac_item.__simple .source_main_nav_ac_tx {
         float: left;
         }
 
 /* /Navigation
----------------------------------------------------------------------------------- */
\ No newline at end of file
+---------------------------------------------------------------------------------- */
diff --git a/assets/css/project/search.less b/assets/css/project/search.less
index f831a9c..1434384 100644
--- a/assets/css/project/search.less
+++ b/assets/css/project/search.less
@@ -2,60 +2,60 @@
 ---------------------------------------------------------------------------------- */
 
 .source_search {
-	display: inline-block;
-	overflow: hidden;
-	height: 28px;
-	width: 100%;
+    display: inline-block;
+    overflow: hidden;
+    height: 28px;
+    width: 100%;
 
-	border: 1px solid #444;
-	border-radius: 5px;
-	vertical-align: top;
-	}
+    border: 1px solid #444;
+    border-radius: 5px;
+    vertical-align: top;
+    }
 
-	.source_search.__light {
-		border-color: #ccc;
-		}
+    .source_search.__light {
+        border-color: #ccc;
+        }
 
-	.source_search.__light input.source_search_it { /* Cascade for weight */
-		background-color: #FFF;
-		}
+    .source_search.__light input.source_search_it { /* Cascade for weight */
+        background-color: #FFF;
+        }
 
 .source_container input.source_search_it { /* Cascade for weight */
-	padding: 6px 8px;
-	padding-left: 28px;
-	height: 30px;
-	margin: -1px 0 0 -1px;
-	width: 101%;
+    padding: 6px 8px;
+    padding-left: 28px;
+    height: 30px;
+    margin: -1px 0 0 -1px;
+    width: 101%;
 
-	border: 0 none;
-	line-height: 15px;
-	background: #000 url(/source/assets/i/search.png) no-repeat 8px 50%;
+    border: 0 none;
+    line-height: 15px;
+    background: #000 url(/source/assets/i/search.png) no-repeat 8px 50%;
 
-	box-sizing: border-box;
+    box-sizing: border-box;
 
     color: @gray;
 
-	/* Resets */
-	display: block;
+    /* Resets */
+    display: block;
 
-	box-shadow: none;
+    box-shadow: none;
 
-	border-radius: 0;
+    border-radius: 0;
 
-	transition: none;
+    transition: none;
 
-	font-weight: 400;
-	font-family: @font-family-main;
-	font-size: @fz-size-m;
-	line-height: 1.5;
+    font-weight: 400;
+    font-family: @font-family-main;
+    font-size: @fz-size-m;
+    line-height: 1.5;
 
-	vertical-align: middle;
-	}
+    vertical-align: middle;
+    }
 
 .source_container input.source_search_it:focus {
-	background: #fff url(/source/assets/i/search.png) no-repeat 8px 50%;
-	color: @black;
-	}
+    background: #fff url(/source/assets/i/search.png) no-repeat 8px 50%;
+    color: @black;
+    }
 
 /* /Search
----------------------------------------------------------------------------------- */
\ No newline at end of file
+---------------------------------------------------------------------------------- */
diff --git a/assets/css/project/section.less b/assets/css/project/section.less
index da3edb5..f993928 100644
--- a/assets/css/project/section.less
+++ b/assets/css/project/section.less
@@ -2,192 +2,192 @@
 ---------------------------------------------------------------------------------- */
 
 .source_section {
-	padding-left: @layout_spec--inner-padding;
-	counter-reset: h3;
+    padding-left: @layout_spec--inner-padding;
+    counter-reset: h3;
 
     @media @media_min-step-m {
-		// Legacy
-		margin-right: @layout_spec--inner-margin-right;
+        // Legacy
+        margin-right: @layout_spec--inner-margin-right;
 
-		// New spec page modifier
-		.source_page.__spec & { margin-right: 0; }
-		}
+        // New spec page modifier
+        .source_page.__spec & { margin-right: 0; }
+        }
 
     & > h2:first-child {
-		margin-left: -@layout_spec--inner-padding !important;
+        margin-left: -@layout_spec--inner-padding !important;
 
         &:before {
-			counter-increment: h2 1;
-			content: counter(h2)". ";
-			color: #666;
-			}
-		}
+            counter-increment: h2 1;
+            content: counter(h2)". ";
+            color: #666;
+            }
+        }
 
     /* Error detection */
     & > h2:not(:first-child) {
-		.reset();
+        .reset();
 
-		background-color: rgba(250, 0, 0, .2);
-		outline: 3px solid red;
-		outline-offset: 3px;
+        background-color: rgba(250, 0, 0, .2);
+        outline: 3px solid red;
+        outline-offset: 3px;
 
-		&:after {
-			content: " error - duplicate h2 or not first tag in section";
-			font-weight: normal;
-			color: @black;
-			}
-		}
+        &:after {
+            content: " error - duplicate h2 or not first tag in section";
+            font-weight: normal;
+            color: @black;
+            }
+        }
 
     & > h3 {
-		position: relative;
-		margin: 30px 0 15px -25px;
-		padding: 0 25px;
+        position: relative;
+        margin: 30px 0 15px -25px;
+        padding: 0 25px;
 
-		font-size: 16px;
-		color: #000;
-		font-weight: normal;
-		line-height: 1.5;
-		font-family: inherit;
+        font-size: 16px;
+        color: #000;
+        font-weight: normal;
+        line-height: 1.5;
+        font-family: inherit;
 
-		counter-reset: h4;
+        counter-reset: h4;
 
         &:after {
-			content: "";
-			border-bottom: 1px dotted #666;
-			position: absolute;
-			left: 0; right: 0; top: 50%;
-			}
-		}
+            content: "";
+            border-bottom: 1px dotted #666;
+            position: absolute;
+            left: 0; right: 0; top: 50%;
+            }
+        }
 
     & > h3 > span {
-		position: relative; z-index: 1;
-		display: inline-block;
-		padding: 0 5px; background: #fff;
+        position: relative; z-index: 1;
+        display: inline-block;
+        padding: 0 5px; background: #fff;
 
         &:before {
-			color: @gray;
-			counter-increment: h3 1;
-			content: counter(h2)"."counter(h3)". ";
-			}
-		}
+            color: @gray;
+            counter-increment: h3 1;
+            content: counter(h2)"."counter(h3)". ";
+            }
+        }
 
     & > h4 {
-		margin: 30px 0 10px;
-		padding: 0;
-		font-size: @fz-size-m;
-		font-family: @font-family-main;
-		color: @black;
-		font-weight: normal;
-		text-indent: .5ex;
-		line-height: 1.5;
+        margin: 30px 0 10px;
+        padding: 0;
+        font-size: @fz-size-m;
+        font-family: @font-family-main;
+        color: @black;
+        font-weight: normal;
+        text-indent: .5ex;
+        line-height: 1.5;
 
         &:before {
-			color: @gray;
-			counter-increment: h4 1;
-			content: counter(h2)"."counter(h3)"."counter(h4)". ";
-			}
-		}
+            color: @gray;
+            counter-increment: h4 1;
+            content: counter(h2)"."counter(h3)"."counter(h4)". ";
+            }
+        }
 
-	& > p {
-		margin: 15px 0;
-		}
+    & > p {
+        margin: 15px 0;
+        }
 
-	& > pre {
-		.reset();
-		}
-	}
+    & > pre {
+        .reset();
+        }
+    }
 
 /* Dynamics
 -------------------------------------------------- */
 
 /* Everything closed by default */
 .source_section {
-	position: absolute;
-	height: 0;
-	width: 0;
-	top: -9999px;
-	overflow: hidden;
-
-	&.__loaded {
-		position: relative;
-		height: auto;
-		width: auto;
-		overflow: visible;
-		top: 0;
-		margin-top: 20px;
-		margin-bottom: 40px;
-	}
+    position: absolute;
+    height: 0;
+    width: 0;
+    top: -9999px;
+    overflow: hidden;
+
+    &.__loaded {
+        position: relative;
+        height: auto;
+        width: auto;
+        overflow: visible;
+        top: 0;
+        margin-top: 20px;
+        margin-bottom: 40px;
+    }
 
     & > script,
     & > style {
-    	display: none !important;
-    	}
+        display: none !important;
+        }
 
     body & > * { //body for weihgt
         display: none;
         }
 
     body & > h2:first-child { //body for weihgt
-		display: block;
-		}
-	}
+        display: block;
+        }
+    }
 
 .source_section__open {
 
     & > *:not(.source_example) {
-		display: block;
-		}
+        display: block;
+        }
 
     & > .source_a_hl {
-		display: inline;
-		}
+        display: inline;
+        }
 
     .source_example {
-		display: inline-block;
-		}
+        display: inline-block;
+        }
 
     .spoiler-cont_css_w,
-	.spoiler-cont_js_w,
-	.spoiler-cont_xml_w {
-		display: none !important;
-		}
+    .spoiler-cont_js_w,
+    .spoiler-cont_xml_w {
+        display: none !important;
+        }
 
     .source_section_h_expand:after {
-		content: "▼";
-		}
+        content: "▼";
+        }
 
     .source_source-code__show, .source_source-code__static, .source_context.__show {
-		display: block !important;
-		}
+        display: block !important;
+        }
 
     .source_context {
         display: none !important;
         }
-	}
+    }
 
 /* Header actions */
 
 .source_section > h2:first-child,
 .source_section_h {
-	.reset();
+    .reset();
 
-	position: relative;
-	margin: 0 0 25px;
+    position: relative;
+    margin: 0 0 25px;
 
-	padding: 5px @layout_spec--inner-padding;
-	line-height: 28px;
-	color: @black;
+    padding: 5px @layout_spec--inner-padding;
+    line-height: 28px;
+    color: @black;
 
-	border-radius: 10px;
-	background-color: @light-gray;
+    border-radius: 10px;
+    background-color: @light-gray;
 
-	font-size: @fz-size-l;
-	font-family: @font-family-main;
+    font-size: @fz-size-l;
+    font-family: @font-family-main;
 
     &:hover .source_section_h_expand {
-		color:#4792D2 !important; //important to override link style
-		}
-	}
+        color:#4792D2 !important; //important to override link style
+        }
+    }
 
     .source_subsection_h {
         background-color: #fff !important;
@@ -195,16 +195,16 @@
         }
 
 .source_section_h_expand {
-	position: absolute;
-	top: 0; left: -20px;
+    position: absolute;
+    top: 0; left: -20px;
 
-	width: 20px;
-	height: 38px;
-	margin: 0 10px 0 0;
+    width: 20px;
+    height: 38px;
+    margin: 0 10px 0 0;
 
-	font-size: 12px !important; //override reset styles
-	text-decoration: none;
-	color: @gray !important; //important to override link style
+    font-size: 12px !important; //override reset styles
+    text-decoration: none;
+    color: @gray !important; //important to override link style
 
     &:after {
         content: "►";
@@ -216,11 +216,11 @@
         text-align: left;
         line-height: 38px;
         }
-	}
+    }
 
 /* /Header actions */
 
 /* /Dynamics */
 
 /* /Section
----------------------------------------------------------------------------------- */
\ No newline at end of file
+---------------------------------------------------------------------------------- */
diff --git a/assets/css/project/source-code.less b/assets/css/project/source-code.less
index 3a0cd2a..c3ecc84 100644
--- a/assets/css/project/source-code.less
+++ b/assets/css/project/source-code.less
@@ -3,57 +3,57 @@
 
 .source_source-code,
 code.brush {
-	display: none !important; /* Hide all code source by default */
-	}
+    display: none !important; /* Hide all code source by default */
+    }
 
 .source_source-code {
-	font-size: @fz-size-m;
-	}
+    font-size: @fz-size-m;
+    }
 
 .source_source-code .source_source-code_toggle .source_show {display: none;} /* Default maximazed */
 .source_source-code__min .source_source-code_toggle .source_hide {display: none;} /* minimized */
 .source_source-code__min .source_source-code_toggle .source_show {display: inline;}
 
 .source_source-code__min .source_source-code_cnt {
-	display: none;
-	}
+    display: none;
+    }
 
 .source_source-code_toggle {
-	display: inline-block;
-	height: 14px;
-	margin-bottom: 10px;
-	border-bottom: #25588D dashed 1px !important;
-	font-size: 10px !important;
-	text-decoration: none;
-
-	& span {
-		color: inherit !important;
-		}
-	}
-	.source_source-code_toggle:hover {
-		border-bottom: none !important;
+    display: inline-block;
+    height: 14px;
+    margin-bottom: 10px;
+    border-bottom: #25588D dashed 1px !important;
+    font-size: 10px !important;
+    text-decoration: none;
+
+    & span {
+        color: inherit !important;
+        }
+    }
+    .source_source-code_toggle:hover {
+        border-bottom: none !important;
         text-decoration: none !important;
-		padding-bottom: 1px;
-		}
+        padding-bottom: 1px;
+        }
 
-	.source_source-code_toggle__css .source_show:after,
-	.source_source-code_toggle__css .source_hide:after {
-		content: " CSS";
-		}
+    .source_source-code_toggle__css .source_show:after,
+    .source_source-code_toggle__css .source_hide:after {
+        content: " CSS";
+        }
 
-	.source_source-code_toggle__html .source_show:after,
-	.source_source-code_toggle__html .source_hide:after {
-		content: " HTML";
-		}
+    .source_source-code_toggle__html .source_show:after,
+    .source_source-code_toggle__html .source_hide:after {
+        content: " HTML";
+        }
 
-	.source_source-code_toggle__js .source_show:after,
-	.source_source-code_toggle__js .source_hide:after {
-		content: " JavaScript";
-		}
+    .source_source-code_toggle__js .source_show:after,
+    .source_source-code_toggle__js .source_hide:after {
+        content: " JavaScript";
+        }
 
 .source_source-code_toggle-all .source_hide {display: none;} /* Default hidden */
 .source_source-code_toggle-all__hide .source_show {display: none;}
 .source_source-code_toggle-all__hide .source_hide {display: inline;}
 
 /* /Code highlighting
----------------------------------------------------------------------------------- */
\ No newline at end of file
+---------------------------------------------------------------------------------- */
diff --git a/assets/css/reset.less b/assets/css/reset.less
index 13a70d8..ea879bb 100644
--- a/assets/css/reset.less
+++ b/assets/css/reset.less
@@ -71,7 +71,7 @@
         font-weight: normal;
         font-style: normal;
         }
-	}
+    }
 
 /* /Fonts */
 
@@ -228,4 +228,4 @@ body {
 /* /Spec page resets */
 
 /* /Reset
----------------------------------------------------------------------------------- */
\ No newline at end of file
+---------------------------------------------------------------------------------- */
diff --git a/assets/js/_require-config.js b/assets/js/_require-config.js
index 053fa3c..a0c9d41 100644
--- a/assets/js/_require-config.js
+++ b/assets/js/_require-config.js
@@ -33,4 +33,4 @@ sourcejs.amd.requirejs.config({
       'sourceLib/jquery-private': { 'jquery': 'jquery' },
       'sourceLib/lodash-private': { 'lodash': 'lodash' }
     }
-});
\ No newline at end of file
+});
diff --git a/assets/js/lib/autocomplete.js b/assets/js/lib/autocomplete.js
index f4546b9..c07d2f8 100644
--- a/assets/js/lib/autocomplete.js
+++ b/assets/js/lib/autocomplete.js
@@ -452,4 +452,4 @@
             var searchInstance = new Autocomplete(this, options);
         });
     };
-});
\ No newline at end of file
+});
diff --git a/assets/js/lib/codeFormat.js b/assets/js/lib/codeFormat.js
index f0ab1a1..4b4ef15 100644
--- a/assets/js/lib/codeFormat.js
+++ b/assets/js/lib/codeFormat.js
@@ -64,4 +64,4 @@ sourcejs.amd.define([
         });
     }
 
-});
\ No newline at end of file
+});
diff --git a/assets/js/lib/jquery-private.js b/assets/js/lib/jquery-private.js
index 24a005b..071194e 100644
--- a/assets/js/lib/jquery-private.js
+++ b/assets/js/lib/jquery-private.js
@@ -1,3 +1,3 @@
 sourcejs.amd.define(['jquery'], function (jq) {
     return jq.noConflict(true);
-});
\ No newline at end of file
+});
diff --git a/assets/js/lib/jquery.autocomplete.js b/assets/js/lib/jquery.autocomplete.js
index bd8bfff..d5e3410 100755
--- a/assets/js/lib/jquery.autocomplete.js
+++ b/assets/js/lib/jquery.autocomplete.js
@@ -643,4 +643,4 @@
             }
         });
     };
-}));
\ No newline at end of file
+}));
diff --git a/assets/js/lib/jquery.mb.browser.js b/assets/js/lib/jquery.mb.browser.js
index 4a8c4a4..4f4552b 100755
--- a/assets/js/lib/jquery.mb.browser.js
+++ b/assets/js/lib/jquery.mb.browser.js
@@ -6,9 +6,9 @@
  *  Copyright (c) 2001-2014. Matteo Bicocchi (Pupunzi);
  *  Open lab srl, Firenze - Italy
  *  email: matteo@open-lab.com
- *  site: 	http://pupunzi.com
- *  blog:	http://pupunzi.open-lab.com
- * 	http://open-lab.com
+ *  site:     http://pupunzi.com
+ *  blog:    http://pupunzi.open-lab.com
+ *     http://open-lab.com
  *
  *  Licences: MIT, GPL
  *  http://www.opensource.org/licenses/mit-license.php
diff --git a/assets/js/lib/modalbox.js b/assets/js/lib/modalbox.js
index bb90f8c..91ed610 100644
--- a/assets/js/lib/modalbox.js
+++ b/assets/js/lib/modalbox.js
@@ -103,4 +103,4 @@ sourcejs.amd.define([
     };
 
     return ModalBox;
-});
\ No newline at end of file
+});
diff --git a/assets/js/lib/prism/prism.css b/assets/js/lib/prism/prism.css
index 1310e16..9503b2e 100644
--- a/assets/js/lib/prism/prism.css
+++ b/assets/js/lib/prism/prism.css
@@ -53,8 +53,8 @@ pre[class*="src-"] {
 pre[class*="src-"] {
     background: #f1f2f3;
     border:1px solid #dfe2e4;
-	-moz-box-sizing: border-box;
-	box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box;
 }
 
 /* Inline code */
diff --git a/assets/js/lib/prism/prism.js b/assets/js/lib/prism/prism.js
index 21d2f34..8d98a24 100644
--- a/assets/js/lib/prism/prism.js
+++ b/assets/js/lib/prism/prism.js
@@ -510,4 +510,4 @@ sourcejs.amd.define([], function(){
     });
 
     return Prism;
-});
\ No newline at end of file
+});
diff --git a/assets/js/lib/require.js b/assets/js/lib/require.js
index 207b25d..72b08ca 100644
--- a/assets/js/lib/require.js
+++ b/assets/js/lib/require.js
@@ -2089,4 +2089,4 @@ window.sourcejs.amd = (function () {
         require: require,
         define: define
     };
-}());
\ No newline at end of file
+}());
diff --git a/assets/js/load-options.js b/assets/js/load-options.js
index 2a0d63b..e1f8bde 100644
--- a/assets/js/load-options.js
+++ b/assets/js/load-options.js
@@ -17,4 +17,4 @@ sourcejs.amd.define([
     $.extend(true, sourceOptions, inlineOptions);
 
     return sourceOptions;
-});
\ No newline at end of file
+});
diff --git a/assets/js/modules/auth.js b/assets/js/modules/auth.js
index 99f159b..e4ed95b 100644
--- a/assets/js/modules/auth.js
+++ b/assets/js/modules/auth.js
@@ -2,7 +2,7 @@ sourcejs.amd.define([
     'jquery',
     'sourceModules/module'
 ], function($, Module) {
-    
+
     'use strict';
 
     /**
@@ -152,4 +152,4 @@ sourcejs.amd.define([
     };
 
     return Auth;
-});
\ No newline at end of file
+});
diff --git a/assets/js/modules/browser.js b/assets/js/modules/browser.js
index ec3ea5e..b46f367 100644
--- a/assets/js/modules/browser.js
+++ b/assets/js/modules/browser.js
@@ -33,4 +33,4 @@ sourcejs.amd.define([
     $('html').addClass(classString);
 
     return $.browser;
-});
\ No newline at end of file
+});
diff --git a/assets/js/modules/clarifyInSpec.js b/assets/js/modules/clarifyInSpec.js
index 851d469..5e3401d 100644
--- a/assets/js/modules/clarifyInSpec.js
+++ b/assets/js/modules/clarifyInSpec.js
@@ -73,4 +73,4 @@ sourcejs.amd.define([
     };
 
     return new ClarifyInSpec();
-});
\ No newline at end of file
+});
diff --git a/assets/js/modules/codeSource.js b/assets/js/modules/codeSource.js
index eea3858..ceeb04f 100644
--- a/assets/js/modules/codeSource.js
+++ b/assets/js/modules/codeSource.js
@@ -232,4 +232,4 @@ sourcejs.amd.define([
             showStaticCode();
         });
     }
-});
\ No newline at end of file
+});
diff --git a/assets/js/modules/couch.js b/assets/js/modules/couch.js
index 81791aa..2559e02 100644
--- a/assets/js/modules/couch.js
+++ b/assets/js/modules/couch.js
@@ -133,4 +133,4 @@ sourcejs.amd.define([
 
     return new Couch();
 
-});
\ No newline at end of file
+});
diff --git a/assets/js/modules/css.js b/assets/js/modules/css.js
index 16a22c8..d3587e1 100644
--- a/assets/js/modules/css.js
+++ b/assets/js/modules/css.js
@@ -9,17 +9,17 @@ sourcejs.amd.define(["source/load-options"], function(options) {
     }
 
     Css.prototype.inject = function(){
-		var href = this.url;
+        var href = this.url;
 
-		var link = document.createElement("link");
+        var link = document.createElement("link");
 
         link.type = "text/css";
         link.rel = "stylesheet";
         link.dataset.source = this.cat;
-		link.href = href;
+        link.href = href;
 
         document.getElementsByTagName("head")[0].appendChild(link);
     };
 
     return Css;
-});
\ No newline at end of file
+});
diff --git a/assets/js/modules/headerFooter.js b/assets/js/modules/headerFooter.js
index 09a5872..699d590 100644
--- a/assets/js/modules/headerFooter.js
+++ b/assets/js/modules/headerFooter.js
@@ -76,4 +76,4 @@ sourcejs.amd.define([
             }
         }
     });
-});
\ No newline at end of file
+});
diff --git a/assets/js/modules/htmlAPISync.js b/assets/js/modules/htmlAPISync.js
index 89ab6f4..8373bfe 100644
--- a/assets/js/modules/htmlAPISync.js
+++ b/assets/js/modules/htmlAPISync.js
@@ -70,4 +70,4 @@ sourcejs.amd.define([
     };
 
     return new HtmlAPiSync();
-});
\ No newline at end of file
+});
diff --git a/assets/js/modules/innerNavigation.js b/assets/js/modules/innerNavigation.js
index 954da02..28143b6 100644
--- a/assets/js/modules/innerNavigation.js
+++ b/assets/js/modules/innerNavigation.js
@@ -158,26 +158,26 @@ sourcejs.amd.define([
                     '</a>'
             ].join('');
 
-			if ( section.subHeaderElements !== undefined ) {
-				appendString += '<ul class="' + this.moduleOptions.NAV_UL_SECONDLEVEL_CLASS + '">';
+            if ( section.subHeaderElements !== undefined ) {
+                appendString += '<ul class="' + this.moduleOptions.NAV_UL_SECONDLEVEL_CLASS + '">';
 
-				for (var j = 0; j < section.subHeaderElements.length; j++) {
+                for (var j = 0; j < section.subHeaderElements.length; j++) {
                     var seqNum = j+1;
                     var subSection = section.subHeaderElements[j];
                     var subSectionID = sectionID + '.' + seqNum;
                     var subHref = subSection.attr('id') || subSectionID;
 
-					appendString += [
+                    appendString += [
                         '<li class="' + this.moduleOptions.NAV_LI_SECONDLEVEL_CLASS + '">',
                             '<a class="source_main_nav_a" href="#' + subHref + '">',
                                 section.num + '.' + seqNum + '&nbsp;' + subSection.text(),
                             '</a>',
                         '</li>'
                     ].join('');
-				}
+                }
 
                 appendString += '</ul>';
-			}
+            }
 
             appendString += '</li>';
         }
@@ -196,4 +196,4 @@ sourcejs.amd.define([
 
     return new InnerNavigation();
 
-});
\ No newline at end of file
+});
diff --git a/assets/js/modules/loadEvents.js b/assets/js/modules/loadEvents.js
index 1071e28..d9aaaa0 100644
--- a/assets/js/modules/loadEvents.js
+++ b/assets/js/modules/loadEvents.js
@@ -8,36 +8,36 @@ sourcejs.amd.define(["sourceModules/module", "sourceModules/utils"], function(mo
 
     'use strict';
 
-	function LoadEvents() {}
+    function LoadEvents() {}
 
-	LoadEvents.prototype = module.createInstance();
-	LoadEvents.prototype.constructor = LoadEvents;
+    LoadEvents.prototype = module.createInstance();
+    LoadEvents.prototype.constructor = LoadEvents;
 
-	LoadEvents.prototype.init = function( callback ) {
+    LoadEvents.prototype.init = function( callback ) {
 
-		callback = callback || function () {};
-		var evt;
-		var complete = false;
-		var debug = module.options.modulesEnabled.loadEvents && module.options.modulesOptions.loadEvents && module.options.modulesOptions.loadEvents.debug;
+        callback = callback || function () {};
+        var evt;
+        var complete = false;
+        var debug = module.options.modulesEnabled.loadEvents && module.options.modulesOptions.loadEvents && module.options.modulesOptions.loadEvents.debug;
 
-		if ( (!module.options.modulesEnabled.loadEvents) || (window.CustomEvent === undefined && document.createEvent === undefined) ) {
-			if (debug && utils.isDevelopmentMode()) {
-				console.log('LoadEvents Module disabled.');
-			}
+        if ( (!module.options.modulesEnabled.loadEvents) || (window.CustomEvent === undefined && document.createEvent === undefined) ) {
+            if (debug && utils.isDevelopmentMode()) {
+                console.log('LoadEvents Module disabled.');
+            }
 
-			callback();
-			return;
-		} else {
-			if (debug && utils.isDevelopmentMode()) {
-				console.log('LoadEvents Module enabled.');
-			}
-		}
+            callback();
+            return;
+        } else {
+            if (debug && utils.isDevelopmentMode()) {
+                console.log('LoadEvents Module enabled.');
+            }
+        }
 
-		function checkPluginsDefinition() {
-			return (window.source !== undefined)
-				&& (window.source.loadEvents !== undefined)
-				&& (Object.keys(window.source.loadEvents).length);
-		}
+        function checkPluginsDefinition() {
+            return (window.source !== undefined)
+                && (window.source.loadEvents !== undefined)
+                && (Object.keys(window.source.loadEvents).length);
+        }
 
         function phantomHook(event) {
             console.log('PhantomJS hook: %s', event);
@@ -47,152 +47,152 @@ sourcejs.amd.define(["sourceModules/module", "sourceModules/utils"], function(mo
             }
         }
 
-		function generateSuccessEvent(eventName) {
-			if (debug && utils.isDevelopmentMode()) {
-				console.log('event happens ' + eventName );
-			}
+        function generateSuccessEvent(eventName) {
+            if (debug && utils.isDevelopmentMode()) {
+                console.log('event happens ' + eventName );
+            }
 
-			if (typeof window.CustomEvent === 'function') {
-				evt = new CustomEvent(eventName);
-			} else {
-				evt = document.createEvent('CustomEvent');
-				evt.initCustomEvent(eventName, false, false, {});
-			}
+            if (typeof window.CustomEvent === 'function') {
+                evt = new CustomEvent(eventName);
+            } else {
+                evt = document.createEvent('CustomEvent');
+                evt.initCustomEvent(eventName, false, false, {});
+            }
 
-			document.dispatchEvent(evt);
+            document.dispatchEvent(evt);
 
 
-			if (!complete) {
-				complete = true;
-				callback();
-			}
-		}
+            if (!complete) {
+                complete = true;
+                callback();
+            }
+        }
 
-		(function checkPluginsState() {
+        (function checkPluginsState() {
 
-			// If there's no any render plugin, just skip checking section
-			if ( !checkPluginsDefinition() ) {
-				generateSuccessEvent('allPluginsFinish');
+            // If there's no any render plugin, just skip checking section
+            if ( !checkPluginsDefinition() ) {
+                generateSuccessEvent('allPluginsFinish');
                 phantomHook('allPluginsFinish');
-				return;
-			}
-
-			var	pluginsSection = window.source.loadEvents;
-			var defaultPluginTimeout = 700;
-
-			function checkPlugins() {
-				var now = new Date().getTime();
-				var pluginFinish = 0;
-
-				var onFinishEvent = function() {
-					if (debug && utils.isDevelopmentMode()) {
-						console.log(plugin + ' drop finishEvent' );
-					}
-
-					pluginsSection[plugin].finish = true;
-					pluginsSection[plugin].timeExpected = now-1;
-				};
-
-				var onUpdateEvent = function() {
-					var tmpExpected = now + parseInt(pluginsSection[plugin].timeout || defaultPluginTimeout, 10);
-
-					if (tmpExpected > pluginsSection[plugin].timeExpected) {
-						pluginsSection[plugin].timeExpected = tmpExpected;
-						if (debug && utils.isDevelopmentMode()) {
-							console.log(plugin + ' drop updateEvent and increase timeout to ' + pluginsSection[plugin].timeExpected );
-						}
-
-					}
-				};
-				/*jshint forin: false */
-				for (var plugin in pluginsSection) {
-					if (!pluginsSection.hasOwnProperty(plugin)) {
-						continue;
-					}
-					if (debug && utils.isDevelopmentMode()) {
-						console.log(plugin + ' checking... ');
-					}
-
-					if (pluginsSection[plugin].finish) {
-						pluginsSection[plugin].timeExpected = now-1;
-						if (debug && utils.isDevelopmentMode()) {
-							console.log(plugin + ' marked as finished');
-						}
-					}
-
-					if ( !Array.isArray( pluginsSection[plugin]) ) {
-						// first time
-
-						if (pluginsSection[plugin].timeExpected === undefined) {
-
-							pluginsSection[plugin].timeExpected = now + parseInt(pluginsSection[plugin].timeout || defaultPluginTimeout, 10);
-							if (debug && utils.isDevelopmentMode()) {
-								console.log(plugin + ' was registred and set timeout ' +  pluginsSection[plugin].timeExpected);
-							}
-
-							// When plugin finish his work, it send "finishEvent", which differs for each plugin
-							pluginsSection[plugin].finishEvent && document.addEventListener(pluginsSection[plugin].finishEvent, onFinishEvent);
-
-							// When plugin need to update work's timeout, it generate "updateEvent"
-							pluginsSection[plugin].updateEvent && document.addEventListener(pluginsSection[plugin].updateEvent, onUpdateEvent);
-
-						// Plugin already was initialized
-						} else {
-
-							// If timeout come, increase counter
-							if ( pluginsSection[plugin].timeExpected < now ) {
-								if (!pluginsSection[plugin].finish) {
-									generateSuccessEvent(plugin + ' timeout, ' + new Date().getTime());
-									pluginsSection[plugin].finish = true;
-								}
-
-								pluginFinish++;
-							}
-						}
-
-					} else {
-						var subPluginFinish = 0;
-						pluginFinish++;
-
-						if ( (pluginsSection[plugin].length) && (!pluginsSection[plugin].finish) ) {
-
-							for (var i = 0; i < pluginsSection[plugin].length; i++ ) {
-								var subPlugin = pluginsSection[plugin][i];
-
-								if ( (pluginsSection[subPlugin] !== undefined) && (pluginsSection[subPlugin].timeExpected < now) ) {
-									subPluginFinish++;
-								}
-							}
-
-							if ( pluginsSection[plugin].length === subPluginFinish) {
-								pluginsSection[plugin].finish = true;
-								generateSuccessEvent(plugin + ' GroupFinish');
-							}
-						}
-					}
-
-				}
-
-				// if there's more than 0 plugins and all of them get timeout, continue,
-				// otherwise make recursive call
-				if ( Object.keys(pluginsSection).length !== pluginFinish ) {
-					setTimeout(function() {
-						checkPlugins();
-					}, 100);
-					return;
-				}
-				setTimeout(function () {
-					generateSuccessEvent('allPluginsFinish');
+                return;
+            }
+
+            var    pluginsSection = window.source.loadEvents;
+            var defaultPluginTimeout = 700;
+
+            function checkPlugins() {
+                var now = new Date().getTime();
+                var pluginFinish = 0;
+
+                var onFinishEvent = function() {
+                    if (debug && utils.isDevelopmentMode()) {
+                        console.log(plugin + ' drop finishEvent' );
+                    }
+
+                    pluginsSection[plugin].finish = true;
+                    pluginsSection[plugin].timeExpected = now-1;
+                };
+
+                var onUpdateEvent = function() {
+                    var tmpExpected = now + parseInt(pluginsSection[plugin].timeout || defaultPluginTimeout, 10);
+
+                    if (tmpExpected > pluginsSection[plugin].timeExpected) {
+                        pluginsSection[plugin].timeExpected = tmpExpected;
+                        if (debug && utils.isDevelopmentMode()) {
+                            console.log(plugin + ' drop updateEvent and increase timeout to ' + pluginsSection[plugin].timeExpected );
+                        }
+
+                    }
+                };
+                /*jshint forin: false */
+                for (var plugin in pluginsSection) {
+                    if (!pluginsSection.hasOwnProperty(plugin)) {
+                        continue;
+                    }
+                    if (debug && utils.isDevelopmentMode()) {
+                        console.log(plugin + ' checking... ');
+                    }
+
+                    if (pluginsSection[plugin].finish) {
+                        pluginsSection[plugin].timeExpected = now-1;
+                        if (debug && utils.isDevelopmentMode()) {
+                            console.log(plugin + ' marked as finished');
+                        }
+                    }
+
+                    if ( !Array.isArray( pluginsSection[plugin]) ) {
+                        // first time
+
+                        if (pluginsSection[plugin].timeExpected === undefined) {
+
+                            pluginsSection[plugin].timeExpected = now + parseInt(pluginsSection[plugin].timeout || defaultPluginTimeout, 10);
+                            if (debug && utils.isDevelopmentMode()) {
+                                console.log(plugin + ' was registred and set timeout ' +  pluginsSection[plugin].timeExpected);
+                            }
+
+                            // When plugin finish his work, it send "finishEvent", which differs for each plugin
+                            pluginsSection[plugin].finishEvent && document.addEventListener(pluginsSection[plugin].finishEvent, onFinishEvent);
+
+                            // When plugin need to update work's timeout, it generate "updateEvent"
+                            pluginsSection[plugin].updateEvent && document.addEventListener(pluginsSection[plugin].updateEvent, onUpdateEvent);
+
+                        // Plugin already was initialized
+                        } else {
+
+                            // If timeout come, increase counter
+                            if ( pluginsSection[plugin].timeExpected < now ) {
+                                if (!pluginsSection[plugin].finish) {
+                                    generateSuccessEvent(plugin + ' timeout, ' + new Date().getTime());
+                                    pluginsSection[plugin].finish = true;
+                                }
+
+                                pluginFinish++;
+                            }
+                        }
+
+                    } else {
+                        var subPluginFinish = 0;
+                        pluginFinish++;
+
+                        if ( (pluginsSection[plugin].length) && (!pluginsSection[plugin].finish) ) {
+
+                            for (var i = 0; i < pluginsSection[plugin].length; i++ ) {
+                                var subPlugin = pluginsSection[plugin][i];
+
+                                if ( (pluginsSection[subPlugin] !== undefined) && (pluginsSection[subPlugin].timeExpected < now) ) {
+                                    subPluginFinish++;
+                                }
+                            }
+
+                            if ( pluginsSection[plugin].length === subPluginFinish) {
+                                pluginsSection[plugin].finish = true;
+                                generateSuccessEvent(plugin + ' GroupFinish');
+                            }
+                        }
+                    }
+
+                }
+
+                // if there's more than 0 plugins and all of them get timeout, continue,
+                // otherwise make recursive call
+                if ( Object.keys(pluginsSection).length !== pluginFinish ) {
+                    setTimeout(function() {
+                        checkPlugins();
+                    }, 100);
+                    return;
+                }
+                setTimeout(function () {
+                    generateSuccessEvent('allPluginsFinish');
                     phantomHook('allPluginsFinish');
 
-				}, defaultPluginTimeout);
+                }, defaultPluginTimeout);
 
-				return;
-			}
+                return;
+            }
 
-			checkPlugins();
-		})();
-	};
+            checkPlugins();
+        })();
+    };
 
-	return new LoadEvents();
-});
\ No newline at end of file
+    return new LoadEvents();
+});
diff --git a/assets/js/modules/module.js b/assets/js/modules/module.js
index 8842ad4..b13617f 100644
--- a/assets/js/modules/module.js
+++ b/assets/js/modules/module.js
@@ -30,4 +30,4 @@ sourcejs.amd.define(["source/load-options"], function (options) {
 
     return new Module();
 
-});
\ No newline at end of file
+});
diff --git a/assets/js/modules/moduleLoader.js b/assets/js/modules/moduleLoader.js
index ba45947..71d8e6f 100644
--- a/assets/js/modules/moduleLoader.js
+++ b/assets/js/modules/moduleLoader.js
@@ -1,7 +1,7 @@
 sourcejs.amd.define([
     'jquery',
-	'sourceModules/module'
-	], function ($, module) {
+    'sourceModules/module'
+    ], function ($, module) {
 
     'use strict';
 
diff --git a/assets/js/modules/navHighlight.js b/assets/js/modules/navHighlight.js
index c0cc5f8..4a4be98 100644
--- a/assets/js/modules/navHighlight.js
+++ b/assets/js/modules/navHighlight.js
@@ -8,199 +8,199 @@
 
 
 sourcejs.amd.define([
-	'jquery',
+    'jquery',
     'sourceModules/module'
     ], function ($, module) {
-	'use strict';
-
-	function NavHighlight() {
-		var defaults = {
-			updateHash: true
-		};
-
-		this.options.modulesOptions.navHighlight = $.extend(true, defaults, this.options.modulesOptions.navHighlight);
-		this.conf = this.options.modulesOptions.navHighlight;
-
-		this.init();
-	}
-
-	NavHighlight.prototype = module.createInstance();
-	NavHighlight.prototype.constructor = NavHighlight;
-
-	NavHighlight.prototype.init = function(){
-		var _this = this;
-
-		// basic utils
-		var utils = (function() {
-
-			return {
-				offsetTop: function(elem) {
-					var box = elem.getBoundingClientRect();
-					var clientTop = document.body.clientTop || 0;
-					var top = box.top +  window.pageYOffset - clientTop;
-
-					return Math.round(top);
-				},
-				hasClass: function(elem, cls) {
-					if (elem !== null) {
-						return elem.className.match(new RegExp('(\\s|^)'+cls+'(\\s|$)'));
-					} else {
-						return false;
-					}
-				},
-				addClass: function(elem, cls) {
-					if (!this.hasClass(elem,cls)) {
-						elem.className += " "+cls;
-						elem.className.replace(/ +/g,' ');
-					}
-				},
-				removeClass: function(elem, cls) {
-					if (this.hasClass(elem,cls)) {
-						var reg = new RegExp('(\\s|^)'+cls+'(\\s|$)');
-						elem.className=elem.className.replace(reg,'');
-					}
-				},
-				closest: function(elem, cls) { //console.log(elem, cls);
-					if (elem.tagName === 'html') return false;
-
-					var elemParent = elem.parentNode;
-					if (!utils.hasClass(elem, cls)) {
-						return utils.closest(elemParent, cls);
-					}
-
-					return elem;
-				}
-			};
-
-		})();
-
-		var sourceHeaders = [];
-		var navHeaders;
-		var currentHeader = -1;
-		var filename = '';
-		var extension = '';
-		var hashThreshold = 100;
-
-		var fullFilename = window.location.href.split("#")[0].split('/').pop().split('.');
-
-		//update extension and filename only if there is one in URL
-		if(fullFilename.length !== 1) {
-			extension = /\w+/.exec(fullFilename[1]);
-			filename = fullFilename[0];
-		}
-
-		// watch headers position
-		var watchSectionTop = function () {
-
-			var headersLength = sourceHeaders.length;
-			var minDistance = Number.MAX_VALUE;
-			var closestHeader = -1;
-			var fileNameInUrl = filename === '' ? '' : filename + '.' +  extension;
-
-			if ((document.body.scrollTop || document.documentElement.scrollTop) < hashThreshold) {
-
-				if (!!window.location.hash)	{
-					currentHeader = -1;
-					if (!!(window.history && history.pushState)) {
-						window.history.replaceState({anchor: 0}, document.title, window.location.pathname);
-					}
-				}
-
-				return;
-			}
-
-			// catch section which is closed for top window border
-			for (var i=0; i < headersLength; i++) {
-
-				if ((sourceHeaders[i].tagName === 'H3') && (!utils.hasClass(utils.closest(sourceHeaders[i], 'source_section'), 'source_section__open')) ) {
-					continue;
-				}
-
-				var currentDist = Math.abs( utils.offsetTop(sourceHeaders[i]) - 60 - window.pageYOffset ); //60 = Header heights
-				if (currentDist < minDistance) {
-					closestHeader = i;
-					minDistance = currentDist;
-				}
-			}
-
-			if (closestHeader !== currentHeader) {
-				utils.removeClass( document.querySelector('.source_main_nav_li.__active'), '__active');
-				utils.removeClass( document.querySelector('.source_main_nav_a.__active'), '__active');
-
-				utils.addClass(navHeaders[closestHeader], '__active');
-
-				var parent = utils.closest(navHeaders[closestHeader], 'source_main_nav_li');
-				var hashFromLink = navHeaders[closestHeader].getAttribute('href');
-
-				if (!!parent && parent) {
-					utils.addClass(parent, '__active');
-				}
-
-				if (_this.conf.updateHash) {
-					// TODO: pause hash change when scrolling - append it only on stand-still
-
-					// Modern browsers uses history API for correct back-button-browser functionality
-					if (!!(window.history && history.pushState)) {
-						window.history.replaceState({anchor: closestHeader+1}, document.title, fileNameInUrl + hashFromLink);
-					} else { // ie9 fallback
-						 window.location.hash = hashFromLink;
-					}
-				}
-
-				currentHeader = closestHeader;
-			}
-		};
-
-		// watch navmenu render
-		var checkNavInterval;
-		var h2Nodes;
-		var bodyNode = document.querySelector('body');
-		var checkOnNav = function checkOnNav() {
+    'use strict';
+
+    function NavHighlight() {
+        var defaults = {
+            updateHash: true
+        };
+
+        this.options.modulesOptions.navHighlight = $.extend(true, defaults, this.options.modulesOptions.navHighlight);
+        this.conf = this.options.modulesOptions.navHighlight;
+
+        this.init();
+    }
+
+    NavHighlight.prototype = module.createInstance();
+    NavHighlight.prototype.constructor = NavHighlight;
+
+    NavHighlight.prototype.init = function(){
+        var _this = this;
+
+        // basic utils
+        var utils = (function() {
+
+            return {
+                offsetTop: function(elem) {
+                    var box = elem.getBoundingClientRect();
+                    var clientTop = document.body.clientTop || 0;
+                    var top = box.top +  window.pageYOffset - clientTop;
+
+                    return Math.round(top);
+                },
+                hasClass: function(elem, cls) {
+                    if (elem !== null) {
+                        return elem.className.match(new RegExp('(\\s|^)'+cls+'(\\s|$)'));
+                    } else {
+                        return false;
+                    }
+                },
+                addClass: function(elem, cls) {
+                    if (!this.hasClass(elem,cls)) {
+                        elem.className += " "+cls;
+                        elem.className.replace(/ +/g,' ');
+                    }
+                },
+                removeClass: function(elem, cls) {
+                    if (this.hasClass(elem,cls)) {
+                        var reg = new RegExp('(\\s|^)'+cls+'(\\s|$)');
+                        elem.className=elem.className.replace(reg,'');
+                    }
+                },
+                closest: function(elem, cls) { //console.log(elem, cls);
+                    if (elem.tagName === 'html') return false;
+
+                    var elemParent = elem.parentNode;
+                    if (!utils.hasClass(elem, cls)) {
+                        return utils.closest(elemParent, cls);
+                    }
+
+                    return elem;
+                }
+            };
+
+        })();
+
+        var sourceHeaders = [];
+        var navHeaders;
+        var currentHeader = -1;
+        var filename = '';
+        var extension = '';
+        var hashThreshold = 100;
+
+        var fullFilename = window.location.href.split("#")[0].split('/').pop().split('.');
+
+        //update extension and filename only if there is one in URL
+        if(fullFilename.length !== 1) {
+            extension = /\w+/.exec(fullFilename[1]);
+            filename = fullFilename[0];
+        }
+
+        // watch headers position
+        var watchSectionTop = function () {
+
+            var headersLength = sourceHeaders.length;
+            var minDistance = Number.MAX_VALUE;
+            var closestHeader = -1;
+            var fileNameInUrl = filename === '' ? '' : filename + '.' +  extension;
+
+            if ((document.body.scrollTop || document.documentElement.scrollTop) < hashThreshold) {
+
+                if (!!window.location.hash)    {
+                    currentHeader = -1;
+                    if (!!(window.history && history.pushState)) {
+                        window.history.replaceState({anchor: 0}, document.title, window.location.pathname);
+                    }
+                }
+
+                return;
+            }
+
+            // catch section which is closed for top window border
+            for (var i=0; i < headersLength; i++) {
+
+                if ((sourceHeaders[i].tagName === 'H3') && (!utils.hasClass(utils.closest(sourceHeaders[i], 'source_section'), 'source_section__open')) ) {
+                    continue;
+                }
+
+                var currentDist = Math.abs( utils.offsetTop(sourceHeaders[i]) - 60 - window.pageYOffset ); //60 = Header heights
+                if (currentDist < minDistance) {
+                    closestHeader = i;
+                    minDistance = currentDist;
+                }
+            }
+
+            if (closestHeader !== currentHeader) {
+                utils.removeClass( document.querySelector('.source_main_nav_li.__active'), '__active');
+                utils.removeClass( document.querySelector('.source_main_nav_a.__active'), '__active');
+
+                utils.addClass(navHeaders[closestHeader], '__active');
+
+                var parent = utils.closest(navHeaders[closestHeader], 'source_main_nav_li');
+                var hashFromLink = navHeaders[closestHeader].getAttribute('href');
+
+                if (!!parent && parent) {
+                    utils.addClass(parent, '__active');
+                }
+
+                if (_this.conf.updateHash) {
+                    // TODO: pause hash change when scrolling - append it only on stand-still
+
+                    // Modern browsers uses history API for correct back-button-browser functionality
+                    if (!!(window.history && history.pushState)) {
+                        window.history.replaceState({anchor: closestHeader+1}, document.title, fileNameInUrl + hashFromLink);
+                    } else { // ie9 fallback
+                         window.location.hash = hashFromLink;
+                    }
+                }
+
+                currentHeader = closestHeader;
+            }
+        };
+
+        // watch navmenu render
+        var checkNavInterval;
+        var h2Nodes;
+        var bodyNode = document.querySelector('body');
+        var checkOnNav = function checkOnNav() {
 
-			if ((document.querySelector('.source_section') !== null) &&
-				(document.querySelector('.source_main_nav_a') !== null)) {
+            if ((document.querySelector('.source_section') !== null) &&
+                (document.querySelector('.source_main_nav_a') !== null)) {
 
-				clearInterval(checkNavInterval);
+                clearInterval(checkNavInterval);
 
-				navHeaders = document.querySelectorAll('.source_main_nav_a');
-				h2Nodes = document.querySelectorAll('.source_section');
+                navHeaders = document.querySelectorAll('.source_main_nav_a');
+                h2Nodes = document.querySelectorAll('.source_section');
 
-				var getH3Nodes = function(childerArray){
-					var h3Nodes = [];
+                var getH3Nodes = function(childerArray){
+                    var h3Nodes = [];
 
-					childerArray.forEach(function (item) {
-						if (item.tagName === 'H3') h3Nodes.push(item);
-					});
+                    childerArray.forEach(function (item) {
+                        if (item.tagName === 'H3') h3Nodes.push(item);
+                    });
 
-					return h3Nodes;
-				};
+                    return h3Nodes;
+                };
 
-				for (var h2 = 0; h2 < h2Nodes.length; h2++) {
-					var childerArray = [].slice.call(h2Nodes[h2].children);
+                for (var h2 = 0; h2 < h2Nodes.length; h2++) {
+                    var childerArray = [].slice.call(h2Nodes[h2].children);
 
-					var h3Nodes = getH3Nodes(childerArray);
+                    var h3Nodes = getH3Nodes(childerArray);
 
-					sourceHeaders.push( h2Nodes[h2].querySelector('h2') );
-					for (var h3 = 0; h3 < h3Nodes.length; h3++) {
-						sourceHeaders.push( h3Nodes[h3] );
-					}
+                    sourceHeaders.push( h2Nodes[h2].querySelector('h2') );
+                    for (var h3 = 0; h3 < h3Nodes.length; h3++) {
+                        sourceHeaders.push( h3Nodes[h3] );
+                    }
 
-				}
+                }
 
-				if (utils.hasClass(bodyNode, 'source__scrolled-down')) {
-					watchSectionTop();
-				}
+                if (utils.hasClass(bodyNode, 'source__scrolled-down')) {
+                    watchSectionTop();
+                }
 
-				window.onscroll = function() {
-					watchSectionTop();
-				};
+                window.onscroll = function() {
+                    watchSectionTop();
+                };
 
-				return;
-			}
-		};
+                return;
+            }
+        };
 
-		checkNavInterval = setInterval(checkOnNav, 1000);
-	};
+        checkNavInterval = setInterval(checkOnNav, 1000);
+    };
 
-	return new NavHighlight();
-});
\ No newline at end of file
+    return new NavHighlight();
+});
diff --git a/assets/js/modules/ntf.js b/assets/js/modules/ntf.js
index 35a0579..8498809 100644
--- a/assets/js/modules/ntf.js
+++ b/assets/js/modules/ntf.js
@@ -30,4 +30,4 @@ sourcejs.amd.define([
     };
 
     return new Notification();
-});
\ No newline at end of file
+});
diff --git a/assets/js/modules/parseFileTree.js b/assets/js/modules/parseFileTree.js
index 6b55d59..8178f6c 100644
--- a/assets/js/modules/parseFileTree.js
+++ b/assets/js/modules/parseFileTree.js
@@ -304,4 +304,4 @@ sourcejs.amd.define([
     };
 
     return new ParseFileTree();
-});
\ No newline at end of file
+});
diff --git a/assets/js/modules/scrollToHash.js b/assets/js/modules/scrollToHash.js
index 0ee05c5..fc92321 100644
--- a/assets/js/modules/scrollToHash.js
+++ b/assets/js/modules/scrollToHash.js
@@ -47,4 +47,4 @@ sourcejs.amd.define([
             }
         });
     });
-});
\ No newline at end of file
+});
diff --git a/assets/js/modules/sectionFolding.js b/assets/js/modules/sectionFolding.js
index 9b4e080..919177d 100644
--- a/assets/js/modules/sectionFolding.js
+++ b/assets/js/modules/sectionFolding.js
@@ -20,26 +20,26 @@ sourcejs.amd.define([
     $(function(){
 
         //TODO: move to utils
-            // Bulletproof localStorage check
-            var storage;
-            var fail;
-            var uid;
-            try {
-                uid = new Date();
-                (storage = window.localStorage).setItem(uid, uid);
-                fail = storage.getItem(uid) !== uid.toString();
-                storage.removeItem(uid);
-                fail && (storage = false);
-            } catch (e) {
-            }
-            //TODO: /move to utils
-            var SECTION_CLASS = options.SECTION_CLASS;
-            var L_SECTION_CLASS = $('.'+SECTION_CLASS);
-            var OPEN_SECTION_CLASS = 'source_section__open';
-            var sectionsOnPage = L_SECTION_CLASS;
-            var specName = utils.getSpecName(); //Определяем название спеки
-            var clientConfig = {};
-            var RES_HIDE_SECTIONS = 'Hide all sections';
+        // Bulletproof localStorage check
+        var storage;
+        var fail;
+        var uid;
+        try {
+            uid = new Date();
+            (storage = window.localStorage).setItem(uid, uid);
+            fail = storage.getItem(uid) !== uid.toString();
+            storage.removeItem(uid);
+            fail && (storage = false);
+        } catch (e) {
+        }
+        //TODO: /move to utils
+        var SECTION_CLASS = options.SECTION_CLASS;
+        var L_SECTION_CLASS = $('.'+SECTION_CLASS);
+        var OPEN_SECTION_CLASS = 'source_section__open';
+        var sectionsOnPage = L_SECTION_CLASS;
+        var specName = utils.getSpecName(); //Определяем название спеки
+        var clientConfig = {};
+        var RES_HIDE_SECTIONS = 'Hide all sections';
 
         if (storage) {
             //Check if localstorage has required data
diff --git a/assets/js/modules/sections.js b/assets/js/modules/sections.js
index 4f8a932..6ec4859 100644
--- a/assets/js/modules/sections.js
+++ b/assets/js/modules/sections.js
@@ -89,4 +89,4 @@ sourcejs.amd.define([
     };
 
     return new Sections();
-});
\ No newline at end of file
+});
diff --git a/assets/js/modules/sectionsParser.js b/assets/js/modules/sectionsParser.js
index 50c9f81..d8d621e 100644
--- a/assets/js/modules/sectionsParser.js
+++ b/assets/js/modules/sectionsParser.js
@@ -426,4 +426,4 @@ SourceGetSections.prototype.getSpecResources = function(scope){
     output.cssStyles = this.getStyleContainersHTML(_scope);
 
     return (output.cssLinks || output.scripts || output.cssStyles) ? output : undefined;
-};
\ No newline at end of file
+};
diff --git a/assets/js/modules/specDecorations.js b/assets/js/modules/specDecorations.js
index d8a04cb..81f9770 100644
--- a/assets/js/modules/specDecorations.js
+++ b/assets/js/modules/specDecorations.js
@@ -28,4 +28,4 @@ sourcejs.amd.define([
         }
     }).trigger('scroll');
 
-});
\ No newline at end of file
+});
diff --git a/assets/js/modules/utils.js b/assets/js/modules/utils.js
index 9a40503..53e402e 100644
--- a/assets/js/modules/utils.js
+++ b/assets/js/modules/utils.js
@@ -96,17 +96,17 @@ sourcejs.amd.define([
     };
 
     Utils.prototype.getCookie = function(name) {
-		var matches = document.cookie.match(new RegExp("(?:^|; )" + name.replace(/([\.$?*|{}\(\)\[\]\\\/\+^])/g, '\\$1') + "=([^;]*)"));
-		return matches ? decodeURIComponent(matches[1]) : undefined;
+        var matches = document.cookie.match(new RegExp("(?:^|; )" + name.replace(/([\.$?*|{}\(\)\[\]\\\/\+^])/g, '\\$1') + "=([^;]*)"));
+        return matches ? decodeURIComponent(matches[1]) : undefined;
     };
 
     Utils.prototype.isDevelopmentMode = function() {
-		return this.getCookie('source-mode') === 'development';
+        return this.getCookie('source-mode') === 'development';
     };
 
-	Utils.prototype.isArray = function(arr) {
-		return Object.prototype.toString.call(arr) === '[object Array]';
-	};
+    Utils.prototype.isArray = function(arr) {
+        return Object.prototype.toString.call(arr) === '[object Array]';
+    };
 
     Utils.prototype.unifySpecPath = function(url) {
         if (url.slice(-10) === "index.html") url = url.slice(0, -10);
@@ -129,4 +129,4 @@ sourcejs.amd.define([
     };
 
     return new Utils();
-});
\ No newline at end of file
+});
diff --git a/assets/templates/footer.inc.html b/assets/templates/footer.inc.html
index 13408e7..412bc12 100644
--- a/assets/templates/footer.inc.html
+++ b/assets/templates/footer.inc.html
@@ -6,11 +6,11 @@
         <!--<div class="source_col">-->
             <!--<h2>Catalog</h2>-->
             <!--<ul class="source_ul">-->
-	            <!--<li><a class="source_a_l" href="#777">Your link</a></li>-->
+                <!--<li><a class="source_a_l" href="#777">Your link</a></li>-->
             <!--</ul>-->
         <!--</div>-->
         <div class="source_footer_copy">
             Copyright © 2013-2015 <a href="http://sourcejs.com" class="source_a_l">Sourcejs.com</a> <span class="source_footer_version">(v.<%- engineVersion %>)</span>
         </div>
     </div>
-</footer>
\ No newline at end of file
+</footer>
diff --git a/assets/templates/nav.inc.html b/assets/templates/nav.inc.html
index 4b29c9e..a6b635a 100644
--- a/assets/templates/nav.inc.html
+++ b/assets/templates/nav.inc.html
@@ -1,15 +1,15 @@
 <nav class="source_main_nav source_nav">
-	<div class="source_nav_c">
-		<div class="source_main_nav_i">
-			<h2>Table of content:</h2>
-			<ul class="source_nav_ul source_main_nav_ul">
-				<!--Filled dynamically-->
-			</ul>
-		</div>
+    <div class="source_nav_c">
+        <div class="source_main_nav_i">
+            <h2>Table of content:</h2>
+            <ul class="source_nav_ul source_main_nav_ul">
+                <!--Filled dynamically-->
+            </ul>
+        </div>
 
-		<div class="source_main_nav_ac source_main_nav_i">
-			<!--Filled dynamically-->
-		</div>
+        <div class="source_main_nav_ac source_main_nav_i">
+            <!--Filled dynamically-->
+        </div>
 
-	</div>
-</nav>
\ No newline at end of file
+    </div>
+</nav>
diff --git a/core/api/index.js b/core/api/index.js
index a79b9d7..df9b1af 100644
--- a/core/api/index.js
+++ b/core/api/index.js
@@ -227,7 +227,7 @@ apiRouter.use(function(req, res, next) {
 });
 
 apiRouter.get('/', function(req, res) {
-	res.json({ message: 'Hello API' });
+    res.json({ message: 'Hello API' });
 });
 
 apiRouter.route('/specs/raw')
@@ -299,7 +299,7 @@ apiTestRouter.use(function(req, res, next) {
 });
 
 apiTestRouter.get('/', function(req, res) {
-	res.json({ message: 'API Testig env' });
+    res.json({ message: 'API Testig env' });
 });
 
 apiTestRouter.route('/specs')
@@ -328,4 +328,4 @@ apiTestRouter.route('/specs/html')
 
 // Activating router
 global.app.use('/api-test', apiTestRouter);
-/* /Test API router */
\ No newline at end of file
+/* /Test API router */
diff --git a/core/api/optionsApi.js b/core/api/optionsApi.js
index 5aee8d2..27d9c60 100644
--- a/core/api/optionsApi.js
+++ b/core/api/optionsApi.js
@@ -21,4 +21,4 @@ global.app.use('/api/options', function(req, res){
     assetsOptions.specInfo = contextOptions.specInfo;
 
     res.jsonp(assetsOptions);
-});
\ No newline at end of file
+});
diff --git a/core/auth.js b/core/auth.js
index 0a26731..6ab0e69 100644
--- a/core/auth.js
+++ b/core/auth.js
@@ -4,82 +4,82 @@ var ejs = require('./ejsWithHelpers.js');
 var path = require('path');
 
 module.exports = function(app) {
-	"use strict";
+    "use strict";
 
-	app.states = app.states || {};
-	app.states.users = app.states.users || {};
+    app.states = app.states || {};
+    app.states.users = app.states.users || {};
 
-	var currentUserId = "";
+    var currentUserId = "";
 
-	// users data processing
-	/**
-	 * @method getUser - user getter
-	 *
-	 * @param {String} id - github user id
-	 *
-	 * @returns {Object} - user - github user entity or empty object, if user is undefined
-	 */
-	var getUser = function(id) {
-		return app.states.users[id] || {};
-	};
+    // users data processing
+    /**
+     * @method getUser - user getter
+     *
+     * @param {String} id - github user id
+     *
+     * @returns {Object} - user - github user entity or empty object, if user is undefined
+     */
+    var getUser = function(id) {
+        return app.states.users[id] || {};
+    };
 
-	/**
-	 * @method setUser - user setter
-	 *
-	 * @param {Object} user - github user entity
-	 *
-	 * @param {String} user.id - required user field, which is used as user templral storage key.
-	 *
-	 * @returns {Object} user - returns user parameter
-	 */
-	var setUser = function(user) {
-		if (typeof user !== "object" || !user.id) return;
-		app.states.users[user.id] = user;
-		return user;
-	};
+    /**
+     * @method setUser - user setter
+     *
+     * @param {Object} user - github user entity
+     *
+     * @param {String} user.id - required user field, which is used as user templral storage key.
+     *
+     * @returns {Object} user - returns user parameter
+     */
+    var setUser = function(user) {
+        if (typeof user !== "object" || !user.id) return;
+        app.states.users[user.id] = user;
+        return user;
+    };
 
-	everyauth.everymodule.findUserById(function(id, callback) {
-		callback(null, getUser(id));
-	});
+    everyauth.everymodule.findUserById(function(id, callback) {
+        callback(null, getUser(id));
+    });
 
-	// TODO: separated id & secret for dev mode
-	everyauth.github
-		.appId(global.opts.github.appId)
-		.appSecret(global.opts.github.appSecret)
-		.findOrCreateUser(function(sess, accessToken, accessTokenExtra, ghUser) {
-			setUser(ghUser);
-			currentUserId = ghUser.id;
-			return ghUser;
-		})
-		.redirectPath('/auth/done');
+    // TODO: separated id & secret for dev mode
+    everyauth.github
+        .appId(global.opts.github.appId)
+        .appSecret(global.opts.github.appSecret)
+        .findOrCreateUser(function(sess, accessToken, accessTokenExtra, ghUser) {
+            setUser(ghUser);
+            currentUserId = ghUser.id;
+            return ghUser;
+        })
+        .redirectPath('/auth/done');
 
 
-	everyauth.everymodule.handleLogout( function (req, res) {
-		delete req.session.authCache;
-		req.logout();
-		this.redirect(res, this.logoutRedirectPath());
-	});
+    everyauth.everymodule.handleLogout( function (req, res) {
+        delete req.session.authCache;
+        req.logout();
+        this.redirect(res, this.logoutRedirectPath());
+    });
 
-	// application routes
-	var authTemplate = fs.readFileSync(path.join(global.pathToApp, '/core/views/auth-done.ejs'), "utf8");
-	app.get('/auth/stub', function (req, res) {
-		res.send(ejs.render(authTemplate, {
-			user: JSON.stringify({})
-		}));
-	});
+    // application routes
+    var authTemplate = fs.readFileSync(path.join(global.pathToApp, '/core/views/auth-done.ejs'), "utf8");
+    app.get('/auth/stub', function (req, res) {
+        res.send(ejs.render(authTemplate, {
+            user: JSON.stringify({})
+        }));
+    });
 
-	app.get('/auth/done', function (req, res) {
-		req.session.authCache = req.session.auth;
+    app.get('/auth/done', function (req, res) {
+        req.session.authCache = req.session.auth;
 
-		res.send(ejs.render(authTemplate, {
-			user: JSON.stringify(getUser(currentUserId))
-		}));
-	});
+        res.send(ejs.render(authTemplate, {
+            user: JSON.stringify(getUser(currentUserId))
+        }));
+    });
 
-	return {
-		getUser: getUser,
-		setUser: setUser,
-		everyauth: everyauth
-	};
+    return {
+        getUser: getUser,
+        setUser: setUser,
+        everyauth: everyauth
+    };
 
-};
\ No newline at end of file
+};
diff --git a/core/ejsWithHelpers.js b/core/ejsWithHelpers.js
index bfb908d..cbf21ea 100644
--- a/core/ejsWithHelpers.js
+++ b/core/ejsWithHelpers.js
@@ -148,4 +148,4 @@ ejs.render = function(template, data, options){
 };
 
 // Export modified EJS
-module.exports = ejs;
\ No newline at end of file
+module.exports = ejs;
diff --git a/core/file-tree/index.js b/core/file-tree/index.js
index be1ab7b..6e9ffe5 100644
--- a/core/file-tree/index.js
+++ b/core/file-tree/index.js
@@ -322,4 +322,4 @@ if (config.cron || (global.MODE === 'production' && config.cronProd)) {
     setInterval(function () {
         scan();
     }, config.cronRepeatTime);
-}
\ No newline at end of file
+}
diff --git a/core/headerFooter.js b/core/headerFooter.js
index 5eb7cbf..865fd9f 100644
--- a/core/headerFooter.js
+++ b/core/headerFooter.js
@@ -21,4 +21,4 @@ exports.getHeaderAndFooter = function () {
     output.footer = fs.readFileSync(output.footerPath, 'utf-8');
 
     return output;
-};
\ No newline at end of file
+};
diff --git a/core/html-tree/index.js b/core/html-tree/index.js
index ceb5d31..cf99a14 100644
--- a/core/html-tree/index.js
+++ b/core/html-tree/index.js
@@ -209,4 +209,4 @@ module.exports.deleteFromDataFile = function(dataPath, removeID, callback) {
     } else {
         if (typeof callback === 'function') callback('No ID provided', null);
     }
-};
\ No newline at end of file
+};
diff --git a/core/lib/configUtils.js b/core/lib/configUtils.js
index f050b98..dfa2836 100644
--- a/core/lib/configUtils.js
+++ b/core/lib/configUtils.js
@@ -188,4 +188,4 @@ module.exports.getContextOptions = function(refUrl, defaultOpts) {
     }
 
     return contextOptions;
-};
\ No newline at end of file
+};
diff --git a/core/lib/extendTillSpec.js b/core/lib/extendTillSpec.js
index 7d58d5a..2312e78 100644
--- a/core/lib/extendTillSpec.js
+++ b/core/lib/extendTillSpec.js
@@ -34,4 +34,4 @@ var extendTillSpec = module.exports = function(target, extender) {
     }
 
     return target;
-};
\ No newline at end of file
+};
diff --git a/core/lib/flattenTillSpec.js b/core/lib/flattenTillSpec.js
index 536391c..aa7bf87 100644
--- a/core/lib/flattenTillSpec.js
+++ b/core/lib/flattenTillSpec.js
@@ -39,4 +39,4 @@ module.exports = function(data) {
     step(_data);
 
     return output;
-};
\ No newline at end of file
+};
diff --git a/core/lib/getUserPath.js b/core/lib/getUserPath.js
index 0bf2828..2303a62 100644
--- a/core/lib/getUserPath.js
+++ b/core/lib/getUserPath.js
@@ -17,6 +17,6 @@ module.exports = function(customGlobalopts, customPathToApp){
     var relativeUserPath = _isNodeModule ? '../..' : globalOpts.core.common.pathToUser;
 
     return path.join(pathToApp, relativeUserPath).replace(/^\w:\\/, function (match) {
-	    return match.toUpperCase();
-	});
-};
\ No newline at end of file
+        return match.toUpperCase();
+    });
+};
diff --git a/core/lib/globArray.js b/core/lib/globArray.js
index 84d4c22..34045e1 100644
--- a/core/lib/globArray.js
+++ b/core/lib/globArray.js
@@ -31,4 +31,4 @@ module.exports = function (patterns, options) {
     });
 
     return list;
-};
\ No newline at end of file
+};
diff --git a/core/lib/isNodeModule.js b/core/lib/isNodeModule.js
index aa1cae5..5613a58 100644
--- a/core/lib/isNodeModule.js
+++ b/core/lib/isNodeModule.js
@@ -16,4 +16,4 @@ if (typeof global.isNodeModule === 'undefined') {
     module.exports = function() {
         return global.isNodeModule;
     };
-}
\ No newline at end of file
+}
diff --git a/core/lib/parseData.js b/core/lib/parseData.js
index 12bf912..8c8e129 100644
--- a/core/lib/parseData.js
+++ b/core/lib/parseData.js
@@ -335,4 +335,4 @@ ParseData.prototype.traverseSections = function(specData, sections) {
     }
 };
 
-module.exports = ParseData;
\ No newline at end of file
+module.exports = ParseData;
diff --git a/core/lib/pathResolver.js b/core/lib/pathResolver.js
index 0abfb50..306171d 100644
--- a/core/lib/pathResolver.js
+++ b/core/lib/pathResolver.js
@@ -69,4 +69,4 @@ module.exports.checkExistence = function(pathsArr, filePath, context){
     global.log.trace('Check existence returned', fullPath);
 
     return fullPath;
-};
\ No newline at end of file
+};
diff --git a/core/lib/processMd.js b/core/lib/processMd.js
index 712d174..b2e831e 100644
--- a/core/lib/processMd.js
+++ b/core/lib/processMd.js
@@ -109,4 +109,4 @@ module.exports = function (markdown, options) {
     });
 
     return $content.html();
-};
\ No newline at end of file
+};
diff --git a/core/lib/request.js b/core/lib/request.js
index e82952e..0651adc 100644
--- a/core/lib/request.js
+++ b/core/lib/request.js
@@ -45,4 +45,4 @@ module.exports = function(options) {
     request.end();
 
     return deferred.promise;
-};
\ No newline at end of file
+};
diff --git a/core/lib/translit.js b/core/lib/translit.js
index 0f07ee3..7668a2f 100644
--- a/core/lib/translit.js
+++ b/core/lib/translit.js
@@ -2,74 +2,74 @@
 /* global XRegExp */
 
 var char_map = {
-	/* jshint ignore:start */
-
-	// Latin
-	'À': 'A', 'Á': 'A', 'Â': 'A', 'Ã': 'A', 'Ä': 'A', 'Å': 'A', 'Æ': 'AE', 'Ç': 'C',
-	'È': 'E', 'É': 'E', 'Ê': 'E', 'Ë': 'E', 'Ì': 'I', 'Í': 'I', 'Î': 'I', 'Ï': 'I',
-	'Ð': 'D', 'Ñ': 'N', 'Ò': 'O', 'Ó': 'O', 'Ô': 'O', 'Õ': 'O', 'Ö': 'O', 'Ő': 'O',
-	'Ø': 'O', 'Ù': 'U', 'Ú': 'U', 'Û': 'U', 'Ü': 'U', 'Ű': 'U', 'Ý': 'Y', 'Þ': 'TH',
-	'ß': 'ss',
-	'à': 'a', 'á': 'a', 'â': 'a', 'ã': 'a', 'ä': 'a', 'å': 'a', 'æ': 'ae', 'ç': 'c',
-	'è': 'e', 'é': 'e', 'ê': 'e', 'ë': 'e', 'ì': 'i', 'í': 'i', 'î': 'i', 'ï': 'i',
-	'ð': 'd', 'ñ': 'n', 'ò': 'o', 'ó': 'o', 'ô': 'o', 'õ': 'o', 'ö': 'o', 'ő': 'o',
-	'ø': 'o', 'ù': 'u', 'ú': 'u', 'û': 'u', 'ü': 'u', 'ű': 'u', 'ý': 'y', 'þ': 'th',
-	'ÿ': 'y',
-
-	// Latin symbols
-	'©': '(c)',
-
-	// Greek
-	'Α': 'A', 'Β': 'B', 'Γ': 'G', 'Δ': 'D', 'Ε': 'E', 'Ζ': 'Z', 'Η': 'H', 'Θ': '8',
-	'Ι': 'I', 'Κ': 'K', 'Λ': 'L', 'Μ': 'M', 'Ν': 'N', 'Ξ': '3', 'Ο': 'O', 'Π': 'P',
-	'Ρ': 'R', 'Σ': 'S', 'Τ': 'T', 'Υ': 'Y', 'Φ': 'F', 'Χ': 'X', 'Ψ': 'PS', 'Ω': 'W',
-	'Ά': 'A', 'Έ': 'E', 'Ί': 'I', 'Ό': 'O', 'Ύ': 'Y', 'Ή': 'H', 'Ώ': 'W', 'Ϊ': 'I',
-	'Ϋ': 'Y',
-	'α': 'a', 'β': 'b', 'γ': 'g', 'δ': 'd', 'ε': 'e', 'ζ': 'z', 'η': 'h', 'θ': '8',
-	'ι': 'i', 'κ': 'k', 'λ': 'l', 'μ': 'm', 'ν': 'n', 'ξ': '3', 'ο': 'o', 'π': 'p',
-	'ρ': 'r', 'σ': 's', 'τ': 't', 'υ': 'y', 'φ': 'f', 'χ': 'x', 'ψ': 'ps', 'ω': 'w',
-	'ά': 'a', 'έ': 'e', 'ί': 'i', 'ό': 'o', 'ύ': 'y', 'ή': 'h', 'ώ': 'w', 'ς': 's',
-	'ϊ': 'i', 'ΰ': 'y', 'ϋ': 'y', 'ΐ': 'i',
-
-	// Turkish
-	'Ş': 'S', 'İ': 'I', 'Ç': 'C', 'Ü': 'U', 'Ö': 'O', 'Ğ': 'G',
-	'ş': 's', 'ı': 'i', 'ç': 'c', 'ü': 'u', 'ö': 'o', 'ğ': 'g',
-
-	// Russian
-	'А': 'A', 'Б': 'B', 'В': 'V', 'Г': 'G', 'Д': 'D', 'Е': 'E', 'Ё': 'Yo', 'Ж': 'Zh',
-	'З': 'Z', 'И': 'I', 'Й': 'J', 'К': 'K', 'Л': 'L', 'М': 'M', 'Н': 'N', 'О': 'O',
-	'П': 'P', 'Р': 'R', 'С': 'S', 'Т': 'T', 'У': 'U', 'Ф': 'F', 'Х': 'H', 'Ц': 'C',
-	'Ч': 'Ch', 'Ш': 'Sh', 'Щ': 'Sh', 'Ъ': '', 'Ы': 'Y', 'Ь': '', 'Э': 'E', 'Ю': 'Yu',
-	'Я': 'Ya',
-	'а': 'a', 'б': 'b', 'в': 'v', 'г': 'g', 'д': 'd', 'е': 'e', 'ё': 'yo', 'ж': 'zh',
-	'з': 'z', 'и': 'i', 'й': 'j', 'к': 'k', 'л': 'l', 'м': 'm', 'н': 'n', 'о': 'o',
-	'п': 'p', 'р': 'r', 'с': 's', 'т': 't', 'у': 'u', 'ф': 'f', 'х': 'h', 'ц': 'c',
-	'ч': 'ch', 'ш': 'sh', 'щ': 'sh', 'ъ': '', 'ы': 'y', 'ь': '', 'э': 'e', 'ю': 'yu',
-	'я': 'ya',
-
-	// Ukrainian
-	'Є': 'Ye', 'І': 'I', 'Ї': 'Yi', 'Ґ': 'G',
-	'є': 'ye', 'і': 'i', 'ї': 'yi', 'ґ': 'g',
-
-	// Czech
-	'Č': 'C', 'Ď': 'D', 'Ě': 'E', 'Ň': 'N', 'Ř': 'R', 'Š': 'S', 'Ť': 'T', 'Ů': 'U',
-	'Ž': 'Z',
-	'č': 'c', 'ď': 'd', 'ě': 'e', 'ň': 'n', 'ř': 'r', 'š': 's', 'ť': 't', 'ů': 'u',
-	'ž': 'z',
-
-	// Polish
-	'Ą': 'A', 'Ć': 'C', 'Ę': 'e', 'Ł': 'L', 'Ń': 'N', 'Ó': 'o', 'Ś': 'S', 'Ź': 'Z',
-	'Ż': 'Z',
-	'ą': 'a', 'ć': 'c', 'ę': 'e', 'ł': 'l', 'ń': 'n', 'ó': 'o', 'ś': 's', 'ź': 'z',
-	'ż': 'z',
-
-	// Latvian
-	'Ā': 'A', 'Č': 'C', 'Ē': 'E', 'Ģ': 'G', 'Ī': 'i', 'Ķ': 'k', 'Ļ': 'L', 'Ņ': 'N',
-	'Š': 'S', 'Ū': 'u', 'Ž': 'Z',
-	'ā': 'a', 'č': 'c', 'ē': 'e', 'ģ': 'g', 'ī': 'i', 'ķ': 'k', 'ļ': 'l', 'ņ': 'n',
-	'š': 's', 'ū': 'u', 'ž': 'z'
-
-	/* jshint ignore:end */
+    /* jshint ignore:start */
+
+    // Latin
+    'À': 'A', 'Á': 'A', 'Â': 'A', 'Ã': 'A', 'Ä': 'A', 'Å': 'A', 'Æ': 'AE', 'Ç': 'C',
+    'È': 'E', 'É': 'E', 'Ê': 'E', 'Ë': 'E', 'Ì': 'I', 'Í': 'I', 'Î': 'I', 'Ï': 'I',
+    'Ð': 'D', 'Ñ': 'N', 'Ò': 'O', 'Ó': 'O', 'Ô': 'O', 'Õ': 'O', 'Ö': 'O', 'Ő': 'O',
+    'Ø': 'O', 'Ù': 'U', 'Ú': 'U', 'Û': 'U', 'Ü': 'U', 'Ű': 'U', 'Ý': 'Y', 'Þ': 'TH',
+    'ß': 'ss',
+    'à': 'a', 'á': 'a', 'â': 'a', 'ã': 'a', 'ä': 'a', 'å': 'a', 'æ': 'ae', 'ç': 'c',
+    'è': 'e', 'é': 'e', 'ê': 'e', 'ë': 'e', 'ì': 'i', 'í': 'i', 'î': 'i', 'ï': 'i',
+    'ð': 'd', 'ñ': 'n', 'ò': 'o', 'ó': 'o', 'ô': 'o', 'õ': 'o', 'ö': 'o', 'ő': 'o',
+    'ø': 'o', 'ù': 'u', 'ú': 'u', 'û': 'u', 'ü': 'u', 'ű': 'u', 'ý': 'y', 'þ': 'th',
+    'ÿ': 'y',
+
+    // Latin symbols
+    '©': '(c)',
+
+    // Greek
+    'Α': 'A', 'Β': 'B', 'Γ': 'G', 'Δ': 'D', 'Ε': 'E', 'Ζ': 'Z', 'Η': 'H', 'Θ': '8',
+    'Ι': 'I', 'Κ': 'K', 'Λ': 'L', 'Μ': 'M', 'Ν': 'N', 'Ξ': '3', 'Ο': 'O', 'Π': 'P',
+    'Ρ': 'R', 'Σ': 'S', 'Τ': 'T', 'Υ': 'Y', 'Φ': 'F', 'Χ': 'X', 'Ψ': 'PS', 'Ω': 'W',
+    'Ά': 'A', 'Έ': 'E', 'Ί': 'I', 'Ό': 'O', 'Ύ': 'Y', 'Ή': 'H', 'Ώ': 'W', 'Ϊ': 'I',
+    'Ϋ': 'Y',
+    'α': 'a', 'β': 'b', 'γ': 'g', 'δ': 'd', 'ε': 'e', 'ζ': 'z', 'η': 'h', 'θ': '8',
+    'ι': 'i', 'κ': 'k', 'λ': 'l', 'μ': 'm', 'ν': 'n', 'ξ': '3', 'ο': 'o', 'π': 'p',
+    'ρ': 'r', 'σ': 's', 'τ': 't', 'υ': 'y', 'φ': 'f', 'χ': 'x', 'ψ': 'ps', 'ω': 'w',
+    'ά': 'a', 'έ': 'e', 'ί': 'i', 'ό': 'o', 'ύ': 'y', 'ή': 'h', 'ώ': 'w', 'ς': 's',
+    'ϊ': 'i', 'ΰ': 'y', 'ϋ': 'y', 'ΐ': 'i',
+
+    // Turkish
+    'Ş': 'S', 'İ': 'I', 'Ç': 'C', 'Ü': 'U', 'Ö': 'O', 'Ğ': 'G',
+    'ş': 's', 'ı': 'i', 'ç': 'c', 'ü': 'u', 'ö': 'o', 'ğ': 'g',
+
+    // Russian
+    'А': 'A', 'Б': 'B', 'В': 'V', 'Г': 'G', 'Д': 'D', 'Е': 'E', 'Ё': 'Yo', 'Ж': 'Zh',
+    'З': 'Z', 'И': 'I', 'Й': 'J', 'К': 'K', 'Л': 'L', 'М': 'M', 'Н': 'N', 'О': 'O',
+    'П': 'P', 'Р': 'R', 'С': 'S', 'Т': 'T', 'У': 'U', 'Ф': 'F', 'Х': 'H', 'Ц': 'C',
+    'Ч': 'Ch', 'Ш': 'Sh', 'Щ': 'Sh', 'Ъ': '', 'Ы': 'Y', 'Ь': '', 'Э': 'E', 'Ю': 'Yu',
+    'Я': 'Ya',
+    'а': 'a', 'б': 'b', 'в': 'v', 'г': 'g', 'д': 'd', 'е': 'e', 'ё': 'yo', 'ж': 'zh',
+    'з': 'z', 'и': 'i', 'й': 'j', 'к': 'k', 'л': 'l', 'м': 'm', 'н': 'n', 'о': 'o',
+    'п': 'p', 'р': 'r', 'с': 's', 'т': 't', 'у': 'u', 'ф': 'f', 'х': 'h', 'ц': 'c',
+    'ч': 'ch', 'ш': 'sh', 'щ': 'sh', 'ъ': '', 'ы': 'y', 'ь': '', 'э': 'e', 'ю': 'yu',
+    'я': 'ya',
+
+    // Ukrainian
+    'Є': 'Ye', 'І': 'I', 'Ї': 'Yi', 'Ґ': 'G',
+    'є': 'ye', 'і': 'i', 'ї': 'yi', 'ґ': 'g',
+
+    // Czech
+    'Č': 'C', 'Ď': 'D', 'Ě': 'E', 'Ň': 'N', 'Ř': 'R', 'Š': 'S', 'Ť': 'T', 'Ů': 'U',
+    'Ž': 'Z',
+    'č': 'c', 'ď': 'd', 'ě': 'e', 'ň': 'n', 'ř': 'r', 'š': 's', 'ť': 't', 'ů': 'u',
+    'ž': 'z',
+
+    // Polish
+    'Ą': 'A', 'Ć': 'C', 'Ę': 'e', 'Ł': 'L', 'Ń': 'N', 'Ó': 'o', 'Ś': 'S', 'Ź': 'Z',
+    'Ż': 'Z',
+    'ą': 'a', 'ć': 'c', 'ę': 'e', 'ł': 'l', 'ń': 'n', 'ó': 'o', 'ś': 's', 'ź': 'z',
+    'ż': 'z',
+
+    // Latvian
+    'Ā': 'A', 'Č': 'C', 'Ē': 'E', 'Ģ': 'G', 'Ī': 'i', 'Ķ': 'k', 'Ļ': 'L', 'Ņ': 'N',
+    'Š': 'S', 'Ū': 'u', 'Ž': 'Z',
+    'ā': 'a', 'č': 'c', 'ē': 'e', 'ģ': 'g', 'ī': 'i', 'ķ': 'k', 'ļ': 'l', 'ņ': 'n',
+    'š': 's', 'ū': 'u', 'ž': 'z'
+
+    /* jshint ignore:end */
 };
 
 /**
@@ -91,50 +91,50 @@ var char_map = {
  */
 
 module.exports = function(s, opt) {
-	'use strict';
-
-	s = String(s);
-	opt = Object(opt);
-
-	var defaults = {
-		'delimiter': '-',
-		'limit': undefined,
-		'lowercase': true,
-		'replacements': {},
-		'transliterate': (typeof(XRegExp) === 'undefined') ? true : false
-	};
-
-	// Merge options
-	for (var k in defaults) {
-		if (!opt.hasOwnProperty(k)) {
-			opt[k] = defaults[k];
-		}
-	}
-
-	// Make custom replacements
-	for (var j in opt.replacements) {
-		s = s.replace(new RegExp(j, 'g'), opt.replacements[j]);
-	}
-
-	// Transliterate characters to ASCII
-	if (opt.transliterate) {
-		for (var i in char_map) {
-			s = s.replace(new RegExp(i, 'g'), char_map[i]);
-		}
-	}
-
-	// Replace non-alphanumeric characters with our delimiter
-	var alnum = (typeof(XRegExp) === 'undefined') ? new RegExp('[^a-z0-9]+', 'ig') : new XRegExp('[^\\p{L}\\p{N}]+', 'ig');
-	s = s.replace(alnum, opt.delimiter);
-
-	// Remove duplicate delimiters
-	s = s.replace(new RegExp('[' + opt.delimiter + ']{2,}', 'g'), opt.delimiter);
-
-	// Truncate slug to max. characters
-	s = s.substring(0, opt.limit);
-
-	// Remove delimiter from ends
-	s = s.replace(new RegExp('(^' + opt.delimiter + '|' + opt.delimiter + '$)', 'g'), '');
-
-	return opt.lowercase ? s.toLowerCase() : s;
-};
\ No newline at end of file
+    'use strict';
+
+    s = String(s);
+    opt = Object(opt);
+
+    var defaults = {
+        'delimiter': '-',
+        'limit': undefined,
+        'lowercase': true,
+        'replacements': {},
+        'transliterate': (typeof(XRegExp) === 'undefined') ? true : false
+    };
+
+    // Merge options
+    for (var k in defaults) {
+        if (!opt.hasOwnProperty(k)) {
+            opt[k] = defaults[k];
+        }
+    }
+
+    // Make custom replacements
+    for (var j in opt.replacements) {
+        s = s.replace(new RegExp(j, 'g'), opt.replacements[j]);
+    }
+
+    // Transliterate characters to ASCII
+    if (opt.transliterate) {
+        for (var i in char_map) {
+            s = s.replace(new RegExp(i, 'g'), char_map[i]);
+        }
+    }
+
+    // Replace non-alphanumeric characters with our delimiter
+    var alnum = (typeof(XRegExp) === 'undefined') ? new RegExp('[^a-z0-9]+', 'ig') : new XRegExp('[^\\p{L}\\p{N}]+', 'ig');
+    s = s.replace(alnum, opt.delimiter);
+
+    // Remove duplicate delimiters
+    s = s.replace(new RegExp('[' + opt.delimiter + ']{2,}', 'g'), opt.delimiter);
+
+    // Truncate slug to max. characters
+    s = s.substring(0, opt.limit);
+
+    // Remove delimiter from ends
+    s = s.replace(new RegExp('(^' + opt.delimiter + '|' + opt.delimiter + '$)', 'g'), '');
+
+    return opt.lowercase ? s.toLowerCase() : s;
+};
diff --git a/core/lib/viewResolver.js b/core/lib/viewResolver.js
index 24d31e4..2511bf7 100644
--- a/core/lib/viewResolver.js
+++ b/core/lib/viewResolver.js
@@ -39,4 +39,4 @@ module.exports = function(typeOrPath, viewsOptions, context){
     }
 
     return pathResolver.checkExistence([typeOrPath], null, context);
-};
\ No newline at end of file
+};
diff --git a/core/loadOptions.js b/core/loadOptions.js
index 68acf77..b7814c4 100644
--- a/core/loadOptions.js
+++ b/core/loadOptions.js
@@ -99,4 +99,4 @@ module.exports = function(basePath, _silent){
     }
 
     return mergedOptions;
-};
\ No newline at end of file
+};
diff --git a/core/loadPlugins.js b/core/loadPlugins.js
index 0dacec5..cff6bbc 100644
--- a/core/loadPlugins.js
+++ b/core/loadPlugins.js
@@ -27,4 +27,4 @@ if (fs.existsSync(pathToModules)) {
             }
         }
     });
-}
\ No newline at end of file
+}
diff --git a/core/logger.js b/core/logger.js
index 94b7ecf..6ba38e6 100644
--- a/core/logger.js
+++ b/core/logger.js
@@ -114,4 +114,4 @@ module.exports = {
 
     // Configured log4js
     log4js: log4js
-};
\ No newline at end of file
+};
diff --git a/core/middlewares/clarify.js b/core/middlewares/clarify.js
index 2ed8362..3c1383a 100644
--- a/core/middlewares/clarify.js
+++ b/core/middlewares/clarify.js
@@ -210,14 +210,14 @@ var getSectionsIDList = function(sections) {
 };
 
 module.exports.process = function(req, res, next) {
-	var parsedUrl = url.parse(req.url, true);
+    var parsedUrl = url.parse(req.url, true);
 
     // Query params
     var q = parsedUrl.query || {};
     var clarifyFlag = q.clarify;
 
     // Check if middleware needs to be activated
-	if (clarifyFlag) {
+    if (clarifyFlag) {
         var urlPath = parsedUrl.pathname;
         var parsedPath = specUtils.parseSpecUrlPath(urlPath);
 
@@ -314,8 +314,8 @@ module.exports.process = function(req, res, next) {
 
             res.status(500).send(errData.msg);
         });
-	} else {
+    } else {
         // redirect to next express middleware
         next();
     }
-};
\ No newline at end of file
+};
diff --git a/core/middlewares/md.js b/core/middlewares/md.js
index c41e3eb..c7d20a5 100644
--- a/core/middlewares/md.js
+++ b/core/middlewares/md.js
@@ -29,4 +29,4 @@ exports.process = function (req, res, next) {
     } else {
         next();
     }
-};
\ No newline at end of file
+};
diff --git a/core/middlewares/mdTag.js b/core/middlewares/mdTag.js
index c965d61..023cece 100644
--- a/core/middlewares/mdTag.js
+++ b/core/middlewares/mdTag.js
@@ -30,4 +30,4 @@ exports.process = function (req, res, next) {
     }
 
     next();
-};
\ No newline at end of file
+};
diff --git a/core/middlewares/preRenderEjs.js b/core/middlewares/preRenderEjs.js
index cea0961..006581d 100644
--- a/core/middlewares/preRenderEjs.js
+++ b/core/middlewares/preRenderEjs.js
@@ -43,4 +43,4 @@ exports.process = function(req, res, next) {
     } else {
         next();
     }
-};
\ No newline at end of file
+};
diff --git a/core/middlewares/read.js b/core/middlewares/read.js
index 9b013d7..ae46068 100644
--- a/core/middlewares/read.js
+++ b/core/middlewares/read.js
@@ -81,4 +81,4 @@ exports.process = function(req, res, next) {
     } else {
         next();
     }
-};
\ No newline at end of file
+};
diff --git a/core/middlewares/send.js b/core/middlewares/send.js
index 8b34155..a0fe6d4 100644
--- a/core/middlewares/send.js
+++ b/core/middlewares/send.js
@@ -21,4 +21,4 @@ exports.process = function (req, res, next) {
     } else {
         next();
     }
-};
\ No newline at end of file
+};
diff --git a/core/trackInstall.js b/core/trackInstall.js
index 3d6dca9..ed08273 100644
--- a/core/trackInstall.js
+++ b/core/trackInstall.js
@@ -28,4 +28,4 @@ if (options && options.core && options.core.tracking && options.core.tracking.en
         group: 'install',
         event: 'disabled tracking'
     }, true);
-}
\ No newline at end of file
+}
diff --git a/core/trackStats.js b/core/trackStats.js
index 0c9d959..a1a0a33 100644
--- a/core/trackStats.js
+++ b/core/trackStats.js
@@ -138,4 +138,4 @@ module.exports.specs = function(req) {
 };
 
 module.exports.page = _trackPage;
-module.exports.event = _trackEvent;
\ No newline at end of file
+module.exports.event = _trackEvent;
diff --git a/core/unflat.js b/core/unflat.js
index 5917e1f..b3f7671 100644
--- a/core/unflat.js
+++ b/core/unflat.js
@@ -38,4 +38,4 @@ function unflatten(target, opts) {
     return result;
 }
 
-module.exports = unflatten;
\ No newline at end of file
+module.exports = unflatten;
diff --git a/core/views/404.ejs b/core/views/404.ejs
index 3714023..be10316 100644
--- a/core/views/404.ejs
+++ b/core/views/404.ejs
@@ -7,9 +7,9 @@
     <title>404</title>
 
     <!-- Source default resources -->
-        <link href="/source/assets/css/source.css" rel="stylesheet" data-source="core">
-        <script src="/source/assets/js/require.bundle.js" data-source="core"></script>
-        <script src="/source/assets/js/enter-the-source.js" data-source="core"></script>
+    <link href="/source/assets/css/source.css" rel="stylesheet" data-source="core">
+    <script src="/source/assets/js/require.bundle.js" data-source="core"></script>
+    <script src="/source/assets/js/enter-the-source.js" data-source="core"></script>
     <!-- /Source default resources -->
 </head>
 <body>
@@ -26,4 +26,4 @@
         <%- footer %>
     </div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/core/views/clean-spec.ejs b/core/views/clean-spec.ejs
index 6f4c3a6..97be058 100644
--- a/core/views/clean-spec.ejs
+++ b/core/views/clean-spec.ejs
@@ -10,9 +10,9 @@
     <% } %>
 
     <!-- Source default resources -->
-        <link href="/source/assets/css/source.css" rel="stylesheet" data-source="core">
-        <script src="/source/assets/js/require.bundle.js" data-source="core"></script>
-        <script src="/source/assets/js/enter-the-source.js" data-source="core"></script>
+    <link href="/source/assets/css/source.css" rel="stylesheet" data-source="core">
+    <script src="/source/assets/js/require.bundle.js" data-source="core"></script>
+    <script src="/source/assets/js/enter-the-source.js" data-source="core"></script>
     <!-- /Source default resources -->
 
     <%- head %>
@@ -24,4 +24,4 @@
         <%- footer %>
     </div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/core/views/doc.ejs b/core/views/doc.ejs
index 09e380e..9f02422 100644
--- a/core/views/doc.ejs
+++ b/core/views/doc.ejs
@@ -10,13 +10,13 @@
     <% } %>
 
     <!-- Your master-app styles -->
-        <link href="/docs/data/bootstrap.css" rel="stylesheet">
+    <link href="/docs/data/bootstrap.css" rel="stylesheet">
     <!-- /Your master-app styles -->
 
     <!-- Source default resources -->
-        <link href="/source/assets/css/source.css" rel="stylesheet" data-source="core">
-        <script src="/source/assets/js/require.bundle.js" data-source="core"></script>
-        <script src="/source/assets/js/enter-the-source.js" data-source="core"></script>
+    <link href="/source/assets/css/source.css" rel="stylesheet" data-source="core">
+    <script src="/source/assets/js/require.bundle.js" data-source="core"></script>
+    <script src="/source/assets/js/enter-the-source.js" data-source="core"></script>
     <!-- /Source default resources -->
 
     <%- head %>
diff --git a/core/views/navigation.ejs b/core/views/navigation.ejs
index b410ee8..76beed2 100644
--- a/core/views/navigation.ejs
+++ b/core/views/navigation.ejs
@@ -7,9 +7,9 @@
     <title><%= info.title %></title>
 
     <!-- Source default resources -->
-        <link href="/source/assets/css/source.css" rel="stylesheet" data-source="core">
-        <script src="/source/assets/js/require.bundle.js" data-source="core"></script>
-        <script src="/source/assets/js/enter-the-source.js" data-source="core"></script>
+    <link href="/source/assets/css/source.css" rel="stylesheet" data-source="core">
+    <script src="/source/assets/js/require.bundle.js" data-source="core"></script>
+    <script src="/source/assets/js/enter-the-source.js" data-source="core"></script>
     <!-- /Source default resources -->
 
     <%- head %>
diff --git a/core/views/spec.ejs b/core/views/spec.ejs
index d7b8c44..824b44a 100644
--- a/core/views/spec.ejs
+++ b/core/views/spec.ejs
@@ -10,13 +10,13 @@
     <% } %>
 
     <!-- Your master-app styles -->
-        <!--<link href="/data/res/css/portal.css" rel="stylesheet">-->
+
     <!-- /Your master-app styles -->
 
     <!-- Source default resources -->
-        <link href="/source/assets/css/source.css" rel="stylesheet" data-source="core">
-        <script src="/source/assets/js/require.bundle.js" data-source="core"></script>
-        <script src="/source/assets/js/enter-the-source.js" data-source="core"></script>
+    <link href="/source/assets/css/source.css" rel="stylesheet" data-source="core">
+    <script src="/source/assets/js/require.bundle.js" data-source="core"></script>
+    <script src="/source/assets/js/enter-the-source.js" data-source="core"></script>
     <!-- /Source default resources -->
 
     <%- head %>
diff --git a/docs/api/info.json b/docs/api/info.json
index 021c5a8..ebd9f97 100644
--- a/docs/api/info.json
+++ b/docs/api/info.json
@@ -1,5 +1,5 @@
 {
     "title": "Intergrating: Our API",
     "role": "navigation",
-	"tag": ["advanced"]
+    "tag": ["advanced"]
 }
diff --git a/docs/api/load-events/readme.md b/docs/api/load-events/readme.md
index 956626b..0183d41 100644
--- a/docs/api/load-events/readme.md
+++ b/docs/api/load-events/readme.md
@@ -20,9 +20,9 @@ Recommended plugin definition:
 window.source = window.source || {};
 window.source.loadEvents = window.source.loadEvents || {};
 window.source.loadEvents.moduleName = window.source.loadEvents.moduleName || {
-	timeout: '300',
-	finishEvent: 'moduleNameFinished',
-	updateEvent: 'moduleNameFinishedUpdated'
+    timeout: '300',
+    finishEvent: 'moduleNameFinished',
+    updateEvent: 'moduleNameFinishedUpdated'
 };
 ```
 
@@ -58,10 +58,10 @@ Recommended way of emitting `finishEvent` or `updateEvent` is:
 
 ```js
 if (window.CustomEvent) {
-	new CustomEvent('moduleNameFinished');
+    new CustomEvent('moduleNameFinished');
 } else {
-	var event = document.createEvent('CustomEvent');
-	event.initCustomEvent('moduleNameFinished', true, true);
+    var event = document.createEvent('CustomEvent');
+    event.initCustomEvent('moduleNameFinished', true, true);
 }
 ```
 
@@ -90,4 +90,4 @@ window.source.loadEvents = window.source.loadEvents || {};
 window.source.loadEvents.groupName1 = ['moduleName1', 'pluginName2'];
 ```
 
-When all modules and plugins in group are done their job, we emit `groupName1GroupFinish` event, where `groupName1` is your defined name.
\ No newline at end of file
+When all modules and plugins in group are done their job, we emit `groupName1GroupFinish` event, where `groupName1` is your defined name.
diff --git a/docs/base/info.json b/docs/base/info.json
index db59423..e6e59a3 100644
--- a/docs/base/info.json
+++ b/docs/base/info.json
@@ -1,5 +1,5 @@
 {
     "title": "Main Engine Documentation",
     "template": "doc",
-	"tag": ["getting-started"]
+    "tag": ["getting-started"]
 }
diff --git a/docs/build-tasks/info.json b/docs/build-tasks/info.json
index bf11ec3..38f17ca 100644
--- a/docs/build-tasks/info.json
+++ b/docs/build-tasks/info.json
@@ -1,5 +1,5 @@
 {
     "title": "Developing SourceJS: Build Tasks",
     "template": "doc",
-	"tag": ["advanced"]
+    "tag": ["advanced"]
 }
diff --git a/docs/clarify/info.json b/docs/clarify/info.json
index cdcc2cb..231cc6b 100644
--- a/docs/clarify/info.json
+++ b/docs/clarify/info.json
@@ -1,5 +1,5 @@
 {
     "title": "Clarify - Spec Section Testing Environment",
     "template": "doc",
-	"tag": ["details"]
+    "tag": ["details"]
 }
diff --git a/docs/configuration/readme.md b/docs/configuration/readme.md
index fb37d2f..d961ff3 100644
--- a/docs/configuration/readme.md
+++ b/docs/configuration/readme.md
@@ -19,12 +19,12 @@ Following the options priority hierarchy, context options allows to define highe
 ```html
 /
     specs
-	    catalog1
-	        component1
-	        component2
-	        sourcejs-options.js
+        catalog1
+            component1
+            component2
+            sourcejs-options.js
 
-	    catalog2
+        catalog2
 ```
 
 On each spec page call, engine gathers all the context configuration files up the tree and merges it on top of each other. The same process will happen with spec context level options in `info.json`, with only difference that it won't be shared with child items.
diff --git a/docs/data-nav/info.json b/docs/data-nav/info.json
index 39816e1..46b102e 100644
--- a/docs/data-nav/info.json
+++ b/docs/data-nav/info.json
@@ -1,5 +1,5 @@
 {
     "title": "Creating catalogs",
     "template": "doc",
-	"tag": ["catalogue", "navigation", "getting-started"]
+    "tag": ["catalogue", "navigation", "getting-started"]
 }
diff --git a/docs/index.src.html b/docs/index.src.html
index db658dd..a140683 100644
--- a/docs/index.src.html
+++ b/docs/index.src.html
@@ -3,11 +3,11 @@ <h1>Documentation and Examples</h1>
 </div>
 
 <div class="source_catalog" data-nav="/docs" data-tag="getting-started">
-	<h2>Getting started</h2>
+    <h2>Getting started</h2>
 </div>
 
 <div class="source_catalog" data-nav="/docs" data-tag="details">
-	<h2>Detailed explanations</h2>
+    <h2>Detailed explanations</h2>
 </div>
 
 <div class="source_catalog" data-nav="/docs" data-tag="advanced">
@@ -15,5 +15,5 @@ <h2>Advanced</h2>
 </div>
 
 <div class="source_catalog" data-nav="/docs" data-tag="other">
-	<h2>Misc</h2>
+    <h2>Misc</h2>
 </div>
diff --git a/docs/migration/info.json b/docs/migration/info.json
index e7c2a80..2433de7 100644
--- a/docs/migration/info.json
+++ b/docs/migration/info.json
@@ -1,5 +1,5 @@
 {
     "title": "Migration Notes",
     "template": "doc",
-	"tag": ["other"]
+    "tag": ["other"]
 }
diff --git a/docs/spec-ejs/info.json b/docs/spec-ejs/info.json
index 4435041..fcd2ec3 100644
--- a/docs/spec-ejs/info.json
+++ b/docs/spec-ejs/info.json
@@ -1,5 +1,5 @@
 {
     "tag": ["ejs", "include", "spec markup", "details"],
-	"title": "Creating Specs: Spec File as EJS",
+    "title": "Creating Specs: Spec File as EJS",
     "template": "doc"
 }
diff --git a/docs/spec-html-example/index.src.html b/docs/spec-html-example/index.src.html
index 250920f..ed30b69 100755
--- a/docs/spec-html-example/index.src.html
+++ b/docs/spec-html-example/index.src.html
@@ -26,4 +26,4 @@ <h2>Spec Section Heading</h2>
         This spec uses <code>index.src.html</code> template, view it's <a href="index.src.html">source</a>.
     </p>
 
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/spec-html/css/spec.css b/docs/spec-html/css/spec.css
index 6ed54ae..205d25d 100644
--- a/docs/spec-html/css/spec.css
+++ b/docs/spec-html/css/spec.css
@@ -2,8 +2,8 @@
 ---------------------------------------------------------------------------------- */
 
 .some-code {
-	font-size: 13px;
-	}
+    font-size: 13px;
+    }
 
 /* /Spec page block styles
----------------------------------------------------------------------------------- */
\ No newline at end of file
+---------------------------------------------------------------------------------- */
diff --git a/docs/test-specs/styles/index.src.html b/docs/test-specs/styles/index.src.html
index 2e60bd6..3195d77 100755
--- a/docs/test-specs/styles/index.src.html
+++ b/docs/test-specs/styles/index.src.html
@@ -2,8 +2,8 @@
 
 <style>
     .foo {
-		color: deeppink;
-	}
+        color: deeppink;
+    }
 </style>
 
 <script>
@@ -80,27 +80,27 @@ <h2>Spec Section Heading</h2>
     <h3>h3</h3>
 
     <p>
-		This is a H3
-	</p>
+        This is a H3
+    </p>
 
-	<div class="source_example">
-		<div class="some-code">
-			<p>Some h3 example</p>
-		</div>
-	</div>
+    <div class="source_example">
+        <div class="some-code">
+            <p>Some h3 example</p>
+        </div>
+    </div>
 
 
     <h4>h4</h4>
 
-	<p>
-		This is a H4
-	</p>
+    <p>
+        This is a H4
+    </p>
 
-	<div class="source_example">
-		<div class="some-code">
-			<p>Some h4 example</p>
-		</div>
-	</div>
+    <div class="source_example">
+        <div class="some-code">
+            <p>Some h4 example</p>
+        </div>
+    </div>
 
 </section>
 
diff --git a/test/functional/clarify.js b/test/functional/clarify.js
index 5338ae7..afdc7c4 100644
--- a/test/functional/clarify.js
+++ b/test/functional/clarify.js
@@ -4,7 +4,7 @@ var url = 'http://127.0.0.1:' + appPort + '/docs/test-specs/styles/';
 casper.options.viewportSize = {width: 1024, height: 768};
 
 casper.test.begin('Open clarify', 4, function suite(test) {
-	casper.start(url).then(function() {
+    casper.start(url).then(function() {
         var openClarifyLink = '.source_clarify-in-spec_link';
 
         this.waitForSelector(openClarifyLink,
diff --git a/test/functional/globalNav.js b/test/functional/globalNav.js
index bc658c9..1665e99 100644
--- a/test/functional/globalNav.js
+++ b/test/functional/globalNav.js
@@ -4,7 +4,7 @@ var url = 'http://127.0.0.1:' + appPort + '/docs/';
 casper.options.viewportSize = {width: 1024, height: 768};
 
 casper.test.begin('Check navigaton page', 3, function suite(test) {
-	casper.start(url).then(function() {
+    casper.start(url).then(function() {
         var _this = this;
         var nav = '.source_catalog_list .source_catalog_list_i';
 
@@ -16,14 +16,14 @@ casper.test.begin('Check navigaton page', 3, function suite(test) {
 
                 test.assertEval(function (nav) {
                     return (
-						!!document.querySelector(nav + ' .source_catalog_a[href="/docs/base"]') &&
-						!!document.querySelector(nav + ' .source_catalog_a[href="/docs/spec-file"]') &&
-						!!document.querySelector(nav + ' .source_catalog_a[href="/docs/spec-json"]') &&
-						!!document.querySelector(nav + ' .source_catalog_a[href="/docs/spec-html"]') &&
-						!!document.querySelector(nav + ' .source_catalog_a[href="/docs/spec-markdown"]') &&
-						!!document.querySelector(nav + ' .source_catalog_a[href="/docs/spec-ejs"]') &&
-						true
-					);
+                        !!document.querySelector(nav + ' .source_catalog_a[href="/docs/base"]') &&
+                        !!document.querySelector(nav + ' .source_catalog_a[href="/docs/spec-file"]') &&
+                        !!document.querySelector(nav + ' .source_catalog_a[href="/docs/spec-json"]') &&
+                        !!document.querySelector(nav + ' .source_catalog_a[href="/docs/spec-html"]') &&
+                        !!document.querySelector(nav + ' .source_catalog_a[href="/docs/spec-markdown"]') &&
+                        !!document.querySelector(nav + ' .source_catalog_a[href="/docs/spec-ejs"]') &&
+                        true
+                    );
                 }, 'Right nav items in set', [nav]);
             },
             function fail() {
diff --git a/test/functional/search.js b/test/functional/search.js
index 83107fe..e11aed3 100644
--- a/test/functional/search.js
+++ b/test/functional/search.js
@@ -4,13 +4,13 @@ var url = 'http://127.0.0.1:' + appPort;
 casper.options.viewportSize = {width: 1024, height: 768};
 
 casper.test.begin('Checking search', 3, function suite(test) {
-	casper.start(url).then(function() {
+    casper.start(url).then(function() {
         var _this = this;
         var input = '.source_search .source_search_it';
         var autoComplete = '.autocomplete-wrapper .autocomplete-suggestion:first-child a';
         var searchField = '.source_search_it[data-initialized]';
 
-		test.assertExists(input, 'Search input exists');
+        test.assertExists(input, 'Search input exists');
 
         this.waitForSelector(searchField,
             function pass() {
@@ -46,5 +46,5 @@ casper.test.begin('Checking search', 3, function suite(test) {
             }
         );
 
-	}).run(function() { test.done() }).clear();
-});
\ No newline at end of file
+    }).run(function() { test.done() }).clear();
+});
diff --git a/test/functional/specpage.js b/test/functional/specpage.js
index 7b0c02a..a9a0c2b 100644
--- a/test/functional/specpage.js
+++ b/test/functional/specpage.js
@@ -4,67 +4,67 @@ var url = 'http://127.0.0.1:' + appPort + '/docs/test-specs/styles/';
 casper.options.viewportSize = {width: 1024, height: 768};
 
 casper.test.begin('Checking inner navigation', 8, function suite(test) {
-	casper.start(url).then(function() {
+    casper.start(url).then(function() {
         var _this = this;
         var menu = '.source_nav.__loaded';
-		var section = '.__loaded[id="2"]';
+        var section = '.__loaded[id="2"]';
 
 
         this.waitForSelector(menu,
-			function pass() {
-				this.waitForSelector(section,
+            function pass() {
+                this.waitForSelector(section,
 
-	            function pass() {
-					test.assertExists(menu, 'Menu item loaded');
-					test.assertExists(section, 'Section item loaded');
+                function pass() {
+                    test.assertExists(menu, 'Menu item loaded');
+                    test.assertExists(section, 'Section item loaded');
 
-					var section_top = this.getElementBounds(section).top;
-					var section_info = this.getElementInfo(section);
+                    var section_top = this.getElementBounds(section).top;
+                    var section_info = this.getElementInfo(section);
 
-					test.assert(section_top > 100, "Section's position should be > 100: " + section_top);
+                    test.assert(section_top > 100, "Section's position should be > 100: " + section_top);
 
-	            },
-	            function fail() {
-	                test.fail(section);
-	            }
-	        )},
-			function fail() {
-				test.fail(menu);
-			}
-		);
+                },
+                function fail() {
+                    test.fail(section);
+                }
+            )},
+            function fail() {
+                test.fail(menu);
+            }
+        );
 
     }).then(function() {
-		this.click('.source_nav .source_main_nav_li:nth-child(2) a');
-		test.assertEquals(this.getCurrentUrl(), url+'#2', 'URL with hash is right')
-	}).then(function() {
-		var highlighted = '.source_nav .source_main_nav_li:nth-child(2).__active a.__active';
-		var section = '.__loaded[id="2"]';
-
-		this.waitForSelector(highlighted, function pass() {
-			this.waitForSelector(section,
-				function pass() {
-					test.assertExists(highlighted, 'Menu item highlighted');
-					test.assertExists(section, 'Section item loaded');
-
-					var section_top = this.getElementBounds(section).top;
-					test.assert(section_top < 100, "Section's position should be < 100: " + section_top);
-
-					var pageYOffset = this.getGlobal('pageYOffset');
-					test.assert(pageYOffset > 100, 'Page should be scrolled to section');
-				},
-				function fail() {
-					test.fail(section);
-				}
-			);
-		}, function fail() {
-			test.fail(highlighted);
-		});
-
-	}).run(function() { test.done() }).clear();
+        this.click('.source_nav .source_main_nav_li:nth-child(2) a');
+        test.assertEquals(this.getCurrentUrl(), url+'#2', 'URL with hash is right')
+    }).then(function() {
+        var highlighted = '.source_nav .source_main_nav_li:nth-child(2).__active a.__active';
+        var section = '.__loaded[id="2"]';
+
+        this.waitForSelector(highlighted, function pass() {
+            this.waitForSelector(section,
+                function pass() {
+                    test.assertExists(highlighted, 'Menu item highlighted');
+                    test.assertExists(section, 'Section item loaded');
+
+                    var section_top = this.getElementBounds(section).top;
+                    test.assert(section_top < 100, "Section's position should be < 100: " + section_top);
+
+                    var pageYOffset = this.getGlobal('pageYOffset');
+                    test.assert(pageYOffset > 100, 'Page should be scrolled to section');
+                },
+                function fail() {
+                    test.fail(section);
+                }
+            );
+        }, function fail() {
+            test.fail(highlighted);
+        });
+
+    }).run(function() { test.done() }).clear();
 });
 
 casper.test.begin('Code source', 2, function suite(test) {
-	casper.start(url).then(function() {
+    casper.start(url).then(function() {
         var _this = this;
         var actionItem = '.source_main_nav_ac_item.source_source-code_action-item';
 
@@ -90,19 +90,19 @@ casper.test.begin('Code source', 2, function suite(test) {
             }
         );
 
-	}).run(function() { test.done() }).clear();
+    }).run(function() { test.done() }).clear();
 });
 
 casper.test.begin('Hash link opening', 2, function suite(test) {
-	casper.start(url + '#2').then(function() {
+    casper.start(url + '#2').then(function() {
         var highlighted = '.source_nav .source_main_nav_li:nth-child(2).__active a.__active';
 
         this.waitForSelector(highlighted,
             function pass() {
-				test.assertExists(highlighted, 'Menu item highlighted');
+                test.assertExists(highlighted, 'Menu item highlighted');
 
-				var pageYOffset = this.getGlobal('pageYOffset');
-				test.assert(pageYOffset > 100, 'Page should be scrolled to section');
+                var pageYOffset = this.getGlobal('pageYOffset');
+                test.assert(pageYOffset > 100, 'Page should be scrolled to section');
 
             },
             function fail() {
diff --git a/test/unit/api/html.js b/test/unit/api/html.js
index 5889f33..2239c67 100644
--- a/test/unit/api/html.js
+++ b/test/unit/api/html.js
@@ -146,4 +146,4 @@ describe('API test /api/specs/html', function () {
                 });
         });
     });
-});
\ No newline at end of file
+});
diff --git a/test/unit/api/specs.js b/test/unit/api/specs.js
index 72ed122..897e092 100644
--- a/test/unit/api/specs.js
+++ b/test/unit/api/specs.js
@@ -418,4 +418,4 @@ describe('API test /api/specs', function () {
                 });
         });
     });
-});
\ No newline at end of file
+});
diff --git a/test/unit/ejsHelpersSpec.js b/test/unit/ejsHelpersSpec.js
index 7224f67..307d8ee 100644
--- a/test/unit/ejsHelpersSpec.js
+++ b/test/unit/ejsHelpersSpec.js
@@ -66,4 +66,4 @@ describe('includeFiles', function () {
 
         done();
     });
-});
\ No newline at end of file
+});
diff --git a/test/unit/lib/extendTillSpec.js b/test/unit/lib/extendTillSpec.js
index 5f8d1a2..24c5c44 100644
--- a/test/unit/lib/extendTillSpec.js
+++ b/test/unit/lib/extendTillSpec.js
@@ -51,4 +51,4 @@ describe('extendTillSpec module check', function () {
 
         done();
     });
-});
\ No newline at end of file
+});
diff --git a/test/unit/lib/specPageParserSpec.js b/test/unit/lib/specPageParserSpec.js
index daa144e..edae1e5 100644
--- a/test/unit/lib/specPageParserSpec.js
+++ b/test/unit/lib/specPageParserSpec.js
@@ -448,4 +448,4 @@ describe('specsParser.getBySection', function () {
             }
         });
     });
-});
\ No newline at end of file
+});
diff --git a/test/unit/lib/utilsSpec.js b/test/unit/lib/utilsSpec.js
index 11cd4bc..e8551bf 100644
--- a/test/unit/lib/utilsSpec.js
+++ b/test/unit/lib/utilsSpec.js
@@ -45,4 +45,4 @@ describe('utils: extendOptions', function () {
 
         done();
     });
-});
\ No newline at end of file
+});

From ceeb6cfbbee6ebab333ad0170e8f25b38685db9d Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Sat, 18 Jun 2016 15:19:40 +0200
Subject: [PATCH 090/104] update `q` dep and delete unused `flat`

---
 package.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 0b99323..11c548d 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,6 @@
     "express": "^4.13.3",
     "express-interceptor": "^1.2.0",
     "express-session": "^1.10.2",
-    "flat": "^2.0.0",
     "fs-extra": "^0.30.0",
     "fs-finder": "operatino/node-fs-finder#fix-windows-find-up",
     "glob": "^7.0.3",
@@ -47,7 +46,7 @@
     "marked": "^0.3.5",
     "minimatch": "^3.0.0",
     "pretty-hrtime": "^1.0.2",
-    "q": "^1.1.1",
+    "q": "^1.4.1",
     "serve-favicon": "^2.3.0",
     "shortid": "^2.2.4",
     "time-grunt": "^1.2.1",

From 5b1020742e0b98987a608677511f9e3023e7733a Mon Sep 17 00:00:00 2001
From: Norbert de Langen <norbert@macaw.nl>
Date: Sun, 19 Jun 2016 21:50:32 +0200
Subject: [PATCH 091/104] FIX
 https://github.com/sourcejs/Source/pull/234#issuecomment-226946891

Adding zero-width spaces breaks ejs pattern-finder
---
 docs/data-nav/readme.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/data-nav/readme.md b/docs/data-nav/readme.md
index 4ff0c84..c5035f4 100644
--- a/docs/data-nav/readme.md
+++ b/docs/data-nav/readme.md
@@ -44,21 +44,21 @@ This feature is especially useful for nested catalogs and stand-alone collection
 Auto-generated title and description in navigation block are taked directly from `info.json` meta file.
 
 ```html
-​<div class="source_catalog" data-nav="./example">​</div>
+​<div class="source_catalog" data-nav="./">​</div>
 ```
 
-<div class="source_catalog" data-nav="./example"></div>
+<div class="source_catalog" data-nav="./"></div>
 
 If there is no description, or you want to leave custom text, just use this extra markup:
 
 ```html
-​<div class="source_catalog" data-nav="./example">
+​<div class="source_catalog" data-nav="./">
     ​<h2>Custom Title​</h2>
     ​<p>Custom description for catalogue.​<p>
 ​</div>
 ```
 
-<div class="source_catalog" data-nav="./example">
+<div class="source_catalog" data-nav="./">
     <h2>Custom Title</h2>
     <p>Custom description for catalogue.</p>
 </div>
@@ -90,7 +90,7 @@ module.exports = {
     moduleOptions: {
       globalNav: {
         templates: {
-          catalogHeader: _.template('<h2 class="custom-class">​<%= catalogMeta.title %​></h2>'),
+          catalogHeader: _.template('<h2 class="custom-class">​<​%​=​ catalogMeta.title ​%​​></h2>'),
         }
       }
     }

From 002f80bb11a40c611858174cd6a07346683d42f8 Mon Sep 17 00:00:00 2001
From: Norbert de Langen <norbert@macaw.nl>
Date: Sun, 19 Jun 2016 22:28:46 +0200
Subject: [PATCH 092/104] Changed the wording from "Middleware" to "Plugin"

FIX https://github.com/sourcejs/Source/pull/234#discussion-diff-67602174
FIX https://github.com/sourcejs/Source/pull/234#discussion-diff-67602194
FIX https://github.com/sourcejs/Source/pull/234#discussion-diff-67602200
FIX https://github.com/sourcejs/Source/pull/234#discussion-diff-67602212
FIX https://github.com/sourcejs/Source/pull/234#discussion-diff-67602219
FIX https://github.com/sourcejs/Source/pull/234#discussion-diff-67602271
FIX https://github.com/sourcejs/Source/pull/234#discussion-diff-67602336
---
 docs/base/readme.md     | 32 +++++++++++++++++++++-----------
 docs/data-nav/info.json |  2 +-
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/docs/base/readme.md b/docs/base/readme.md
index 3f592b2..966f952 100644
--- a/docs/base/readme.md
+++ b/docs/base/readme.md
@@ -111,7 +111,7 @@ Remember, SourceJS Specs are a simple static pages, that are then enchanted with
 
 ## Examples
 
-Main [project website](http://sourcejs.com) is based on SourceJS platform, as well as all documentation that you're surfing right now. Engine docs are both viewable on [GitHub](https://github.com/sourcejs/Source/tree/master/docs) and in SourceJS environment.
+Main project site: [sourcejs.com](http://sourcejs.com) is based on SourceJS platform, as well as all documentation that you're surfing right now. Engine docs are both viewable on [GitHub](https://github.com/sourcejs/Source/tree/master/docs) and in SourceJS environment.
 
 ### Specs Showcase
 
@@ -140,32 +140,36 @@ To get more insights about recommended workflow within Style Guide platform chec
 
 ## Configuration
 
-SourceJS engine is highly configurable. Engine and Middleware are configured in 1 place:: `options.js`.
+SourceJS engine is highly configurable. Engine and plugins are configured in 1 place:: `options.js`.
 
 With version 0.5.3 we also introduced context level options `sourcejs-options.js`, which allows to configure any catalog specifically for your needs. Read more about it, and other configuration capabilities in [Engine Configuration](/docs/configuration) doc.
 
-## Middleware
+## Plugins
 
 As a Style Guide Platform we focus on flexibility and ease of integration. All SourceJS core modules are easy to configure and replace with your customized version.
 
 Plugins are working in the same way as core modules, but are kept outside the main platform, allowing to separate specific features.
 
-Here is a list of available plugins:
+### Available plugins:
 
-### New spec languages:
+#### Spec Language Integrations:
+These plugins allow for writing specs pages in your prefered language or method
 * [sourcejs-slm](https://github.com/venticco/sourcejs-slm)
 * [sourcejs-react](https://github.com/szarouski/sourcejs-react)
 * [sourcejs-jade](https://github.com/sourcejs/sourcejs-jade)
 * [sourcejs-dss](http://github.com/sourcejs/sourcejs-contrib-dss)
 
-### New example languages
+#### Spec Code example languages
+These plugins add new ways to incoperate code examples on spec pages
 * [sourcejs-react-styleguidist](https://github.com/sourcejs/sourcejs-react-styleguidist)
 * [sourcejs-md-react](https://github.com/mik01aj/sourcejs-md-react)
 
-### New Utility
+#### Utility
+These plugin help with development with SourceJS
 * [sourcejs-browser-sync](https://github.com/sourcejs/sourcejs-contrib-browser-sync)
 
-### New Spec Parts
+#### Spec Extentions
+These plugins add additional functionality that can be used on spec pages
 * [sourcejs-comments](https://github.com/sourcejs/sourcejs-comments)
 * [sourcejs-react-dependencies](https://github.com/ndelangen/sourcejs-react-dependencies)
 * [sourcejs-spec-dependencies](https://github.com/sourcejs/sourcejs-spec-dependencies)
@@ -173,19 +177,25 @@ Here is a list of available plugins:
 * [sourcejs-crowd-voice](https://github.com/sourcejs/sourcejs-crowd-voice)
 * [sourcejs-specs-linting](https://github.com/sourcejs/sourcejs-specs-linting)
 
+Even more plugin may be found by searching npm: [Search npm for 'sourcejs-'](https://www.npmjs.com/search?q=sourcejs-)
+
+### Installing plugins
 These modules are able to extend both front-end and back-end part of the engine. To install any middleware, run `npm install <name>`
 
 After install is finished (re)start your SourceJS instance using: `npm start`.
 
-Some Middleware need addition setup!
+<div class="source_warn">
+    Some plugins may need addition setup!<br/>
+    Read their documentation
+</div>
 
 Follow [this guide](/docs/api/plugins) to learn how to develop own plugins for SourceJS Platform.
 
-If you have created your own middleware, please let us know! If you'd like to add your middleware to the list above, you can submit a Pull-Request.
+If you have created your own middleware, please let us know! If you'd like to add your middleware to the list above, or you can submit a Pull-Request.
 
 ## Contact us
 
-Leave your questions and feedback as [issues](https://github.com/sourcejs/Source/issues) on GitHub orr [request a consultation](mailto:r@rhr.me) from SourceJS founders.
+Leave your questions and feedback as [issues](https://github.com/sourcejs/Source/issues) on GitHub or [request a consultation](mailto:r@rhr.me) from SourceJS founders.
 
 If you have any quick questions, or want to share your experience working with SourceJS, drop us a message in Gitter chat:
 
diff --git a/docs/data-nav/info.json b/docs/data-nav/info.json
index 46b102e..5d405a8 100644
--- a/docs/data-nav/info.json
+++ b/docs/data-nav/info.json
@@ -1,5 +1,5 @@
 {
-    "title": "Creating catalogs",
+    "title": "Creating catalog pages",
     "template": "doc",
     "tag": ["catalogue", "navigation", "getting-started"]
 }

From 2d4bd54a280031c0dea1ea70868136e639fb0029 Mon Sep 17 00:00:00 2001
From: Norbert de Langen <norbert@macaw.nl>
Date: Sun, 19 Jun 2016 22:29:20 +0200
Subject: [PATCH 093/104] CHANGE the docs for creating plugin to reflect
 installation with npm module

---
 docs/api/plugins/readme.md | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/docs/api/plugins/readme.md b/docs/api/plugins/readme.md
index edd7c17..e0c9359 100644
--- a/docs/api/plugins/readme.md
+++ b/docs/api/plugins/readme.md
@@ -20,15 +20,14 @@ We are continuously improving mentioned demos, adding new best practices and API
 
 The recommended way of structuring SourceJS plugins is to define them as [NPM packages](https://docs.npmjs.com/misc/developers). All public plugins must be named by corresponding prefix `sourcejs-*`, so they could be easily searchable through global repository.
 
-All plugins must be installed in `sourcejs/user` directory:
+All plugins must be installed in `/` directory:
 
 ```html
-/source
-  user
+/
     package.json
     node_modules
-      sourcejs-plugin1
-      sourcejs-plugin2
+        sourcejs-plugin1
+        sourcejs-plugin2
 ```
 
 ### Internal plugins
@@ -36,8 +35,8 @@ All plugins must be installed in `sourcejs/user` directory:
 SourceJS is an open source project, and we expect our community to be open as we do, sharing their features and engine extends to public. But in case you prefer to have private plugins, there are few ways solving this case:
 
 * Create private NPM plugins, installing them from your closed repositories
-* Commit `sourcejs/user/node_modules` contents to your common repository
-* Using `sourcejs/user/plugins` folder for your custom client-side dependencies and `sourcejs/user/app.js` to extend SourceJS back-end
+* Commit `/node_modules` contents to your common repository
+* Using `/plugins` folder for your custom client-side dependencies and `/app.js` to extend SourceJS back-end
 
 Last mentioned option is deprecated, and not recommended to use, yet you can still find some mentions of this approach in `options.js` and `moduleLoader.js`.
 
@@ -74,7 +73,7 @@ As we mentioned above, when SourceJS plugin is installed through NPM, main clien
 
 To achieve this, we generate custom RequireJS configuration through default build task and dynamically extend `options.js`, filling installed modules to `assets.npmPluginsEnabled` with `true`.
 
-To disable client-side module of any installed npm Plugins, you can edit the module definition in `user/options.js`:
+To disable client-side module of any installed npm Plugins, you can edit the module definition in `/options.js`:
 
 ```js
 {
@@ -89,7 +88,7 @@ To disable client-side module of any installed npm Plugins, you can edit the mod
 
 ### Back-end
 
-Plugins back-end is exposed in `core/index.js` and is automatically loaded during SourceJS app initialization, before importing `user/app.js` extender. It's a simple Node.js module, from which you can use any existing dependencies in SourceJS or define your own.
+Plugins back-end is exposed in `/node_modules/sourcejs/core/index.js` and is automatically loaded during SourceJS app initialization, before importing `/app.js` extender. It's a simple Node.js module, from which you can use any existing dependencies in SourceJS or define your own.
 
 As SourceJS back-end uses [ExpressJS](http://expressjs.com), it's recommended to use this framework for creating APIs and custom routers.
 
@@ -103,7 +102,7 @@ As SourceJS back-end uses [ExpressJS](http://expressjs.com), it's recommended to
 
 ## Middlewares
 
-SourceJS Middleware is basically the same as Plugin item, but it has only back-end part and its entry point must be defined in `core/middleware/index.js` path.
+SourceJS Middleware is basically the same as Plugin item, but it has only back-end part and its entry point must be defined in `/node_modules/sourcejs/core/middleware/index.js` path.
 
 As SourceJS uses [ExpressJS](http://expressjs.com), middleware development constraints are bound to this framework.
 
@@ -111,9 +110,9 @@ Most common use cases of middleware in SourceJS in modification of Spec file con
 
 ### Connecting The Middleware
 
-Middlewares are automatically loaded after installation, and are evaluated on each request before `sourcejs/core/middleware/wrap.js` and `sourcejs/core/middleware/send.js`.
+Middlewares are automatically loaded after installation, and are evaluated on each request before `/node_modules/sourcejs/core/middleware/wrap.js` and `sourcejs/core/middleware/send.js`.
 
-`wrap.js` is wrapping spec page (`index.src.html`, `index.md` and etc) contents in a pre-defined a view template from `sourcejs/core/views` or user custom path `sourcejs/user/core/views` using [EJS](http://www.embeddedjs.com/).
+`wrap.js` is wrapping spec page (`index.src.html`, `index.md` and etc) contents in a pre-defined a view template from `/node_modules/sourcejs/core/views` or user custom path `/node_modules/sourcejs/user/core/views` using [EJS](http://www.embeddedjs.com/).
 
 `send.js` is used in case when we modify Spec contents, as we do with `*.src.html` and all other middlewares. Modified Spec content is passed through `req.specData.renderedHtml` object, which each middleware can modify during the request handling process and which then is sent to the client's browser.
 
@@ -169,4 +168,4 @@ To override core middlewares, changing their order or replacing with alternative
 ### Examples
 
 * [sourcejs-jade](https://github.com/sourcejs/sourcejs-jade)
-* [sourcejs-smiles](https://github.com/sourcejs/sourcejs-smiles)
\ No newline at end of file
+* [sourcejs-smiles](https://github.com/sourcejs/sourcejs-smiles)

From 6bda0aa61e279ed114ac8a3ee3a38a21a921accc Mon Sep 17 00:00:00 2001
From: Norbert de Langen <norbert@macaw.nl>
Date: Mon, 20 Jun 2016 22:54:32 +0200
Subject: [PATCH 094/104] CHANGE personal grunt-casperjs to global one that has
 been updated (by me)

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 11c548d..72608b6 100644
--- a/package.json
+++ b/package.json
@@ -68,10 +68,10 @@
     "ci-test-win": "grunt ci-pre-run && node app.js --post-grunt ci-post-run-win --test --log trace --no-watch"
   },
   "devDependencies": {
-    "@ndelangen/grunt-casperjs": "^3.0.0",
     "assert": "^1.3.0",
     "chai": "^3.2.0",
     "cross-spawn": "^4.0.0",
+    "grunt-casperjs": "^2.2.0",
     "grunt-contrib-jshint": "^1.0.0",
     "grunt-contrib-watch": "^1.0.0",
     "grunt-jsdoc": "^2.1.0",

From a2de35f550efdfa5e0aea873dc4138d332e9c10a Mon Sep 17 00:00:00 2001
From: "Collins, Alan" <Alan.Collins@tylertech.com>
Date: Mon, 12 Dec 2016 15:07:12 -0600
Subject: [PATCH 095/104] Replace Paths to the "main application" with the path
 to "SourceJS" using global.pathToApp

---
 core/api/index.js           | 2 +-
 core/loadOptions.js         | 2 +-
 core/middlewares/clarify.js | 2 +-
 core/routes/redirects.js    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/api/index.js b/core/api/index.js
index 7f06941..9b248a4 100644
--- a/core/api/index.js
+++ b/core/api/index.js
@@ -4,7 +4,7 @@ var express = require('express');
 var path = require('path');
 var ParseData = require(path.join(global.pathToApp, 'core/lib/parseData'));
 var utils = require(path.join(global.pathToApp, 'core/lib/utils'));
-var pathToApp = path.dirname(require.main.filename);
+var pathToApp = global.pathToApp;
 var htmlTree = require(path.join(global.pathToApp, 'core/html-tree'));
 var unflatten = require(path.join(global.pathToApp,'core/unflat'));
 
diff --git a/core/loadOptions.js b/core/loadOptions.js
index b7814c4..633e4aa 100644
--- a/core/loadOptions.js
+++ b/core/loadOptions.js
@@ -76,7 +76,7 @@ var legacyOptionsChecker = function(options, fileName){
 module.exports = function(basePath, _silent){
     silent = _silent;
 
-    var pathToApp = basePath || path.dirname(require.main.filename);
+    var pathToApp = basePath || global.pathToApp;
 
     var mergedOptions = utils.requireUncached(path.join(pathToApp, 'options'));
 
diff --git a/core/middlewares/clarify.js b/core/middlewares/clarify.js
index 7bd54de..a3614d8 100644
--- a/core/middlewares/clarify.js
+++ b/core/middlewares/clarify.js
@@ -9,7 +9,7 @@ var http = require('http');
 
 var ejs = require(path.join(global.pathToApp, 'core/ejsWithHelpers.js'));
 var trackStats = require(path.join(global.pathToApp, 'core/trackStats'));
-var pathToApp = path.dirname(require.main.filename);
+var pathToApp = global.pathToApp;
 var specUtils = require(path.join(pathToApp, 'core/lib/specUtils'));
 var ParseData = require(path.join(pathToApp, 'core/lib/parseData'));
 var specsParser = require(path.join(pathToApp, 'core/lib/specPageParser'));
diff --git a/core/routes/redirects.js b/core/routes/redirects.js
index 06a3d2d..a9c0a84 100644
--- a/core/routes/redirects.js
+++ b/core/routes/redirects.js
@@ -8,7 +8,7 @@
 
 var path = require('path');
 var express = require('express');
-var pathToApp = path.dirname(require.main.filename);
+var pathToApp = global.pathToApp;
 
 /*
 *

From 93ce7e9803bf5bbfe7a972c7f981d4402c7822c3 Mon Sep 17 00:00:00 2001
From: "Collins, Alan" <Alan.Collins@tylertech.com>
Date: Mon, 12 Dec 2016 15:08:00 -0600
Subject: [PATCH 096/104] Add a NodeJS exports function, so SourceJS can be
 launched from another script file using require()

---
 app.js | 67 ++++++++++++++++++++++++++++++----------------------------
 1 file changed, 35 insertions(+), 32 deletions(-)

diff --git a/app.js b/app.js
index f0a1c54..430eb88 100644
--- a/app.js
+++ b/app.js
@@ -255,40 +255,43 @@ app.use(logErrors);
 /* /Error handling */
 
 
-
-/* Server start */
-if (!module.parent) {
-    var serverOpts = global.opts.core.server;
-    var port = serverOpts.port;
-
-    app.listen(port, serverOpts.hostname, serverOpts.backlog, serverOpts.callback);
-    log.info('[SOURCEJS] launched on http://127.0.0.1:'.blue + (port.toString()).red + ' in '.blue + MODE.blue + ' mode...'.blue);
-
-    if (commander.test) {
-        var spawn = require('cross-spawn');
-
-        spawn('./node_modules/grunt-cli/bin/grunt', [commander.postGrunt, '--port='+port], {stdio: 'inherit'})
+module.exports = function () {
+  var serverOpts = global.opts.core.server;
+  var port = serverOpts.port;
+  
+  app.listen(port, serverOpts.hostname, serverOpts.backlog, serverOpts.callback);
+  log.info('[SOURCEJS] launched on http://127.0.0.1:'.blue + (port.toString()).red + ' in '.blue + MODE.blue + ' mode...'.blue);
+  
+  if (commander.test) {
+    var spawn = require('cross-spawn');
+    
+    spawn('./node_modules/grunt-cli/bin/grunt', [commander.postGrunt, '--port=' + port], { stdio: 'inherit' })
             .on('close', function (code) {
-                if (code === 0) {
-                    log.info('Test successful');
-                    process.exit(0);
-                } else {
-                    log.error('Test failed');
-                    process.exit(1);
-                }
-            });
+      if (code === 0) {
+        log.info('Test successful');
+        process.exit(0);
+      } else {
+        log.error('Test failed');
+        process.exit(1);
+      }
+    });
+  } else {
+    if (global.opts.core.tracking.enabled) {
+      trackStats.event({
+        group: 'start',
+        event: 'default'
+      });
     } else {
-        if (global.opts.core.tracking.enabled) {
-            trackStats.event({
-                group: 'start',
-                event: 'default'
-            });
-        } else {
-            trackStats.event({
-                group: 'start',
-                event: 'disabled tracking'
-            }, true);
-        }
+      trackStats.event({
+        group: 'start',
+        event: 'disabled tracking'
+      }, true);
     }
+  }
+};
+
+/* Server start */
+if (!module.parent) {
+  module.exports();
 }
 /* Server start */

From 3208b830d5ff40d7e2e54437a56ad888676b2ce2 Mon Sep 17 00:00:00 2001
From: "Collins, Alan" <Alan.Collins@tylertech.com>
Date: Tue, 13 Dec 2016 12:50:48 -0600
Subject: [PATCH 097/104] Refactored module.exports to be more expressive.

---
 app.js | 67 ++++++++++++++++++++++++++++++----------------------------
 1 file changed, 35 insertions(+), 32 deletions(-)

diff --git a/app.js b/app.js
index 430eb88..f354070 100644
--- a/app.js
+++ b/app.js
@@ -254,44 +254,47 @@ var logErrors = function(err, req, res, next) {
 app.use(logErrors);
 /* /Error handling */
 
+var startServer = function () {
+    var serverOpts = global.opts.core.server;
+    var port = serverOpts.port;
 
-module.exports = function () {
-  var serverOpts = global.opts.core.server;
-  var port = serverOpts.port;
-  
-  app.listen(port, serverOpts.hostname, serverOpts.backlog, serverOpts.callback);
-  log.info('[SOURCEJS] launched on http://127.0.0.1:'.blue + (port.toString()).red + ' in '.blue + MODE.blue + ' mode...'.blue);
-  
-  if (commander.test) {
-    var spawn = require('cross-spawn');
-    
-    spawn('./node_modules/grunt-cli/bin/grunt', [commander.postGrunt, '--port=' + port], { stdio: 'inherit' })
+    app.listen(port, serverOpts.hostname, serverOpts.backlog, serverOpts.callback);
+    log.info('[SOURCEJS] launched on http://127.0.0.1:'.blue + (port.toString()).red + ' in '.blue + MODE.blue + ' mode...'.blue);
+
+    if (commander.test) {
+        var spawn = require('cross-spawn');
+
+        spawn('./node_modules/grunt-cli/bin/grunt', [commander.postGrunt, '--port=' + port], { stdio: 'inherit' })
             .on('close', function (code) {
-      if (code === 0) {
-        log.info('Test successful');
-        process.exit(0);
-      } else {
-        log.error('Test failed');
-        process.exit(1);
-      }
-    });
-  } else {
-    if (global.opts.core.tracking.enabled) {
-      trackStats.event({
-        group: 'start',
-        event: 'default'
-      });
+                if (code === 0) {
+                    log.info('Test successful');
+                    process.exit(0);
+                } else {
+                    log.error('Test failed');
+                    process.exit(1);
+                }
+            });
     } else {
-      trackStats.event({
-        group: 'start',
-        event: 'disabled tracking'
-      }, true);
+        if (global.opts.core.tracking.enabled) {
+            trackStats.event({
+                group: 'start',
+                event: 'default'
+            });
+        } else {
+            trackStats.event({
+                group: 'start',
+                event: 'disabled tracking'
+            }, true);
+        }
     }
-  }
-};
+}
 
 /* Server start */
 if (!module.parent) {
-  module.exports();
+    startServer();
 }
 /* Server start */
+
+module.exports = {
+    startServer: startServer
+};
\ No newline at end of file

From cf11b8437114598aa1380142e26764fafa7b8964 Mon Sep 17 00:00:00 2001
From: "Collins, Alan" <Alan.Collins@tylertech.com>
Date: Tue, 13 Dec 2016 12:52:54 -0600
Subject: [PATCH 098/104] Missed a semi-colon declaring the function variable

---
 app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app.js b/app.js
index f354070..ecc0b6f 100644
--- a/app.js
+++ b/app.js
@@ -287,7 +287,7 @@ var startServer = function () {
             }, true);
         }
     }
-}
+};
 
 /* Server start */
 if (!module.parent) {

From 316006c8525340a39d2070f92d15547f283e4ec6 Mon Sep 17 00:00:00 2001
From: Alanoll <alanollv@gmail.com>
Date: Thu, 12 Jan 2017 18:48:28 -0600
Subject: [PATCH 099/104] Removing parseInt from process.env.PORT retrieval.
 Allows socket/named pipes usage

---
 app.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app.js b/app.js
index ecc0b6f..e993d72 100644
--- a/app.js
+++ b/app.js
@@ -70,7 +70,7 @@ if (!commander.watch) {
 }
 
 if (process.env.PORT) {
-    global.opts.core.server.port = parseInt(process.env.PORT);
+    global.opts.core.server.port = process.env.PORT;
     console.log('Using defined app PORT from environment variable: ' + process.env.PORT);
 }
 /* /Globals */
@@ -297,4 +297,4 @@ if (!module.parent) {
 
 module.exports = {
     startServer: startServer
-};
\ No newline at end of file
+};

From 92686d598764d4fbc39c5e40fa5d42f89005cca5 Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Tue, 17 Jan 2017 16:40:04 +0100
Subject: [PATCH 100/104] update node version for CI's

---
 .travis.yml  | 5 ++---
 appveyor.yml | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0fbaa2e..5a32382 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,7 @@
 language: node_js
 node_js:
-  - "0.10"
-  - "0.12"
-  - "4"
+  - "6"
+  - "7"
 sudo: false
 install:
   - npm cache clean
diff --git a/appveyor.yml b/appveyor.yml
index 49ecf7d..8ac32b6 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -3,8 +3,8 @@
 
 environment:
   matrix:
-    - nodejs_version: 0.12
-    - nodejs_version: 4
+    - nodejs_version: 6
+    - nodejs_version: 7
 
 install:
   - ps: Install-Product node $env:nodejs_version

From b54218d37774ca13b8d149180d0e35852d3456ae Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Wed, 18 Jan 2017 17:31:47 +0100
Subject: [PATCH 101/104] update cross links, rename base to getting started,
 update github urls to future repo name

---
 CONTRIBUTING.md                               |   2 +-
 Gruntfile.js                                  |   2 +-
 README.md                                     |  28 ++++----
 app.js                                        |   2 +-
 assets/css/source.css                         |   4 +-
 assets/js/clarify.js                          |   2 +-
 assets/js/enter-the-source.js                 |   2 +-
 assets/js/modules/utils.js                    |   2 +-
 assets/test/js/tests.js                       |   4 +-
 core/api/optionsApi.js                        |   2 +-
 core/file-tree/index.js                       |   2 +-
 docs/api/load-events/info.json                |   2 +-
 docs/api/plugins/info.json                    |   2 +-
 docs/auth/info.json                           |   2 +-
 docs/auth/readme.md                           |   6 +-
 docs/build-tasks/info.json                    |   2 +-
 docs/clarify/info.json                        |   2 +-
 docs/clarify/readme.md                        |   8 +--
 docs/configuration/info.json                  |   2 +-
 docs/data-nav/readme.md                       |   2 +-
 docs/{base => getting-started}/i/files.png    | Bin
 docs/{base => getting-started}/info.json      |   2 +-
 docs/{base => getting-started}/readme.md      |  61 ++++++++++--------
 docs/migration/info.json                      |   2 +-
 docs/spec-ejs/info.json                       |   2 +-
 docs/spec-ejs/readme.md                       |   6 +-
 docs/spec-file/readme.md                      |   6 +-
 docs/spec-html-example/index.src.html         |   2 +-
 docs/spec-html/info.json                      |   2 +-
 docs/spec-json/info.json                      |   2 +-
 docs/spec-json/readme.md                      |   6 +-
 docs/spec-markdown-example/info.json          |   2 +-
 docs/spec-markdown-example/readme.md          |   2 +-
 docs/spec-markdown/info.json                  |   2 +-
 docs/test-specs/styles/includes/all-tags.html |  12 ++--
 docs/test-specs/styles/info.json              |   4 +-
 package.json                                  |  28 ++++----
 test/functional/globalNav.js                  |   2 +-
 test/functional/search.js                     |   6 +-
 test/functional/snippets.md                   |   4 +-
 test/unit/api/specs.js                        |   6 +-
 41 files changed, 123 insertions(+), 116 deletions(-)
 rename docs/{base => getting-started}/i/files.png (100%)
 rename docs/{base => getting-started}/info.json (55%)
 rename docs/{base => getting-started}/readme.md (78%)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 200926a..c736f58 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -16,7 +16,7 @@ Please read [this doc](MAINTAINING.md) for information on how we're running deve
 * [@SourceJS](https://twitter.com/SourceJS)
 * [Web site](http://sourcejs.com)
 * [General documentation](http://sourcejs.com/docs/)
-* [Quick Start guide](http://sourcejs.com/docs/base/)
+* [Quick Start guide](http://sourcejs.com/docs/getting-started/)
 * [More information on contributing](MAINTAINING.md)
 
 ## Team members
diff --git a/Gruntfile.js b/Gruntfile.js
index 2adab2d..f6ba48e 100755
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -40,7 +40,7 @@ module.exports = function(grunt) {
         banner:'/*!\n' +
                 '* SourceJS - Living Style Guides Engine and Integrated Maintenance Environment for Front-end Components.\n' +
                 '* @copyright 2013-2015 Sourcejs.com\n' +
-                '* @license MIT license: http://github.com/sourcejs/source/wiki/MIT-License\n' +
+                '* @license MIT license: http://github.com/sourcejs/sourcejs/wiki/MIT-License\n' +
                 '* */\n',
 
         // clean files after build
diff --git a/README.md b/README.md
index d773212..533d88f 100755
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
 
 **The most advanced tool for documenting, testing and managing Front-end Components achieving productive team work.**
 
-🚀 [**Quick Start**](http://sourcejs.com/docs/base)
+🚀 [**Quick Start**](http://sourcejs.com/docs/getting-started/)
 
 SourceJS powered workflow allows developers to **code new components directly in the documentation.** Combining web components development with documentation and team communication processes, makes SourceJS a powerful tool for Front-end developers and designers.
 
@@ -19,7 +19,7 @@ Our main goal is to provide flexible, modular environment for managing reusable
 ___
 
 
-[**Source engine project page**](http://sourcejs.com) &nbsp;&nbsp;&nbsp; [**Documentation**](http://sourcejs.com/docs) &nbsp;&nbsp;&nbsp; [**Examples**](http://sourcejs.com/docs/base/#examples) &nbsp;&nbsp;&nbsp;[**How-to's**](https://github.com/sourcejs/blog-howto)
+[**Source engine project page**](http://sourcejs.com) &nbsp;&nbsp;&nbsp; [**Documentation**](http://sourcejs.com/docs) &nbsp;&nbsp;&nbsp; [**Examples**](http://sourcejs.com/docs/getting-started/#examples) &nbsp;&nbsp;&nbsp;[**How-to's**](https://github.com/sourcejs/blog-howto)
 
 ___
 
@@ -52,22 +52,22 @@ If you notice some bugs, or need to help finding a better solution in your proce
 [Materials for presentations](https://github.com/sourcejs/pres).
 
 ## Updates
-* 20.09.15 [0.5.6](https://github.com/sourcejs/Source/releases/tag/0.5.6) and  [0.5.6-no-jsdom](https://github.com/sourcejs/Source/releases/tag/0.5.6-no-jsdom) with EJS helpers, NPM 3 support and navigation improvements
-* 16.08.15 [0.5.5](https://github.com/sourcejs/Source/releases/tag/0.5.5) and  [0.5.5-no-jsdom](https://github.com/sourcejs/Source/releases/tag/0.5.5-no-jsdom) patch release with `<markdown>` tag fix and set of functional tests
-* 15.08.15 [0.5.4](https://github.com/sourcejs/Source/releases/tag/0.5.4) and  [0.5.4-no-jsdom](https://github.com/sourcejs/Source/releases/tag/0.5.4-no-jsdom) with middleware loader, relative paths in navigation support and other improvements
-* 28.05.15 [0.5.3](https://github.com/sourcejs/Source/releases/tag/0.5.3) context options support, source-as-npm package, CI integration, watcher stability improvements and other great features
-* 28.05.15 [0.5.3-no-jsdom](https://github.com/sourcejs/Source/releases/tag/0.5.3-no-jsdom) special release without JSDom for Windows users
-* 15.04.15 [0.5.2](https://github.com/sourcejs/Source/releases/tag/0.5.2) patch release with improved markdown support and `index.src.html`
-* 28.03.15 [0.5.1](https://github.com/sourcejs/Source/releases/tag/0.5.1) patch release with EJS pre-rendering and various bugfixes
+* 20.09.15 [0.5.6](https://github.com/sourcejs/sourcejs/releases/tag/0.5.6) and  [0.5.6-no-jsdom](https://github.com/sourcejs/sourcejs/releases/tag/0.5.6-no-jsdom) with EJS helpers, NPM 3 support and navigation improvements
+* 16.08.15 [0.5.5](https://github.com/sourcejs/sourcejs/releases/tag/0.5.5) and  [0.5.5-no-jsdom](https://github.com/sourcejs/sourcejs/releases/tag/0.5.5-no-jsdom) patch release with `<markdown>` tag fix and set of functional tests
+* 15.08.15 [0.5.4](https://github.com/sourcejs/sourcejs/releases/tag/0.5.4) and  [0.5.4-no-jsdom](https://github.com/sourcejs/sourcejs/releases/tag/0.5.4-no-jsdom) with middleware loader, relative paths in navigation support and other improvements
+* 28.05.15 [0.5.3](https://github.com/sourcejs/sourcejs/releases/tag/0.5.3) context options support, source-as-npm package, CI integration, watcher stability improvements and other great features
+* 28.05.15 [0.5.3-no-jsdom](https://github.com/sourcejs/sourcejs/releases/tag/0.5.3-no-jsdom) special release without JSDom for Windows users
+* 15.04.15 [0.5.2](https://github.com/sourcejs/sourcejs/releases/tag/0.5.2) patch release with improved markdown support and `index.src.html`
+* 28.03.15 [0.5.1](https://github.com/sourcejs/sourcejs/releases/tag/0.5.1) patch release with EJS pre-rendering and various bugfixes
 * 28.03.15. SourceJS [Bootstrap example bundle](https://github.com/sourcejs/example-bootstrap-bundle) and [How-to articles blog](https://github.com/sourcejs/blog-howto)
 * 15.03.15. New example [Specs showcase](http://sourcejs.com/specs/) ([source code](https://github.com/sourcejs/example-specs-showcase))
 * 15.03.15. CSS Documentation support with [SourceJS DSS plugin](https://github.com/sourcejs/sourcejs-contrib-dss)
-* 12.03.15. **[0.5.0](https://github.com/sourcejs/Source/releases/tag/0.5.0) release** with full Markdown support, GitHub auth, `info.json` watchers and other improvements
-* 24.02.15. [0.4.1](https://github.com/sourcejs/Source/releases/tag/0.4.1) patch release
+* 12.03.15. **[0.5.0](https://github.com/sourcejs/sourcejs/releases/tag/0.5.0) release** with full Markdown support, GitHub auth, `info.json` watchers and other improvements
+* 24.02.15. [0.4.1](https://github.com/sourcejs/sourcejs/releases/tag/0.4.1) patch release
 * 05.02.15. Mentioned at in-depth [Style Guides Tools overview talk](http://youtu.be/Fr23VpM6wl4ds)
 * 18.01.15. Published an [intro video about SourceJS](http://youtu.be/y4KHmX8vCc0)
-* 07.01.15. **[0.4.0](https://github.com/sourcejs/Source/releases/tag/0.4.0) stable release.** From now, we move to fast, semantic release cycle. No globally breaking changes till 1.0.0
-* 08.10.14. 0.4.0-rc release, migration [instructions](https://github.com/sourcejs/Source/tree/master/docs/migration)
+* 07.01.15. **[0.4.0](https://github.com/sourcejs/sourcejs/releases/tag/0.4.0) stable release.** From now, we move to fast, semantic release cycle. No globally breaking changes till 1.0.0
+* 08.10.14. 0.4.0-rc release, migration [instructions](https://github.com/sourcejs/sourcejs/tree/master/docs/migration)
 * 01.08.14. [Video review](http://youtu.be/ukFeZnJjrLs?list=PL20zJcC2wnX7RY1CDrKLhSvYxEe6jtMbB) of SourceJS engine and workflow example (RU with EN subtitles)
 * 31.07.14. 0.4.0-beta release
 * 01.05.14. Engine presentation from [Front-end Ops Conf](http://www.feopsconf.com/), San Francisco - [Taking Development Tools To The Next Level](http://rhr.me/pres/ime/) with [video](https://www.youtube.com/watch?v=cMIad0zl00I)
@@ -102,4 +102,4 @@ ___
 
 Copyright © 2013-2015 [SourceJS](http://sourcejs.com)
 
-Licensed under [MIT License](http://en.wikipedia.org/wiki/MIT_License), read more at [license page](http://github.com/sourcejs/source/wiki/MIT-License).
+Licensed under [MIT License](http://en.wikipedia.org/wiki/MIT_License), read more at [license page](http://github.com/sourcejs/sourcejs/wiki/MIT-License).
diff --git a/app.js b/app.js
index e993d72..79b37be 100644
--- a/app.js
+++ b/app.js
@@ -1,7 +1,7 @@
 /*!
 * SourceJS - Living Style Guides Engine and Integrated Maintenance Environment for Front-end Components
 * @copyright 2013-2015 Sourcejs.com
-* @license MIT license: http://github.com/sourcejs/source/wiki/MIT-License
+* @license MIT license: http://github.com/sourcejs/sourcejs/wiki/MIT-License
 * */
 
 'use strict';
diff --git a/assets/css/source.css b/assets/css/source.css
index 987c70e..0700603 100644
--- a/assets/css/source.css
+++ b/assets/css/source.css
@@ -1,11 +1,11 @@
 /*!
 * SourceJS - Living Style Guides Engine and Integrated Maintenance Environment for Front-end Components
 * @copyright 2013-2015 SourceJS.com
-* @license MIT license: http://github.com/sourcejs/source/wiki/MIT-License
+* @license MIT license: http://github.com/sourcejs/sourcejs/wiki/MIT-License
 * */
 
 /* Default core styles */
 @import url('/source/assets/css/defaults.css');
 
 /* Users override */
-@import url('/assets/css/defaults.css');
\ No newline at end of file
+@import url('/assets/css/defaults.css');
diff --git a/assets/js/clarify.js b/assets/js/clarify.js
index 8170678..5f20293 100644
--- a/assets/js/clarify.js
+++ b/assets/js/clarify.js
@@ -1,7 +1,7 @@
 /*!
 * SourceJS - Front-end documentation engine
 * @copyright 2013-2015 Sourcejs.com
-* @license MIT license: http://github.com/sourcejs/source/wiki/MIT-License
+* @license MIT license: http://github.com/sourcejs/sourcejs/wiki/MIT-License
 * */
 
 sourcejs.amd.require([
diff --git a/assets/js/enter-the-source.js b/assets/js/enter-the-source.js
index 95f080f..e6ea264 100644
--- a/assets/js/enter-the-source.js
+++ b/assets/js/enter-the-source.js
@@ -1,7 +1,7 @@
 /*!
 * SourceJS - Front-end documentation engine
 * @copyright 2013-2015 Sourcejs.com
-* @license MIT license: http://github.com/sourcejs/source/wiki/MIT-License
+* @license MIT license: http://github.com/sourcejs/sourcejs/wiki/MIT-License
 * */
 
 sourcejs.amd.require([
diff --git a/assets/js/modules/utils.js b/assets/js/modules/utils.js
index 53e402e..d0cdaa6 100644
--- a/assets/js/modules/utils.js
+++ b/assets/js/modules/utils.js
@@ -69,7 +69,7 @@ sourcejs.amd.define([
         var pathToSpec = (function(){
             var path;
 
-            //specUrl is used from parseFileTree, and contains only path, without file like "/docs/spec"
+            //specUrl is used from parseFileTree, and contains only path, without file like "/docs/spec-html"
             if (typeof specUrlFromFileTree === 'undefined') {
                 path = window.location.pathname;
 
diff --git a/assets/test/js/tests.js b/assets/test/js/tests.js
index ee9b9d4..103532c 100644
--- a/assets/test/js/tests.js
+++ b/assets/test/js/tests.js
@@ -1,7 +1,7 @@
 /*!
  * SourceJS - Living Style Guides Engine and Integrated Maintenance Environment for Front-end Components
  * @copyright 2013-2015 Sourcejs.com
- * @license MIT license: http://github.com/sourcejs/source/wiki/MIT-License
+ * @license MIT license: http://github.com/sourcejs/sourcejs/wiki/MIT-License
  * */
 
 requirejs.config({
@@ -49,4 +49,4 @@ require(['jquery', 'jasmine-html'], function($, jasmine){
         });
     });
 
-});
\ No newline at end of file
+});
diff --git a/core/api/optionsApi.js b/core/api/optionsApi.js
index 27d9c60..3336e96 100644
--- a/core/api/optionsApi.js
+++ b/core/api/optionsApi.js
@@ -15,7 +15,7 @@ global.app.use('/api/options', function(req, res){
     // Legacy options root structure
     var assetsOptions = contextOptions.assets;
 
-    // TODO: https://github.com/sourcejs/Source/issues/142
+    // TODO: https://github.com/sourcejs/sourcejs/issues/142
     assetsOptions.plugins = contextOptions.plugins;
     assetsOptions.rendering = contextOptions.rendering;
     assetsOptions.specInfo = contextOptions.specInfo;
diff --git a/core/file-tree/index.js b/core/file-tree/index.js
index 6e9ffe5..8541405 100644
--- a/core/file-tree/index.js
+++ b/core/file-tree/index.js
@@ -47,7 +47,7 @@ if (Array.isArray(config.includedDirs)) {
 }
 
 /**
- * Prepare relative path for web usage (like `/docs/spec`, `/specs/btn`) out of absolute path
+ * Prepare relative path for web usage (like `/docs/spec-html`, `/specs/btn`) out of absolute path
  *
  * @param {String} path - absolute path to Spec directory or Spec file
  *
diff --git a/docs/api/load-events/info.json b/docs/api/load-events/info.json
index 453ae79..f529bac 100644
--- a/docs/api/load-events/info.json
+++ b/docs/api/load-events/info.json
@@ -1,5 +1,5 @@
 {
     "tag": ["events", "spec", "loaded"],
-    "title": "Spec Load Event",
+    "title": "Spec load event",
     "template": "doc"
 }
diff --git a/docs/api/plugins/info.json b/docs/api/plugins/info.json
index a11e136..19a4459 100644
--- a/docs/api/plugins/info.json
+++ b/docs/api/plugins/info.json
@@ -1,5 +1,5 @@
 {
     "tag": ["plugins", "middlewares"],
-    "title": "Writing SourceJS Plugins and Middlewares",
+    "title": "Writing SourceJS plugins and middlewares",
     "template": "doc"
 }
diff --git a/docs/auth/info.json b/docs/auth/info.json
index 5665389..7b378fd 100644
--- a/docs/auth/info.json
+++ b/docs/auth/info.json
@@ -1,5 +1,5 @@
 {
     "tag": ["auth", "github", "advanced"],
-    "title": "Using Github Auth",
+    "title": "Using Github auth",
     "template": "doc"
 }
diff --git a/docs/auth/readme.md b/docs/auth/readme.md
index 35bab54..d8c6d53 100644
--- a/docs/auth/readme.md
+++ b/docs/auth/readme.md
@@ -2,7 +2,7 @@
 
 Before you start, please make sure that you have referenced GitHub App registered. Please visit [this link](https://developer.github.com/guides/basics-of-authentication/#registering-your-app) to get more information.
 
-If you allready have registered app replace existed github api key and secret into your local options file, as mentioned [here](/docs/base/#5!).
+If you already have registered app replace existed github api key and secret into your local options file, as mentioned [here](/docs/getting-started/#5!).
 
 Values, given below, are created as a demo. They are usable for [local instance](http://127.0.0.1:8080) at `127.0.0.1:8080`
 
@@ -33,7 +33,7 @@ Auth uses `js-hook` and `source_login` classes for targeting. This hook is defin
 
 ## Auth configuration
 
-Auth configuration is available from your instance [options](/docs/base/#configuration), as it was mentioned above. Here's few of available options:
+Auth configuration is available from your instance [options](/docs/getting-started/#configuration), as it was mentioned above. Here's few of available options:
 
 ```js
 // localStorage key for client-side user object
@@ -66,4 +66,4 @@ Both server-side and client-side auth parts are able to use from other modules.
 
 Server-side part provides [The everyauth](https://github.com/bnoguchi/everyauth) API whitch it is based on. Also there are methods either to get or to set GitHub user into temporary users storage.
 
-Client-side part allows to login/logout using Github, to check if user is logined and to get user data.
\ No newline at end of file
+Client-side part allows to login/logout using Github, to check if user is logined and to get user data.
diff --git a/docs/build-tasks/info.json b/docs/build-tasks/info.json
index 38f17ca..ca0eaab 100644
--- a/docs/build-tasks/info.json
+++ b/docs/build-tasks/info.json
@@ -1,5 +1,5 @@
 {
-    "title": "Developing SourceJS: Build Tasks",
+    "title": "Developing SourceJS: Build tasks",
     "template": "doc",
     "tag": ["advanced"]
 }
diff --git a/docs/clarify/info.json b/docs/clarify/info.json
index 231cc6b..134273a 100644
--- a/docs/clarify/info.json
+++ b/docs/clarify/info.json
@@ -1,5 +1,5 @@
 {
-    "title": "Clarify - Spec Section Testing Environment",
+    "title": "Clarify - spec section testing environment",
     "template": "doc",
     "tag": ["details"]
 }
diff --git a/docs/clarify/readme.md b/docs/clarify/readme.md
index 0346c87..5bc26d2 100644
--- a/docs/clarify/readme.md
+++ b/docs/clarify/readme.md
@@ -5,14 +5,14 @@ SourceJS middleware, that allows to open separate documentation examples in cust
 Clarify is an [expressJS](http://expressjs.com/) middleware built into SourceJS engine. Easy configurable through URL parameters in Spec pages:
 
 ```html
-http://localhost:8080/docs/spec/?clarify=true&sections=1.1
+http://localhost:8080/docs/spec-html/?clarify=true&sections=1.1
 ```
 
 When enabled, Clarify uses [Cheerio](https://github.com/cheeriojs/cheerio) for getting specified sections and wrap them in pre-defined or user templates. If you're using SourceJS HTML API, Clarify can be configured to take data directly from API storage as well.
 
 Clarify page is enhanced with helper panel, where you can chose any option available:
 
-[<img src="i/clarify.png" alt="image" style="margin-left: -57px;">](/docs/spec/?clarify=true&sections=1.1)
+[<img src="i/clarify.png" alt="image" style="margin-left: -57px;">](/docs/spec-html/?clarify=true&sections=1.1)
 
 ## List of parameters
 
@@ -25,7 +25,7 @@ Clarify page is enhanced with helper panel, where you can chose any option avail
 | nojs | Boolean | false | Turn on and off JS injection from the Spec. |
 | tpl | template-name | default | Define EJS template name to render sections. Templates are defined in `core/views/clarify/` and `user/core/views/clarify/`, user templates overrides core. |
 
-To play around with available URL params, open [Clarify page](/docs/spec/?clarify=true&sections=1.1) and fill the helpers form below.
+To play around with available URL params, open [Clarify page](/docs/spec-html/?clarify=true&sections=1.1) and fill the helpers form below.
 
 ## Use cases
 
@@ -36,4 +36,4 @@ Clarify is covering wide range of use cases:
 * Focusing on single example during development
 * Isoleted page for automated testing
 * Responsive design testing
-* Fast transfer of code examples to templates
\ No newline at end of file
+* Fast transfer of code examples to templates
diff --git a/docs/configuration/info.json b/docs/configuration/info.json
index 1ebc864..41cde8b 100644
--- a/docs/configuration/info.json
+++ b/docs/configuration/info.json
@@ -1,5 +1,5 @@
 {
-    "title": "Engine Configuration",
+    "title": "Engine configuration",
     "tag": ["options", "options.js", "sourcejs-options", "context"],
     "template": "doc"
 }
diff --git a/docs/data-nav/readme.md b/docs/data-nav/readme.md
index c5035f4..f018eb3 100644
--- a/docs/data-nav/readme.md
+++ b/docs/data-nav/readme.md
@@ -65,7 +65,7 @@ If there is no description, or you want to leave custom text, just use this extr
 
 ## Filtering by tag
 
-As it's possible to define different tags for specs in `info.json` [files](/docs/info-json/)), they can be used for filtering custom navigation collection.
+As it's possible to define different tags for specs in `info.json` [files](/docs/spec-json/)), they can be used for filtering custom navigation collection.
 
 
 ```html
diff --git a/docs/base/i/files.png b/docs/getting-started/i/files.png
similarity index 100%
rename from docs/base/i/files.png
rename to docs/getting-started/i/files.png
diff --git a/docs/base/info.json b/docs/getting-started/info.json
similarity index 55%
rename from docs/base/info.json
rename to docs/getting-started/info.json
index e6e59a3..017c0c7 100644
--- a/docs/base/info.json
+++ b/docs/getting-started/info.json
@@ -1,5 +1,5 @@
 {
-    "title": "Main Engine Documentation",
+    "title": "Getting started with SourceJS",
     "template": "doc",
     "tag": ["getting-started"]
 }
diff --git a/docs/base/readme.md b/docs/getting-started/readme.md
similarity index 78%
rename from docs/base/readme.md
rename to docs/getting-started/readme.md
index 966f952..7549fec 100644
--- a/docs/base/readme.md
+++ b/docs/getting-started/readme.md
@@ -4,20 +4,25 @@ SourceJS documentation is rendered by the engine itself and is shipped together
 
 ## Install
 
-Before you start, please make sure that [Git](http://git-scm.com/downloads) and [Node.js](http://nodejs.org/download/) are already installed on your system. Then install these NMP packages:
-
 [![npm version](https://badge.fury.io/js/sourcejs.svg)](http://badge.fury.io/js/sourcejs)
 
-To install SourceJS, first clone clean `user` configuration folder and then execute `npm install`.
+Before you start, please make sure that [Git](http://git-scm.com/downloads) and [Node.js](https://nodejs.org/en/download/) are already installed on your system. Then install these NMP packages:
 
-TODO
+To install SourceJS, first clone clean `user` configuration folder and then execute `npm install`.
 
 ```bash
-git clone https://github.com/sourcejs/init.git -b npm my-sourcejs && cd my-sourcejs
+git clone https://github.com/sourcejs/init.git my-sourcejs && cd my-sourcejs
 npm install sourcejs --save
 npm start
 ```
 
+The starting project at `sourcejs/init` repo should be treated only as a bootsrap example, and simple project setup reference. The most minimal setup of SourceJS may look like this:
+
+```bash
+npm install sourcejs@0.6.0-nightly.7
+node ./node_modules/sourcejs/app.js
+```
+
 ## Commands
 
 ### Run
@@ -36,18 +41,6 @@ Other configuration arguments are described in the help section:
 npm start -- -h
 ```
 
-### Build
-
-TODO : this should no longer be nessesary
-
-During the initial set-up, generator will build everything for you. To re-build the engine, run this command:
-
-```bash
-npm run build
-```
-
-It will trigger `npm i` and default build task for updating dependencies and building SourceJS assets. See the full list of [all build tasks available](/docs/build-tasks).
-
 ### Update
 
 To check for updates for all NPM modules run this command:
@@ -58,7 +51,7 @@ npm outdated
 
 This will list all outdated packages. If a new version of SourceJS is availeble, it will be listed.
 
-It's possible to update the version number in your `package.json` file manually, but it's easier to install [npm check updates](https://www.npmjs.org/package/npm-check-updates):
+It's possible to update the version number in your `package.json` file manually, but it's easier to install [npm check updates](https://github.com/tjunnone/npm-check-updates):
 
 ```bash
 npm install -g npm-check-updates
@@ -67,19 +60,19 @@ npm-check-updates -u sourcejs
 
 ## Creating First Spec
 
-Specs are the main content files in SourceJS engine, in them you define all your component description and UI code for rendered examples. Originally we use `*.src.html` and `*.md` file templates with custom flavoured syntax. It is also possible to configure other technologies for writing Specs using plugins like [Jade](https://github.com/sourcejs/sourcejs-jade).
+Specs are the main content files in SourceJS engine, in them you define all your component description and UI code for rendered examples. Originally we use `*.src.html` and `*.md` file templates with custom flavoured syntax. It is also possible to configure other technologies for writing Specs using plugins like [sourcejs-jade](https://github.com/sourcejs/sourcejs-jade).
 
 We treat Spec files as an interface, you can construct Spec page in many ways following only few simple rules. Each Spec folder must contain `info.json` with it's meta information and SourceJS compliant markup file. As an essential markup, engine requires only few hooks like `.source_section`, `.source_example` to define content sections and the rest is plain semantic HTML.
 
 ### Spec Starting Template
 
-The starting template for new Spec pages can be found in `sourcejs/docs/starting` folder. Copy the contents to a new folder in `source/user/specs` and you'll be ready to write a new spec.
+The starting templates for officially supported Spec page extensions can be found in `sourcejs/docs/spec-html-example` and `sourcejs/docs/spec-markdown-example` folders. Copy the contents to a new folder in `source/user/specs` and you'll be ready to write a new spec.
 
-[Check the SourceJS Spec page documentation.](/docs/spec)
+[Check Spec page documentation for more details.](/docs/spec-file/)
 
 ### Server-side Templating Engines
 
-As we mentioned before, it's also possible to use *other* server-side templating engines like Jade. You need to create a SourceJS middleware that will perform the rendering. Our [sourcjejs-jade Middleware](https://github.com/sourcejs/sourcejs-jade) may serve as an example of such middleware.
+As we mentioned before, it's also possible to use *other* server-side templating engines like Jade. You need to create a SourceJS middleware that will perform the rendering. Our [sourcejs-jade Middleware](https://github.com/sourcejs/sourcejs-jade) may serve as an example of such middleware.
 
 By default all files are pre-processed with [EJS](http://ejs.co/), so you're free to use custom EJS features, which is basicly most JavaScript:
 
@@ -101,7 +94,7 @@ And you can even use includes: a very useful EJS feature:
 &lt;%- include('filename.ejs', {info: info}) %&gt;
 ```
 
-[Read more about Spec page generation helpers.](/docs/spec-helpers)
+[Read more about Spec page generation helpers.](/docs/spec-ejs/)
 
 ### Client-side Templating Engines
 
@@ -111,7 +104,7 @@ Remember, SourceJS Specs are a simple static pages, that are then enchanted with
 
 ## Examples
 
-Main project site: [sourcejs.com](http://sourcejs.com) is based on SourceJS platform, as well as all documentation that you're surfing right now. Engine docs are both viewable on [GitHub](https://github.com/sourcejs/Source/tree/master/docs) and in SourceJS environment.
+Main project site: [sourcejs.com](http://sourcejs.com) is based on SourceJS platform, as well as all documentation that you're surfing right now. Engine docs are both viewable on [GitHub](https://github.com/sourcejs/sourcejs/tree/master/docs) and in SourceJS environment.
 
 ### Specs Showcase
 
@@ -119,7 +112,7 @@ Highlighting the variety of different ways for organizing Spec pages we gathered
 
 Showcase includes both native Specs examples, and ones that are rendered with plugins like [sourcejs-contrib-dss](http://github.com/sourcejs/sourcejs-contrib-dss) and [sourcejs-jade](http://github.com/sourcejs/sourcejs-jade).
 
-[Also check the SourceJS Spec page documentation.](/docs/spec)
+[Also check the SourceJS Spec page documentation.](/docs/spec-html/)
 
 ### Bootstrap Bundle
 
@@ -142,7 +135,7 @@ To get more insights about recommended workflow within Style Guide platform chec
 
 SourceJS engine is highly configurable. Engine and plugins are configured in 1 place:: `options.js`.
 
-With version 0.5.3 we also introduced context level options `sourcejs-options.js`, which allows to configure any catalog specifically for your needs. Read more about it, and other configuration capabilities in [Engine Configuration](/docs/configuration) doc.
+With version 0.5.3 we also introduced context level options `sourcejs-options.js`, which allows to configure any catalog specifically for your needs. Read more about it, and other configuration capabilities in [Engine configuration](/docs/configuration) doc.
 
 ## Plugins
 
@@ -193,9 +186,23 @@ Follow [this guide](/docs/api/plugins) to learn how to develop own plugins for S
 
 If you have created your own middleware, please let us know! If you'd like to add your middleware to the list above, or you can submit a Pull-Request.
 
+## Developing SourceJS
+
+With future versions, all the build dependencies would be removed from distributed version, so in case you need to edit the engine, please [clone the project](https://github.com/sourcejs/sourcejs) from sources.
+
+### Commands
+
+During the `sourcejs` npm dependency setup, post-install will build everything for you. To re-build the engine assets in case of any changes done in `sourcejs` itself, run this command from project root:
+
+```bash
+npm run build-source
+```
+
+For other internal build commands, please reffer to [Build Tasks](/docs/build-tasks) document.
+
 ## Contact us
 
-Leave your questions and feedback as [issues](https://github.com/sourcejs/Source/issues) on GitHub or [request a consultation](mailto:r@rhr.me) from SourceJS founders.
+Leave your questions and feedback as [issues](https://github.com/sourcejs/sourcejs/issues) on GitHub or [request a consultation](mailto:r@rhr.me) from SourceJS founders.
 
 If you have any quick questions, or want to share your experience working with SourceJS, drop us a message in Gitter chat:
 
diff --git a/docs/migration/info.json b/docs/migration/info.json
index 2433de7..beef2b3 100644
--- a/docs/migration/info.json
+++ b/docs/migration/info.json
@@ -1,5 +1,5 @@
 {
-    "title": "Migration Notes",
+    "title": "Migration notes",
     "template": "doc",
     "tag": ["other"]
 }
diff --git a/docs/spec-ejs/info.json b/docs/spec-ejs/info.json
index fcd2ec3..2e56429 100644
--- a/docs/spec-ejs/info.json
+++ b/docs/spec-ejs/info.json
@@ -1,5 +1,5 @@
 {
     "tag": ["ejs", "include", "spec markup", "details"],
-    "title": "Creating Specs: Spec File as EJS",
+    "title": "Creating specs: Using EJS templating helpers",
     "template": "doc"
 }
diff --git a/docs/spec-ejs/readme.md b/docs/spec-ejs/readme.md
index e3258b5..35a191f 100644
--- a/docs/spec-ejs/readme.md
+++ b/docs/spec-ejs/readme.md
@@ -6,7 +6,7 @@ SourceJS uses powerful [EJS](http://ejs.co/) templating engine for core UI gener
 <​% if (info.title === 'Title') {% ​> Action! <​% } %​>
 ```
 
-Use plain JavaScript for managing conditions and generating demo content through data loops. All `info.json` file contents are by default available in each Spec scope. Apart from common [meta information](/docs/info-json) available in `info.json` files, it's possible to set any of your own custom data.
+Use plain JavaScript for managing conditions and generating demo content through data loops. All `info.json` file contents are by default available in each Spec scope. Apart from common [meta information](/docs/spec-json/) available in `info.json` files, it's possible to set any of your own custom data.
 
 ```html
 <​h2​><​%- info.title %​><​/h2​>
@@ -40,7 +40,7 @@ Providing a relative path to current Specs, it's easy to include any file.
 
 Note that by default, SourceJS restricts including files outside project directory for security reasons. To disable this restrictions, change `core.sandboxIncludes` configuration.
 
-<a href="https://github.com/sourcejs/Source/tree/master/docs/spec-helpers/examples" class="source_a_hl">View examples source code.</a>
+<a href="https://github.com/sourcejs/sourcejs/tree/master/docs/spec-helpers/examples" class="source_a_hl">View examples source code.</a>
 
 
 ## EJS Custom Helpers
@@ -72,7 +72,7 @@ Feel free to create Pull Requests with a wider set of helpers.
 <%- includeFiles('examples/mask-*.html') %>
 ```
 
-<a href="https://github.com/sourcejs/Source/tree/master/docs/spec-helpers/examples" class="source_a_hl">View examples source code.</a>
+<a href="https://github.com/sourcejs/sourcejs/tree/master/docs/spec-helpers/examples" class="source_a_hl">View examples source code.</a>
 
 ## Extended features
 
diff --git a/docs/spec-file/readme.md b/docs/spec-file/readme.md
index 18c37e2..8e6a33c 100644
--- a/docs/spec-file/readme.md
+++ b/docs/spec-file/readme.md
@@ -6,9 +6,9 @@ Spec pages in SourceJS engine are the main content units. They provide a proper
 
 Out of the box you've got 3 options on how you can write your spec pages. Choose whichever makes your development process as easy as possible
 
-* [HTML](/docs/spec-html)
-* [Markdown](/docs/spec-markdown)
-* [EJS](/docs/spec-ejs)
+* [HTML](/docs/spec-html/)
+* [Markdown](/docs/spec-markdown/)
+* [EJS](/docs/spec-ejs/)
 
 These 3 options are not mutually exclusive, on a single spec page, you can use all 3!
 
diff --git a/docs/spec-html-example/index.src.html b/docs/spec-html-example/index.src.html
index ed30b69..6ba329c 100755
--- a/docs/spec-html-example/index.src.html
+++ b/docs/spec-html-example/index.src.html
@@ -14,7 +14,7 @@ <h1>Starting Spec Page Template</h1>
 <section class="source_section">
     <h2>Spec Section Heading</h2>
 
-    <a class="source_a_hl" href="/docs/spec">Spec Page Documentation</a>
+    <a class="source_a_hl" href="/docs/spec-file/">Spec Page Documentation</a>
 
     <p>Useful notes.</p>
 
diff --git a/docs/spec-html/info.json b/docs/spec-html/info.json
index 7dbca2c..1f3f281 100644
--- a/docs/spec-html/info.json
+++ b/docs/spec-html/info.json
@@ -1,5 +1,5 @@
 {
     "tag": ["create spec", "spec markup", "details"],
     "template": "doc",
-    "title": "Creating Specs: Spec File as HTML"
+    "title": "Creating specs: Spec file as HTML"
 }
diff --git a/docs/spec-json/info.json b/docs/spec-json/info.json
index 6c98942..53ff386 100644
--- a/docs/spec-json/info.json
+++ b/docs/spec-json/info.json
@@ -1,5 +1,5 @@
 {
-    "title": "Creating Specs: Info.json File",
+    "title": "Creating specs: info.json file",
     "tag": ["tag", "title", "thumbnailPath", "specFile", "template", "role", "info", "spec meta", "details"],
     "template": "doc"
 }
diff --git a/docs/spec-json/readme.md b/docs/spec-json/readme.md
index af8c82b..704158d 100644
--- a/docs/spec-json/readme.md
+++ b/docs/spec-json/readme.md
@@ -46,13 +46,13 @@ List of options in `info.json` (example):
 
 `sourcejs` - this field accepts a local configuration object for configuring spec level context options.
 
-Read more about engine configuration capabilities in [Engine Configuration](/docs/configuration) doc.
+Read more about engine configuration capabilities in [Engine configuration](/docs/configuration/) doc.
 
 ## Custom options / properties
 
-Feel free to add **any** custom meta information to `info.json` file for your needs as well. This info will be then available from [Spec API](/docs/api), in middleware-plugins (`req.specData.info`).
+Feel free to add **any** custom meta information to `info.json` file for your needs as well. This info will be then available from [Spec API](/docs/api/), in middleware-plugins (`req.specData.info`).
 
-It will also be availeble to [EJS](/docs/spec-ejs) during spec rendering:
+It will also be available to [EJS](/docs/spec-ejs/) during spec rendering:
 
 ```js
 {
diff --git a/docs/spec-markdown-example/info.json b/docs/spec-markdown-example/info.json
index 7fb4970..95cfdb7 100644
--- a/docs/spec-markdown-example/info.json
+++ b/docs/spec-markdown-example/info.json
@@ -1,5 +1,5 @@
 {
     "author": "Spec author",
-    "title": "Markdown Spec Page Template",
+    "title": "Markdown spec page template",
     "tag": ["templates"]
 }
diff --git a/docs/spec-markdown-example/readme.md b/docs/spec-markdown-example/readme.md
index 1c23071..715e3c4 100755
--- a/docs/spec-markdown-example/readme.md
+++ b/docs/spec-markdown-example/readme.md
@@ -9,7 +9,7 @@ Useful information regarding this spec can be left for your team members here.
 
 ## Spec Section Heading
 
-[Spec Page Documentation](/docs/spec)
+[Spec Page Documentation](/docs/spec-file/)
 
 Useful notes.
 
diff --git a/docs/spec-markdown/info.json b/docs/spec-markdown/info.json
index 0625098..ee7f840 100644
--- a/docs/spec-markdown/info.json
+++ b/docs/spec-markdown/info.json
@@ -1,5 +1,5 @@
 {
-  "title": "Creating Specs: Spec File as Markdown",
+  "title": "Creating specs: Spec file as Markdown",
   "tag": ["create spec", "spec markup", "details"],
   "template": "doc"
 }
diff --git a/docs/test-specs/styles/includes/all-tags.html b/docs/test-specs/styles/includes/all-tags.html
index 21bca27..734d87f 100644
--- a/docs/test-specs/styles/includes/all-tags.html
+++ b/docs/test-specs/styles/includes/all-tags.html
@@ -1,17 +1,17 @@
-Some text <a href="/docs/base#creating-first-spec">some link</a>. <strong>Strong</strong>, <b>b</b>, <em>em</em>, <i>i</i>, <s>s</s>.
+Some text <a href="/docs/getting-started/#creating-first-spec">some link</a>. <strong>Strong</strong>, <b>b</b>, <em>em</em>, <i>i</i>, <s>s</s>.
 
-<p>In text in P tag <a href="/docs/base#creating-first-spec">some link</a>. Some text <a href="/docs/base#creating-first-spec">some link</a>. <strong>Strong</strong>, <b>b</b>, <em>em</em>, <i>i</i>, <s>s</s>.</p>
+<p>In text in P tag <a href="/docs/getting-started/#creating-first-spec">some link</a>. Some text <a href="/docs/getting-started/#creating-first-spec">some link</a>. <strong>Strong</strong>, <b>b</b>, <em>em</em>, <i>i</i>, <s>s</s>.</p>
 
 <ul>
     <li>List 1</li>
-    <li>List 2 <a href="/docs/base#creating-first-spec">short guide</a></li>
+    <li>List 2 <a href="/docs/getting-started/#creating-first-spec">short guide</a></li>
     <li>List 3 - Long text Lorem ipsum dolor sit amet, consectetur adipiscing elit. At tu eadem ista dic in iudicio aut, si coronam times, dic in senatu. Aliter enim explicari, quod quaeritur, non potest. Quid, quod res alia tota est?</li>
     <li>List 4</li>
 </ul>
 
 <ol>
     <li>List 1</li>
-    <li>List 2 <a href="/docs/base#creating-first-spec">short guide</a></li>
+    <li>List 2 <a href="/docs/getting-started/#creating-first-spec">short guide</a></li>
     <li>List 3 - Long text Lorem ipsum dolor sit amet, consectetur adipiscing elit. At tu eadem ista dic in iudicio aut, si coronam times, dic in senatu. Aliter enim explicari, quod quaeritur, non potest. Quid, quod res alia tota est?</li>
     <li>List 4</li>
 </ol>
@@ -29,7 +29,7 @@
     <tbody>
     <tr>
         <td>widget-estatement</td>
-        <td style="text-align:center"><a href="/docs/base#creating-first-spec">short guide</a></td>
+        <td style="text-align:center"><a href="/docs/getting-started/#creating-first-spec">short guide</a></td>
         <td style="text-align:right">launchpad</td>
     </tr>
     </tbody>
@@ -43,4 +43,4 @@
 
 <p>
     <code>code in div</code>
-</p>
\ No newline at end of file
+</p>
diff --git a/docs/test-specs/styles/info.json b/docs/test-specs/styles/info.json
index b6ee913..ec5c6dd 100644
--- a/docs/test-specs/styles/info.json
+++ b/docs/test-specs/styles/info.json
@@ -1,5 +1,5 @@
 {
     "template": "doc",
-    "title": "Spec Styles Test Page (кириллица)",
+    "title": "Spec styles test page (кириллица)",
     "tag": ["hidden"]
-}
\ No newline at end of file
+}
diff --git a/package.json b/package.json
index 72608b6..d900dd8 100644
--- a/package.json
+++ b/package.json
@@ -11,6 +11,20 @@
     "type": "git",
     "url": "https://github.com/sourcejs/Source.git"
   },
+  "scripts": {
+    "postinstall": "grunt update && node ./core/trackInstall",
+    "build": "grunt update",
+    "build:prod": "grunt build",
+    "lint": "grunt jshint",
+    "start": "node app",
+    "watch": "grunt watch-all",
+    "watch:css": "grunt watch-css",
+    "test": "grunt ci-pre-run && node app.js --test",
+    "test:unit": "grunt test",
+    "test:func": "grunt test-func",
+    "ci-test": "grunt ci-pre-run && node app.js --test --log trace",
+    "ci-test-win": "grunt ci-pre-run && node app.js --post-grunt ci-post-run-win --test --log trace --no-watch"
+  },
   "dependencies": {
     "body-parser": "^1.14.1",
     "cheerio": "^0.20.0",
@@ -53,20 +67,6 @@
     "tinyforever": "0.0.3",
     "universal-analytics": "^0.3.11"
   },
-  "scripts": {
-    "postinstall": "grunt update && node ./core/trackInstall",
-    "build": "grunt update",
-    "build:prod": "grunt build",
-    "lint": "grunt jshint",
-    "start": "node app",
-    "watch": "grunt watch-all",
-    "watch:css": "grunt watch-css",
-    "test": "grunt ci-pre-run && node app.js --test",
-    "test:unit": "grunt test",
-    "test:func": "grunt test-func",
-    "ci-test": "grunt ci-pre-run && node app.js --test --log trace",
-    "ci-test-win": "grunt ci-pre-run && node app.js --post-grunt ci-post-run-win --test --log trace --no-watch"
-  },
   "devDependencies": {
     "assert": "^1.3.0",
     "chai": "^3.2.0",
diff --git a/test/functional/globalNav.js b/test/functional/globalNav.js
index 1665e99..fb5fd91 100644
--- a/test/functional/globalNav.js
+++ b/test/functional/globalNav.js
@@ -16,7 +16,7 @@ casper.test.begin('Check navigaton page', 3, function suite(test) {
 
                 test.assertEval(function (nav) {
                     return (
-                        !!document.querySelector(nav + ' .source_catalog_a[href="/docs/base"]') &&
+                        !!document.querySelector(nav + ' .source_catalog_a[href="/docs/getting-started"]') &&
                         !!document.querySelector(nav + ' .source_catalog_a[href="/docs/spec-file"]') &&
                         !!document.querySelector(nav + ' .source_catalog_a[href="/docs/spec-json"]') &&
                         !!document.querySelector(nav + ' .source_catalog_a[href="/docs/spec-html"]') &&
diff --git a/test/functional/search.js b/test/functional/search.js
index e11aed3..d400a1d 100644
--- a/test/functional/search.js
+++ b/test/functional/search.js
@@ -14,7 +14,7 @@ casper.test.begin('Checking search', 3, function suite(test) {
 
         this.waitForSelector(searchField,
             function pass() {
-                casper.sendKeys(searchField, 'main', {keepFocus: true});
+                casper.sendKeys(searchField, 'getting started', {keepFocus: true});
 
                 _this.waitForSelector(autoComplete,
                     function pass() {
@@ -34,12 +34,12 @@ casper.test.begin('Checking search', 3, function suite(test) {
 
         this.waitFor(
             function check() {
-                return (this.getCurrentUrl() === url+'/docs/base/');
+                return (this.getCurrentUrl() === url+'/docs/getting-started/');
             },
             function then() { // step to execute when check() is ok
                 test.assertExists('.source_main > h1', 'Spec header exists');
 
-                test.assertEquals(this.getCurrentUrl(), url+'/docs/base/', 'New page URL is right')
+                test.assertEquals(this.getCurrentUrl(), url+'/docs/getting-started/', 'New page URL is right')
             },
             function timeout() { // step to execute if check has failed
                 this.echo('Failed to navigate to search result');
diff --git a/test/functional/snippets.md b/test/functional/snippets.md
index 44dd4ad..52a6ab3 100644
--- a/test/functional/snippets.md
+++ b/test/functional/snippets.md
@@ -34,12 +34,12 @@ _this.waitForSelector(autoComplete,
 
 this.waitFor(
     function check() {
-        return (this.getCurrentUrl() === url+'/docs/base/');
+        return (this.getCurrentUrl() === url+'/docs/getting-started/');
     },
     function then() { // step to execute when check() is ok
         test.assertExists('.source_main > h1', 'Spec header exists');
 
-        test.assertEquals(this.getCurrentUrl(), url+'/docs/base/', 'New page URL is right')
+        test.assertEquals(this.getCurrentUrl(), url+'/docs/getting-started/', 'New page URL is right')
     },
     function timeout() { // step to execute if check has failed
         this.echo('Failed to navigate to search result');
diff --git a/test/unit/api/specs.js b/test/unit/api/specs.js
index 897e092..418848f 100644
--- a/test/unit/api/specs.js
+++ b/test/unit/api/specs.js
@@ -20,12 +20,12 @@ describe('Internal API tests', function () {
         it('should return list of specs', function (done) {
             var data = parseSpecs.getAll();
 
-            data.should.have.property('docs/base');
+            data.should.have.property('docs/getting-started');
             done();
         });
 
         it('should return spec by ID', function (done) {
-            var data = parseSpecs.getByID('docs/base');
+            var data = parseSpecs.getByID('docs/getting-started');
 
             data.should.have.property('url');
             done();
@@ -51,7 +51,7 @@ describe('API test /api/specs', function () {
                     }
 
                     res.should.be.json;
-                    res.body.should.have.property('docs/base');
+                    res.body.should.have.property('docs/getting-started');
                     done();
                 });
         });

From 3bb384a0caa717b3b518f7630e7c022d36b7b5ee Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Wed, 18 Jan 2017 18:00:28 +0100
Subject: [PATCH 102/104] add deprecation warning about nested user structure
 and node version support

---
 core/file-tree/index.js  | 5 +++++
 docs/migration/readme.md | 3 ++-
 package.json             | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/core/file-tree/index.js b/core/file-tree/index.js
index 8541405..52bd72d 100644
--- a/core/file-tree/index.js
+++ b/core/file-tree/index.js
@@ -171,6 +171,11 @@ var fileTree = function(workingDir) {
     if (!fs.existsSync(workingDir) && workingDir === config.specsRoot) {
         global.log.warn('Running SourceJS without user dir. This set-up should be used only for running tests.');
         workingDir = normalizedPathToApp;
+    } else {
+        // TODO:clear with 0.7 version
+        if (!global.isNodeModule) {
+            global.log.error('Deprecation warning: since next version, running SourceJS with nested user folder structure scenario (not as an npm dependency) will be no longer supported.');
+        }
     }
 
     var files = globArray(glob, {
diff --git a/docs/migration/readme.md b/docs/migration/readme.md
index 6fc73af..ce93ca1 100644
--- a/docs/migration/readme.md
+++ b/docs/migration/readme.md
@@ -2,7 +2,8 @@ Here you will find migration instructions from different Source versions
 
 ## From 0.5.x to 0.6.x
 
-* It's not recommended to install and use SourceJS as a npm dependency, installation via cloning is deprecated and will be removed in the next version.
+* It's now recommended to install and use SourceJS only as a npm dependency, installation via cloning and nested project structure (`sourcejs/user`) is deprecated and will be no more supported in further versions
+* Since SourceJS 0.6.0 we officially support only Node v6+, further project releases will drop support for older versions
 
 ## From 0.4.0-beta to 0.4.0-rc
 
diff --git a/package.json b/package.json
index d900dd8..43866d5 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
   "version": "0.6.0-dev",
   "license": "MIT",
   "engines": {
-    "node": ">=0.10.0"
+    "node": ">=6"
   },
   "repository": {
     "type": "git",

From 445a10851a749bf0774479a17045c6f757135b33 Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Wed, 18 Jan 2017 18:16:21 +0100
Subject: [PATCH 103/104] update minor deps

---
 package.json | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index 43866d5..cfb99af 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,7 @@
   },
   "dependencies": {
     "body-parser": "^1.14.1",
-    "cheerio": "^0.20.0",
+    "cheerio": "^0.22.0",
     "colors": "^1.1.2",
     "commander": "^2.8.1",
     "compression": "^1.6.1",
@@ -38,7 +38,7 @@
     "express": "^4.13.3",
     "express-interceptor": "^1.2.0",
     "express-session": "^1.10.2",
-    "fs-extra": "^0.30.0",
+    "fs-extra": "^2.0.0",
     "fs-finder": "operatino/node-fs-finder#fix-windows-find-up",
     "glob": "^7.0.3",
     "grunt": "~1.0.1",
@@ -48,14 +48,14 @@
     "grunt-contrib-copy": "^1.0.0",
     "grunt-contrib-less": "^1.2.0",
     "grunt-contrib-cssmin": "^1.0.1",
-    "grunt-contrib-htmlmin": "^1.1.0",
-    "grunt-contrib-uglify": "^1.0.1",
+    "grunt-contrib-htmlmin": "^2.1.0",
+    "grunt-contrib-uglify": "^2.0.0",
     "grunt-newer": "^1.1.2",
     "gulp-watch": "operatino/gulp-watch#4.3.5-latest-fsevents",
     "load-grunt-parent-tasks": "^0.1.1",
     "load-grunt-tasks": "^3.3.0",
     "lodash": "^4.6.1",
-    "log4js": "~0.6.20",
+    "log4js": "~1.1.0",
     "macaddress": "^0.2.8",
     "marked": "^0.3.5",
     "minimatch": "^3.0.0",
@@ -64,20 +64,20 @@
     "serve-favicon": "^2.3.0",
     "shortid": "^2.2.4",
     "time-grunt": "^1.2.1",
-    "tinyforever": "0.0.3",
-    "universal-analytics": "^0.3.11"
+    "tinyforever": "0.0.4",
+    "universal-analytics": "^0.4.8"
   },
   "devDependencies": {
     "assert": "^1.3.0",
     "chai": "^3.2.0",
-    "cross-spawn": "^4.0.0",
+    "cross-spawn": "^5.0.1",
     "grunt-casperjs": "^2.2.0",
     "grunt-contrib-jshint": "^1.0.0",
     "grunt-contrib-watch": "^1.0.0",
     "grunt-jsdoc": "^2.1.0",
-    "grunt-mocha-test": "^0.12.7",
-    "mocha": "^2.0.1",
-    "should": "^9.0.2",
-    "supertest": "^1.1.0"
+    "grunt-mocha-test": "^0.13.2",
+    "mocha": "^3.2.0",
+    "should": "^11.1.2",
+    "supertest": "^2.0.1"
   }
 }

From 118a3b49cd376a10d889c6cb25e90e79a2c71e5b Mon Sep 17 00:00:00 2001
From: Robert Haritonov <r@rhr.me>
Date: Wed, 18 Jan 2017 18:19:14 +0100
Subject: [PATCH 104/104] update minor deps - step 2

---
 package.json | 48 ++++++++++++++++++++++++------------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/package.json b/package.json
index cfb99af..e6948b9 100644
--- a/package.json
+++ b/package.json
@@ -26,53 +26,53 @@
     "ci-test-win": "grunt ci-pre-run && node app.js --post-grunt ci-post-run-win --test --log trace --no-watch"
   },
   "dependencies": {
-    "body-parser": "^1.14.1",
+    "body-parser": "^1.16.0",
     "cheerio": "^0.22.0",
     "colors": "^1.1.2",
-    "commander": "^2.8.1",
-    "compression": "^1.6.1",
-    "cookie-parser": "^1.4.1",
-    "device": "^0.3.6",
+    "commander": "^2.9.0",
+    "compression": "^1.6.2",
+    "cookie-parser": "^1.4.3",
+    "device": "^0.3.8",
     "ejs": "operatino/ejs#2.3.4-sandbox-option",
     "everyauth": "^0.4.9",
-    "express": "^4.13.3",
+    "express": "^4.14.0",
     "express-interceptor": "^1.2.0",
-    "express-session": "^1.10.2",
+    "express-session": "^1.14.2",
     "fs-extra": "^2.0.0",
     "fs-finder": "operatino/node-fs-finder#fix-windows-find-up",
-    "glob": "^7.0.3",
+    "glob": "^7.1.1",
     "grunt": "~1.0.1",
     "grunt-autoprefixer": "^3.0.4",
-    "grunt-cli": "^1.1.0",
+    "grunt-cli": "^1.2.0",
     "grunt-contrib-clean": "^1.0.0",
     "grunt-contrib-copy": "^1.0.0",
-    "grunt-contrib-less": "^1.2.0",
-    "grunt-contrib-cssmin": "^1.0.1",
+    "grunt-contrib-less": "^1.4.0",
+    "grunt-contrib-cssmin": "^1.0.2",
     "grunt-contrib-htmlmin": "^2.1.0",
     "grunt-contrib-uglify": "^2.0.0",
-    "grunt-newer": "^1.1.2",
+    "grunt-newer": "^1.2.0",
     "gulp-watch": "operatino/gulp-watch#4.3.5-latest-fsevents",
     "load-grunt-parent-tasks": "^0.1.1",
-    "load-grunt-tasks": "^3.3.0",
-    "lodash": "^4.6.1",
+    "load-grunt-tasks": "^3.5.2",
+    "lodash": "^4.17.4",
     "log4js": "~1.1.0",
     "macaddress": "^0.2.8",
-    "marked": "^0.3.5",
-    "minimatch": "^3.0.0",
-    "pretty-hrtime": "^1.0.2",
+    "marked": "^0.3.6",
+    "minimatch": "^3.0.3",
+    "pretty-hrtime": "^1.0.3",
     "q": "^1.4.1",
-    "serve-favicon": "^2.3.0",
-    "shortid": "^2.2.4",
-    "time-grunt": "^1.2.1",
+    "serve-favicon": "^2.3.2",
+    "shortid": "^2.2.6",
+    "time-grunt": "^1.4.0",
     "tinyforever": "0.0.4",
     "universal-analytics": "^0.4.8"
   },
   "devDependencies": {
-    "assert": "^1.3.0",
-    "chai": "^3.2.0",
+    "assert": "^1.4.1",
+    "chai": "^3.5.0",
     "cross-spawn": "^5.0.1",
-    "grunt-casperjs": "^2.2.0",
-    "grunt-contrib-jshint": "^1.0.0",
+    "grunt-casperjs": "^2.2.1",
+    "grunt-contrib-jshint": "^1.1.0",
     "grunt-contrib-watch": "^1.0.0",
     "grunt-jsdoc": "^2.1.0",
     "grunt-mocha-test": "^0.13.2",