Merge branch 'master' into greenkeeper-input-plugin-password-0.1.4

lib/api/apis.js

@@ -171,18 +171,19 @@ const ofType = (query, type) => {
  *
  * @param {object} query - Request queries
  * @param {string} id - The GUID to search
- * @param {array} base - Array of content type attributes
+ * @param {array} model - Array of content type attributes
  *
  * @returns {object} - All items and the pagination for the items
  */
 // TODO: Return error if no items are found
-const one = (query, id, base) => {
+const one = (query, id, model) => {
   // const organize = utils.organize(query);
 
   return database('live').select('*').where({
     id,
   }).then(rows => {
-    const formatted = utils.format(rows, base)[0];
+    const formatted = utils.format(rows, model)[0];
+
     if (formatted) {
       const type = {
         name: formatted.type,

lib/api/utils.js

@@ -13,12 +13,12 @@ const liveSchema = utils.singleItem('name', 'live', schemas).fields.map(field =>
  * Formats raw attributes in to API output
  *
  * @param {array} attrs - Array of objects representing the raw attribute content
- * @param {array} base - Array of objects representing the content type's attribute model
+ * @param {array} model - Array of objects representing the content type's attribute model
  */
-const attributes = (attrs, base) => {
+const attributes = (attrs, model) => {
   const result = {};
 
-  base.forEach(input => {
+  model.forEach(input => {
     if (!input.hasOwnProperty('repeatable')) {
       const inputs = Object.keys(input.inputs);
       const total = Object.keys(inputs).length;
@@ -72,11 +72,11 @@ const attributes = (attrs, base) => {
  * Formats raw live data in to consumable returns
  *
  * @param {array} content - Array of objects representing the raw DB query of content
- * @param {object} attrs - If included, will include attributes instead of meta, built off of the attribute definition passed in
+ * @param {object} model - If included, will include attributes instead of meta, built off of the attribute definition passed in
  *
  * @returns {array} - formatted object of content
  */
-const format = (content, attrs) => {
+const format = (content, model) => {
   return content.map(item => {
     const result = {
       id: item.id,
@@ -86,8 +86,8 @@ const format = (content, attrs) => {
       key_slug: item['key-slug'], // eslint-disable-line camelcase
     };
 
-    if (attrs) {
-      result.attributes = attributes(item.attributes, attrs);
+    if (model) {
+      result.attributes = attributes(item.attributes, model);
     }
     else {
       result.meta = {
@@ -235,6 +235,7 @@ const page = (base, organized, count) => {
 };
 
 module.exports = {
+  attributes,
   format,
   organize,
   page,

package.json

@@ -20,8 +20,8 @@
     "posttest": "gulp build",
     "start": "nodemon -e html,js ./index.js",
     "lint": "gulp lint",
-    "ava:watch": "NODE_ENV=test NODE_CONFIG_DIR=../config ava --watch | tap-difflet",
-    "ava": "NODE_ENV=test NODE_CONFIG_DIR=../config ava | tap-difflet",
+    "ava:watch": "NODE_ENV=test NODE_CONFIG_DIR=../config ava --watch",
+    "ava": "NODE_ENV=test NODE_CONFIG_DIR=../config ava",
     "nyc": "nyc --all npm run ava",
     "dev:database": "postgres -D /usr/local/var/postgres",
     "dev:start": "gulp",
@@ -112,9 +112,6 @@
   },
   "nyc": {
     "exclude": [
-      "lib/api.js",
-      "lib/routes/api.js",
-      "lib/api/**/*",
       "tests/**/*",
       "config/**/*",
       "public/**/*",
@@ -125,11 +122,10 @@
   },
   "ava": {
     "files": [
-      "tests/*.js",
-      "!tests/apis.js"
+      "tests/*.js"
     ],
-    "failFast": true,
-    "tap": true
+    "failFast": false,
+    "tap": false
   },
   "config": {
     "ghooks": {