Merge pull request cucumber#34 from UrsKR/issue17

Fix for issue cucumber#17: Cucumber replaces %20 when resolving jar paths on Windows

Author: aslakhellesoy

core/src/main/java/cucumber/resources/Decoder.java

@@ -0,0 +1,10 @@
+package cucumber.resources;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+
+public class Decoder {
+    public String decode(String string) throws UnsupportedEncodingException {
+        return URLDecoder.decode(string, "UTF-8");
+    }
+}

core/src/main/java/cucumber/resources/FilePathExtractor.java

@@ -0,0 +1,36 @@
+package cucumber.resources;
+
+import cucumber.runtime.CucumberException;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+
+public class FilePathExtractor {
+
+    private Decoder decoder;
+
+    public FilePathExtractor() {
+        this(new Decoder());
+    }
+
+    public FilePathExtractor(Decoder decoder) {
+        this.decoder = decoder;
+    }
+
+    public String filePath(String jarUrl) {
+        String pathWithProtocol = jarUrl.substring(0, jarUrl.indexOf("!/"));
+        String[] segments = pathWithProtocol.split(":");
+        // WINDOWS: jar:file:/C:/Users/ahellesoy/scm/cucumber-jvm/java/target/java-1.0.0-SNAPSHOT.jar
+        // POSIX:   jar:file:/Users/ahellesoy/scm/cucumber-jvm/java/target/java-1.0.0-SNAPSHOT.jar
+        String pathToJar = segments.length == 4 ? segments[2].substring(1) + ":" + segments[3] : segments[2];
+        return resolveEncodedBlanksInPath(pathToJar);
+    }
+
+    public String resolveEncodedBlanksInPath(String path) {
+        try {
+            return decoder.decode(path);
+        } catch (UnsupportedEncodingException e) {
+            throw new CucumberException("UTF-8 is not supported on your system. This should not be happening.", e);
+        }
+    }
+}

core/src/main/java/cucumber/resources/Resources.java

@@ -12,6 +12,8 @@
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
+import static cucumber.resources.FilePathExtractor.*;
+
 /**
  * Static utility methods for looking up classes and resources on the classpath.
  * TODO: Look them op on the file system as well. The CLI needs to offer resources like that. DUH!
@@ -127,7 +129,7 @@ public static <T> List<T> instantiateSubclasses(Class<T> type, String packagePre
 
     private static void scanJar(URL jarDir, PathWithLines pwl, String suffix, Consumer consumer) {
         String jarUrl = jarDir.toExternalForm();
-        String path = filePath(jarUrl);
+        String path = new FilePathExtractor().filePath(jarUrl);
         try {
             ZipFile jarFile = new ZipFile(path);
             Enumeration<? extends ZipEntry> entries = jarFile.entries();
@@ -143,14 +145,6 @@ private static void scanJar(URL jarDir, PathWithLines pwl, String suffix, Consum
         }
     }
 
-    private static String filePath(String jarUrl) {
-        String pathWithProtocol = jarUrl.substring(0, jarUrl.indexOf("!/"));
-        String[] segments = pathWithProtocol.split(":");
-        // WINDOWS: jar:file:/C:/Users/ahellesoy/scm/cucumber-jvm/java/target/java-1.0.0-SNAPSHOT.jar
-        // POSIX:   jar:file:/Users/ahellesoy/scm/cucumber-jvm/java/target/java-1.0.0-SNAPSHOT.jar
-        return segments.length == 4 ? segments[2].substring(1) + ":" + segments[3] : segments[2];
-    }
-
     private static void scanFilesystem(URL startDir, PathWithLines pathPrefix, String suffix, Consumer consumer) {
         PathWithLines dir = new PathWithLines(getPath(startDir));
         String rootPath = getPath(startDir).substring(0, getPath(startDir).length() - pathPrefix.path.length() - 1);
@@ -159,7 +153,8 @@ private static void scanFilesystem(URL startDir, PathWithLines pathPrefix, Strin
     }
 
     private static String getPath(URL url) {
-        return url.getPath().replaceAll("%20", " ");
+        String path = url.getPath();
+        return new FilePathExtractor().resolveEncodedBlanksInPath(path);
     }
 
     private static void scanFilesystem(File rootDir, PathWithLines pathWithLines, String suffix, Consumer consumer) {

core/src/test/java/cucumber/runtime/FilePathExtractorTest.java

@@ -0,0 +1,35 @@
+package cucumber.runtime;
+
+import cucumber.resources.Decoder;
+import cucumber.resources.FilePathExtractor;
+import org.junit.Test;
+import org.mockito.Mockito;
+
+import java.io.UnsupportedEncodingException;
+
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
+import static org.junit.matchers.JUnitMatchers.*;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+/**
+ * Tests for Issue #17
+ */
+public class FilePathExtractorTest {
+    public static final String anyString = "";
+
+    @Test
+    public void replacesUrlEncodedBlanksWithActualBlanks() {
+        String pathToJar = new FilePathExtractor().filePath("jar:file:/C:/path%20with%20blanks/actual.jar!/content.file");
+        assertThat(pathToJar, not(containsString("%20")));
+    }
+
+    @Test(expected = CucumberException.class)
+    public void forwardsExceptionsAsCucumberExceptions() throws Exception {
+        Decoder decoder = mock(Decoder.class);
+        when(decoder.decode(anyString())).thenThrow(new UnsupportedEncodingException());
+        new FilePathExtractor(decoder).resolveEncodedBlanksInPath(anyString);
+    }
+}