Merge pull request GoogleCloudPlatform#48 from GoogleCloudPlatform/co…

…nfig

Improving config and auth story

.gitignore

@@ -6,3 +6,4 @@ coverage/
 test/encrypted/nodejs-docs-samples.json
 *.iml
 .idea/
+config.json

.travis.yml

@@ -36,6 +36,10 @@ env:
     - GCLOUD_PROJECT=nodejs-docs-samples
     - OAUTH_CLIENT_ID=test-id
     - OAUTH_CLIENT_SECRET=test-secret
+  matrix:
+    - DATA_BACKEND=datastore
+    - DATA_BACKEND=mongodb
+    - DATA_BACKEND=cloudsql
 
 before_install:
   - if [ ! -d $HOME/gcloud/google-cloud-sdk ]; then

2-structured-data/app.js

@@ -15,7 +15,7 @@
 
 var path = require('path');
 var express = require('express');
-var config = require('./config')();
+var config = require('./config');
 
 var app = express();
 
@@ -25,9 +25,8 @@ app.set('view engine', 'jade');
 app.set('trust proxy', true);
 
 // Books
-var model = require('./books/model')(config);
-app.use('/books', require('./books/crud')(model));
-app.use('/api/books', require('./books/api')(model));
+app.use('/books', require('./books/crud'));
+app.use('/api/books', require('./books/api'));
 
 // Redirect root to /books
 app.get('/', function (req, res) {
@@ -50,7 +49,7 @@ app.use(function (err, req, res, next) {
 
 if (module === require.main) {
   // Start the server
-  var server = app.listen(config.port, function () {
+  var server = app.listen(config.get('PORT'), function () {
     var host = server.address().address;
     var port = server.address().port;
 

2-structured-data/books/api.js

@@ -15,98 +15,98 @@
 
 var express = require('express');
 var bodyParser = require('body-parser');
+var config = require('../config');
+var model = require('./model-' + config.get('DATA_BACKEND'));
 
-module.exports = function (model) {
-  var router = express.Router();
+var router = express.Router();
 
-  // Automatically parse request body as JSON
-  router.use(bodyParser.json());
+// Automatically parse request body as JSON
+router.use(bodyParser.json());
 
-  /**
-   * GET /api/books
-   *
-   * Retrieve a page of books (up to ten at a time).
-   */
-  router.get('/', function list (req, res, next) {
-    model.list(10, req.query.pageToken, function (err, entities, cursor) {
-      if (err) {
-        return next(err);
-      }
-      res.json({
-        items: entities,
-        nextPageToken: cursor
-      });
+/**
+ * GET /api/books
+ *
+ * Retrieve a page of books (up to ten at a time).
+ */
+router.get('/', function list (req, res, next) {
+  model.list(10, req.query.pageToken, function (err, entities, cursor) {
+    if (err) {
+      return next(err);
+    }
+    res.json({
+      items: entities,
+      nextPageToken: cursor
     });
   });
+});
 
-  /**
-   * POST /api/books
-   *
-   * Create a new book.
-   */
-  router.post('/', function insert (req, res, next) {
-    model.create(req.body, function (err, entity) {
-      if (err) {
-        return next(err);
-      }
-      res.json(entity);
-    });
+/**
+ * POST /api/books
+ *
+ * Create a new book.
+ */
+router.post('/', function insert (req, res, next) {
+  model.create(req.body, function (err, entity) {
+    if (err) {
+      return next(err);
+    }
+    res.json(entity);
   });
+});
 
-  /**
-   * GET /api/books/:id
-   *
-   * Retrieve a book.
-   */
-  router.get('/:book', function get (req, res, next) {
-    model.read(req.params.book, function (err, entity) {
-      if (err) {
-        return next(err);
-      }
-      res.json(entity);
-    });
+/**
+ * GET /api/books/:id
+ *
+ * Retrieve a book.
+ */
+router.get('/:book', function get (req, res, next) {
+  model.read(req.params.book, function (err, entity) {
+    if (err) {
+      return next(err);
+    }
+    res.json(entity);
   });
+});
 
-  /**
-   * PUT /api/books/:id
-   *
-   * Update a book.
-   */
-  router.put('/:book', function update (req, res, next) {
-    model.update(req.params.book, req.body, function (err, entity) {
-      if (err) {
-        return next(err);
-      }
-      res.json(entity);
-    });
+/**
+ * PUT /api/books/:id
+ *
+ * Update a book.
+ */
+router.put('/:book', function update (req, res, next) {
+  model.update(req.params.book, req.body, function (err, entity) {
+    if (err) {
+      return next(err);
+    }
+    res.json(entity);
   });
+});
 
-  /**
-   * DELETE /api/books/:id
-   *
-   * Delete a book.
-   */
-  router.delete('/:book', function _delete (req, res, next) {
-    model.delete(req.params.book, function (err) {
-      if (err) {
-        return next(err);
-      }
-      res.status(200).send('OK');
-    });
+/**
+ * DELETE /api/books/:id
+ *
+ * Delete a book.
+ */
+router.delete('/:book', function _delete (req, res, next) {
+  model.delete(req.params.book, function (err) {
+    if (err) {
+      return next(err);
+    }
+    res.status(200).send('OK');
   });
+});
 
-  /**
-   * Errors on "/api/books/*" routes.
-   */
-  router.use(function handleRpcError (err, req, res, next) {
-    // Format error and forward to generic error handler for logging and
-    // responding to the request
-    err.response = {
-      message: err.message,
-      internalCode: err.code
-    };
-    next(err);
-  });
+/**
+ * Errors on "/api/books/*" routes.
+ */
+router.use(function handleRpcError (err, req, res, next) {
+  // Format error and forward to generic error handler for logging and
+  // responding to the request
+  err.response = {
+    message: err.message,
+    internalCode: err.code
+  };
+  next(err);
+});
 
-  return router;
-};
+module.exports = router;