A number of code style fixes

SierraSoftworks · Jun 11, 2015 · c9bc082 · c9bc082
1 parent aed3171
commit c9bc082
Show file tree

Hide file tree

Showing 11 changed files with 35 additions and 34 deletions.
diff --git a/build/test.js b/build/test.js
@@ -1,6 +1,5 @@
 var gulp = require('gulp'),
 	mocha = require('gulp-mocha'),
-	plumber = require('gulp-plumber'),
 	path = require('path');
 
 var paths = require('./paths');

diff --git a/build/version.js b/build/version.js
@@ -6,13 +6,11 @@ var gulp = require('gulp'),
     semver = require('semver'),
     runSequence = require('run-sequence'),
     fs = require('fs');
-
-var paths = require('./paths');
 
 function getPackageJsonVersion() {
     //We parse the json file instead of using require because require caches multiple calls so the version number won't be updated
     return JSON.parse(fs.readFileSync('./package.json', 'utf8')).version;
-};
+}
 
 gulp.task('version-bump', function () {
     var args = minimist(process.argv);

diff --git a/dist/lib/Core.js b/dist/lib/Core.js
diff --git a/dist/lib/Core.js.map b/dist/lib/Core.js.map
diff --git a/dist/lib/Instance.js b/dist/lib/Instance.js
diff --git a/dist/lib/Instance.js.map b/dist/lib/Instance.js.map
diff --git a/dist/lib/ModelCache.js b/dist/lib/ModelCache.js
diff --git a/dist/lib/ModelCache.js.map b/dist/lib/ModelCache.js.map
diff --git a/lib/Core.ts b/lib/Core.ts
@@ -18,7 +18,7 @@ import {Cache} from './Cache';
 import NoOpCache from './caches/NoOpCache';
 import MemoryCache from './caches/MemoryCache';
 
-var MongoConnectAsyc = Bluebird.promisify(MongoDB.MongoClient.connect);
+var mongoConnectAsyc = Bluebird.promisify(MongoDB.MongoClient.connect);
 
 export default class Core {
     /**
@@ -159,7 +159,7 @@ export default class Core {
         var self = this;
         return Bluebird.bind(this).then(function() {
             if (self._connection) return self._connection;
-            return MongoConnectAsyc(self.url);
+            return mongoConnectAsyc(self.url);
         }).then(function(db: MongoDB.Db) {
             self._connection = db;
             return self;

diff --git a/lib/Instance.ts b/lib/Instance.ts
@@ -120,20 +120,22 @@ export default class Instance<TDocument extends { _id?: any }, TInstance> {
         }).then((changes) => {
             if (!changes && !this._isNew) return false;
 
-            if (this._isNew) return new Bluebird<boolean>((resolve, reject) => {
-                this._model.collection.insertOne(this._modified, { w: 'majority' },(err, doc) => {
-                    if (err) return reject(err);
-                    return resolve(<any>!!doc);
+            if (this._isNew) {
+                return new Bluebird<boolean>((resolve, reject) => {
+                    this._model.collection.insertOne(this._modified, { w: 'majority' }, (err, doc) => {
+                        if (err) return reject(err);
+                        return resolve(<any>!!doc);
+                    });
                 });
-            });
-
-            return new Bluebird<boolean>((resolve: (changed: boolean) => void, reject) => {
-                this._model.collection.updateOne(conditions, changes, { w: 'majority' },(err: Error, changed: boolean) => {
-                    if (err) return reject(err);
-                    return resolve(changed);
+            } else {
+                return new Bluebird<boolean>((resolve: (changed: boolean) => void, reject) => {
+                    this._model.collection.updateOne(conditions, changes, { w: 'majority' }, (err: Error, changed: boolean) => {
+                        if (err) return reject(err);
+                        return resolve(changed);
+                    });
                 });
-            });
-            }).then((changed: boolean) => {
+            }
+        }).then((changed: boolean) => {
             conditions = { _id: this._modified._id };
             if (!changed) {
                 return _.cloneDeep(this._modified);
@@ -227,7 +229,7 @@ export default class Instance<TDocument extends { _id?: any }, TInstance> {
         }).then((removed) => {
             if (removed) return this._model.cache.clear(conditions);
             return false;
-        }).then((removed) => {
+        }).then(() => {
             this._isNew = true;
             return <TInstance><any>this;
         }).nodeify(callback);

diff --git a/lib/ModelCache.ts b/lib/ModelCache.ts
@@ -8,7 +8,7 @@ export default class ModelCache {
     }
 
     set<T>(value: T): void {
-        if (!this.model.cacheDirector || !this.model.cacheDirector.valid(value)) return;;
+        if (!this.model.cacheDirector || !this.model.cacheDirector.valid(value)) return;
         this.model.core.cache.set(this.model.cacheDirector.buildKey(value), value);
     }