Merge pull request #11 from EnsembleLab/dev

Dev

Author: iolufemi

.travis.yml

@@ -1,11 +1,13 @@
 language: node_js
 node_js:
-  - "7"
-  - "6"
-  - "4"
+  - '7'
+  - '6'
 before_script:
-  - npm install -g gulp mocha gulp-cli codecov istanbul
+  - npm install -g gulp mocha gulp-cli codecov istanbul [email protected]
+  - dredd ./apiary.apib http://127.0.0.1:8080 --dry-run
 install:
   - npm install
-script: 
-  - istanbul cover ./node_modules/mocha/bin/_mocha --report lcovonly -- -R spec && codecov
+script:
+  - >-
+    istanbul cover ./node_modules/mocha/bin/_mocha --report lcovonly -- -R spec
+    && codecov

apiary.apib

@@ -1296,7 +1296,7 @@ Note: Do html redirect to the password reset successful page and kill the active
     Authorization: dd3343ae567c8f8a0b9e8f
 
 + Parameters
-    + booking_id (Number)  - ID of the booking
+    + booking_id: "10" (Number)  - ID of the booking
 
 + Response 200 (application/json)
 
@@ -2471,7 +2471,7 @@ Check if the Worker matches some tags on the booking and worker is not assigned
 + Parameters
     + limit: "10" (Number) - Number of records to return
     + skip: "0" (Number)  - Number of records to skip
-    + booking_id (Number)  - ID of the booking
+    + booking_id: "10" (Number)  - ID of the booking
 
 + Response 200 (application/json)
 
@@ -2545,7 +2545,7 @@ Check if the Worker matches some tags on the booking and worker is not assigned
     Authorization: dd3343ae567c8f8a0b9e8f 
 
 + Parameters
-    + booking_id (Number)  - ID of the booking
+    + booking_id: "10" (Number)  - ID of the booking
 
 + Response 200 (application/json)
 
@@ -2607,9 +2607,9 @@ Check if the Worker matches some tags on the booking and worker is not assigned
     Authorization: dd3343ae567c8f8a0b9e8f 
 
 + Parameters
-    + booking_id (Number)  - ID of the booking
-    + skip (Number) - Number of records to skip
-    + limit (Number) - Number of records to return
+    + booking_id: "10" (Number)  - ID of the booking
+    + skip: "10" (Number) - Number of records to skip
+    + limit: "10" (Number) - Number of records to return
 
 + Response 200 (application/json)
 
@@ -2684,7 +2684,7 @@ Add the rating and review to each worker assigned to the project
     Authorization: dd3343ae567c8f8a0b9e8f 
 
 + Parameters
-    + booking_id (Number)  - ID of the booking
+    + booking_id: "10" (Number)  - ID of the booking
 
 + Request (application/json)
 
@@ -2747,7 +2747,7 @@ Add the rating and review to each worker assigned to the project
     Authorization: dd3343ae567c8f8a0b9e8f 
 
 + Parameters
-    + booking_id (Number)  - ID of the booking
+    + booking_id: "10" (Number)  - ID of the booking
 
 + Response 200 (application/json)
 
@@ -2873,7 +2873,7 @@ Remember to requery the transaction to confirm the true state from the processor
     Authorization: dd3343ae567c8f8a0b9e8f
 
 + Parameters
-    + payment_id (Number)  - ID of the payment
+    + payment_id: "10" (Number)  - ID of the payment
 
 + Request (application/json)
 
@@ -2941,7 +2941,7 @@ Remember to requery the transaction to confirm the true state from the processor
     Authorization: dd3343ae567c8f8a0b9e8f
 
 + Parameters
-    + user_id (Number)  - ID of the user
+    + user_id: "10" (Number)  - ID of the user
     + limit: "10" (Number) - Number of records to return
     + skip: "0" (Number)  - Number of records to skip
     + status: "completed" (String)  - Status of a booking
@@ -3921,8 +3921,8 @@ If user_id is not provided, get current users wallet balance
     Authorization: dd3343ae567c8f8a0b9e8f
 
 + Parameters
