Merge pull request #2 from johnotander/dont-allow-whitespace-for-exact-option

Update the exact regex to not allow trailing or leading whitespace

Author: johno

README.md

@@ -1,6 +1,6 @@
 # Phone Regex
 
-[![Build Status](https://travis-ci.org/johnotander/phone-regex.svg?branch=master)](https://travis-ci.org/johnotander/phone-regex)
+[![Build Status](https://travis-ci.org/regexps/phone-regex.svg?branch=master)](https://travis-ci.org/regexps/phone-regex)
 
 A regular expression for matching phone numbers.
 
@@ -29,10 +29,6 @@ phone().test('apple')            // => false
 
 * Regex from <http://stackoverflow.com/a/16702965/1378668>.
 
-## TODO
-
-- [ ] Don't let the regex match strings with whitespace, `" 1234567890 "`, with the exact option.
-
 ## License
 
 MIT

index.js

@@ -2,8 +2,8 @@
 
 module.exports = function(options) {
   options = options || {};
-  var regexBase = '\\s*(?:\\+?(\\d{1,3}))?[-. (]*(\\d{3})[-. )]*(\\d{3})[-. ]*(\\d{4})(?: *x(\\d+))?\\s*';
+  var regexBase = '(?:\\+?(\\d{1,3}))?[-. (]*(\\d{3})[-. )]*(\\d{3})[-. ]*(\\d{4})(?: *x(\\d+))?';
 
   return options.exact ? new RegExp('^' + regexBase + '$') :
-                         new RegExp(regexBase, 'g');
+                         new RegExp('\\s*' + regexBase + '\\s*', 'g');
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "phone-regex",
-  "version": "1.0.0",
+  "version": "2.0.0",
   "description": "Regular expression for phone numbers.",
   "main": "index.js",
   "directories": {

test/test.js

@@ -32,6 +32,14 @@ describe('phone-regex', function() {
     it('should not find a phone number if it is not exact', function() {
       assert.equal(phone({ exact: true }).test('apples 1 123 456 7890'), false);
     });
+
+    it('should not find a phone number if there is leading whitespace', function() {
+      assert.equal(phone({ exact: true }).test(' 1 123 456 7890'), false);
+    });
+
+    it('should not find a phone number if there is trailing whitespace', function() {
+      assert.equal(phone({ exact: true }).test('1 123 456 7890 '), false);
+    });
   });
 
   describe('g', function() {