Refactor to package JS resources in jar

Instead of requiring each project to have their own copy of the
supporting JavaScript and HTML resources (like jasmine.js), package
them into this project's JAR and load the resources from the
classpath.

src/main/java/be/klak/junit/jasmine/JasmineSpecRunnerGenerator.java

@@ -4,6 +4,7 @@ import java.io.File;
 import java.io.IOException;
 
 import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
 
 class JasmineSpecRunnerGenerator {
 
@@ -66,12 +67,17 @@ class JasmineSpecRunnerGenerator {
 	}
 
 	private String loadTemplate() {
-		String template = null;
 		try {
-			template = FileUtils.readFileToString(new File(suite.jsRootDir() + "/lib/specRunner.tpl"));
+			return IOUtils.toString(
+				Thread
+					.currentThread()
+					.getContextClassLoader()
+					.getResourceAsStream("js/lib/specRunner.tpl")
+			);
+		} catch (NullPointerException e) {
+			throw new IllegalStateException("spec runner template file not found!");
 		} catch (IOException e) {
-			throw new RuntimeException("spec runner template file not found!", e);
+			throw new IllegalStateException("spec runner template file could not be read!", e);
 		}
-		return template;
 	}
 }

src/main/java/be/klak/junit/jasmine/JasmineTestRunner.java

@@ -4,6 +4,9 @@ import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 
 import org.apache.commons.lang.StringUtils;
+
+import java.net.URL;
+
 import org.junit.After;
 import org.junit.Before;
 import org.junit.runner.Description;
@@ -18,7 +21,9 @@ import be.klak.rhino.RhinoContext;
 public class JasmineTestRunner extends Runner {
 
 	private static final int SLEEP_TIME_MILISECONDS = 50;
-	private static final String JASMINE_LIB_DIR = "/lib/jasmine-1.0.2/";
+
+	// relative to classpath
+	private static final String JASMINE_LIB_DIR = "js/lib/jasmine-1.0.2";
 
 	private JasmineDescriptions jasmineSuite;
 
@@ -63,8 +68,8 @@ public class JasmineTestRunner extends Runner {
     }
 
 	private void setUpJasmine(RhinoContext context) {
-		context.load(getJsLibDir() + "jasmine.js");
-		context.load(getJsLibDir() + "jasmine.delegator_reporter.js");
+		context.loadFromClasspath(JASMINE_LIB_DIR + "/jasmine.js");
+		context.loadFromClasspath(JASMINE_LIB_DIR + "/jasmine.delegator_reporter.js");
 
 		context.evalJS("jasmine.getEnv().addReporter(new jasmine.DelegatorJUnitReporter());");
 	}
@@ -102,11 +107,26 @@ public class JasmineTestRunner extends Runner {
 	}
 
 	private void resetEnvjsWindowSpace() {
-		this.rhinoContext.evalJS("window.location = '" + suiteAnnotation.jsRootDir() + "/lib/blank.html';");
-	}
+		URL blankUrl = Thread
+			.currentThread()
+			.getContextClassLoader()
+			.getResource("js/lib/blank.html");
 
-	private String getJsLibDir() {
-		return suiteAnnotation.jsRootDir() + JASMINE_LIB_DIR;
+		if (blankUrl == null) {
+			throw new IllegalStateException("Unable to load js/lib/blank.html from classpath");
+		}
+
+		String blankUrlStr = blankUrl.toExternalForm();
+		
+		// "file:/path/to/file" is not legal, but "file:///path/to/file" is
+		if (blankUrlStr.startsWith("file:/") && (! blankUrlStr.startsWith("file:///"))) {
+			blankUrlStr = "file://" + blankUrlStr.substring(5);
+		}
+
+		this.rhinoContext.evalJS(String.format(
+			"window.location = '%s';",
+			blankUrlStr
+		));
 	}
 
 	private JasmineDescriptions getJasmineDescriptions() {

src/main/java/be/klak/rhino/RhinoContext.java

@@ -128,8 +128,8 @@ public class RhinoContext {
 	}
 
 	public void loadEnv(String jsDir) {
-		load(jsDir + "/lib/env.rhino.1.2.js");
-		load(jsDir + "/lib/env.utils.js");
+		loadFromClasspath("js/lib/env.rhino.1.2.js");
+		loadFromClasspath("js/lib/env.utils.js");
 		load(jsDir + "/envJsOptions.js");
 	}
 

src/main/resources/js/lib/env.rhino.1.2.js

@@ -1093,7 +1093,7 @@ Envjs.uri = function(path, base) {
     }
 
     // if path is absolute, then just normalize and return
-    if (path.match('^[a-zA-Z]+://')) {
+    if (path.match('^([a-zA-Z]+://|jar:file:/)')) {
         return urlparse.urlnormalize(path);
     }
 
@@ -1499,7 +1499,7 @@ Envjs.connection = function(xhr, responseHandler, data){
         instream,
         responseXML,
         i;
-    if ( /^file\:/.test(url) ) {
+    if ( /^(jar:)?file\:/.test(url) ) {
         try{
             if ( "PUT" == xhr.method || "POST" == xhr.method ) {
                 data =  data || "" ;

src/main/resources/js/lib/env.utils.js

@@ -1,4 +1,3 @@
-
 /**
  * Rhino and Envjs additions, filling the missing pieces such as a decent stacktrace
  * 1) Firefox knows new Error().stack but Envjs does not.

src/test/java/be/klak/env/EnvUtilsTest.java

@@ -13,7 +13,7 @@ public class EnvUtilsTest {
 
 	@Before
 	public void loadJasmineJQueryMatchers(RhinoContext context) {
-		context.load("src/test/javascript/lib/jasmine-1.0.2/jasmine-jquery-rhino.js");
+		context.loadFromClasspath("js/lib/jasmine-1.0.2/jasmine-jquery-rhino.js");
 	}
 
 }