feature(normalizePath): fixing "/foo/.." to result in "/" instead of …

…"" - closing #224
medialize · Jun 29, 2015 · 5331344 · 5331344
1 parent 4ad3f29
commit 5331344
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -248,6 +248,7 @@ URI.js is published under the [MIT license](http://www.opensource.org/licenses/m
 
 * fixing [`URI.parseQuery()`](http://medialize.github.io/URI.js/docs.html#static-parseQuery) to accept `?foo&foo=bar` - [Issue #220](https://github.com/medialize/URI.js/issues/220)
 * fixing [`URI.segmentCoded()`](http://medialize.github.io/URI.js/docs.html#accessors-segmentCoded) to encode (instead of decode) array input - [Issue #223](https://github.com/medialize/URI.js/issues/223)
+* fixing [`URI.normalizePath()`](http://medialize.github.io/URI.js/docs.html#normalize-path) to properly resolve `/foo/..` to `/` - [Issue #224](https://github.com/medialize/URI.js/issues/224)
 
 ### 1.15.1 (April 5th 2015) ###
 

diff --git a/src/URI.js b/src/URI.js
@@ -1781,6 +1781,11 @@
       _path = '/' + _path;
     }
 
+    // handle relative files (as opposed to directories)
+    if (_path.slice(-3) === '/..' || _path.slice(-2) === '/.') {
+      _path += '/';
+    }
+
     // resolve simples
     _path = _path
       .replace(/(\/(\.\/)+)|(\/\.$)/g, '/')
@@ -2016,7 +2021,7 @@
     }
 
     // determine common sub path
-    common = URI.commonPath(relative.path(), base.path());
+    common = URI.commonPath(relativePath, basePath);
 
     // If the paths have nothing in common, return a relative URL with the absolute path.
     if (!common) {

diff --git a/test/test.js b/test/test.js
@@ -1096,15 +1096,24 @@
     u.path('/.//').normalizePath();
     equal(u.path(), '/', 'root /.//');
 
-    u.path('/.').normalizePath();
-    equal(u.path(), '/', 'root /.');
-
     // encoding
     u._parts.path = '/~userhome/@mine;is %2F and/';
     u.normalize();
     equal(u.pathname(), '/~userhome/@mine;is%20%2F%20and/', 'path encoding');
 
     // relative URL
+    u = URI('/.').normalizePath();
+    equal(u.path(), '/', 'root /.');
+
+    u = URI('/..').normalizePath();
+    equal(u.path(), '/', 'root /..');
+
+    u = URI('/foo/.').normalizePath();
+    equal(u.path(), '/foo/', 'root /foo/.');
+
+    u = URI('/foo/..').normalizePath();
+    equal(u.path(), '/', 'root /foo/..');
+
     u = URI('../../../../../www/common/js/app/../../../../www_test/common/js/app/views/view-test.html');
     u.normalize();
     equal(u.path(), '../../../../../www_test/common/js/app/views/view-test.html', 'parent relative');