Move UMD wrapper to Gruntfile.

Should only be added when building the concatenated/minified files.

Author: gregjacobs

.jshintrc

@@ -0,0 +1,4 @@
+{
+	"undef": true,
+	"smarttabs": true
+}

Gruntfile.js

@@ -1,72 +1,141 @@
 module.exports = function(grunt) {
-    'use strict';
+	'use strict';
+	
+	var banner = createBanner();
+	
+	// Project configuration.
+	grunt.initConfig( {
+		pkg: grunt.file.readJSON( 'package.json' ),
+		
+		connect: {
+			server: {
+				options: {
+					hostname: '*',
+					port: 3000,
+					base: '.'
+				}
+			}
+		},
+		
+		jshint: {
+			files: {
+				src: [ 'src/**/*.js', 'tests/**/*.js' ]
+			}
+		},
+		
+		jasmine: {
+			src: 'dist/Autolinker.min.js',
+			options: {
+				specs: 'tests/*Spec.js',
+			}
+		},
+		
+		concat: {
+			development: {
+				options: {
+					banner : banner + createDistFileHeader(),
+					footer : createDistFileFooter(),
+					nonull : true,
+					
+					process : function( src, filepath ) {
+						return '\t' + src.replace( /\n/g, '\n\t' );  // indent each source file, which is placed inside the UMD block
+					}
+				},
+				src: [ 'src/umdBegin.js', 'src/Autolinker.js', 'src/umdEnd.js' ],
+				dest: 'dist/Autolinker.js',
+			},
+		},
+		
+		uglify: {
+			production: {
+				options: {
+					banner: banner
+				},
+				src: [ 'dist/Autolinker.js' ],
+				dest: 'dist/Autolinker.min.js',
+			}
+		}
+	} );
 
-    var banner = [
-        '/*!',
-        ' * Autolinker.js',
-        ' * <%= pkg.version %>',
-        ' *',
-        ' * Copyright(c) <%= grunt.template.today("yyyy") %> <%= pkg.author %>',
-        ' * <%= pkg.license %>',
-        ' *',
-        ' * <%= pkg.homepage %>',
-        ' */\n'
-    ].join('\n');
+	// Plugins
+	grunt.loadNpmTasks( 'grunt-contrib-connect' );
+	grunt.loadNpmTasks( 'grunt-contrib-jasmine' );
+	grunt.loadNpmTasks( 'grunt-contrib-concat' );
+	grunt.loadNpmTasks( 'grunt-contrib-uglify' );
+	grunt.loadNpmTasks( 'grunt-contrib-jshint' );
 
-    // Project configuration.
-    grunt.initConfig({
-        pkg: grunt.file.readJSON('package.json'),
-        connect: {
-            server: {
-                options: {
-                    hostname: '*',
-                    port: 3000,
-                    base: '.'
-                }
-            }
-        },
-        jasmine: {
-            src: 'src/Autolinker.js',
-            options: {
-                specs: 'tests/*Spec.js',
-            }
-        },
-        concat: {
-            development: {
-                options: {
-                    banner: banner
-                },
-                src: ['src/Autolinker.js'],
-                dest: 'dist/Autolinker.js',
-            },
-        },
-        uglify: {
-            production: {
-                options: {
-                    banner: banner
-                },
-                src: ['src/Autolinker.js'],
-                dest: 'dist/Autolinker.min.js',
-            }
-        },
-        jshint: {
-            files: {
-                src: ['src/**/*.js', 'tests/**/*.js']
-            }
-        }
-    });
-
-    // Plugins
-    grunt.loadNpmTasks('grunt-contrib-connect');
-    grunt.loadNpmTasks('grunt-contrib-jasmine');
-    grunt.loadNpmTasks('grunt-contrib-concat');
-    grunt.loadNpmTasks('grunt-contrib-uglify');
-    grunt.loadNpmTasks('grunt-contrib-jshint');
-
-    // Tasks
-    grunt.registerTask('default', ['lint', 'test', 'build']);
-    grunt.registerTask('lint', ['jshint']);
-    grunt.registerTask('test', ['jasmine']);
-    grunt.registerTask('build', ['concat:development', 'uglify:production']);
-    grunt.registerTask('serve', ['connect:server:keepalive']);
+	// Tasks
+	grunt.registerTask( 'default', [ 'lint', 'build', 'doTest' ] );
+	grunt.registerTask( 'lint', [ 'jshint' ] );
+	grunt.registerTask( 'test', [ 'build', 'doTest' ] );
+	grunt.registerTask( 'doTest', [ 'jasmine' ] );
+	grunt.registerTask( 'build', [ 'concat:development', 'uglify:production' ] );
+	grunt.registerTask( 'serve', [ 'connect:server:keepalive' ] );
+	
+	
+	
+	/**
+	 * Creates the banner comment with license header that is placed over the concatenated/minified files.
+	 * 
+	 * @private
+	 * @return {String}
+	 */
+	function createBanner() {
+		return [
+			'/*!',
+			' * Autolinker.js',
+			' * <%= pkg.version %>',
+			' *',
+			' * Copyright(c) <%= grunt.template.today("yyyy") %> <%= pkg.author %>',
+			' * <%= pkg.license %>',
+			' *',
+			' * <%= pkg.homepage %>',
+			' */\n'
+		].join( "\n" );
+	}
+	
+	
+	/**
+	 * Creates the UMD (Universal Module Definition) header, which defines Autolinker as one of the following when loaded:
+	 * 
+	 * 1. An AMD module, if an AMD loader is available (such as RequireJS)
+	 * 2. A CommonJS module, if a CommonJS module environment is available (such as Node.js), or
+	 * 3. A global variable if the others are unavailable.
+	 * 
+	 * This UMD header is combined with the UMD footer to create the distribution JavaScript file.
+	 * 
+	 * @private
+	 * @return {String}
+	 */
+	function createDistFileHeader() {
+		return [
+			"/*global define, module */",
+			"( function( root, factory ) {\n",
+				"\tif( typeof define === 'function' && define.amd ) {",
+					"\t\tdefine( factory );             // Define as AMD module if an AMD loader is present (ex: RequireJS).",
+				"\t} else if( typeof exports !== 'undefined' ) {",
+					"\t\tmodule.exports = factory();    // Define as CommonJS module for Node.js, if available.",
+				"\t} else {",
+					"\t\troot.Autolinker = factory();   // Finally, define as a browser global if no module loader.",
+				"\t}",
+			"}( this, function() {\n\n"
+		].join( "\n" );
+	}
+	
+	
+	/**
+	 * Creates the UMD (Universal Module Definition) footer. See {@link #createDistFileHeader} for details.
+	 * 
+	 * @private
+	 * @return {String}
+	 */
+	function createDistFileFooter() {
+		var umdEnd = [
+				'\n\n\treturn Autolinker;\n',
+			'} ) );'
+		];
+		
+		return umdEnd.join( "\n" );
+	}
+	
 };