-    + skip (Number) - Number of records to skip
-    + limit (Number) - Number of records to return
+    + skip: "10" (Number) - Number of records to skip
+    + limit: "10" (Number) - Number of records to return
 
 + Response 200 (application/json)
 
@@ -3989,9 +3989,9 @@ If user_id is not provided, get current users wallet balance
     Authorization: dd3343ae567c8f8a0b9e8f
 
 + Parameters
-    + skip (Number) - Number of records to skip
-    + limit (Number) - Number of records to return
-    + user_id (String) - Id of the user we want to get a statement for
+    + skip: "10" (Number) - Number of records to skip
+    + limit: "10" (Number) - Number of records to return
+    + user_id: "10" (String) - Id of the user we want to get a statement for
 
 + Response 200 (application/json)
 

app.js

@@ -23,13 +23,13 @@ if (cluster.isMaster && config.env === 'production') {
 } else {
 	var express = require('express');
 	var app = express();
-	var router = require('./routes');
+	// var router = require('./routes');
 
 	if(config.trustProxy === 'yes'){
 		app.enable('trust proxy');
 	}
 
-	app.use('/',router);
+	// app.use('/',router);
 
 	if(config.env === 'production'){
 		log.info('Worker %d running!', cluster.worker.id);

config/development.js

@@ -1,9 +1,10 @@
 "use strict";
 module.exports = {
 	env: process.env.NODE_ENV || 'development',
-	port: process.env.PORT || 3000,
+	port: process.env.PORT || 8080,
 	trustProxy: process.env.TRUST_PROXY || 'no',
 	bugsnagKey: process.env.BUGSNAG_KEY || false,
 	secureMode: process.env.SECURE_MODE || false,
-	secret: process.env.SECRET || 'lakikihdgdfdjjjdgd67264664vdjhjdyncmxuei8336%%^#%gdvdhj????jjhdghduue'
+	secret: process.env.SECRET || 'lakikihdgdfdjjjdgd67264664vdjhjdyncmxuei8336%%^#%gdvdhj????jjhdghduue',
+	mongoURL: process.env.MONGOLAB_URL || 'mongodb://192.168.99.100/snipe'
 };

config/production.js

@@ -1,9 +1,10 @@
 "use strict";
 module.exports = {
 	env: process.env.NODE_ENV || 'production',
-	port: process.env.PORT || 3000,
+	port: process.env.PORT || 80,
 	trustProxy: process.env.TRUST_PROXY || 'no',
 	bugsnagKey: process.env.BUGSNAG_KEY || false,
 	secureMode: process.env.SECURE_MODE || true,
-	secret: process.env.SECRET || 'lakikihdgdfdjjjdgd67264660okjnbgtrdxswerfgytg373745ei8336%%^#%gdvdhj????jjhdghduue'
+	secret: process.env.SECRET || 'lakikihdgdfdjjjdgd67264660okjnbgtrdxswerfgytg373745ei8336%%^#%gdvdhj????jjhdghduue',
+	mongoURL: process.env.MONGOLAB_URL || 'mongodb://192.168.99.100/snipe'
 };

dredd.yml

@@ -0,0 +1,36 @@
+dry-run: null
+hookfiles: null
+language: nodejs
+sandbox: false
+server: node app.js
+server-wait: 3
+init: false
+custom:
+  apiaryApiKey: 0b50190a4bec8e35a0572c94d583b499
+  apiaryApiName: sniper1
+names: false
+only: []
+reporter: apiary
+output: []
+header: []
+sorted: false
+user: null
+inline-errors: false
+details: false
+method: []
+color: true
+level: info
+timestamp: false
+silent: false
+path: []
+hooks-worker-timeout: 5000
+hooks-worker-connect-timeout: 1500
+hooks-worker-connect-retry: 500
+hooks-worker-after-connect-wait: 100
+hooks-worker-term-timeout: 5000
+hooks-worker-term-retry: 500
+hooks-worker-handler-host: 127.0.0.1
+hooks-worker-handler-port: 61321
+config: ./dredd.yml
+blueprint: apiary.apib
+endpoint: 'http://127.0.0.1:8080'