medici - npm Package Compare versions

Comparing version 0.9.0 to 0.9.1

index.js

@@ -43,113 +43,112 @@ var Q, Schema, book, entry, err, journalSchema, mongoose, transactionSchema, _;
 
-journalSchema = new Schema({
-  datetime: Date,
-  memo: {
-    type: String,
-    "default": ''
-  },
-  _transactions: [
-    {
-      type: Schema.Types.ObjectId,
-      ref: 'Medici_Transaction'
+try {
+  journalSchema = mongoose.model('Medici_Journal');
+} catch (_error) {
+  err = _error;
+  journalSchema = new Schema({
+    datetime: Date,
+    memo: {
+      type: String,
+      "default": ''
+    },
+    _transactions: [
+      {
+        type: Schema.Types.ObjectId,
+        ref: 'Medici_Transaction'
+      }
+    ],
+    book: String,
+    voided: {
+      type: Boolean,
+      "default": false
+    },
+    void_reason: String
+  });
+  journalSchema.methods["void"] = function(book, reason) {
+    var deferred, trans_id, voidTransaction, voids, _i, _len, _ref,
+      _this = this;
+    deferred = Q.defer();
+    if (this.voided === true) {
+      deferred.reject(new Error('Journal already voided'));
     }
-  ],
-  book: String,
-  voided: {
-    type: Boolean,
-    "default": false
-  },
-  void_reason: String
-});
-
-journalSchema.methods.getTransactionModel = function() {
-  return mongoose.model('Medici_Transaction');
-};
-
-journalSchema.methods["void"] = function(book, reason) {
-  var deferred, trans_id, voidTransaction, voids, _i, _len, _ref,
-    _this = this;
-  deferred = Q.defer();
-  if (this.voided === true) {
-    deferred.reject(new Error('Journal already voided'));
-  }
-  this.voided = true;
-  if (reason == null) {
-    this.void_reason = '';
-  } else {
-    this.void_reason = reason;
-  }
-  voidTransaction = function(trans_id) {
-    var d;
-    d = Q.defer();
-    _this.getTransactionModel().findByIdAndUpdate(trans_id, {
-      voided: true,
-      void_reason: _this.void_reason
-    }, function(err, trans) {
-      if (err) {
-        console.error('Failed to void transaction:', err);
-        return d.reject(err);
-      } else {
-        return d.resolve(trans);
-      }
-    });
-    return d.promise;
-  };
-  voids = [];
-  _ref = this._transactions;
-  for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-    trans_id = _ref[_i];
-    voids.push(voidTransaction(trans_id));
-  }
-  Q.all(voids).then(function(transactions) {
-    var key, meta, newMemo, trans, val, valid_fields, _j, _len1;
-    if (_this.void_reason) {
-      newMemo = _this.void_reason;
+    this.voided = true;
+    if (reason == null) {
+      this.void_reason = '';
     } else {
-      if (_this.memo.substr(0, 6) === '[VOID]') {
-        newMemo = _this.memo.replace('[VOID]', '[UNVOID]');
-      } else if (_this.memo.substr(0, 8) === '[UNVOID]') {
-        newMemo = _this.memo.replace('[UNVOID]', '[REVOID]');
-      } else if (_this.memo.substr(0, 8) === '[REVOID]') {
-        newMemo = _this.memo.replace('[REVOID]', '[UNVOID]');
+      this.void_reason = reason;
+    }
+    voidTransaction = function(trans_id) {
+      var d;
+      d = Q.defer();
+      mongoose.model('Medici_Transaction').findByIdAndUpdate(trans_id, {
+        voided: true,
+        void_reason: _this.void_reason
+      }, function(err, trans) {
+        if (err) {
+          console.error('Failed to void transaction:', err);
+          return d.reject(err);
+        } else {
+          return d.resolve(trans);
+        }
+      });
+      return d.promise;
+    };
+    voids = [];
+    _ref = this._transactions;
+    for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+      trans_id = _ref[_i];
+      voids.push(voidTransaction(trans_id));
+    }
+    Q.all(voids).then(function(transactions) {
+      var key, meta, newMemo, trans, val, valid_fields, _j, _len1;
+      if (_this.void_reason) {
+        newMemo = _this.void_reason;
       } else {
-        newMemo = '[VOID] ' + _this.memo;
+        if (_this.memo.substr(0, 6) === '[VOID]') {
+          newMemo = _this.memo.replace('[VOID]', '[UNVOID]');
+        } else if (_this.memo.substr(0, 8) === '[UNVOID]') {
+          newMemo = _this.memo.replace('[UNVOID]', '[REVOID]');
+        } else if (_this.memo.substr(0, 8) === '[REVOID]') {
+          newMemo = _this.memo.replace('[REVOID]', '[UNVOID]');
+        } else {
+          newMemo = '[VOID] ' + _this.memo;
+        }
       }
-    }
-    entry = book.entry(newMemo, null, _this._id);
-    valid_fields = ['credit', 'debit', 'account_path', 'accounts', 'datetime', 'book', 'memo', 'timestamp', 'voided', 'void_reason', '_original_journal'];
-    for (_j = 0, _len1 = transactions.length; _j < _len1; _j++) {
-      trans = transactions[_j];
-      trans = trans.toObject();
-      meta = {};
-      for (key in trans) {
-        val = trans[key];
-        if (key === '_id' || key === '_journal') {
-          continue;
+      entry = book.entry(newMemo, null, _this._id);
+      valid_fields = ['credit', 'debit', 'account_path', 'accounts', 'datetime', 'book', 'memo', 'timestamp', 'voided', 'void_reason', '_original_journal'];
+      for (_j = 0, _len1 = transactions.length; _j < _len1; _j++) {
+        trans = transactions[_j];
+        trans = trans.toObject();
+        meta = {};
+        for (key in trans) {
+          val = trans[key];
+          if (key === '_id' || key === '_journal') {
+            continue;
+          }
+          if (valid_fields.indexOf(key) === -1) {
+            meta[key] = val;
+          }
         }
-        if (valid_fields.indexOf(key) === -1) {
-          meta[key] = val;
+        if (trans.credit) {
+          entry.debit(trans.account_path, trans.credit, meta);
         }
+        if (trans.debit) {
+          entry.credit(trans.account_path, trans.debit, meta);
+        }
       }
-      if (trans.credit) {
-        entry.debit(trans.account_path, trans.credit, meta);
-      }
-      if (trans.debit) {
-        entry.credit(trans.account_path, trans.debit, meta);
-      }
-    }
-    return entry.commit().then(function(entry) {
-      return deferred.resolve(entry);
+      return entry.commit().then(function(entry) {
+        return deferred.resolve(entry);
+      }, function(err) {
+        return deferred.reject(err);
+      });
     }, function(err) {
       return deferred.reject(err);
     });
-  }, function(err) {
-    return deferred.reject(err);
-  });
-  return deferred.promise;
-};
+    return deferred.promise;
+  };
+  mongoose.model('Medici_Journal', journalSchema);
+}
 
-mongoose.model('Medici_Journal', journalSchema);
-
 module.exports = {
   book: book
 };

lib/entry.js

@@ -23,3 +23,3 @@ var Entry, Q, mongoose, _;
     this.book = book;
-    journalClass = mongoose.model('Medici_Journal');
+    journalClass = this.book.journalClass;
     this.journal = new journalClass();
@@ -62,3 +62,3 @@ this.journal.memo = memo;
     };
-    keys = _.keys(mongoose.model('Medici_Transaction').schema.paths);
+    keys = _.keys(this.book.transactionClass.schema.paths);
     meta = {};
@@ -101,3 +101,3 @@ for (key in extra) {
     };
-    keys = _.keys(mongoose.model('Medici_Transaction').schema.paths);
+    keys = _.keys(this.book.transactionClass.schema.paths);
     meta = {};
@@ -120,3 +120,3 @@ for (key in extra) {
     d = Q.defer();
-    modelClass = mongoose.model('Medici_Transaction');
+    modelClass = this.book.transactionClass;
     model = new modelClass(transaction);
@@ -161,3 +161,3 @@ this.journal._transactions.push(model._id);
           if (err) {
-            mongoose.model('Medici_Transaction').remove({
+            _this.book.transactionClass.remove({
               _journal: _this.journal._id
@@ -164,0 +164,0 @@ });

package.json

 {
   "name": "medici",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "description": "Simple double-entry accounting for Node + Mongoose",
@@ -5,0 +5,0 @@ "main": "index.js",

No alert changes

Improved metrics

Total package byte prevSize

37293

increased by0.24%

Lines of code

563

increased by0.36%

No dependency changes