added comments, fixes #2

lib/url-join.js

@@ -4,17 +4,23 @@
   else context[name] = definition();
 })('urljoin', this, function () {
 
-  function normalize (str) {
-    return str
-            .replace(/[\/]+/g, '/')
-            .replace(/\/\?/g, '?')
-            .replace(/\/\#/g, '#')
-            .replace(/\:\//g, '://');
+  function normalize (str, options) {
+
+    // make sure protocol is followed by two slashes
+    str = str.replace(/:\//g, '://');
+
+    // remove consecutive slashes
+    str = str.replace(/([^:\s])\/+/g, '$1/');
+
+    // remove trailing slash before parameters or hash
+    str = str.replace(/\/(\?|#)/g, '$1');
+
+    return str;
   }
 
   return function () {
     var joined = [].slice.call(arguments, 0).join('/');
     return normalize(joined);
   };
 
-});
+});

test/tests.js

@@ -11,6 +11,11 @@ describe('url join', function () {
       .should.eql('http://www.google.com/foo/bar?test=123');
   });
 
+  it('should be able to join protocol with slashes', function () {
+    urljoin('http://', 'www.google.com/', 'foo/bar', '?test=123')
+      .should.eql('http://www.google.com/foo/bar?test=123');
+  });
+
   it('should remove extra slashes', function () {
     urljoin('http:', 'www.google.com///', 'foo/bar', '?test=123')
       .should.eql('http://www.google.com/foo/bar?test=123');
@@ -20,4 +25,9 @@ describe('url join', function () {
     urljoin('http:', 'www.google.com///', 'foo/bar', '?test=123', '#faaaaa')
       .should.eql('http://www.google.com/foo/bar?test=123#faaaaa');
   });
-});
+
+  it('should support protocol-relative urls', function () {
+    urljoin('//www.google.com', 'foo/bar', '?test=123')
+      .should.eql('//www.google.com/foo/bar?test=123')
+  });
+});