Support single validator in addition to arrays of validators (#14)

* support non-Array as argument to validateSometimes

for consistency with plain ember-changeset-validations

* Update sometimes.js

* add unit tests

* Update README.md

Author: sovietspaceship

README.md

@@ -28,7 +28,7 @@ export default {
 };
 ```
 
-`validateSometimes()` takes 2 arguments. The first is a list of validators you want applied to the attribute. 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. The callback will also be invoked with its `this` value set to an object that has a `get()` method for accessing a property. `this.get(property)` first proxies to the changes and then the underlying content, and has the same semantics as `Ember.get()`.
+`validateSometimes()` takes 2 arguments. The first is a validator or list of validators you want applied to the attribute. 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. The callback will also be invoked with its `this` value set to an object that has a `get()` method for accessing a property. `this.get(property)` first proxies to the changes and then the underlying content, and has the same semantics as `Ember.get()`.
 
 ```js
 import Changeset from 'ember-changeset';

addon/validators/sometimes.js

@@ -1,7 +1,9 @@
 import { get } from '@ember/object';
 
-export default function validateSometimes(validators, condition) {
-  return validators.map(function(validator) {
+export default function validateSometimes(validator, condition) {
+  return Array.isArray(validator) ? validator.map(mapValidator) : mapValidator(validator)
+
+  function mapValidator(validator) {
     return function(key, newValue, oldValue, changes, content) {
       let thisValue = {
         get(property) {
@@ -16,5 +18,5 @@ export default function validateSometimes(validators, condition) {
       }
       return true;
     };
-  });
+  }
 }

tests/unit/validators/sometimes-test.js

@@ -7,7 +7,7 @@ import isFunction from './../../helpers/is-function';
 import Changeset from 'ember-changeset';
 
 module('Unit | Validator | sometimes', function() {
-  test('an array of validators is returned', function(assert) {
+  test('an array of validators is returned when given an array', function(assert) {
     let validatorA = function() {};
     let validatorB = function() {};
     let condition = function() {};
@@ -18,6 +18,15 @@ module('Unit | Validator | sometimes', function() {
     assert.ok(validators.every(isFunction));
   });
 
+  test('an validator function is returned if given a validator', function(assert) {
+    let validatorA = function() {};
+    let condition = function() {};
+
+    let validator = validateSometimes(validatorA, condition);
+
+    assert.ok(isFunction(validator));
+  });
+
   test('if the condition returns false, the validators return true', function(assert) {
     let validatorA = function() {};
     let validatorB = function() {};
@@ -91,6 +100,29 @@ module('Unit | Validator | sometimes', function() {
     assert.strictEqual(validatorB.firstCall.args[4], content);
   });
 
+  test('single validator is invoked with key, newValue, oldValue, changes, and content', function(assert) {
+    let key = 'name';
+    let newValue = 'Yehuda';
+    let oldValue = 'YK';
+    let changes = {};
+    let content = {};
+
+    let validatorA = sinon.spy();
+    let condition = () => true;
+
+    let validator = validateSometimes(validatorA, condition);
+
+    assert.ok(isFunction(validator));
+
+    validator(key, newValue, oldValue, changes, content);
+
+    assert.strictEqual(validatorA.firstCall.args[0], key);
+    assert.strictEqual(validatorA.firstCall.args[1], newValue);
+    assert.strictEqual(validatorA.firstCall.args[2], oldValue);
+    assert.strictEqual(validatorA.firstCall.args[3], changes);
+    assert.strictEqual(validatorA.firstCall.args[4], content);
+  });
+
   test('this.get() when accessing the changes', function(assert) {
     let Validations = {
       paymentMethod: validatePresence(true),