Replace File.basename in URL#relative_path_to because it doesn't handle special characters in URLs well

nucular · Thibaut · commit 034ecfae72f3 · 2016-05-29T11:04:59.000-04:00
diff --git a/lib/docs/core/url.rb b/lib/docs/core/url.rb
@@ -100,7 +100,7 @@ def relative_path_to(url)
           result << '/' if result != '.'
         end
       else
-        dest_dir.parent.relative_path_from(base_dir).join(::File.basename(dest)).to_s
+        dest_dir.parent.relative_path_from(base_dir).join(dest.split('/').last).to_s
       end
     end
 
diff --git a/test/lib/docs/core/url_test.rb b/test/lib/docs/core/url_test.rb
@@ -394,6 +394,14 @@ class DocsUrlTest < MiniTest::Spec
         assert_equal 'file', url.relative_path_to('http://example.com/file?query#frag')
       end
 
+      it "returns 'some:file' with 'http://example.com/some:file'" do
+        assert_equal 'some:file', url.relative_path_to('http://example.com/some:file')
+      end
+
+      it "returns 'some:file' with 'http://example.com/some:file?query#frag'" do
+        assert_equal 'some:file', url.relative_path_to('http://example.com/some:file?query#frag')
+      end
+
       it "returns nil with '/file'" do
         assert_nil url.relative_path_to('/file')
       end
