Merge pull request #12 from ph0bos/partial-response

Partial response
ph0bos · Nov 1, 2015 · 9cda29f · 9cda29f
2 parents aac8cca + e63311f
commit 9cda29f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 13 deletions.
diff --git a/index.js b/index.js
@@ -45,15 +45,16 @@ var buildOptions = function(options) {
   var config = konfig({ path: options.configPath || process.cwd() + '/config' });
 
   // Default options
-  options.server          = options.server || { port: process.env.PORT };
-  options.debug           = options.debug || false;
-  options.discoverable    = options.discoverable || false;
-  options.monitorsPath    = options.monitorsPath || 'monitors';
-  options.controllersPath = options.controllersPath || 'controllers';
-  options.callerPath      = path.dirname(caller(2));
-  options.serviceName     = pkgInfo.name;
-  options.serviceBasePath = 'services';
-  options.zookeeper       = { connectionString: 'localhost:2181', retry: { count: 5 } };
+  options.server               = options.server || { port: process.env.PORT };
+  options.debug                = options.debug || false;
+  options.discoverable         = options.discoverable || false;
+  options.monitorsPath         = options.monitorsPath || 'monitors';
+  options.controllersPath      = options.controllersPath || 'controllers';
+  options.callerPath           = path.dirname(caller(2));
+  options.serviceName          = pkgInfo.name;
+  options.serviceBasePath      = 'services';
+  options.zookeeper            = { connectionString: 'localhost:2181', retry: { count: 5 } };
+  options.partialResponseQuery = options.partialResponseQuery || 'fields';
 
   // Return now if we have no config
   if (!config.app) {

diff --git a/lib/bootstrap.js b/lib/bootstrap.js
@@ -34,15 +34,15 @@ module.exports = function (app, options) {
   // Parse application/json
   app.use(bodyParser.json());
 
+  // Partial Response
+  app.use(partialRes({ query: options.partialResponseQuery }));
+
   // Starter routes (e.g. actuator)
   app.use('/' + options.serviceName, enrouten({ directory: '../controllers' }));
 
   // Implementor routes
   app.use('/' + options.serviceName, enrouten({ directory: path.resolve(options.callerPath, options.controllersPath) }));
 
-  // Partial Response
-  app.use(partialRes({ query: options.partialResponseQuery || 'filter' }));
-
   // Make service discoverable?
   if (options.discoverable) {
     zoologist.on('ready', function() {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "express-microservice-starter",
-  "version": "0.5.7",
+  "version": "0.5.8",
   "description": "An express-based Node.js API bootstrapping module for microservices.",
   "main": "index.js",
   "scripts": {