Commiting #9 for testing.

Author: Aglezabad

.eslintrc.js

@@ -16,11 +16,8 @@ var config = {
     }
   },
   env: {
-    browser: true,
     node: true,
-    es6: true,
-    commonjs: true,
-    amd: true
+    es6: true
   },
   rules: {
     // ----------------------------

HISTORY.md

@@ -2,6 +2,7 @@
 
 ## v2.2.0 2017 April 3
 - Conversion from Coffeescript to ES6 (ES5 included through Babel)
+- New api loading system. You can use multiple isolated apis. (Sorry for breaking changes)
 
 ## v2.1.5 2017 March 6
 - Load multiple API Javascript files and configurable API base URL

README.md

@@ -5,11 +5,12 @@
 <span class="badge-travisci"><a href="http://travis-ci.org/UnivUnix/docpad-plugin-api" title="Check this project's build status on TravisCI"><img src="https://img.shields.io/travis/UnivUnix/docpad-plugin-api/master.svg" alt="Travis CI Build Status" /></a></span>
 <span class="badge-npmversion"><a href="https://npmjs.org/package/docpad-plugin-api" title="View this project on NPM"><img src="https://img.shields.io/npm/v/docpad-plugin-api.svg" alt="NPM version" /></a></span>
 <span class="badge-npmdownloads"><a href="https://npmjs.org/package/docpad-plugin-api" title="View this project on NPM"><img src="https://img.shields.io/npm/dm/docpad-plugin-api.svg" alt="NPM downloads" /></a></span>
-<span class="badge-daviddm"><a href="https://david-dm.org/univunix/docpad-plugin-api" title="View the status of this project's dependencies on DavidDM"><img src="https://img.shields.io/david/univunix/docpad-plugin-api.svg" alt="Dependency Status" /></a></span>
-<span class="badge-daviddmdev"><a href="https://david-dm.org/univunix/docpad-plugin-api#info=devDependencies" title="View the status of this project's development dependencies on DavidDM"><img src="https://img.shields.io/david/dev/univunix/docpad-plugin-api.svg" alt="Dev Dependency Status" /></a></span>
+<span class="badge-daviddm"><a href="https://david-dm.org/UnivUnix/docpad-plugin-api" title="View the status of this project's dependencies on DavidDM"><img src="https://img.shields.io/david/UnivUnix/docpad-plugin-api.svg" alt="Dependency Status" /></a></span>
+<span class="badge-daviddmdev"><a href="https://david-dm.org/UnivUnix/docpad-plugin-api#info=devDependencies" title="View the status of this project's development dependencies on DavidDM"><img src="https://img.shields.io/david/dev/Univunix/docpad-plugin-api.svg" alt="Dev Dependency Status" /></a></span>
 
 <!-- /BADGES -->
 
+
 ## How to use the plugin
 
 * First, you need to create a Javascript file inside your Docpad project.

es2015/api.plugin.js

@@ -26,25 +26,82 @@ module.exports = function (BasePlugin) {
     _createClass(ApiPlugin, [{
       key: 'serverExtend',
       value: function serverExtend(opts) {
+        // Error types
+        var DPA_CONFIG_ERROR = 'DPAConfigError';
+        var DPA_SRC_ERROR = 'DPASrcError';
+
         // Extract server from options.
         var server = opts.server;
 
         var docpad = this.docpad;
         var rootPath = docpad.getConfig().rootPath;
-        var customApis = [];
-        var src = void 0;
+        var apis = [];
+        var configSrc = void 0,
+            configJson = void 0,
+            func = void 0;
         var _iteratorNormalCompletion = true;
         var _didIteratorError = false;
         var _iteratorError = undefined;
 
         try {
-          for (var _iterator = this.config.source[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-            src = _step.value;
+          for (var _iterator = this.config.cfgSrc[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+            configSrc = _step.value;
 
             try {
-              customApis.push(require(path.join(rootPath, src.file)));
-            } catch (error) {
-              docpad.log('error', 'Api - Error: ' + error.message);
+              // Variables inside try block.
+              var jsSrc = void 0;
+              var _api = {};
+              // Load config file.
+              configJson = require(path.join(rootPath, configSrc));
+              // Check if baseApiUrl is set.
+              if (!configJson.baseApiUrl) {
+                var dpaError = new Error('No baseApiUrl set in config file.\n\tIn ' + path.join(rootPath, configSrc));
+                dpaError.name = DPA_CONFIG_ERROR;
+                throw dpaError;
+              }
+              _api.baseApiUrl = configJson.baseApiUrl;
+              // Check if there's any source set.
+              if (!configJson.src || configJson.src.length === 0) {
+                var _dpaError = new Error('The src parameter is\'nt properly configured.\n\tIn ' + path.join(rootPath, configSrc));
+                _dpaError.name = DPA_CONFIG_ERROR;
+                throw _dpaError;
+              }
+              _api.src = [];
+              var _iteratorNormalCompletion3 = true;
+              var _didIteratorError3 = false;
+              var _iteratorError3 = undefined;
+
+              try {
+                for (var _iterator3 = configJson.src[Symbol.iterator](), _step3; !(_iteratorNormalCompletion3 = (_step3 = _iterator3.next()).done); _iteratorNormalCompletion3 = true) {
+                  jsSrc = _step3.value;
+
+                  try {
+                    _api.src.push(require(path.join(rootPath, jsSrc)));
+                  } catch (err) {
+                    var _dpaError2 = new Error(err.name + ': ' + err.message + '\n\tIn ' + path.join(rootPath, jsSrc));
+                    _dpaError2.name = DPA_SRC_ERROR;
+                    throw _dpaError2;
+                  }
+                }
+                // When all configuration is ok, insert in apis array.
+              } catch (err) {
+                _didIteratorError3 = true;
+                _iteratorError3 = err;
+              } finally {
+                try {
+                  if (!_iteratorNormalCompletion3 && _iterator3.return) {
+                    _iterator3.return();
+                  }
+                } finally {
+                  if (_didIteratorError3) {
+                    throw _iteratorError3;
+                  }
+                }
+              }
+
+              apis.push(_api);
+            } catch (err) {
+              docpad.log('error', 'Api - ' + err.name + ': ' + err.message);
             }
           }
         } catch (err) {
@@ -62,28 +119,50 @@ module.exports = function (BasePlugin) {
           }
         }
 
-        docpad.log('info', 'Api - Loaded files: ' + customApis.length);
+        docpad.log('info', 'Api - Loaded files: ' + apis.length);
 
         // Default route.
-        server.get(this.config.baseApiUrl + '/engine/version', function (req, res) {
+        server.get('/engine/version', function (req, res) {
           return res.json({
             name: packJson.name,
             dev: packJson.author,
             version: packJson.version
           });
         });
 
+        var api = void 0;
         // Go to custom API routes.
-        var func = void 0;
         var _iteratorNormalCompletion2 = true;
         var _didIteratorError2 = false;
         var _iteratorError2 = undefined;
 
         try {
-          for (var _iterator2 = customApis[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
-            func = _step2.value;
+          for (var _iterator2 = apis[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
+            api = _step2.value;
+            var _iteratorNormalCompletion4 = true;
+            var _didIteratorError4 = false;
+            var _iteratorError4 = undefined;
 
-            func(opts, this.config.baseApiUrl);
+            try {
+              for (var _iterator4 = api.src[Symbol.iterator](), _step4; !(_iteratorNormalCompletion4 = (_step4 = _iterator4.next()).done); _iteratorNormalCompletion4 = true) {
+                func = _step4.value;
+
+                func(opts, api.baseApiUrl);
+              }
+            } catch (err) {
+              _didIteratorError4 = true;
+              _iteratorError4 = err;
+            } finally {
+              try {
+                if (!_iteratorNormalCompletion4 && _iterator4.return) {
+                  _iterator4.return();
+                }
+              } finally {
+                if (_didIteratorError4) {
+                  throw _iteratorError4;
+                }
+              }
+            }
           }
         } catch (err) {
           _didIteratorError2 = true;
@@ -109,10 +188,7 @@ module.exports = function (BasePlugin) {
       key: 'initialConfig',
       get: function get() {
         return {
-          baseApiUrl: '/api',
-          source: [{
-            file: ''
-          }]
+          cfgSrc: []
         };
       }
     }]);

es2015/api.test.js

@@ -1,7 +1,7 @@
 'use strict';
 
 // Test our plugin using DocPad's testers
+var path = require('path');
 require('docpad').require('testers').test({
-  pluginPath: __dirname + '/..',
-  testerClass: 'ServerTester'
+  pluginPath: path.join(__dirname, '..')
 });

package.json

@@ -100,7 +100,7 @@
     "our:meta": "npm run our:meta:projectz",
     "our:meta:projectz": "projectz compile",
     "our:verify": "npm run our:verify:eslint",
-    "our:verify:eslint": "eslint ./src",
+    "our:verify:eslint": "./node_modules/.bin/eslint ./src",
     "our:test": "npm run our:verify && npm test",
     "our:release": "npm run our:release:prepare && npm run our:release:check && npm run our:release:tag && npm run our:release:push",
     "our:release:prepare": "npm run our:clean && npm run our:compile && npm run our:test && npm run our:meta",

src/api.plugin.js

@@ -12,43 +12,76 @@ module.exports = function (BasePlugin) {
 
     get initialConfig () {
       return {
-        baseApiUrl: '/api',
-        source: [{
-          file: ''
-        }]
+        cfgSrc: []
       };
     }
 
     serverExtend (opts) {
+      // Error types
+      const DPA_CONFIG_ERROR = 'DPAConfigError';
+      const DPA_SRC_ERROR = 'DPASrcError';
+
       // Extract server from options.
       const {server} = opts;
       const docpad = this.docpad;
       const rootPath = docpad.getConfig().rootPath;
-      const customApis = [];
-      let src;
-      for (src of this.config.source) {
+      const apis = [];
+      let configSrc, configJson, func;
+      for (configSrc of this.config.cfgSrc) {
         try {
-          customApis.push(require(path.join(rootPath, src.file)));
+          // Variables inside try block.
+          let jsSrc;
+          const api = {};
+          // Load config file.
+          configJson = require(path.join(rootPath, configSrc));
+          // Check if baseApiUrl is set.
+          if (!configJson.baseApiUrl) {
+            const dpaError = new Error('No baseApiUrl set in config file.\n\tIn ' + path.join(rootPath, configSrc));
+            dpaError.name = DPA_CONFIG_ERROR;
+            throw dpaError;
+          }
+          api.baseApiUrl = configJson.baseApiUrl;
+          // Check if there's any source set.
+          if (!configJson.src || configJson.src.length === 0) {
+            const dpaError = new Error('The src parameter is\'nt properly configured.\n\tIn ' + path.join(rootPath, configSrc));
+            dpaError.name = DPA_CONFIG_ERROR;
+            throw dpaError;
+          }
+          api.src = [];
+          for (jsSrc of configJson.src) {
+            try {
+              api.src.push(require(path.join(rootPath, jsSrc)));
+            }
+            catch (err) {
+              const dpaError = new Error(err.name + ': ' + err.message + '\n\tIn ' + path.join(rootPath, jsSrc));
+              dpaError.name = DPA_SRC_ERROR;
+              throw dpaError;
+            }
+          }
+          // When all configuration is ok, insert in apis array.
+          apis.push(api);
         }
-        catch (error) {
-          docpad.log('error', 'Api - Error: ' + error.message);
+        catch (err) {
+          docpad.log('error', 'Api - ' + err.name + ': ' + err.message);
         }
       }
-      docpad.log('info', 'Api - Loaded files: ' + customApis.length);
+      docpad.log('info', 'Api - Loaded files: ' + apis.length);
 
       // Default route.
-      server.get(`${this.config.baseApiUrl}/engine/version`, (req, res) =>
+      server.get('/engine/version', (req, res) =>
         res.json({
           name: packJson.name,
           dev: packJson.author,
           version: packJson.version
         })
       );
 
+      let api;
       // Go to custom API routes.
-      let func;
-      for (func of customApis) {
-        func(opts, this.config.baseApiUrl);
+      for (api of apis) {
+        for (func of api.src) {
+          func(opts, api.baseApiUrl);
+        }
       }
     }
   };

src/api.test.js

@@ -1,5 +1,5 @@
 // Test our plugin using DocPad's testers
+const path = require('path');
 require('docpad').require('testers').test({
-  pluginPath: `${__dirname}/..`,
-  testerClass: 'ServerTester'
+  pluginPath: path.join(__dirname, '..')
 });

test/api/api-test.js

@@ -6,12 +6,11 @@ docpadConfig = {
   # Plugins configuration
   plugins:
     api:
-      baseApiUrl: '/APIURLTEST'
-      source: [{
-          file: 'api/api-test.js'
-        },{
-          file: 'api/missing.js'
-        }]
+      cfgSrc: [
+        'testapi1/dpaconfig.json',
+        'testapi2/dpaconfig.json',
+        'testapi0/dpaconfig.json'
+      ]
 }
 
 # Export the DocPad Configuration