Fix for autolinking strings in the form of version:1.0, which were being interpreted as a protocol:domain url

Author: gregjacobs

README.md

@@ -148,6 +148,10 @@ autolinker.link( "Go to www.google.com" );
 
 ## Changelog:
 
+### 0.10.1
+
+- Added fix to not autolink strings like "version:1.0", which were accidentally being interpreted as a protocol:domain string.
+
 ### 0.10.0
 
 - Added support for protocol-relative URLs (ex: `//google.com`, which will effectively either have the `http://` or `https://` 

dist/Autolinker.js

@@ -1,6 +1,6 @@
 /*!
  * Autolinker.js
- * 0.10.0
+ * 0.10.1
  *
  * Copyright(c) 2014 Gregory Jacobs <[email protected]>
  * MIT Licensed. http://www.opensource.org/licenses/mit-license.php
@@ -381,6 +381,7 @@
 				if( 
 				    ( twitterMatch && !enableTwitter ) || ( emailAddress && !enableEmailAddresses ) || ( urlMatch && !enableUrls ) ||
 				    ( urlMatch && urlMatch.indexOf( '.' ) === -1 ) ||  // At least one period ('.') must exist in the URL match for us to consider it an actual URL
+				    ( urlMatch && /^[A-Za-z]{3,9}:/.test( urlMatch ) && !/:.*?[A-Za-z]/.test( urlMatch ) ) ||  // At least one letter character must exist in the domain name after a protocol match. Ex: skip over something like "git:1.0"
 				    ( protocolRelativeMatch && /^[\w]\/\//.test( protocolRelativeMatch ) )  // a protocol-relative match which has a word character in front of it (so we can skip something like "abc//google.com")
 				) {
 					return matchStr;

dist/Autolinker.min.js

@@ -1,6 +1,6 @@
 {
   "name": "autolinker",
-  "version": "0.10.0",
+  "version": "0.10.1",
   "description": "Simple utility to automatically link the URLs, email addresses, and Twitter handles in a given block of text/HTML",
   "main": "dist/Autolinker.js",
   "directories": {

package.json

@@ -372,6 +372,7 @@
 				if( 
 				    ( twitterMatch && !enableTwitter ) || ( emailAddress && !enableEmailAddresses ) || ( urlMatch && !enableUrls ) ||
 				    ( urlMatch && urlMatch.indexOf( '.' ) === -1 ) ||  // At least one period ('.') must exist in the URL match for us to consider it an actual URL
+				    ( urlMatch && /^[A-Za-z]{3,9}:/.test( urlMatch ) && !/:.*?[A-Za-z]/.test( urlMatch ) ) ||  // At least one letter character must exist in the domain name after a protocol match. Ex: skip over something like "git:1.0"
 				    ( protocolRelativeMatch && /^[\w]\/\//.test( protocolRelativeMatch ) )  // a protocol-relative match which has a word character in front of it (so we can skip something like "abc//google.com")
 				) {
 					return matchStr;

src/Autolinker.js

@@ -78,6 +78,33 @@ describe( "Autolinker", function() {
 					expect( result ).toBe( 'Something like <a href="git:domain.com">git:domain.com</a> should be linked as a URL' );
 				} );
 
+				
+				it( "should NOT automatically link a string in the form of 'version:1.0'", function() {
+					var result = autolinker.link( 'version:1.0' );
+					expect( result ).toBe( 'version:1.0' );
+				} );
+				
+				
+				it( "should NOT automatically link these 'abc:def' style strings", function() {
+					var strings = [
+						'BEGIN:VCALENDAR',
+						'VERSION:1.0',
+						'BEGIN:VEVENT',
+						'DTSTART:20140401T090000',
+						'DTEND:20140401T100000',
+						'SUMMARY:Some thing to do',
+						'LOCATION:',
+						'DESCRIPTION:Just call this guy yeah! Testings',
+						'PRIORITY:3',
+						'END:VEVENT',
+						'END:VCALENDAR'
+					];
+					
+					for( var i = 0, len = strings.length; i < len; i++ ) {
+						expect( autolinker.link( strings[ i ] ) ).toBe( strings[ i ] );  // none should be autolinked
+					}
+				} );
+				
 			} );