url now matches null and blank strings

dtrelogan · Aug 1, 2016 · e45b08b · e45b08b
1 parent 2b8d443
commit e45b08b
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/index.es6 b/index.es6
@@ -48,6 +48,10 @@ export let library = {
     return library.required(value) && library.exists(searchString) && value.trim().substr(0, searchString.length) === searchString;
   },
   url: function(value) {
+    // matches blank strings so you have a choice of pairing it with required
+    if (value === null || (typeof(value) === 'string' && value.trim() === '')) {
+      return true;
+    }
     //
     // https://gist.github.com/dperini/729294
     //

diff --git a/index.js b/index.js
@@ -67,6 +67,10 @@ var library = exports.library = {
     return library.required(value) && library.exists(searchString) && value.trim().substr(0, searchString.length) === searchString;
   },
   url: function url(value) {
+    // matches blank strings so you have a choice of pairing it with required
+    if (value === null || typeof value === 'string' && value.trim() === '') {
+      return true;
+    }
     //
     // https://gist.github.com/dperini/729294
     //

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-formstate-validation",
-  "version": "0.1.5",
+  "version": "0.2.0",
   "peerDependencies": {
     "react-formstate": ">=0.3.0"
   },

diff --git a/test/test.js b/test/test.js
@@ -171,7 +171,11 @@ describe('validation library', function() {
     it('does not match schema relative', function() { assert.equal(false, lib.url('//react-formstate-validation.test')); });
     it('does not match site relative', function() { assert.equal(false, lib.url('~/react-formstate-validation.test')); });
     it('does not match gopher', function() { assert.equal(false, lib.url('gopher://react-formstate-validation.test')); });
-    it('does not crash', function() { assert.equal(false, lib.url(null)); });
+    it('matches null', function() { assert.equal(true, lib.url(null)); });
+    it('matches empty string', function() { assert.equal(true, lib.url('')); });
+    it('matches blank string', function() { assert.equal(true, lib.url('   ')); });
+    it('does not crash on an integer', function() { assert.equal(false, lib.url(3)); });
+    it('does not crash on an object', function() { assert.equal(false, lib.url({x: 3})); });
   });
 });
 
@@ -337,7 +341,7 @@ describe('Messages', function() {
   });
   describe('#url', function() {
     it('has a message', function() {
-      assert.equal('Field must be a url', v['url']('','Field'));
+      assert.equal('Field must be a url', v['url']('badUrl','Field'));
     });
     it('might not return a message', function() {
       assert.equal(undefined, v['url']('http://test.test','Field'));