Removed a couple checks that could never occur.

DavidTPate · Aug 5, 2014 · c321746 · c321746
1 parent d4455c9
commit c321746
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 23 deletions.
diff --git a/index.js b/index.js
@@ -63,7 +63,7 @@ function decompose(url, str) {
     } else if (charCode === octothorpe) {
         // Hash value
         url.hash = str.substring(1, str.length);
-    } else if(matches = giantPattern.exec(str)) {
+    } else if (matches = giantPattern.exec(str)) {
         // Full URL
         return decomposeUrl(url, matches);
     } else {
@@ -80,30 +80,24 @@ function decomposeUrl(url, str) {
         matches = giantPattern.exec(str);
     }
 
-    if (matches) {
-        url.protocol = matches[2] || null;
-        url.username = matches[4] || null;
-        url.password = matches[5] || null;
-        url.hostname = matches[6] || null;
-        url.host = url.hostname ? url.hostname.split('.') : null;
+    url.protocol = matches[2] || null;
+    url.username = matches[4] || null;
+    url.password = matches[5] || null;
+    url.hostname = matches[6] || null;
+    url.host = url.hostname ? url.hostname.split('.') : null;
 
-        if (url.host && url.host.length > 1) {
-            var tld = url.host && url.host.slice(url.host.length - 1)[0];
-            url.tld = !isNumberic(tld) && tld;
-        }
+    if (url.host && url.host.length > 1) {
+        var tld = url.host && url.host.slice(url.host.length - 1)[0];
+        url.tld = !isNumberic(tld) && tld;
+    }
 
-        url.port = matches[8] || '80';
+    url.port = matches[8] || '80';
 
-        url = decompose(url, matches[9]);
-    }
+    url = decompose(url, matches[9]);
     return url;
 }
 
 function decomposePath(url, str) {
-    if (!str) {
-        return url;
-    }
-
     var simplePath = simplePathRegExp.exec(str);
 
     if (simplePath) {
@@ -126,10 +120,6 @@ function decomposePath(url, str) {
 }
 
 function parseQueryString(str) {
-    if (!str || typeof str !== 'string') {
-        return null;
-    }
-
     var obj = {};
 
     var matches = queryStringPattern.exec(str),

diff --git a/test/test.js b/test/test.js
@@ -158,7 +158,7 @@ describe('decompose-url(url)', function () {
         parsed.hash.should.be.exactly('david-rules');
         parsed.href.should.be.exactly('//username:password@test.example.com/one/two/three?value=abc&value2=123#david-rules');
     });
-    it.only('should parse a protocol relative URL pointing to the root', function () {
+    it('should parse a protocol relative URL pointing to the root', function () {
         var parsed = decomposeUrl('//');
 
         (!!!parsed.protocol).should.be.true;