feature(deps) Update deps, change server API, update changelog

mchapman · mchapman · commit d9508ae88500 · 2017-02-06T13:01:37.000Z
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,15 @@
 * Allow adding _id to list fields
 * Fix bug with routing to specific tab (such as /#/collection/id/edit/tab1)
 ### BREAKING CHANGES
+* The server side of forms angular is now passed a Mongoose instance:
+```
+var formsAngular = require('forms-angular');
+var express = require('express');
+var mongoose = require('mongoose');
+
+var app = express();
+var fng = new (formsAngular)(mongoose, app, {});
+```
 * If your application calls recordHandler.handleError (typically from a controller) then you will need
 to pass a response object rather than (data:any, status: number)
 
diff --git a/package.json b/package.json
@@ -31,15 +31,15 @@
     "RESTful API"
   ],
   "dependencies": {
-    "body-parser": "1.16.0",
-    "express": "4.14.1",
-    "method-override": "2.3.7",
     "async": "1.5.2",
+    "express": "4.14.1",
+    "kerberos":"0.0.22",
     "mongoose": "4.8.1",
     "node.extend": "1.1.6",
     "underscore": "1.8.3"
   },
   "devDependencies": {
+    "body-parser": "1.16.0",
     "del": "2.2.2",
     "gulp": "3.9.1",
     "gulp-angular-templatecache": "2.0.0",
diff --git a/server/data_form.js b/server/data_form.js
@@ -1,18 +1,15 @@
 /// <reference path="../typings/globals/node/index.d.ts" />
 /// <reference path="../typings/modules/mongoose/index.d.ts" />
-/// <reference path="../typings/modules/mpromise/index.d.ts" />
 'use strict';
+var Mongoose = require("mongoose");
 // This part of forms-angular borrows _very_ heavily from https://github.com/Alexandre-Strzelewicz/angular-bridge
 // (now https://github.com/Unitech/angular-bridge
 var _ = require('underscore');
 var util = require('util');
 var extend = require('node.extend');
 var async = require('async');
 var url = require('url');
-var mongoose = require('mongoose');
 var debug = false;
-mongoose.set('debug', debug);
-mongoose.Promise = global.Promise;
 function logTheAPICalls(req, res, next) {
     void (res);
     console.log('API     : ' + req.method + ' ' + req.url + '  [ ' + JSON.stringify(req.body) + ' ]');
@@ -31,11 +28,13 @@ function processArgs(options, array) {
     array[0] = options.urlPrefix + array[0];
     return array;
 }
-var DataForm = function (app, options) {
+var DataForm = function (mongoose, app, options) {
     this.app = app;
     app.locals.formsAngular = app.locals.formsAngular || [];
     app.locals.formsAngular.push(this);
     this.mongoose = mongoose;
+    mongoose.set('debug', debug);
+    mongoose.Promise = global.Promise;
     this.options = _.extend({
         urlPrefix: '/api/'
     }, options || {});
@@ -558,7 +557,7 @@ DataForm.prototype.hackVariables = function (obj) {
                 else {
                     var objectIdTest = /^([0-9a-fA-F]{24})$/.exec(obj[prop]);
                     if (objectIdTest) {
-                        obj[prop] = new mongoose.Types.ObjectId(objectIdTest[1]);
+                        obj[prop] = new Mongoose.Types.ObjectId(objectIdTest[1]);
                     }
                 }
             }
@@ -569,7 +568,8 @@ DataForm.prototype.hackVariables = function (obj) {
     }
 };
 DataForm.prototype.reportInternal = function (req, resource, schema, options, callback) {
-    var runPipeline, self = this;
+    var runPipeline;
+    var self = this;
     self.doFindFunc(req, resource, function (err, queryObj) {
         if (err) {
             return 'There was a problem with the findFunc for model';
diff --git a/server/data_form.ts b/server/data_form.ts
@@ -1,8 +1,8 @@
 /// <reference path="../typings/globals/node/index.d.ts" />
 /// <reference path="../typings/modules/mongoose/index.d.ts" />
-/// <reference path="../typings/modules/mpromise/index.d.ts" />
 
 'use strict';
+import * as Mongoose from "mongoose";
 
 // This part of forms-angular borrows _very_ heavily from https://github.com/Alexandre-Strzelewicz/angular-bridge
 // (now https://github.com/Unitech/angular-bridge
@@ -12,13 +12,12 @@ var util = require('util');
 var extend = require('node.extend');
 var async = require('async');
 var url = require('url');
-import mongoose = require('mongoose');
 
 var debug = false;
 
 interface Resource {
   resourceName: string;
-  model?: mongoose.Model<any>;            // TODO TS Get rid of the ? here
+  model?: Mongoose.Model<any>;            // TODO TS Get rid of the ? here
   options?: any;
 }
 
@@ -31,9 +30,6 @@ interface ListField {
   params? : ListParams;
 }
 
-mongoose.set('debug', debug);
-mongoose.Promise = <any>global.Promise;
-
 function logTheAPICalls(req, res, next) {
   void(res);
   console.log('API     : ' + req.method + ' ' + req.url + '  [ ' + JSON.stringify(req.body) + ' ]');
@@ -54,11 +50,13 @@ function processArgs(options, array) {
   return array;
 }
 
-var DataForm = function (app, options) {
+var DataForm = function (mongoose, app, options) {
   this.app = app;
   app.locals.formsAngular = app.locals.formsAngular || [];
   app.locals.formsAngular.push(this);
   this.mongoose = mongoose;
+  mongoose.set('debug', debug);
+  mongoose.Promise = <any>global.Promise;
   this.options = _.extend({
     urlPrefix: '/api/'
   }, options || {});
@@ -75,7 +73,7 @@ var DataForm = function (app, options) {
 
 module.exports = exports = DataForm;
 
-DataForm.prototype.getListFields = function (resource : Resource, doc: mongoose.Document, cb) {
+DataForm.prototype.getListFields = function (resource : Resource, doc: Mongoose.Document, cb) {
 
   function getFirstMatchingField(keyList, type?) {
     for (var i = 0; i < keyList.length; i++) {
@@ -625,7 +623,7 @@ DataForm.prototype.hackVariables = function (obj) {
         } else {
           var objectIdTest = /^([0-9a-fA-F]{24})$/.exec(obj[prop]);
           if (objectIdTest) {
-            obj[prop] = new mongoose.Types.ObjectId(objectIdTest[1]);
+            obj[prop] = new Mongoose.Types.ObjectId(objectIdTest[1]);
           }
         }
       } else if (_.isObject(obj[prop])) {
@@ -636,16 +634,16 @@ DataForm.prototype.hackVariables = function (obj) {
 };
 
 DataForm.prototype.reportInternal = function (req, resource, schema, options, callback) {
-  var runPipeline,
-    self = this;
+  let runPipeline: any;
+  let self = this;
 
   self.doFindFunc(req, resource, function (err, queryObj) {
     if (err) {
       return 'There was a problem with the findFunc for model';
     } else {
       // Bit crap here switching back and forth to string
       runPipeline = JSON.stringify(schema.pipeline);
-      for (var param in options.query) {
+      for (let param in options.query) {
         if (options.query[param]) {
           if (param !== 'r') {             // we don't want to copy the whole report schema (again!)
             schema.params[param].value = options.query[param];
diff --git a/test/api/CRUD-APISpec.js b/test/api/CRUD-APISpec.js
@@ -16,7 +16,7 @@ describe('API', function () {
   before(function (done) {
     app = express();
 
-    fng = new (formsAngular)(app, {urlPrefix: '/api/'});
+    fng = new (formsAngular)(mongoose, app, {urlPrefix: '/api/'});
 
     mongoose.connect('localhost', 'forms-ng_test');
     mongoose.connection.on('error', function () {
diff --git a/test/api/ControlAPISpec.js b/test/api/ControlAPISpec.js
@@ -17,7 +17,7 @@ describe('original API', function () {
   before(function (done) {
     app = express();
 
-    fng = new (formsAngular)(app, {urlPrefix: '/api/'});
+    fng = new (formsAngular)(mongoose, app, {urlPrefix: '/api/'});
 
     mongoose.connect('localhost', 'forms-ng_test');
     mongoose.connection.on('error', function () {
diff --git a/test/api/NewAddResourceAPISpec.js b/test/api/NewAddResourceAPISpec.js
@@ -15,7 +15,7 @@ describe('mongoose collection name API', function () {
   before(function (done) {
     app = express();
 
-    fng = new (formsAngular)(app, {urlPrefix: '/api/'});
+    fng = new (formsAngular)(mongoose, app, {urlPrefix: '/api/'});
 
     mongoose.connect('localhost', 'forms-ng_test');
     mongoose.connection.on('error', function () {
@@ -77,4 +77,4 @@ describe('mongoose collection name API', function () {
     fng.schema()(mockReq, mockRes);
   });
 
-});
+});
diff --git a/test/api/listAPISpec.js b/test/api/listAPISpec.js
@@ -17,7 +17,7 @@ describe('List API', function () {
 
     app = express();
 
-    fng = new (formsAngular)(app, {urlPrefix: '/api/'});
+    fng = new (formsAngular)(mongoose, app, {urlPrefix: '/api/'});
 
     mongoose.connect('localhost', 'forms-ng_test');
     mongoose.connection.on('error', function () {
diff --git a/test/api/reportAPISpec.js b/test/api/reportAPISpec.js
@@ -16,7 +16,7 @@ describe('Report API', function () {
   before(function (done) {
     app = express();
 
-    fng = new (formsAngular)(app, {urlPrefix: '/api/'});
+    fng = new (formsAngular)(mongoose, app, {urlPrefix: '/api/'});
 
     mongoose.connect('localhost', 'forms-ng_test');
 //    mongoose.set('debug',true);
