Merge remote-tracking branch 'upstream/master'

1602 · Feb 21, 2014 · 6e2da61 · 6e2da61
2 parents f757988 + 2a345d2
commit 6e2da61
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/lib/adapters/memory.js b/lib/adapters/memory.js
@@ -96,7 +96,7 @@ Memory.prototype.fromDb = function(model, data) {
                 val = new Date(val.toString().replace(/GMT.*$/, 'GMT'));
                 break;
                 case 'Boolean':
-                val = new Boolean(val);
+                val = Boolean(val);
                 break;
             }
         }

diff --git a/lib/model.js b/lib/model.js
@@ -380,7 +380,7 @@ AbstractClass.upsert = AbstractClass.updateOrCreate = function upsert(data, call
 /**
  * Find one record, same as `all`, limited by 1 and return object, not collection,
  * if not found, create using data provided as second argument
- * 
+ *
  * @param {Object} query - search conditions: {where: {test: 'me'}}.
  * @param {Object} data - object to create.
  * @param {Function} cb - callback called with (err, instance)
@@ -585,7 +585,7 @@ AbstractClass.iterate = function map(filter, iterator, callback) {
 
 /**
  * Find one record, same as `all`, limited by 1 and return object, not collection
- * 
+ *
  * @param {Object} params - search conditions: {where: {test: 'me'}}
  * @param {Function} cb - callback called with (err, instance)
  */
@@ -673,7 +673,7 @@ AbstractClass.prototype.save = function (options, callback) {
 
     if (!this.id) {
         // Pass options and this to create
-        var data = { 
+        var data = {
             data: this,
             options: options
         };
@@ -734,11 +734,11 @@ AbstractClass.prototype._adapter = function () {
  * Convert instance to Object
  *
  * @param {Boolean} onlySchema - restrict properties to schema only, default false
- * when onlySchema == true, only properties defined in schema returned, 
+ * when onlySchema == true, only properties defined in schema returned,
  * otherwise all enumerable properties returned
  * @returns {Object} - canonical object representation (no getters and setters)
  */
-AbstractClass.prototype.toObject = function (onlySchema) {
+AbstractClass.prototype.toObject = function (onlySchema, cachedRelations) {
     var data = {};
     var ds = this.constructor.schema.definitions[this.constructor.modelName];
     var properties = ds.properties;
@@ -760,6 +760,15 @@ AbstractClass.prototype.toObject = function (onlySchema) {
                 data[attr] = self[attr];
             }
         });
+
+        if (cachedRelations === true && this.__cachedRelations) {
+            var relations = this.__cachedRelations;
+            Object.keys(relations).forEach(function (attr) {
+                if (!data.hasOwnProperty(attr)) {
+                    data[attr] = relations[attr];
+                }
+            });
+        }
     }
 
     return data;
@@ -770,10 +779,11 @@ AbstractClass.prototype.toObject = function (onlySchema) {
 //         Object.getOwnPropertyNames(this).indexOf(prop) !== -1;
 // };
 
-AbstractClass.prototype.toJSON = function () {
-    return this.toObject();
+AbstractClass.prototype.toJSON = function (cachedRelations) {
+    return this.toObject(false, cachedRelations);
 };
 
+
 /**
  * Delete object from persistence
  *