Allow before* hooks to modify the instance

notheotherben · notheotherben · commit 0ce2e43a5dc9 · 2013-07-16T19:41:22.000+02:00
diff --git a/lib/Instance.js b/lib/Instance.js
@@ -93,10 +93,6 @@ function Instance(Model, opts) {
 		}
 	};
 	var saveInstance = function (cb, saveOptions) {
-		if (!opts.is_new && opts.changes.length === 0) {
-			return saveInstanceExtra(cb);
-		}
-
 		handleValidations(function (err) {
 			if (err) {
 				return saveError(cb, err);
@@ -116,6 +112,10 @@ function Instance(Model, opts) {
 						return saveError(cb, err);
 					}
 
+					if (opts.changes.length === 0) {
+					    return saveInstanceExtra(cb);
+					}
+
 					return savePersisted(cb, saveOptions, getInstanceData());
 				});
 			}
diff --git a/test/integration/hook.js b/test/integration/hook.js
@@ -119,6 +119,21 @@ describe("Hook", function() {
 			});
 		});
 
+		it("should allow modification of instance", function (done) {
+		    Person.beforeCreate(function (next) {
+		        this.name = "Hook Worked";
+		        next();
+		    });
+
+		    Person.create([{ }], function (err, people) {
+		        should.not.exist(err);
+		        should.exist(people);
+		        should.equal(people.length, 1);
+		        should.equal(people[0].name, "Hook Worked");
+		        done();
+		    });
+		});
+
 		describe("when setting properties", function () {
 			before(setup({
 				beforeCreate : function () {
@@ -217,6 +232,20 @@ describe("Hook", function() {
 				return done();
 			});
 		});
+        
+		it("should allow modification of instance", function (done) {
+		    Person.beforeSave(function () {
+		        this.name = "Hook Worked";
+		    });
+
+		    Person.create([{ name: "John Doe" }], function (err, people) {
+		        should.not.exist(err);
+		        should.exist(people);
+		        should.equal(people.length, 1);
+		        should.equal(people[0].name, "Hook Worked");
+		        done();
+		    });
+		});
 
 		describe("when setting properties", function () {
 			before(setup({
@@ -339,6 +368,21 @@ describe("Hook", function() {
 			});
 		});
 
+
+		it("should allow modification of instance", function (done) {
+		    Person.beforeValidation(function () {
+		        this.name = "Hook Worked";
+		    });
+
+		    Person.create([{ name: "John Doe" }], function (err, people) {
+		        should.not.exist(err);
+		        should.exist(people);
+		        should.equal(people.length, 1);
+		        should.equal(people[0].name, "Hook Worked");
+		        done();
+		    });
+		});
+
 		describe("if hook method has 1 argument", function () {
 			var beforeValidation = false;
 			this.timeout(500);
@@ -589,4 +633,31 @@ describe("Hook", function() {
 			});
 		});
 	});
+
+	describe("instance modifications", function () {
+	    before(setup({
+	        beforeValidation: function () {
+	            should.equal(this.name, "John Doe");
+	            this.name = "beforeValidation";
+	        },
+	        beforeCreate: function () {
+	            should.equal(this.name, "beforeValidation");
+	            this.name = "beforeCreate";
+	        },
+	        beforeSave: function () {
+	            should.equal(this.name, "beforeCreate");
+	            this.name = "beforeSave";
+	        }
+	    }));
+
+	    it("should propagate down hooks", function (done) {
+	        Person.create([{ name: "John Doe" }], function (err, people) {
+	            should.not.exist(err);
+	            should.exist(people);
+	            should.equal(people.length, 1);
+	            should.equal(people[0].name, "beforeSave");
+	            done();
+	        });
+	    });
+	});
 });
