fixing absoluteTo() - Issue #29

medialize · Jun 24, 2012 · 9f71510 · 9f71510
1 parent 3eb744d
commit 9f71510
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 15 deletions.
diff --git a/src/URI.js b/src/URI.js
@@ -1314,11 +1314,15 @@ p.absoluteTo = function(base) {
     if (this._parts.urn) {
         throw new Error('URNs do not have any generally defined hierachical components');
     }
+
+    if (this._parts.hostname) {
+        return new URI(this);
+    }
 
     if (!(base instanceof URI)) {
         base = new URI(base);
     }
-
+    
     var resolved = new URI(this),
         properties = ['protocol', 'username', 'password', 'hostname', 'port'],
         basedir;

diff --git a/test/test.js b/test/test.js
@@ -689,37 +689,30 @@ test("absoluteTo", function() {
             base: 'rel/path/something',
             result: 'rel/path/the_relative_url'
         }, {
-            name: 'relative path file - urljoin',
+            name: 'relative parent path file - urljoin',
             url: '../the_relative_url',
             base: 'rel/path/',
             result: 'rel/the_relative_url'
         }, {
-            name: 'relative path file - urljoin',
+            name: 'relative root path file - urljoin',
             url: '/the_relative_url',
             base: 'rel/path/',
             result: '/the_relative_url'
         }, {
-            name: 'relative path file - urljoin',
+            name: 'relative root file - urljoin',
             url: '/the_relative_url',
             base: 'http://example.com/rel/path/',
             result: 'http://example.com/the_relative_url'
         }, {
-            name: 'relative path file - urljoin',
-            url: '/the_relative_url',
-            base: 'http://github.com//the_relative_url',
-            // result is sanitized, so a double slashes are eradicated!
-            //result: 'http://github.com//the_relative_url'
-            result: 'http://github.com/the_relative_url'
+            name: 'absolute passthru - urljoin',
+            url: 'http://github.com//the_relative_url',
+            base: 'http://example.com/foo/bar',
+            result: 'http://github.com//the_relative_url'
         }, {
             name: 'file paths - urljoin',
             url: 'anotherFile',
             base: 'aFile',
             result: 'anotherFile'
-        }, {
-            name: 'absolute URL to absolute URL',
-            url: 'http://example.com/some/other/path/file',
-            base: 'http://example.org/rel/path/foo',
-            result: 'http://example.org/some/other/path/file'
         }
     ];