added new syntax to allow options, fixed #! urls

this adds a syntax which allows calling url-join with two arguments: an array of strings to join and an (optional) object of options. This could be used in the future to allow keeping trailing slashes etc.

lib/url-join.js

@@ -13,7 +13,7 @@
     str = str.replace(/([^:\s])\/+/g, '$1/');
 
     // remove trailing slash before parameters or hash
-    str = str.replace(/\/(\?|&|#)/g, '$1');
+    str = str.replace(/\/(\?|&|#[^!])/g, '$1');
 
     // replace ? in parameters with &
     str = str.replace(/(\?.+)\?/g, '$1&');
@@ -22,8 +22,17 @@
   }
 
   return function () {
-    var joined = [].slice.call(arguments, 0).join('/');
-    return normalize(joined);
+    var input = arguments;
+    var options = {};
+
+    if (typeof arguments[0] === 'object') {
+      // new syntax with array and options
+      input = arguments[0];
+      options = arguments[1] || {};
+    }
+
+    var joined = [].slice.call(input, 0).join('/');
+    return normalize(joined, options);
   };
 
 });

test/tests.js

@@ -6,6 +6,16 @@ describe('url join', function () {
       .should.eql('http://www.google.com/foo/bar?test=123');
   });
 
+  it('should work for simple case with new syntax', function () {
+    urljoin(['http://www.google.com/', 'foo/bar', '?test=123'])
+      .should.eql('http://www.google.com/foo/bar?test=123');
+  });
+
+  it('should work for hashbang urls', function () {
+    urljoin(['http://www.google.com', '#!', 'foo/bar', '?test=123'])
+      .should.eql('http://www.google.com/#!/foo/bar?test=123');
+  });
+
   it('should be able to join protocol', function () {
     urljoin('http:', 'www.google.com/', 'foo/bar', '?test=123')
       .should.eql('http://www.google.com/foo/bar?test=123');