dist/Autolinker.js

@@ -8,9 +8,8 @@
  * https://github.com/gregjacobs/Autolinker.js
  */
 /*global define, module */
-/*jshint undef:true, smarttabs:true */
-// Set up Autolinker appropriately for the environment.
 ( function( root, factory ) {
+
 	if( typeof define === 'function' && define.amd ) {
 		define( factory );             // Define as AMD module if an AMD loader is present (ex: RequireJS).
 	} else if( typeof exports !== 'undefined' ) {
@@ -19,7 +18,7 @@
 		root.Autolinker = factory();   // Finally, define as a browser global if no module loader.
 	}
 }( this, function() {
-	
+
 	/**
 	 * @class Autolinker
 	 * @extends Object
@@ -260,7 +259,7 @@
 				'>'
 			].join( "" ), 'g' );
 		} )(),
-
+	
 		/**
 		 * @private
 		 * @property {RegExp} urlPrefixRegex
@@ -413,7 +412,7 @@
 				var anchorHref = matchStr,  // initialize both of these
 				    anchorText = matchStr,  // values as the full match
 				    linkType;
-
+	
 				// Process the urls that are found. We need to change URLs like "www.yahoo.com" to "http://www.yahoo.com" (or the browser
 				// will try to direct the user to "http://current-domain.com/www.yahoo.com"), and we need to prefix 'mailto:' to email addresses.
 				if( twitterMatch ) {
@@ -439,13 +438,13 @@
 						prefixStr = charBeforeMatch + prefixStr;  // re-add the character before the '//' to what will be placed before the <a> tag
 						anchorHref = anchorHref.replace( protocolRelRegex, "//" );  // remove the char before the match for the href
 						anchorText = anchorText.replace( protocolRelRegex, "" );    // remove both the char before the match and the '//' for the anchor text
-
+	
 					} else if( !/^[A-Za-z]{3,9}:/i.test( anchorHref ) ) {
 						// url string doesn't begin with a protocol, assume http://
 						anchorHref = 'http://' + anchorHref;
 					}
 				}
-
+	
 				// wrap the match in an anchor tag
 				var anchorTag = me.createAnchorTag( linkType, anchorHref, anchorText );
 				return prefixStr + anchorTag + suffixStr;
@@ -605,7 +604,6 @@
 		return autolinker.link( text );
 	};
 
-	
 	return Autolinker;
-	
-} ) );
+
+} ) );