1.0.7

README.md

@@ -0,0 +1,4 @@
+# smartdata
+
+smartdata is a ODM that adheres to TypeScript practices and uses classes to organize data.
+It uses MongoDB as persistent storage.

dist/index.d.ts

@@ -1,14 +1,2 @@
-/// <reference types="q" />
+export * from './smartdata.classes.dbcollection';
-import * as plugins from './smartdata.plugins';
+export * from './smartdata.classes.dbconnection';
-export declare class DbCollection<T> {
-    constructor(nameArg: string, db: plugins.mongodb.Db);
-}
-export declare type TDbConnectionStatus = 'disconnected' | 'connected' | 'failed';
-export declare class DbConnection {
-    dbUrl: string;
-    db: plugins.mongodb.Db;
-    status: TDbConnectionStatus;
-    constructor(dbUrl: string);
-    connect(): plugins.q.Promise<any>;
-    close(): plugins.q.Promise<any>;
-}

dist/index.js

@@ -1,35 +1,7 @@
 "use strict";
-const plugins = require('./smartdata.plugins');
+function __export(m) {
-class DbCollection {
+    for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
-    constructor(nameArg, db) {
-        let collection = db.collection(nameArg);
 }
-}
+__export(require('./smartdata.classes.dbcollection'));
-exports.DbCollection = DbCollection;
+__export(require('./smartdata.classes.dbconnection'));
-class DbConnection {
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7O0FBRUEsaUJBQWMsa0NBQ2QsQ0FBQyxFQUQrQztBQUNoRCxpQkFBYyxrQ0FDZCxDQUFDLEVBRCtDIn0=
-    constructor(dbUrl) {
-        this.dbUrl = dbUrl;
-    }
-    connect() {
-        let done = plugins.q.defer();
-        plugins.mongodb.MongoClient.connect(this.dbUrl, (err, db) => {
-            if (err) {
-                console.log(err);
-            }
-            plugins.assert.equal(null, err);
-            this.db = db;
-            plugins.beautylog.success(`connected to database at ${this.dbUrl}`);
-            done.resolve(this.db);
-        });
-        return done.promise;
-    }
-    close() {
-        let done = plugins.q.defer();
-        this.db.close();
-        plugins.beautylog.ok(`disconnected to database at ${this.dbUrl}`);
-        done.resolve();
-        return done.promise;
-    }
-}
-exports.DbConnection = DbConnection;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsTUFBWSxPQUFPLFdBQU0scUJBRXpCLENBQUMsQ0FGNkM7QUFFOUM7SUFDSSxZQUFZLE9BQWUsRUFBRSxFQUFzQjtRQUMvQyxJQUFJLFVBQVUsR0FBRyxFQUFFLENBQUMsVUFBVSxDQUFDLE9BQU8sQ0FBQyxDQUFBO0lBQzNDLENBQUM7QUFDTCxDQUFDO0FBSlksb0JBQVksZUFJeEIsQ0FBQTtBQUlEO0lBS0ksWUFBWSxLQUFhO1FBQ3JCLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFBO0lBQ3RCLENBQUM7SUFFRCxPQUFPO1FBQ0gsSUFBSSxJQUFJLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQTtRQUM1QixPQUFPLENBQUMsT0FBTyxDQUFDLFdBQVcsQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLEtBQUssRUFBRSxDQUFDLEdBQUcsRUFBRSxFQUFFO1lBQ3BELEVBQUUsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7Z0JBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQTtZQUFDLENBQUM7WUFDN0IsT0FBTyxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsSUFBSSxFQUFFLEdBQUcsQ0FBQyxDQUFBO1lBQy9CLElBQUksQ0FBQyxFQUFFLEdBQUcsRUFBRSxDQUFBO1lBQ1osT0FBTyxDQUFDLFNBQVMsQ0FBQyxPQUFPLENBQUMsNEJBQTRCLElBQUksQ0FBQyxLQUFLLEVBQUUsQ0FBQyxDQUFBO1lBQ25FLElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFBO1FBQ3pCLENBQUMsQ0FBQyxDQUFBO1FBQ0YsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUE7SUFDdkIsQ0FBQztJQUVELEtBQUs7UUFDRCxJQUFJLElBQUksR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFBO1FBQzVCLElBQUksQ0FBQyxFQUFFLENBQUMsS0FBSyxFQUFFLENBQUE7UUFDZixPQUFPLENBQUMsU0FBUyxDQUFDLEVBQUUsQ0FBQywrQkFBK0IsSUFBSSxDQUFDLEtBQUssRUFBRSxDQUFDLENBQUE7UUFDakUsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFBO1FBQ2QsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUE7SUFDdkIsQ0FBQztBQUNMLENBQUM7QUE1Qlksb0JBQVksZUE0QnhCLENBQUEifQ==

dist/smartdata.classes.dbcollection.d.ts

@@ -0,0 +1,24 @@
+/// <reference types="q" />
+import * as plugins from './smartdata.plugins';
+import { DbConnection } from './smartdata.classes.dbconnection';
+export declare class DbCollection<T> {
+    collection: plugins.mongodb.Collection;
+    constructor(nameArg: string, dbConnectionArg: DbConnection);
+    /**
+     * adds a validation function that all newly inserted and updated objects have to pass
+     */
+    addObjectValidation(funcArg: any): void;
+    /**
+     * finds an object in the DbCollection
+     */
+    find(docMatchArg: T): plugins.q.Promise<T[]>;
+    /**
+     * inserts  object into the DbCollection
+     */
+    insertOne(docArg: T): plugins.q.Promise<void>;
+    /**
+     * inserts many objects at once into the DbCollection
+     */
+    insertMany(docArrayArg: T[]): plugins.q.Promise<void>;
+    private checkDoc(doc);
+}

dist/smartdata.classes.dbcollection.js

@@ -0,0 +1,57 @@
+"use strict";
+const plugins = require('./smartdata.plugins');
+class DbCollection {
+    constructor(nameArg, dbConnectionArg) {
+        this.collection = dbConnectionArg.db.collection(nameArg);
+    }
+    /**
+     * adds a validation function that all newly inserted and updated objects have to pass
+     */
+    addObjectValidation(funcArg) { }
+    /**
+     * finds an object in the DbCollection
+     */
+    find(docMatchArg) {
+        let done = plugins.q.defer();
+        this.collection.find(docMatchArg).toArray((err, docs) => {
+            if (err) {
+                throw err;
+            }
+            done.resolve(docs);
+        });
+        return done.promise;
+    }
+    /**
+     * inserts  object into the DbCollection
+     */
+    insertOne(docArg) {
+        let done = plugins.q.defer();
+        this.checkDoc(docArg).then(() => {
+            this.collection.insertOne(docArg)
+                .then(() => { done.resolve(); });
+        });
+        return done.promise;
+    }
+    /**
+     * inserts many objects at once into the DbCollection
+     */
+    insertMany(docArrayArg) {
+        let done = plugins.q.defer();
+        let checkDocPromiseArray = [];
+        for (let docArg of docArrayArg) {
+            checkDocPromiseArray.push(this.checkDoc(docArg));
+        }
+        plugins.q.all(checkDocPromiseArray).then(() => {
+            this.collection.insertMany(docArrayArg)
+                .then(() => { done.resolve(); });
+        });
+        return done.promise;
+    }
+    checkDoc(doc) {
+        let done = plugins.q.defer();
+        done.resolve();
+        return done.promise;
+    }
+}
+exports.DbCollection = DbCollection;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRkYXRhLmNsYXNzZXMuZGJjb2xsZWN0aW9uLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRkYXRhLmNsYXNzZXMuZGJjb2xsZWN0aW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxNQUFZLE9BQU8sV0FBTSxxQkFDekIsQ0FBQyxDQUQ2QztBQUc5QztJQUVJLFlBQVksT0FBZSxFQUFFLGVBQTZCO1FBQ3RELElBQUksQ0FBQyxVQUFVLEdBQUcsZUFBZSxDQUFDLEVBQUUsQ0FBQyxVQUFVLENBQUMsT0FBTyxDQUFDLENBQUE7SUFDNUQsQ0FBQztJQUVEOztPQUVHO0lBQ0gsbUJBQW1CLENBQUMsT0FBTyxJQUFJLENBQUM7SUFFaEM7O09BRUc7SUFDSCxJQUFJLENBQUMsV0FBYztRQUNmLElBQUksSUFBSSxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsS0FBSyxFQUFPLENBQUE7UUFDakMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsV0FBVyxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUMsR0FBRyxFQUFFLElBQUk7WUFDaEQsRUFBRSxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQztnQkFBQyxNQUFNLEdBQUcsQ0FBQTtZQUFDLENBQUM7WUFDdEIsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQTtRQUN0QixDQUFDLENBQUMsQ0FBQTtRQUNGLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFBO0lBQ3ZCLENBQUM7SUFFRDs7T0FFRztJQUNILFNBQVMsQ0FBQyxNQUFTO1FBQ2YsSUFBSSxJQUFJLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQyxLQUFLLEVBQVEsQ0FBQTtRQUNsQyxJQUFJLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxDQUFDLElBQUksQ0FBQztZQUN2QixJQUFJLENBQUMsVUFBVSxDQUFDLFNBQVMsQ0FBQyxNQUFNLENBQUM7aUJBQzVCLElBQUksQ0FBQyxRQUFRLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQSxDQUFDLENBQUMsQ0FBQyxDQUFBO1FBQ3ZDLENBQUMsQ0FBQyxDQUFBO1FBQ0YsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUE7SUFDdkIsQ0FBQztJQUVEOztPQUVHO0lBQ0gsVUFBVSxDQUFDLFdBQWdCO1FBQ3ZCLElBQUksSUFBSSxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsS0FBSyxFQUFRLENBQUE7UUFDbEMsSUFBSSxvQkFBb0IsR0FBOEIsRUFBRSxDQUFBO1FBQ3hELEdBQUcsQ0FBQyxDQUFDLElBQUksTUFBTSxJQUFJLFdBQVcsQ0FBQyxDQUFBLENBQUM7WUFDNUIsb0JBQW9CLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQTtRQUNwRCxDQUFDO1FBQ0QsT0FBTyxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsb0JBQW9CLENBQUMsQ0FBQyxJQUFJLENBQUM7WUFDckMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxVQUFVLENBQUMsV0FBVyxDQUFDO2lCQUNsQyxJQUFJLENBQUMsUUFBUSxJQUFJLENBQUMsT0FBTyxFQUFFLENBQUEsQ0FBQyxDQUFDLENBQUMsQ0FBQTtRQUN2QyxDQUFDLENBQUMsQ0FBQTtRQUNGLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFBO0lBQ3ZCLENBQUM7SUFFTyxRQUFRLENBQUMsR0FBTTtRQUNuQixJQUFJLElBQUksR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDLEtBQUssRUFBUSxDQUFBO1FBQ2xDLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQTtRQUNkLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFBO0lBQ3ZCLENBQUM7QUFDTCxDQUFDO0FBeERZLG9CQUFZLGVBd0R4QixDQUFBIn0=

dist/smartdata.classes.dbconnection.d.ts

@@ -0,0 +1,11 @@
+/// <reference types="q" />
+import * as plugins from './smartdata.plugins';
+export declare type TDbConnectionStatus = 'disconnected' | 'connected' | 'failed';
+export declare class DbConnection {
+    dbUrl: string;
+    db: plugins.mongodb.Db;
+    status: TDbConnectionStatus;
+    constructor(dbUrl: string);
+    connect(): plugins.q.Promise<any>;
+    close(): plugins.q.Promise<any>;
+}

dist/smartdata.classes.dbconnection.js

@@ -0,0 +1,29 @@
+"use strict";
+const plugins = require('./smartdata.plugins');
+class DbConnection {
+    constructor(dbUrl) {
+        this.dbUrl = dbUrl;
+    }
+    connect() {
+        let done = plugins.q.defer();
+        plugins.mongodb.MongoClient.connect(this.dbUrl, (err, db) => {
+            if (err) {
+                console.log(err);
+            }
+            plugins.assert.equal(null, err);
+            this.db = db;
+            plugins.beautylog.success(`connected to database at ${this.dbUrl}`);
+            done.resolve(this.db);
+        });
+        return done.promise;
+    }
+    close() {
+        let done = plugins.q.defer();
+        this.db.close();
+        plugins.beautylog.ok(`disconnected to database at ${this.dbUrl}`);
+        done.resolve();
+        return done.promise;
+    }
+}
+exports.DbConnection = DbConnection;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRkYXRhLmNsYXNzZXMuZGJjb25uZWN0aW9uLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRkYXRhLmNsYXNzZXMuZGJjb25uZWN0aW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxNQUFZLE9BQU8sV0FBTSxxQkFFekIsQ0FBQyxDQUY2QztBQUk5QztJQUtJLFlBQVksS0FBYTtRQUNyQixJQUFJLENBQUMsS0FBSyxHQUFHLEtBQUssQ0FBQTtJQUN0QixDQUFDO0lBRUQsT0FBTztRQUNILElBQUksSUFBSSxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUE7UUFDNUIsT0FBTyxDQUFDLE9BQU8sQ0FBQyxXQUFXLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxLQUFLLEVBQUUsQ0FBQyxHQUFHLEVBQUUsRUFBRTtZQUNwRCxFQUFFLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO2dCQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUE7WUFBQyxDQUFDO1lBQzdCLE9BQU8sQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLElBQUksRUFBRSxHQUFHLENBQUMsQ0FBQTtZQUMvQixJQUFJLENBQUMsRUFBRSxHQUFHLEVBQUUsQ0FBQTtZQUNaLE9BQU8sQ0FBQyxTQUFTLENBQUMsT0FBTyxDQUFDLDRCQUE0QixJQUFJLENBQUMsS0FBSyxFQUFFLENBQUMsQ0FBQTtZQUNuRSxJQUFJLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQTtRQUN6QixDQUFDLENBQUMsQ0FBQTtRQUNGLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFBO0lBQ3ZCLENBQUM7SUFFRCxLQUFLO1FBQ0QsSUFBSSxJQUFJLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQTtRQUM1QixJQUFJLENBQUMsRUFBRSxDQUFDLEtBQUssRUFBRSxDQUFBO1FBQ2YsT0FBTyxDQUFDLFNBQVMsQ0FBQyxFQUFFLENBQUMsK0JBQStCLElBQUksQ0FBQyxLQUFLLEVBQUUsQ0FBQyxDQUFBO1FBQ2pFLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQTtRQUNkLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFBO0lBQ3ZCLENBQUM7QUFDTCxDQUFDO0FBNUJZLG9CQUFZLGVBNEJ4QixDQUFBIn0=

package.json

@@ -1,11 +1,12 @@
 {
   "name": "smartdata",
-  "version": "1.0.1",
+  "version": "1.0.7",
   "description": "do more with data",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "scripts": {
-    "test": "(npmts)"
+    "test": "(npm run prepareMongo && npmts)",
+    "prepareMongo": "(rm -rf ./test/data && mkdir ./test/data/)"
   },
   "repository": {
     "type": "git",
@@ -30,6 +31,7 @@
     "@types/should": "^8.1.29",
     "shelljs": "^0.7.4",
     "should": "^11.1.0",
+    "smartstring": "^2.0.17",
     "typings-test": "^1.0.3"
   }
 }

test/test.js

@@ -1,13 +1,27 @@
 "use strict";
 require('typings-test');
 const shelljs = require('shelljs');
+const should = require('should');
+const smartstring = require('smartstring');
+// the tested module
 const smartdata = require('../dist/index');
 let mongoChildProcess;
 let testDbConnection;
+let testDbCollection;
 describe('mongodb', function () {
     it('should start mongodb', function (done) {
-        mongoChildProcess = shelljs.exec('mongod --dbpath=./test/data --port 27017', { async: true });
+        this.timeout(30000);
-        setTimeout(() => { done(); }, 1500);
+        mongoChildProcess = shelljs.exec('mongod --dbpath=./test/data --port 27017', { async: true, silent: true });
+        let doneCalled = false;
+        mongoChildProcess.stdout.on('data', function (data) {
+            console.log(smartstring.indent.indentWithPrefix(data, "*** MongoDB Process *** : "));
+            if (!doneCalled) {
+                if (/waiting for connections on port 27017/.test(data)) {
+                    doneCalled = true;
+                    done();
+                }
+            }
+        });
     });
 });
 describe('smartdata', function () {
@@ -16,15 +30,45 @@ describe('smartdata', function () {
         testDbConnection.connect().then(() => { done(); });
     });
     it('should create a collection', function () {
+        testDbCollection = new smartdata.DbCollection('something', testDbConnection);
+    });
+    it('should insert a doc into the collection', function (done) {
+        testDbCollection.insertOne({ hello: 'test' }).then(() => { done(); });
+    });
+    it('should find all docs of testDbCollection', function (done) {
+        testDbCollection.find({}).then((resultArray) => {
+            console.log(resultArray);
+            should(resultArray[0].hello).equal('test');
+            done();
+        });
+    });
+    it('should insert many docs into the collection', function (done) {
+        testDbCollection.insertMany([
+            { hello: 'test' },
+            { wow: 'what is this', wow2: 3 }
+        ]).then(() => { done(); });
+    });
+    it('should find a specified doc', function (done) {
+        testDbCollection.find({ 'wow2': { '$exists': true } }).then((resultArray) => {
+            console.log(resultArray);
+            should(resultArray[0].wow2).equal(3);
+            done();
+        }).catch(console.log);
     });
     it('should close the db Connection', function () {
         testDbConnection.close();
     });
 });
 describe('mongodb', function () {
-    it('should kill mongodb', function () {
+    it('should kill mongodb', function (done) {
+        this.timeout(30000);
+        mongoChildProcess.stdout.on('data', function (data) {
+            if (/dbexit:  rc: 0/.test(data)) {
+                done();
+            }
+        });
         shelljs.exec('mongod --dbpath=./test/data --shutdown');
         mongoChildProcess.kill('SIGTERM');
     });
 });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sY0FDUCxDQUFDLENBRG9CO0FBQ3JCLE1BQVksT0FBTyxXQUFNLFNBQ3pCLENBQUMsQ0FEaUM7QUFFbEMsTUFBWSxTQUFTLFdBQU0sZUFHM0IsQ0FBQyxDQUh5QztBQUcxQyxJQUFJLGlCQUFpQixDQUFBO0FBQ3JCLElBQUksZ0JBQXdDLENBQUE7QUFHNUMsUUFBUSxDQUFDLFNBQVMsRUFBQztJQUNmLEVBQUUsQ0FBQyxzQkFBc0IsRUFBQyxVQUFTLElBQUk7UUFDbkMsaUJBQWlCLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQywwQ0FBMEMsRUFBQyxFQUFDLEtBQUssRUFBRSxJQUFJLEVBQUMsQ0FBQyxDQUFBO1FBQzFGLFVBQVUsQ0FBQyxRQUFRLElBQUksRUFBRSxDQUFBLENBQUMsQ0FBQyxFQUFFLElBQUksQ0FBQyxDQUFBO0lBQ3RDLENBQUMsQ0FBQyxDQUFBO0FBQ04sQ0FBQyxDQUFDLENBQUE7QUFDRixRQUFRLENBQUMsV0FBVyxFQUFDO0lBQ2pCLEVBQUUsQ0FBQywwQ0FBMEMsRUFBQyxVQUFTLElBQUk7UUFDdkQsZ0JBQWdCLEdBQUcsSUFBSSxTQUFTLENBQUMsWUFBWSxDQUFDLHFDQUFxQyxDQUFDLENBQUE7UUFDcEYsZ0JBQWdCLENBQUMsT0FBTyxFQUFFLENBQUMsSUFBSSxDQUFDLFFBQVEsSUFBSSxFQUFFLENBQUEsQ0FBQyxDQUFDLENBQUMsQ0FBQTtJQUNyRCxDQUFDLENBQUMsQ0FBQTtJQUNGLEVBQUUsQ0FBQyw0QkFBNEIsRUFBQztJQUVoQyxDQUFDLENBQUMsQ0FBQTtJQUNGLEVBQUUsQ0FBQyxnQ0FBZ0MsRUFBQztRQUNoQyxnQkFBZ0IsQ0FBQyxLQUFLLEVBQUUsQ0FBQTtJQUM1QixDQUFDLENBQUMsQ0FBQTtBQUNOLENBQUMsQ0FBQyxDQUFBO0FBRUYsUUFBUSxDQUFDLFNBQVMsRUFBQztJQUNmLEVBQUUsQ0FBQyxxQkFBcUIsRUFBQztRQUNyQixPQUFPLENBQUMsSUFBSSxDQUFDLHdDQUF3QyxDQUFDLENBQUE7UUFDdEQsaUJBQWlCLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxDQUFBO0lBQ3JDLENBQUMsQ0FBQyxDQUFBO0FBQ04sQ0FBQyxDQUFDLENBQUEifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sY0FFUCxDQUFDLENBRm9CO0FBRXJCLE1BQVksT0FBTyxXQUFNLFNBQ3pCLENBQUMsQ0FEaUM7QUFDbEMsTUFBWSxNQUFNLFdBQU0sUUFDeEIsQ0FBQyxDQUQrQjtBQUNoQyxNQUFZLFdBQVcsV0FBTSxhQUc3QixDQUFDLENBSHlDO0FBRTFDLG9CQUFvQjtBQUNwQixNQUFZLFNBQVMsV0FBTSxlQUUzQixDQUFDLENBRnlDO0FBRTFDLElBQUksaUJBQWlCLENBQUE7QUFDckIsSUFBSSxnQkFBd0MsQ0FBQTtBQUM1QyxJQUFJLGdCQUE2QyxDQUFBO0FBRWpELFFBQVEsQ0FBQyxTQUFTLEVBQUU7SUFDaEIsRUFBRSxDQUFDLHNCQUFzQixFQUFFLFVBQVUsSUFBSTtRQUNyQyxJQUFJLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxDQUFBO1FBQ25CLGlCQUFpQixHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsMENBQTBDLEVBQUUsRUFBRSxLQUFLLEVBQUUsSUFBSSxFQUFFLE1BQU0sRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFBO1FBQzNHLElBQUksVUFBVSxHQUFHLEtBQUssQ0FBQTtRQUN0QixpQkFBaUIsQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLE1BQU0sRUFBRSxVQUFVLElBQUk7WUFDOUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxXQUFXLENBQUMsTUFBTSxDQUFDLGdCQUFnQixDQUFDLElBQUksRUFBRSw0QkFBNEIsQ0FBQyxDQUFDLENBQUE7WUFDcEYsRUFBRSxDQUFDLENBQUMsQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDO2dCQUNkLEVBQUUsQ0FBQyxDQUFDLHVDQUF1QyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7b0JBQ3JELFVBQVUsR0FBRyxJQUFJLENBQUE7b0JBQ2pCLElBQUksRUFBRSxD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

test/test.ts

@@ -1,17 +1,30 @@
 import 'typings-test'
+
 import * as shelljs from 'shelljs'
 import * as should from 'should'
-import * as smartdata from '../dist/index'
+import * as smartstring from 'smartstring'
 
+// the tested module
+import * as smartdata from '../dist/index'
 
 let mongoChildProcess
 let testDbConnection: smartdata.DbConnection
-
+let testDbCollection: smartdata.DbCollection<any>
 
 describe('mongodb', function () {
     it('should start mongodb', function (done) {
-        mongoChildProcess = shelljs.exec('mongod --dbpath=./test/data --port 27017',{async: true})
+        this.timeout(30000)
-        setTimeout(() => { done() }, 1500)
+        mongoChildProcess = shelljs.exec('mongod --dbpath=./test/data --port 27017', { async: true, silent: true })
+        let doneCalled = false
+        mongoChildProcess.stdout.on('data', function (data) {
+            console.log(smartstring.indent.indentWithPrefix(data, "*** MongoDB Process *** : "))
+            if (!doneCalled) {
+                if (/waiting for connections on port 27017/.test(data)) {
+                    doneCalled = true
+                    done()
+                }
+            }
+        })
     })
 })
 describe('smartdata', function () {
@@ -20,7 +33,30 @@ describe('smartdata',function(){
         testDbConnection.connect().then(() => { done() })
     })
     it('should create a collection', function () {
-
+        testDbCollection = new smartdata.DbCollection('something', testDbConnection)
+    })
+    it('should insert a doc into the collection', function (done) {
+        testDbCollection.insertOne({ hello: 'test' }).then(() => { done() })
+    })
+    it('should find all docs of testDbCollection', function (done) {
+        testDbCollection.find({}).then((resultArray) => {
+            console.log(resultArray)
+            should(resultArray[0].hello).equal('test')
+            done()
+        })
+    })
+    it('should insert many docs into the collection', function (done) {
+        testDbCollection.insertMany([
+            { hello: 'test' },
+            { wow: 'what is this', wow2: 3}
+        ]).then(() => { done() })
+    })
+    it('should find a specified doc', function (done) {
+        testDbCollection.find({'wow2': {'$exists': true}}).then((resultArray) => {
+            console.log(resultArray)
+            should(resultArray[0].wow2).equal(3)
+            done()
+        }).catch(console.log)
     })
     it('should close the db Connection', function () {
         testDbConnection.close()
@@ -28,7 +64,13 @@ describe('smartdata',function(){
 })
 
 describe('mongodb', function () {
-    it('should kill mongodb',function(){
+    it('should kill mongodb', function (done) {
+        this.timeout(30000)
+        mongoChildProcess.stdout.on('data', function (data) {
+            if (/dbexit:  rc: 0/.test(data)) {
+                done()
+            }
+        })
         shelljs.exec('mongod --dbpath=./test/data --shutdown')
         mongoChildProcess.kill('SIGTERM')
     })

ts/index.ts

@@ -1,39 +1,4 @@
 import * as plugins from './smartdata.plugins'
 
-export class DbCollection<T> {
+export * from './smartdata.classes.dbcollection'
-    constructor(nameArg: string, db: plugins.mongodb.Db) {
+export * from './smartdata.classes.dbconnection'
-        let collection = db.collection(nameArg)
-    }
-}
-
-export type TDbConnectionStatus = 'disconnected' | 'connected' | 'failed'
-
-export class DbConnection {
-    dbUrl: string
-    db: plugins.mongodb.Db
-    status: TDbConnectionStatus
-
-    constructor(dbUrl: string) {
-        this.dbUrl = dbUrl
-    }
-
-    connect(): plugins.q.Promise<any> {
-        let done = plugins.q.defer()
-        plugins.mongodb.MongoClient.connect(this.dbUrl, (err, db) => {
-            if (err) { console.log(err) }
-            plugins.assert.equal(null, err)
-            this.db = db
-            plugins.beautylog.success(`connected to database at ${this.dbUrl}`)
-            done.resolve(this.db)
-        })
-        return done.promise
-    }
-
-    close(): plugins.q.Promise<any> {
-        let done = plugins.q.defer()
-        this.db.close()
-        plugins.beautylog.ok(`disconnected to database at ${this.dbUrl}`)
-        done.resolve()
-        return done.promise
-    }
-}

ts/smartdata.classes.dbcollection.ts

@@ -0,0 +1,60 @@
+import * as plugins from './smartdata.plugins'
+import { DbConnection } from './smartdata.classes.dbconnection'
+
+export class DbCollection<T> {
+    collection: plugins.mongodb.Collection
+    constructor(nameArg: string, dbConnectionArg: DbConnection) {
+        this.collection = dbConnectionArg.db.collection(nameArg)
+    }
+
+    /**
+     * adds a validation function that all newly inserted and updated objects have to pass
+     */
+    addObjectValidation(funcArg) { }
+
+    /**
+     * finds an object in the DbCollection
+     */
+    find(docMatchArg: T): plugins.q.Promise<T[]> {
+        let done = plugins.q.defer<T[]>()
+        this.collection.find(docMatchArg).toArray((err, docs) => {
+            if (err) { throw err }
+            done.resolve(docs)
+        })
+        return done.promise
+    }
+
+    /**
+     * inserts  object into the DbCollection
+     */
+    insertOne(docArg: T): plugins.q.Promise<void> {
+        let done = plugins.q.defer<void>()
+        this.checkDoc(docArg).then(() => {
+            this.collection.insertOne(docArg)
+                .then(() => { done.resolve() })
+        })
+        return done.promise
+    }
+
+    /**
+     * inserts many objects at once into the DbCollection
+     */
+    insertMany(docArrayArg: T[]): plugins.q.Promise<void> {
+        let done = plugins.q.defer<void>()
+        let checkDocPromiseArray: plugins.q.Promise<void>[] = []
+        for (let docArg of docArrayArg){
+            checkDocPromiseArray.push(this.checkDoc(docArg))
+        }
+        plugins.q.all(checkDocPromiseArray).then(() => {
+            this.collection.insertMany(docArrayArg)
+                .then(() => { done.resolve() })
+        })
+        return done.promise
+    }
+
+    private checkDoc(doc: T): plugins.q.Promise<void> {
+        let done = plugins.q.defer<void>()
+        done.resolve()
+        return done.promise
+    }
+}

ts/smartdata.classes.dbconnection.ts

@@ -0,0 +1,33 @@
+import * as plugins from './smartdata.plugins'
+
+export type TDbConnectionStatus = 'disconnected' | 'connected' | 'failed'
+
+export class DbConnection {
+    dbUrl: string
+    db: plugins.mongodb.Db
+    status: TDbConnectionStatus
+
+    constructor(dbUrl: string) {
+        this.dbUrl = dbUrl
+    }
+
+    connect(): plugins.q.Promise<any> {
+        let done = plugins.q.defer()
+        plugins.mongodb.MongoClient.connect(this.dbUrl, (err, db) => {
+            if (err) { console.log(err) }
+            plugins.assert.equal(null, err)
+            this.db = db
+            plugins.beautylog.success(`connected to database at ${this.dbUrl}`)
+            done.resolve(this.db)
+        })
+        return done.promise
+    }
+
+    close(): plugins.q.Promise<any> {
+        let done = plugins.q.defer()
+        this.db.close()
+        plugins.beautylog.ok(`disconnected to database at ${this.dbUrl}`)
+        done.resolve()
+        return done.promise
+    }
+}