Merge branch '0.6.0-dev' into ndelangen/update-docs

# Conflicts:
#	assets/js/modules/loadEvents.js

Author: Norbert de Langen

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);

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;
                     }

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',

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
 });

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
     });

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
 });

package.json

@@ -24,11 +24,10 @@
     "express": "^4.13.3",
     "express-interceptor": "^1.2.0",
     "express-session": "^1.10.2",
-    "flat": "^1.2.1",
-    "fs-extra": "^0.26.7",
+    "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",
@@ -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",
@@ -69,16 +68,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"
   }
 }