Merge branch 'master' into release

Author: jmdobry

.mailmap

@@ -1 +1,2 @@
-Jason Dobry <[email protected]> Jason Dobry <[email protected]>
+Dave Ramirez <[email protected]> Dave <[email protected]>
+Jason Dobry <[email protected]> Jason Dobry <[email protected]>

AUTHORS

@@ -5,6 +5,6 @@
 #
 # The email address is not required for organizations.
 #
-Dave <[email protected]>
+Cory Robinson <[email protected]>
 Dave Ramirez <[email protected]>
 Jason Dobry <[email protected]>

CHANGELOG.md

@@ -1,3 +1,10 @@
-#### 1.0.0-alpha.1 - xx xx 2016
+#### 1.0.0-rc.1 - 26 August 2016
+
+##### Backwards compatible changes
+- #13, #14 - Feature - Response handlers by @crobinson42
+- Made endpoints more configurable
+- Upgraded dependencies
+
+#### 1.0.0-alpha.1 - 06 June 2016
 
 Initial release

CONTRIBUTORS

@@ -3,4 +3,6 @@
 # Names are formatted as:
 #   Name <email address>
 #
+Cory Robinson <[email protected]>
+Dave Ramirez <[email protected]>
 Jason Dobry <[email protected]>

circle.yml

@@ -7,8 +7,9 @@ machine:
     version: 5.7.0
 dependencies:
   pre:
-    - npm i -g npm codecov nyc
-    - npm i js-data@^3.0.0-beta.6 express
+    - npm i -g npm
+    - npm i -g codecov nyc
+    - npm i js-data@^3.0.0-rc.4 express
 test:
   post:
     - nyc report --reporter=lcov | codecov

conf.json

@@ -14,7 +14,7 @@
   "templates": {
     "theme": "jsdata",
     "systemName": "js-data-express",
-    "copyright": "js-data-express Copyright © 2014-2016 js-data-express project authors",
+    "copyright": "js-data-express Copyright © 2016 js-data-express project authors",
     "outputSourceFiles": true,
     "linenums": true,
     "footer": "<div style=\"text-align:center\"><a href=\"/\">api.js-data.io</a>&nbsp;&#8226;&nbsp;<a href=\"http://js-data.io\">js-data.io</a></div>",

package.json

@@ -1,7 +1,7 @@
 {
   "name": "js-data-express",
   "description": "Generate Express.js-compatible route middleware for JSData models.",
-  "version": "1.0.0-alpha.1",
+  "version": "1.0.0-rc.1",
   "homepage": "https://github.com/js-data/js-data-express",
   "repository": {
     "type": "git",
@@ -48,13 +48,12 @@
     "release": "npm test && npm run doc && repo-tools updates && repo-tools changelog && repo-tools authors"
   },
   "peerDependencies": {
-    "js-data": "^3.0.0-beta.6"
+    "js-data": "^3.0.0-rc.4"
   },
   "devDependencies": {
-    "express": "4.13.4",
-    "js-data-adapter": "0.7.3",
-    "js-data-repo-tools": "0.5.2",
-    "supertest": "1.2.0",
-    "body-parser": "1.15.1"
+    "express": "4.14.0",
+    "js-data-repo-tools": "0.5.6",
+    "supertest": "2.0.0",
+    "body-parser": "1.15.2"
   }
 }

src/handlers.js

@@ -0,0 +1,111 @@
+import { utils } from 'js-data'
+
+const DEFAULTS = {
+  create: {
+    action (component, req) {
+      return component.create(req.body, req.jsdataOpts)
+    },
+    statusCode: 201
+  },
+  createMany: {
+    action (component, req) {
+      return component.createMany(req.body, req.jsdataOpts)
+    },
+    statusCode: 201
+  },
+  destroy: {
+    action (component, req) {
+      return component.destroy(req.params.id, req.jsdataOpts)
+    },
+    statusCode: 204
+  },
+  destroyAll: {
+    action (component, req) {
+      return component.destroyAll(req.query, req.jsdataOpts)
+    },
+    statusCode: 204
+  },
+  find: {
+    action (component, req) {
+      return component.find(req.params.id, req.jsdataOpts)
+    },
+    statusCode: 200
+  },
+  findAll: {
+    action (component, req) {
+      return component.findAll(req.query, req.jsdataOpts)
+    },
+    statusCode: 200
+  },
+  update: {
+    action (component, req) {
+      return component.update(req.params.id, req.body, req.jsdataOpts)
+    },
+    statusCode: 200
+  },
+  updateAll: {
+    action (component, req) {
+      return component.updateAll(req.body, req.query, req.jsdataOpts)
+    },
+    statusCode: 200
+  },
+  updateMany: {
+    action (component, req) {
+      return component.updateMany(req.body, req.jsdataOpts)
+    },
+    statusCode: 200
+  }
+}
+
+export function makeRequestHandler (method, component, config = {}) {
+  config[method] || (config[method] = {})
+  const action = config[method].action || DEFAULTS[method].action
+
+  return (req, res, next) => {
+    action(component, req)
+      .then((result) => {
+        req.jsdataResult = result
+        next()
+      })
+      .catch(next)
+  }
+}
+
+export function makeResponseHandler (method, component, config = {}) {
+  const methodConfig = config[method] || {}
+  const statusCode = methodConfig.statusCode || DEFAULTS[method].statusCode
+  let toJSON
+
+  // Pick the user's toJSON setting, in order of preference
+  if (utils.isFunction(methodConfig.toJSON)) {
+    toJSON = (component, result, opts) => methodConfig.toJSON(component, result, opts)
+  } else if (methodConfig.toJSON === false) {
+    toJSON = (component, result, opts) => result
+  } else if (methodConfig.toJSON === true) {
+    toJSON = (component, result, opts) => component.toJSON(result, opts)
+  } else {
+    if (utils.isFunction(config.toJSON)) {
+      toJSON = (component, result, opts) => config.toJSON(component, result, opts)
+    } else if (config.toJSON === false) {
+      toJSON = (component, result, opts) => result
+    } else {
+      toJSON = (component, result, opts) => component.toJSON(result, opts)
+    }
+  }
+
+  return (req, res, next) => {
+    const result = req.jsdataResult
+
+    res.status(statusCode)
+
+    try {
+      if (result !== undefined) {
+        res.send(toJSON(component, result, req.jsdataOpts))
+      }
+    } catch (err) {
+      return next(err)
+    }
+
+    res.end()
+  }
+}