added "version" property in KuzzleDocument

Author: scottinet

src/kuzzleDataCollection.js

@@ -72,7 +72,7 @@ KuzzleDataCollection.prototype.advancedSearch = function (filters, cb) {
     }
 
     result.hits.hits.forEach(function (doc) {
-      documents.push(new KuzzleDocument(self, doc._id, doc._source));
+      documents.push(this.documentFactory(doc._id, doc));
     });
 
     cb(null, { total: result.hits.total, documents: documents });
@@ -155,7 +155,7 @@ KuzzleDataCollection.prototype.createDocument = function (document, options, cb)
         return cb(err);
       }
 
-      cb(null, new KuzzleDocument(self, res._id, res._source));
+      cb(null, self.documentFactory(res._id, res));
     });
   } else {
     this.kuzzle.query(this.collection, 'write', action, data, options);
@@ -239,7 +239,7 @@ KuzzleDataCollection.prototype.fetchDocument = function (documentId, cb) {
       return cb(err);
     }
 
-    cb(null, new KuzzleDocument(self, res._id, res._source));
+    cb(null, self.documentFactory(res._id, res));
   });
 
   return this;
@@ -338,7 +338,7 @@ KuzzleDataCollection.prototype.replaceDocument = function (documentId, content,
         return cb(err);
       }
 
-      cb(null, new KuzzleDocument(self, res._id, res._source));
+      cb(null, self.documentFactory(res._id, res));
     });
   } else {
     self.kuzzle.query(this.collection, 'write', 'createOrUpdate', data, options);
@@ -417,7 +417,13 @@ KuzzleDataCollection.prototype.updateDocument = function (documentId, content, o
  * @constructor
  */
 KuzzleDataCollection.prototype.documentFactory = function (id, content) {
-  return new KuzzleDocument(this, id, content);
+  var document = content._source ? new KuzzleDocument(this, id, content._source) : new KuzzleDocument(this, id, content);
+
+  if (content._version) {
+    document.version = content._version;
+  }
+
+  return document;
 };
 
 /**

src/kuzzleDocument.js

@@ -55,22 +55,19 @@ function KuzzleDocument(kuzzleDataCollection, documentId, content) {
     },
     // writable properties
     content: {
-      enumerable: true,
-      set: function (data) {
-        if (!content) {
-          content = {};
-        }
-
-        return this.setContent(data, false);
-      },
-      get: function () {
-        return content;
-      }
+      value: {},
+      writable: true,
+      enumerable: true
     },
     headers: {
       value: JSON.parse(JSON.stringify(kuzzleDataCollection.headers)),
       enumerable: true,
       writable: true
+    },
+    version: {
+      value: undefined,
+      enumerable: true,
+      writable: true
     }
   });
 
@@ -117,6 +114,7 @@ KuzzleDocument.prototype.toJSON = function () {
   }
 
   data.body = this.content;
+  data._version = this.version;
   data = this.kuzzle.addHeaders(data, this.headers);
 
   return data;
@@ -195,18 +193,21 @@ KuzzleDocument.prototype.refresh = function (cb) {
   self.refreshing = true;
 
   self.kuzzle.query(self.collection, 'read', 'get', {_id: self.id}, function (error, result) {
-    self.refreshing = false;
-    dequeue.call(self);
-
     if (error) {
+      self.refreshing = false;
+      self.queue = [];
       return cb ? cb(error) : false;
     }
 
+    self.version = result._version;
     self.content = result._source;
 
     if (cb) {
       cb(null, self);
     }
+
+    self.refreshing = false;
+    dequeue.call(self);
   });
 
   return this;