Merge pull request #15 from skaterdav85/updates

Updates

Author: David Tang

README.md

@@ -28,7 +28,7 @@ export default {
 };
 ```
 
-`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()`.
+`validateSometimes()` takes 2 arguments. The first is a validator or an array 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';
@@ -65,11 +65,28 @@ You can also have a combination of validations that will always run and conditio
 import { validateNumber } from 'ember-changeset-validations/validators';
 import validateSometimes from 'ember-changeset-conditional-validations/validators/sometimes';
 
+export default {
+  someProperty: [
+    validateNumber({ integer: true }),
+    validateSometimes(validateNumber({ gt: 5 }), function() {
+      // condition
+    })
+  ]
+};
+```
+
+Let's say in the previous example that you also wanted to conditionally validate that the number is less than 10. You could do something like the following:
+
+```js
+import { validateNumber } from 'ember-changeset-validations/validators';
+import validateSometimes from 'ember-changeset-conditional-validations/validators/sometimes';
+
 export default {
   someProperty: [
     validateNumber({ integer: true }),
     ...validateSometimes([
-      validateNumber({ gt: 5 })
+      validateNumber({ gt: 5 }),
+      validateNumber({ lt: 10 })
     ], function() {
       // condition
     })

addon/validators/sometimes.js

@@ -1,9 +1,15 @@
 import { get } from '@ember/object';
 
 export default function validateSometimes(validator, condition) {
-  return Array.isArray(validator) ? validator.map(mapValidator) : mapValidator(validator)
+  if (Array.isArray(arguments[0])) {
+    let validators = arguments[0];
+    return validators.map(guardValidatorWithCondition);
+  } else {
+    let validator = arguments[0];
+    return guardValidatorWithCondition(validator);
+  }
 
-  function mapValidator(validator) {
+  function guardValidatorWithCondition(validator) {
     return function(key, newValue, oldValue, changes, content) {
       let thisValue = {
         get(property) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-changeset-conditional-validations",
-  "version": "0.4.2",
+  "version": "0.5.0",
   "description": "Conditional validations for ember-changeset-validations",
   "keywords": [
     "ember-addon",

tests/unit/validators/sometimes-test.js

@@ -18,7 +18,7 @@ module('Unit | Validator | sometimes', function() {
     assert.ok(validators.every(isFunction));
   });
 
-  test('an validator function is returned if given a validator', function(assert) {
+  test('a validator function is returned if given a validator', function(assert) {
     let validatorA = function() {};
     let condition = function() {};