Merge branch 'master' into create-generate-id

Author: pmcnr-hx

.gitignore

@@ -1,6 +1,6 @@
 *.tgz
-complexity
-coverage.html
 jsonapi-server.cpuprofile
 node_modules
 npm-debug.log
+/.nyc_output/
+/coverage/

.travis.yml

@@ -2,9 +2,14 @@ dist: trusty
 sudo: false
 language: node_js
 node_js:
-  - 4
   - 6
   - 8
+before_install:
+- npm install -g npm@latest
+- npm install -g greenkeeper-lockfile@latest
+before_script: greenkeeper-lockfile-update
 script: npm run ci
+after_script: greenkeeper-lockfile-upload
+after_success: npm run coverage
 notifications:
   email: false

CHANGELOG.md

@@ -1,3 +1,9 @@
+- 2017-11-03 - v4.0.0
+- 2017-11-03 - Return error when a response item does not validate.
+- 2017-11-03 - Remove Node.js 4 support.
+- 2017-10-21 - v3.2.2
+- 2017-10-21 - Report coverage with Coveralls.
+- 2017-10-21 - Modernise script.
 - 2017-09-23 - v3.2.1
 - 2017-09-23 - Fix packaging.
 - 2017-09-19 - v3.2.0

README.md

@@ -1,9 +1,12 @@
 [![Build Status](https://travis-ci.org/holidayextras/jsonapi-server.svg?branch=master)](https://travis-ci.org/holidayextras/jsonapi-server)
+[![Coverage Status](https://coveralls.io/repos/github/holidayextras/jsonapi-server/badge.svg?branch=master)](https://coveralls.io/github/holidayextras/jsonapi-server?branch=master)
 [![npm version](https://badge.fury.io/js/jsonapi-server.svg)](http://badge.fury.io/js/jsonapi-server)
 [![Dependencies Status](https://david-dm.org/holidayextras/jsonapi-server.svg)](https://david-dm.org/holidayextras/jsonapi-server)
 
 # jsonapi-server
 
+[![Greenkeeper badge](https://badges.greenkeeper.io/holidayextras/jsonapi-server.svg)](https://greenkeeper.io/)
+
 A config driven NodeJS framework implementing [`json:api`](http://jsonapi.org/) and [`GraphQL`](http://graphql.org/). You define the resources, it provides the api.
 
 ### Motivation / Justification / Rationale

example/handlers/brokenResponseHandler.js

@@ -0,0 +1,5 @@
+'use strict'
+
+const jsonApi = require('../..')
+
+module.exports = new jsonApi.MemoryHandler()

example/resources/brokenResponse.js

@@ -0,0 +1,24 @@
+'use strict'
+
+const jsonApi = require('../../.')
+const brokenResponseHandler = require('../handlers/brokenResponseHandler.js')
+
+jsonApi.define({
+  namespace: 'json:api',
+  resource: 'brokenResponse',
+  description: 'Example demonstrating error handling of broken responses',
+  handlers: brokenResponseHandler,
+  searchParams: { },
+  attributes: {
+    boolean: jsonApi.Joi.boolean(),
+    number: jsonApi.Joi.number()
+  },
+  examples: [
+    {
+      id: 'b3ea78f4-8d03-4708-9945-d58cadc97b04',
+      type: 'brokenResponse',
+      boolean: 1,
+      number: '3'
+    }
+  ]
+})

lib/responseHelper.js

@@ -34,7 +34,16 @@ responseHelper._enforceSchemaOnObject = (item, schema, callback) => {
   Joi.validate(item, schema, (err, sanitisedItem) => {
     if (err) {
       debug.validationError(err.message, JSON.stringify(item))
-      return callback(null, null)
+      const res = {
+        status: '500',
+        code: 'EINVALIDITEM',
+        title: 'Item in response does not validate',
+        detail: {
+          item: item,
+          error: err.message
+        }
+      }
+      return callback(res)
     }
 
     const dataItem = responseHelper._generateDataItem(sanitisedItem, schema)