Fixes #40 - encoding issue when URL contains non-ASCII characters. (#42)

Author: ben-gibson

CHANGELOG.md

@@ -51,4 +51,8 @@ All Notable changes to `Open in Git host` will be documented in this file
 
 ## 2.0.0 - 2017-09-17
 
-- Rebuilt the entire plugin! Note that you have to configure the plugin again!
+- Rebuilt the entire plugin! Note that you have to configure the plugin again!
+
+## 2.0.1 - 2017-09-30
+
+- Fixed encoding issue when URL contains non-ASCII characters. #40

resources/META-INF/plugin.xml

@@ -1,7 +1,7 @@
 <idea-plugin url="https://github.com/ben-gibson/jetbrains-open-in-git-host">
     <id>uk.co.ben-gibson.remote.repository.mapper</id>
     <name>Open in Git host</name>
-    <version>2.0.0</version>
+    <version>2.0.1</version>
     <vendor url="https://github.com/ben-gibson/jetbrains-open-in-git-host">Ben Gibson</vendor>
     <description><![CDATA[
       Determines the remote URL of a git commit or file and runs it through enabled extensions. Extensions allow the URL to be
@@ -25,13 +25,7 @@
     <change-notes><![CDATA[
     <ul>
       <li>
-          Rebuilt code base for a cleaner more modular plugin that will scale better in future updates!
-      </li>
-      <li>
-          Note: Plugin settings will need to be reconfigured!
-      </li>
-      <li>
-          Note: No support for GitBlit - to be re-added in upcoming update.
+          Fixed encoding issue when URL contains non-ASCII characters. <a href="https://github.com/ben-gibson/jetbrains-open-in-git-host/issues/40">#40</a>
       </li>
      </ul>
     ]]>

src/uk/co/ben_gibson/open/in/git/host/Extension/OpenInBrowserExtension.java

@@ -18,7 +18,12 @@ public OpenInBrowserExtension(BrowserLauncher browserLauncher)
 
     public void run(URL remoteUrl) throws ExtensionException
     {
-        this.browserLauncher.open(remoteUrl.toString());
+        try {
+            this.browserLauncher.open(remoteUrl.toURI().toASCIIString());
+        } catch (Exception e) {
+            throw new ExtensionException(e.getMessage());
+        }
+
     }
 
     public String displayName()

src/uk/co/ben_gibson/open/in/git/host/UI/Target/SelectInTarget.java

@@ -13,9 +13,7 @@
 import git4idea.repo.GitRepository;
 import org.jetbrains.annotations.NotNull;
 import uk.co.ben_gibson.open.in.git.host.Container;
-import uk.co.ben_gibson.open.in.git.host.Git.Commit;
 import uk.co.ben_gibson.open.in.git.host.Logger.Logger;
-import uk.co.ben_gibson.open.in.git.host.RemoteUrlFactory.Description.RemoteCommitDescription;
 import uk.co.ben_gibson.open.in.git.host.UI.Exception.RepositoryNotFoundException;
 import uk.co.ben_gibson.open.in.git.host.Exception.OpenInGitHostException;
 import uk.co.ben_gibson.open.in.git.host.Git.Branch;

tests/unit/uk/co/ben_gibson/open/in/git/host/test/Extension/OpenInBrowserExtensionTest.java

@@ -1,26 +1,47 @@
 package uk.co.ben_gibson.open.in.git.host.test.Extension;
 
 import com.intellij.ide.browsers.BrowserLauncher;
+import com.tngtech.java.junit.dataprovider.DataProvider;
+import com.tngtech.java.junit.dataprovider.DataProviderRunner;
+import com.tngtech.java.junit.dataprovider.UseDataProvider;
 import junit.framework.TestCase;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 import uk.co.ben_gibson.open.in.git.host.Extension.Exception.ExtensionException;
 import uk.co.ben_gibson.open.in.git.host.Extension.Extension;
 import uk.co.ben_gibson.open.in.git.host.Extension.OpenInBrowserExtension;
 import static org.mockito.Mockito.*;
 import java.net.MalformedURLException;
 import java.net.URL;
 
+@RunWith(DataProviderRunner.class)
 public class OpenInBrowserExtensionTest extends TestCase
 {
-    public void testOpensInBrowser() throws MalformedURLException, ExtensionException
+    @Test
+    @UseDataProvider("urlProvider")
+    public void testOpensInBrowser(URL url, String expected) throws MalformedURLException, ExtensionException
     {
-        URL url = new URL("https://example.com");
-
         BrowserLauncher browserLauncher = mock(BrowserLauncher.class);
 
         Extension extension = new OpenInBrowserExtension(browserLauncher);
 
         extension.run(url);
 
-        verify(browserLauncher, times(1)).open(url.toString());
+        verify(browserLauncher, times(1)).open(expected);
+    }
+
+    @DataProvider
+    public static Object[][] urlProvider() throws MalformedURLException
+    {
+        return new Object[][] {
+            {
+                new URL("https://example.com"),
+                "https://example.com"
+            },
+            {
+                new URL("https://github.com/foo%20bar/baz/blob/master/需求0920-2017/0928.sql#L15"),
+                "https://github.com/foo%20bar/baz/blob/master/%E9%9C%80%E6%B1%820920-2017/0928.sql#L15"
+            },
+        };
     }
 }

tests/unit/uk/co/ben_gibson/open/in/git/host/test/RemoteUrlFactory/GitHubRemoteUrlFactoryTest.java

@@ -95,6 +95,16 @@ public static Object[][] fileProvider() throws MalformedURLException, RemoteExce
                 "https://github.com/foo%20bar/baz/blob/master/resources/Bar%20Baz.java",
                 true
             },
+            {
+                new RemoteFileDescription(
+                    RemoteUrlFactoryTest.mockRemote("https://github.com/foo bar/baz"),
+                    Branch.master(),
+                    RemoteUrlFactoryTest.mockFile("需求0920-2017/0928.sql", "0928.sql"),
+                    15
+                ),
+                "https://github.com/foo%20bar/baz/blob/master/需求0920-2017/0928.sql#L15",
+                true
+            },
         };
     }