Merge pull request #59 from kuzzleio/KUZ415_serialize

renamed KuzzleDocument.toJSON to serialize

Author: stafyniaksacha

dist/kuzzle.js

@@ -1644,7 +1644,7 @@ KuzzleDataCollection.prototype.createDocument = function (id, document, options,
   }
 
   if (document instanceof KuzzleDocument) {
-    data = document.toJSON();
+    data = document.serialize();
   } else {
     data.body = document;
   }
@@ -1849,7 +1849,7 @@ KuzzleDataCollection.prototype.publishMessage = function (document, options) {
   var data = {};
 
   if (document instanceof KuzzleDocument) {
-    data = document.toJSON();
+    data = document.serialize();
   } else {
     data.body = document;
   }
@@ -2313,7 +2313,7 @@ function KuzzleDocument(kuzzleDataCollection, documentId, content) {
  *
  * @return {object} JSON object representing this document
  */
-KuzzleDocument.prototype.toJSON = function () {
+KuzzleDocument.prototype.serialize = function () {
   var
     data = {};
 
@@ -2334,7 +2334,7 @@ KuzzleDocument.prototype.toJSON = function () {
  * @return {string} serialized version of this object
  */
 KuzzleDocument.prototype.toString = function () {
-  return JSON.stringify(this.toJSON());
+  return JSON.stringify(this.serialize());
 };
 
 /**
@@ -2361,15 +2361,15 @@ KuzzleDocument.prototype.delete = function (options, cb) {
   }
 
   if (cb) {
-    this.kuzzle.query(this.dataCollection.buildQueryArgs('write', 'delete'), this.toJSON(), options, function (err) {
+    this.kuzzle.query(this.dataCollection.buildQueryArgs('write', 'delete'), this.serialize(), options, function (err) {
       if (err) {
         return cb(err);
       }
 
       cb(null, self);
     });
   } else {
-    this.kuzzle.query(this.dataCollection.buildQueryArgs('write', 'delete'), this.toJSON(), options);
+    this.kuzzle.query(this.dataCollection.buildQueryArgs('write', 'delete'), this.serialize(), options);
   }
 
   return this;
@@ -2427,7 +2427,7 @@ KuzzleDocument.prototype.refresh = function (options, cb) {
  */
 KuzzleDocument.prototype.save = function (options, cb) {
   var
-    data = this.toJSON(),
+    data = this.serialize(),
     self = this;
 
   if (options && cb === undefined && typeof options === 'function') {
@@ -2462,7 +2462,7 @@ KuzzleDocument.prototype.save = function (options, cb) {
  * @returns {*} this
  */
 KuzzleDocument.prototype.publish = function (options) {
-  var data = this.toJSON();
+  var data = this.serialize();
 
   this.kuzzle.query(this.dataCollection.buildQueryArgs('write', 'publish'), data, options);
 

dist/kuzzle.min.js

@@ -213,7 +213,7 @@ KuzzleDataCollection.prototype.createDocument = function (id, document, options,
   }
 
   if (document instanceof KuzzleDocument) {
-    data = document.toJSON();
+    data = document.serialize();
   } else {
     data.body = document;
   }
@@ -418,7 +418,7 @@ KuzzleDataCollection.prototype.publishMessage = function (document, options) {
   var data = {};
 
   if (document instanceof KuzzleDocument) {
-    data = document.toJSON();
+    data = document.serialize();
   } else {
     data.body = document;
   }

dist/kuzzle.min.map

@@ -99,7 +99,7 @@ function KuzzleDocument(kuzzleDataCollection, documentId, content) {
  *
  * @return {object} JSON object representing this document
  */
-KuzzleDocument.prototype.toJSON = function () {
+KuzzleDocument.prototype.serialize = function () {
   var
     data = {};
 
@@ -120,7 +120,7 @@ KuzzleDocument.prototype.toJSON = function () {
  * @return {string} serialized version of this object
  */
 KuzzleDocument.prototype.toString = function () {
-  return JSON.stringify(this.toJSON());
+  return JSON.stringify(this.serialize());
 };
 
 /**
@@ -147,15 +147,15 @@ KuzzleDocument.prototype.delete = function (options, cb) {
   }
 
   if (cb) {
-    this.kuzzle.query(this.dataCollection.buildQueryArgs('write', 'delete'), this.toJSON(), options, function (err) {
+    this.kuzzle.query(this.dataCollection.buildQueryArgs('write', 'delete'), this.serialize(), options, function (err) {
       if (err) {
         return cb(err);
       }
 
       cb(null, self);
     });
   } else {
-    this.kuzzle.query(this.dataCollection.buildQueryArgs('write', 'delete'), this.toJSON(), options);
+    this.kuzzle.query(this.dataCollection.buildQueryArgs('write', 'delete'), this.serialize(), options);
   }
 
   return this;
@@ -213,7 +213,7 @@ KuzzleDocument.prototype.refresh = function (options, cb) {
  */
 KuzzleDocument.prototype.save = function (options, cb) {
   var
-    data = this.toJSON(),
+    data = this.serialize(),
     self = this;
 
   if (options && cb === undefined && typeof options === 'function') {
@@ -248,7 +248,7 @@ KuzzleDocument.prototype.save = function (options, cb) {
  * @returns {*} this
  */
 KuzzleDocument.prototype.publish = function (options) {
-  var data = this.toJSON();
+  var data = this.serialize();
 
   this.kuzzle.query(this.dataCollection.buildQueryArgs('write', 'publish'), data, options);
 

src/kuzzleDataCollection.js

@@ -57,20 +57,20 @@ describe('KuzzleDocument methods', function () {
     it('should serialize itself properly', function () {
       var
         document = new KuzzleDocument(dataCollection, {some: 'content'}),
-        serialized = document.toJSON();
+        serialized = document.serialize();
 
       should(serialized._id).be.undefined();
       should(serialized._version).be.undefined();
       should(serialized.body).be.an.Object().and.match({some: 'content'});
 
       document.id = 'foo';
-      serialized = document.toJSON();
+      serialized = document.serialize();
       should(serialized._id).be.exactly('foo');
       should(serialized._version).be.undefined();
       should(serialized.body).be.an.Object().and.match({some: 'content'});
 
       document.version = 42;
-      serialized = document.toJSON();
+      serialized = document.serialize();
       should(serialized._id).be.exactly('foo');
       should(serialized._version).be.exactly(42);
       should(serialized.body).be.an.Object().and.match({some: 'content'});
@@ -86,7 +86,7 @@ describe('KuzzleDocument methods', function () {
     it('should stringify itself properly', function () {
       var
         document = new KuzzleDocument(dataCollection, 'id', {some: 'content', _version: 42}),
-        serialized = document.toJSON(),
+        serialized = document.serialize(),
         stringified = document.toString();
 
       should(stringified).be.a.String();