rewrite regex, update/add tests

Author: Charlike Mike Reagent

index.js

@@ -8,7 +8,7 @@
 'use strict';
 
 module.exports =  function youtubeRegex() {
-  var regex = /youtu(?:.+\/v\/|.*v\=|\.be\/)([A-Za-z0-9_\-]{6,11})/g;
+  var regex = /(?:youtube\.com\/\S*(?:(?:\/e(?:mbed))?\/|watch\?(?:\S*?&?v\=))|youtu\.be\/)([a-zA-Z0-9_-]{6,11})/g;
 
   return regex;
 };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "youtube-regex",
-  "description": "The correct Youtube video id regex. Regex done right!",
+  "description": "The correct Youtube video id regex! Regex done right!",
   "version": "1.0.2",
   "scripts": {
     "test": "npm install && node_modules/.bin/mocha",

test.js

@@ -14,41 +14,81 @@ function test(str) {
   return youtubeRegex().test(str);
 }
 
+var fixtures = {
+  // should not match
+  invalid: [
+    'youtube.com/embed/v=0EWbonj7f18',
+    'youtube.com/e/v=0EWbonj7f18',
+    'youtube.com/attribution_link?u=/embed/v=0EWbonj7f18',
+    'youtube.com/attribution_link?u=/e/v=0EWbonj7f18',
+    'hey guys go to youtube and v=thisweird video i found',
+    'i found a youtube video on 4chan /v/foobarbaz',
+    'but we work at youtu.be and /thisweird video'
+  ],
+  // short links
+  shortlinks: [
+    'youtu.be/WijF8aivOo8',
+    'youtu.be/0EWbonj7f18'
+  ],
+  // mixed
+  mixed: [
+    'youtube.com/user/sandervandoorntv/watch?v=WijF8aivOo8',
+    'youtube.com/user/sandervandoorntv/watch?v=WijF8aivOo8&feature=related',
+    'youtube.com/user/sandervandoorntv/watch?feature=related&v=WijF8aivOo8',
+    'youtube.com/watch?v=0EWbonj7f18',
+    'youtube.com/watch?feature=related&v=0EWbonj7f18',
+    'youtube.com/watch?v=0EWbonj7f18&feature=related',
+    'youtube.com/embed/watch?v=0EWbonj7f18',
+    'youtube.com/embed/watch?feature=related&v=0EWbonj7f18',
+    'youtube.com/embed/v/0EWbonj7f18',
+    'youtube.com/e/v/0EWbonj7f18',
+    'youtube.com/e/watch?v=0EWbonj7f18',
+    'youtube.com/e/watch?feature=related&v=0EWbonj7f18'
+  ],
+  // attribution link
+  attrlink: [
+    'youtube.com/attribution_link?u=/user/sandervandoorntv/watch?v=WijF8aivOo8',
+    'youtube.com/attribution_link?u=/user/sandervandoorntv/watch?v=WijF8aivOo8&feature=related',
+    'youtube.com/attribution_link?u=/user/sandervandoorntv/watch?feature=related&v=WijF8aivOo8',
+    'youtube.com/attribution_link?u=/watch?v=0EWbonj7f18',
+    'youtube.com/attribution_link?u=/watch?feature=related&v=0EWbonj7f18',
+    'youtube.com/attribution_link?u=/watch?v=0EWbonj7f18&feature=related',
+    'youtube.com/attribution_link?u=/embed/watch?v=0EWbonj7f18',
+    'youtube.com/attribution_link?u=/embed/watch?feature=related&v=0EWbonj7f18',
+    'youtube.com/attribution_link?u=/embed/v/0EWbonj7f18',
+    'youtube.com/attribution_link?u=/e/v/0EWbonj7f18',
+    'youtube.com/attribution_link?u=/e/watch?v=0EWbonj7f18',
+    'youtube.com/attribution_link?u=/e/watch?feature=related&v=0EWbonj7f18'
+  ]
+};
+
 describe('youtube-regex', function() {
-  it('should work with `watch` links', function(done) {
-    assert.ok(test('youtube.com/watch?v=0EWbonj7f18'));
-    assert.ok(test('youtube.com/watch?feature=related&v=0EWbonj7f18'));
-    assert.ok(test('youtube.com/watch?v=0EWbonj7f18&feature=related'));
-    assert.ok(test('http://www.youtube.com/watch?v=0EWbonj7f18'));
-    assert.ok(test('http://www.youtube.com/watch?feature=related&v=0EWbonj7f18'));
-    assert.ok(test('http://www.youtube.com/watch?v=0EWbonj7f18&feature=related'));
-    assert.ok(test('https://www.youtube.com/watch?v=0EWbonj7f18'));
-    assert.ok(test('https://www.youtube.com/watch?feature=related&v=0EWbonj7f18'));
-    assert.ok(test('https://www.youtube.com/watch?v=0EWbonj7f18&feature=related'));
-    assert.ok(test('www.youtube.com/watch?v=0EWbonj7f18'));
-    assert.ok(test('www.youtube.com/watch?feature=related&v=0EWbonj7f18'));
-    assert.ok(test('www.youtube.com/watch?v=0EWbonj7f18&feature=related'));
-    done();
-  });
-  it('should work with `embed` links', function(done) {
-    assert.ok(test('youtube.com/embed/watch?v=0EWbonj7f18'));
-    assert.ok(test('youtube.com/embed/watch?feature=related&v=0EWbonj7f18'));
-    assert.ok(test('youtube.com/embed/v/0EWbonj7f18'));
-    assert.ok(test('youtube.com/embed/v=0EWbonj7f18'));
-    done();
-  });
-  it('should work with shortlikns youtu.be/{id}', function(done) {
-    assert.ok(test('http://youtu.be/0EWbonj7f18'));
-    assert.ok(test('http://youtu.be/n17B_uFF4cA'));
-    done();
+  describe('should match id from', function() {
+    it('shortlinks `youtu.be/{id}`', function(done) {
+      fixtures.shortlinks.forEach(function each(link) {
+        assert.ok(test(link));
+      });
+      done();
+    });
+    it('common used links', function(done) {
+      fixtures.mixed.forEach(function each(link) {
+        assert.ok(test(link));
+      });
+      done();
+    });
+    it('attribution links', function(done) {
+      fixtures.attrlink.forEach(function each(link) {
+        assert.ok(test(link));
+      });
+      done();
+    });
   });
-  it('should work with `attribution_link`s (wtf?)', function(done) {
-    assert.ok(test('youtube.com/attribution_link?u=/watch?v=0EWbonj7f18'));
-    assert.ok(test('youtube.com/attribution_link?u=/v/0EWbonj7f18'));
-    assert.ok(test('youtube.com/attribution_link?u=/embed/watch?feature=related&v=0EWbonj7f18'));
-    assert.ok(test('youtube.com/attribution_link?u=/embed/watch?v=0EWbonj7f18'));
-    assert.ok(test('youtube.com/attribution_link?u=/embed/v/0EWbonj7f18'));
-    assert.ok(test('youtube.com/attribution_link?u=/embed/v=0EWbonj7f18'));
-    done();
+  describe('should NOT match id from', function() {
+    it('invalid links', function(done) {
+      fixtures.invalid.forEach(function each(link) {
+        assert(!test(link));
+      });
+      done();
+    });
   });
 });