Merge branch 'simplify'

This branch switches the JRuby script language to lean on JRuby's
built-in JSR-223 implementation, and fixes up the unit tests and
templates to work as expected.

Author: ctrueden

src/main/java/org/scijava/plugins/scripting/jruby/JRubyBindings.java

@@ -40,7 +40,7 @@
 /**
  * An adapter of the JRuby interpreter to the SciJava scripting interface.
  * 
- * @author Johannes Schindelin
+ * @author Curtis Rueden
  * @see ScriptEngine
  */
 @Plugin(type = ScriptLanguage.class, name = "Ruby")
@@ -50,10 +50,4 @@ public JRubyScriptLanguage() {
 		super("jruby");
 	}
 
-	@Override
-	public ScriptEngine getScriptEngine() {
-		// TODO: Consider adapting the wrapped ScriptEngineFactory's ScriptEngine.
-		return new JRubyScriptEngine();
-	}
-
 }

src/main/java/org/scijava/plugins/scripting/jruby/JRubyScriptEngine.java

@@ -6,4 +6,4 @@
 # the 'name' parameter from the user, and then display
 # the 'greeting' output parameter, based on its type.
 
-greeting = "Hello, " + name + "!"
+$greeting = "Hello, " + $name + "!"

src/main/java/org/scijava/plugins/scripting/jruby/JRubyScriptLanguage.java

@@ -36,14 +36,11 @@
 import java.io.IOException;
 import java.util.concurrent.ExecutionException;
 
-import javax.script.Bindings;
-import javax.script.ScriptContext;
 import javax.script.ScriptEngine;
 import javax.script.ScriptException;
 
 import org.junit.Test;
 import org.scijava.Context;
-import org.scijava.plugins.scripting.jruby.JRubyScriptEngine;
 import org.scijava.script.ScriptLanguage;
 import org.scijava.script.ScriptModule;
 import org.scijava.script.ScriptService;
@@ -63,10 +60,8 @@ public void testBasic() throws InterruptedException, ExecutionException,
 		final ScriptService scriptService = context.getService(ScriptService.class);
 		final String script = "$x = 1 + 2;";
 		final ScriptModule m = scriptService.run("add.rb", script, true).get();
-		final ScriptEngine engine = (ScriptEngine) m.getReturnValue();
-		final Object result = engine.get("$x");
-		// NB: Result is of type org.jruby.RubyFixnum.
-		assertEquals("3", result.toString());
+		final Object result = m.getReturnValue();
+		assertEquals(3L, result);
 	}
 
 	@Test
@@ -76,18 +71,14 @@ public void testLocals() throws ScriptException {
 
 		final ScriptLanguage language = scriptService.getLanguageByExtension("rb");
 		final ScriptEngine engine = language.getScriptEngine();
-		assertEquals(JRubyScriptEngine.class, engine.getClass());
-		engine.put("$hello", 17);
-		assertEquals("17", engine.eval("$hello").toString());
-		assertEquals("17", engine.get("$hello").toString());
-
-		final Bindings bindings = engine.getBindings(ScriptContext.ENGINE_SCOPE);
-		bindings.clear();
-		assertEquals("", engine.get("$hello").toString());
+		final String engineClassName = engine.getClass().getName();
+		assertEquals("org.jruby.embed.jsr223.JRubyEngine", engineClassName);
+		engine.put("hello", 17);
+		assertEquals(17L, engine.eval("$hello"));
+		assertEquals(17, engine.get("hello"));
 	}
 
-	// FIXME: This test currently fails due to input injection failure.
-//	@Test
+	@Test
 	public void testParameters() throws InterruptedException, ExecutionException,
 		IOException, ScriptException
 	{
@@ -97,12 +88,12 @@ public void testParameters() throws InterruptedException, ExecutionException,
 		final String script = "" + //
 			"# @ScriptService ss\n" + //
 			"# @OUTPUT String language\n" + //
-			"language = ss.getLanguageByName(\"Ruby\").getLanguageName\n";
+			"$language = $ss.getLanguageByName(\"ruby\").getLanguageName\n";
 		final ScriptModule m = scriptService.run("hello.rb", script, true).get();
 
 		final Object actual = m.getOutput("language");
 		final String expected =
-			scriptService.getLanguageByName("Ruby").getLanguageName();
+			scriptService.getLanguageByName("ruby").getLanguageName();
 		assertEquals(expected, actual);
 
 		final Object result = m.getReturnValue();