Merge pull request #64 from jakesjews/master

add allowBlank option to number validator
adopted-ember-addons · Nov 3, 2015 · 2f52935 · 2f52935
2 parents f66d7d4 + a7fe3df
commit 2f52935
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 0 deletions.
diff --git a/app/validators/number.js b/app/validators/number.js
@@ -15,6 +15,10 @@ export default Base.extend({
     let numValue = Number(value);
     let optionKeys = Object.keys(options);
 
+    if (options.allowBlank && isEmpty(value)) {
+      return true;
+    }
+
     if (typeof value === 'string' && (isEmpty(value) || !options.allowString)) {
       return this.createErrorMessage('notANumber', value, options);
     }

diff --git a/docs/docs/validators/number.md b/docs/docs/validators/number.md
@@ -1,6 +1,7 @@
 Validates that your attributes have only numeric values.
 
 ## Options
+* `allowBlank` (**Boolean**): If true, skips validation if the value is empty
 * `allowString` (**Boolean**): If true, validator will accept string representation of a number
 * `integer` (**Boolean**): Number must be an integer
 * `positive` (**Boolean**): Number must be greater than 0

diff --git a/tests/unit/validators/number-test.js b/tests/unit/validators/number-test.js
@@ -220,3 +220,20 @@ test('even', function(assert) {
   message = validator.validate(-33, options);
   assert.equal(message, 'This field must be even');
 });
+
+test('allowBlank', function(assert) {
+  assert.expect(3);
+
+  options = {
+    allowBlank: true
+  };
+
+  message = validator.validate(null, options);
+  assert.equal(message, true);
+
+  message = validator.validate(undefined, options);
+  assert.equal(message, true);
+
+  message = validator.validate('', options);
+  assert.equal(message, true);
+});