fix beforeSave on ActiveRecord

Author: JulienMichelFr

.gitignore

@@ -1,4 +1,5 @@
 # Created by .ignore support plugin (hsz.mobi)
 bower_components
 node_modules
-coverage
+coverage
+.idea

CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 2.0.5
+
+- Fix `beforeSave` on object with nested model without `beforeSave` function
+
 ## 2.0.0
 
 - Diff on save

build/app.js

@@ -332,7 +332,7 @@ function ActiveRecord(model, name) {
                     });
                   } else {
                     if (obj[key] && obj[key] !== null) {
-                      obj[key] = obj[key].beforeSave(null, { force: true });
+                      obj[key] = obj[key].beforeSave ? obj[key].beforeSave(null, { force: true }) : obj[key];
                     }
                   }
                 } else if (_.isDate(obj[key])) {
@@ -461,8 +461,8 @@ function ActiveRecord(model, name) {
 
           // Get from the model the fields that reference another object
           var pop = _.pick(model, function (v) {
-            if (_.isArray(v)) return v[0].ref;
-            return v.ref;
+            if (_.isArray(v)) return v[0].ref && !v[0].nested;
+            return v.ref && !v.nested;
           });
 
           if (populateArray === 'all') {
@@ -704,13 +704,17 @@ function GenericDao(model, qb, discriminators) {
             }
         }, {
             key: 'getHeaders',
-            value: function getHeaders() {}
+            value: function getHeaders() {
+                var opts = arguments.length <= 0 || arguments[0] === undefined ? {} : arguments[0];
+
+                return opts.headers;
+            }
         }, {
             key: 'getOptions',
             value: function getOptions() {
                 var opts = arguments.length <= 0 || arguments[0] === undefined ? {} : arguments[0];
 
-                opts.headers = this.getHeaders();
+                opts.headers = this.getHeaders(opts);
                 return opts;
             }
         }, {
@@ -811,6 +815,7 @@ function GenericDao(model, qb, discriminators) {
                 var qb = arguments.length <= 1 || arguments[1] === undefined ? this.query() : arguments[1];
                 var opts = arguments.length <= 2 || arguments[2] === undefined ? {} : arguments[2];
 
+                opts = this.getOptions(opts);
                 return this.$http.get(this.url + '/' + value, _.merge(opts, { params: qb.opts })).then(function (data) {
                     return new model(_this2.$injector, _this2.url, data.data);
                 });
@@ -820,6 +825,7 @@ function GenericDao(model, qb, discriminators) {
                 var qb = arguments.length <= 1 || arguments[1] === undefined ? this.query() : arguments[1];
                 var opts = arguments.length <= 2 || arguments[2] === undefined ? {} : arguments[2];
 
+                opts = this.getOptions(opts);
                 if (toSelect && toSelect.length) {
                     if (value.ref) {
                         toSelect = extractId(toSelect);

dest/temp/ActiveRecord.js

@@ -331,7 +331,7 @@ function ActiveRecord(model, name) {
                     });
                   } else {
                     if (obj[key] && obj[key] !== null) {
-                      obj[key] = obj[key].beforeSave(null, { force: true });
+                      obj[key] = obj[key].beforeSave ? obj[key].beforeSave(null, { force: true }) : obj[key];
                     }
                   }
                 } else if (_.isDate(obj[key])) {
@@ -460,8 +460,8 @@ function ActiveRecord(model, name) {
 
           // Get from the model the fields that reference another object
           var pop = _.pick(model, function (v) {
-            if (_.isArray(v)) return v[0].ref;
-            return v.ref;
+            if (_.isArray(v)) return v[0].ref && !v[0].nested;
+            return v.ref && !v.nested;
           });
 
           if (populateArray === 'all') {

dest/temp/GenericDao.js

@@ -60,13 +60,17 @@ function GenericDao(model, qb, discriminators) {
             }
         }, {
             key: 'getHeaders',
-            value: function getHeaders() {}
+            value: function getHeaders() {
+                var opts = arguments.length <= 0 || arguments[0] === undefined ? {} : arguments[0];
+
+                return opts.headers;
+            }
         }, {
             key: 'getOptions',
             value: function getOptions() {
                 var opts = arguments.length <= 0 || arguments[0] === undefined ? {} : arguments[0];
 
-                opts.headers = this.getHeaders();
+                opts.headers = this.getHeaders(opts);
                 return opts;
             }
         }, {
@@ -167,6 +171,7 @@ function GenericDao(model, qb, discriminators) {
                 var qb = arguments.length <= 1 || arguments[1] === undefined ? this.query() : arguments[1];
                 var opts = arguments.length <= 2 || arguments[2] === undefined ? {} : arguments[2];
 
+                opts = this.getOptions(opts);
                 return this.$http.get(this.url + '/' + value, _.merge(opts, { params: qb.opts })).then(function (data) {
                     return new model(_this2.$injector, _this2.url, data.data);
                 });
@@ -176,6 +181,7 @@ function GenericDao(model, qb, discriminators) {
                 var qb = arguments.length <= 1 || arguments[1] === undefined ? this.query() : arguments[1];
                 var opts = arguments.length <= 2 || arguments[2] === undefined ? {} : arguments[2];
 
+                opts = this.getOptions(opts);
                 if (toSelect && toSelect.length) {
                     if (value.ref) {
                         toSelect = extractId(toSelect);

package.json

@@ -1,11 +1,11 @@
 {
   "author": "flogou <florent.gouget@gmail.com>",
   "name": "angular-orm",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "description": "",
   "homepage": "",
   "dependencies": {
-    "deep-diff": "~0.3.4"
+    "deep-diff": "0.3.4"
   },
   "files": [
     "src/**/*.js"

src/ActiveRecord.js

@@ -284,7 +284,7 @@ export default function ActiveRecord (model, name, SManager = SessionManager(mod
                 .map(e => e.beforeSave ? e.beforeSave(null, { force: true }) : e)
             } else {
               if (obj[ key ] && obj[ key ] !== null) {
-                obj[ key ] = obj[ key ].beforeSave(null, { force: true })
+                obj[ key ] = obj[ key ].beforeSave ? obj[ key ].beforeSave(null, { force: true }) : obj[ key ]
               }
             }
           } else if (_.isDate(obj[ key ])) {