relative, proximate: no coerce

Author: scivision

+stdlib/proximate_to.m

@@ -7,14 +7,13 @@
 % * rel: relative path from base to other
 
 function rel = proximate_to(base, other)
-arguments
-  base (1,1) string
-  other (1,1) string
-end
 
 rel = stdlib.relative_to(base, other);
 if stdlib.strempty(rel)
   rel = other;
+  if isstring(base)
+    rel = string(rel);
+  end
 end
 
 end

+stdlib/relative_to.m

@@ -11,16 +11,20 @@
 % https://docs.oracle.com/javase/8/docs/api/java/nio/file/Path.html#relativize-java.nio.file.Path-
 
 function rel = relative_to(base, target)
-arguments
-  base (1,1) string
-  target (1,1) string
-end
+% arguments
+%   base (1,1) string
+%   target (1,1) string
+% end
 
 % matlab.io.internal.filesystem.relativepath only works on Windows (!) and only
 % then with / filesep.
 
 if stdlib.strempty(base) || stdlib.strempty(target)
-  rel = "";
+  if isstring(base) || isstring(target)
+    rel = "";
+  else
+    rel = '';
+  end
   return
 end
 
@@ -35,10 +39,17 @@
   n = n + 1;
 end
 
-rel = join(tp(n+1:end), filesep);
+if n+1 <= length(tp)
+  rel = join(tp(n+1:end), filesep);
+  if iscell(rel)
+    rel = rel{1};
+  end
+else
+  rel = '.';
+end
 
-if stdlib.strempty(rel)
-  rel = ".";
+if isstring(base) || isstring(target)
+  rel = string(rel);
 end
 
 end

test/TestRelative.m

@@ -1,5 +1,5 @@
 classdef (SharedTestFixtures={ matlab.unittest.fixtures.PathFixture(fileparts(fileparts(mfilename('fullpath'))))}, ...
-          TestTags = {'R2019b', 'pure'}) ...
+          TestTags = {'R2017b', 'pure'}) ...
     TestRelative < matlab.unittest.TestCase
 
 
@@ -12,14 +12,18 @@
 
 function test_relative_to(tc, pr)
 r = stdlib.relative_to(pr{1}, pr{2});
-
 tc.verifyEqual(r, pr{3}, "relative_to(" + pr{1} + "," + pr{2}+")")
+
+r = stdlib.relative_to(string(pr{1}), pr{2});
+tc.verifyEqual(r, string(pr{3}))
 end
 
 function test_proximate_to(tc, pr)
 r = stdlib.proximate_to(pr{1}, pr{2});
-
 tc.verifyEqual(r, pr{3}, "proximate_to(" + pr{1} + ", " + pr{2}+")")
+
+r = stdlib.proximate_to(string(pr{1}), pr{2});
+tc.verifyEqual(r, string(pr{3}))
 end
 
 end
@@ -28,13 +32,18 @@ function test_proximate_to(tc, pr)
 
 function pr = init_rel()
 
+pr = {{'', '', ''}, ...
+{pwd(), pwd(), '.'}, ...
+{fileparts(pwd()), pwd(), 'test'}
+};
+
+
 root = fileparts(fileparts(mfilename('fullpath')));
+if ~isempty(root)
+  pr{end+1} = {root, [root, '/test/', mfilename(), '.m'], ['test/', mfilename, '.m']};
+end
+
 
-pr = {{"", "", ""}, ...
-{pwd(), pwd(), "."}, ...
-{fileparts(pwd()), pwd(), "test"}, ...
-{root, fullfile(root, "test", mfilename() + ".m"), fullfile("test", mfilename + ".m")}
-};
 % NOTE: ".." in relative_to(base) is ambiguous including for python.pathlib, C++ <filesystem>, etc.
 
 % if stdlib.has_python() || stdlib.has_dotnet()
@@ -67,8 +76,8 @@ function test_proximate_to(tc, pr)
 else
 
 pr = [pr, {
-{"/", "/", "."}, ...
-{"/dev/null", "/dev/null", "."}, ...
+{'/', '/', '.'}, ...
+{'/dev/null', '/dev/null', '.'}, ...
 }];
 end
 end