the condition callback is invoked with the changes and content

Author: David Tang

README.md

@@ -25,13 +25,13 @@ const Validations = {
   creditCardNumber: validateSometimes([
     validatePresence(true),
     validateNumber({ is: 16 })
-  ], function(changes) {
+  ], function(changes, content) {
     return get(changes, 'paymentMethod.isCreditCard')
   })
 };
 ```
 
-`validateSometimes` takes 2 arguments. The first is a list of validators and the second is a callback function which represents the condition. If the condition callback returns `true`, the rules will be added.
+`validateSometimes` takes 2 arguments. The first is a list of validators. The second argument is a callback function which represents the condition. If the condition callback returns `true`, the rules will be added. This callback function will be invoked with the changeset's changes and content.
 
 ```js
 import Changeset from 'ember-changeset';

addon/validators/sometimes.js

@@ -1,7 +1,7 @@
 export default function validateSometimes(validators, condition) {
   return validators.map(function(validator) {
     return function(key, newValue, oldValue, changes, content) {
-      if (condition(changes)) {
+      if (condition(changes, content)) {
         return validator(key, newValue, oldValue, changes, content);
       }
       return true;

tests/dummy/app/routes/application.js

@@ -36,23 +36,26 @@ test('if the condition returns true, the validators are invoked and their result
   assert.deepEqual(validations, ['Error message A', true]);
 });
 
-test('the condition is invoked with the changes for each validator', function(assert) {
+test('the condition is invoked with the changes and content for each validator', function(assert) {
   let key = 'name';
   let newValue = 'Yehuda';
   let oldValue = 'YK';
   let changes = {};
+  let content = {};
 
   let validatorA = sinon.stub().returns('Error message A');
   let validatorB = sinon.stub().returns(true);
   let condition = sinon.spy();
 
   let validators = validateSometimes([validatorA, validatorB], condition);
   validators.map((validator) => {
-    return validator(key, newValue, oldValue, changes);
+    return validator(key, newValue, oldValue, changes, content);
   });
   assert.equal(condition.callCount, 2);
   assert.strictEqual(condition.getCall(0).args[0], changes);
+  assert.strictEqual(condition.getCall(0).args[1], content);
   assert.strictEqual(condition.getCall(1).args[0], changes);
+  assert.strictEqual(condition.getCall(1).args[1], content);
 });
 
 test('each validator is invoked with key, newValue, oldValue, changes, and content', function(assert) {
@@ -64,7 +67,7 @@ test('each validator is invoked with key, newValue, oldValue, changes, and conte
 
   let validatorA = sinon.spy();
   let validatorB = sinon.spy();
-  let condition = sinon.stub().returns(true);  
+  let condition = sinon.stub().returns(true);
   let validators = validateSometimes([validatorA, validatorB], condition);
 
   validators.map((validator) => {