amphora 8.0.0 → 8.3.0

package/.circleci/config.yml

@@ -57,7 +57,6 @@ jobs:
           paths:
             - node_modules
       - run: npm test
-      - run: cat coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js
 
   test_node14:
     docker:

package/lib/render.js

@@ -87,8 +87,12 @@ function renderComponent(req, res, hrStart) {
   return components.get(_ref, locals)
     .then(cmptData => formDataForRenderer(cmptData, { _ref }, locals))
     .tap(logTime(hrStart, _ref))
-    .then(({data, options}) => renderer.render(data, options, res))
-    .catch(err => log('error', err, { url: _.get(res, 'locals.url') }));
+    .then(({ data, options }) => renderer.render(data, options, res))
+    .catch(err => {
+      log('error', err, { url: _.get(res, 'locals.url') });
+
+      return responses.handleError(res)(err);
+    });
 }
 
 /**

package/lib/render.test.js

@@ -7,6 +7,7 @@ const _ = require('lodash'),
   expect = require('chai').expect,
   sinon = require('sinon'),
   schema = require('./schema'),
+  responses = require('./responses'),
   components = require('./services/components'),
   composer = require('./services/composer'),
   createMockReq = require('../test/fixtures/mocks/req'),
@@ -81,6 +82,7 @@ describe(_.startCase(filename), function () {
     sandbox.stub(components);
     sandbox.stub(composer);
     sandbox.stub(schema);
+    sandbox.stub(responses, 'handleError').returns(() => {});
     lib.setLog(mockLog);
     lib.resetUriRouteHandlers();
     lib.registerRenderers({
@@ -177,6 +179,7 @@ describe(_.startCase(filename), function () {
       return fn(req, getMockRes())
         .then(() => {
           sinon.assert.calledWith(mockLog, 'error', error);
+          sinon.assert.calledOnce(responses.handleError);
           lib.registerRenderers(undefined);
         });
     });

package/lib/services/db-operations.js

@@ -80,6 +80,30 @@ function splitCascadingData(uri, data) {
   return ops;
 }
 
+/**
+ * Adds user info onto each op object
+ *
+ * @param {Object} locals
+ * @param {Object} locals.user
+ * @returns {Function}
+ */
+function addUserInfoToOp(locals) {
+  if (!locals) {
+    return _.identity;
+  }
+
+  const { user } = locals;
+
+  function addUserProp(op) {
+    op.user = user;
+  }
+
+  return (opsList) => {
+    opsList.forEach(addUserProp);
+    return opsList;
+  };
+}
+
 /**
  * Get a list of all the put operations needed to complete a cascading PUT
  *
@@ -105,8 +129,10 @@ function getPutOperations(putFn, uri, data, locals) {
   }
 
   // run each through the normal put, which may or may not hit custom component logic
-  return bluebird.map(cmptOrLayout, ({ key, value }) => putFn(key, value, locals))
-    .then(ops => _.filter(_.flattenDeep(ops), _.identity));
+  return bluebird
+    .map(cmptOrLayout, ({ key, value }) => putFn(key, value, locals))
+    .then(ops => _.filter(_.flattenDeep(ops), _.identity))
+    .then(addUserInfoToOp(locals));
 }
 
 /**

package/lib/services/layouts.js

@@ -6,8 +6,9 @@ const _ = require('lodash'),
   uid = require('../uid'),
   files = require('../files'),
   models = require('./models'),
+  components = require('./components'),
   meta = require('./metadata'),
-  { getLayoutName, replaceVersion } = require('clayutils'),
+  { getLayoutName, replaceVersion, isComponent } = require('clayutils'),
   bus = require('./bus');
 
 /**
@@ -39,9 +40,13 @@ function get(uri, locals) {
  * @returns {Promise}
  */
 function put(uri, data, locals) {
-  var model = files.getLayoutModules(getLayoutName(uri)),
-    callHooks = _.get(locals, 'hooks') !== 'false',
-    result;
+  // layout-level components are published the same as page-level components
+  if (isComponent(uri)) return components.cmptPut(uri, data, locals);
+
+  // else try to apply a layout model to the layout instance
+  const model = files.getLayoutModules(getLayoutName(uri)),
+    callHooks = _.get(locals, 'hooks') !== 'false';
+  let result;
 
   if (model && _.isFunction(model.save) && callHooks) {
     result = models.put(model, uri, data, locals);

package/lib/services/pages.js

@@ -27,13 +27,17 @@ const _ = require('lodash'),
  * @param {string} uri
  * @param {{}} data
  * @param {[]} ops
+ * @param {{}} locals
  * @returns {array}
  */
-function addOp(uri, data, ops) {
+function addOp(uri, data, ops, locals = {}) {
+  const { user } = locals;
+
   ops.push({
     type: 'put',
     key: uri,
-    value: JSON.stringify(data)
+    value: JSON.stringify(data),
+    user
   });
 
   return ops;
@@ -257,7 +261,7 @@ function publish(uri, data, locals) {
           publishedMeta = meta;
 
           // add page PUT operation last
-          return addOp(replaceVersion(uri, published), pageData, ops);
+          return addOp(replaceVersion(uri, published), pageData, ops, locals);
         });
     })
     .then(applyBatch)
@@ -306,7 +310,7 @@ function create(uri, data, locals) {
       return getPageClonePutOperations(pageData, locals)
         .then(ops => {
           pageData.layout = layoutReference;
-          return addOp(pageReference, pageData, ops);
+          return addOp(pageReference, pageData, ops, locals);
         });
     })
     .then(applyBatch)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amphora",
-  "version": "8.0.0",
+  "version": "8.3.0",
   "description": "An API mixin for Express that saves, publishes and composes data with the key-value store of your choice.",
   "main": "index.js",
   "scripts": {