Removed some bad ideas from the API.

Author: nedtwigg

gradle.properties

@@ -1,5 +1,5 @@
-stable=2.0.0
-version=2.1.0-SNAPSHOT
+stable=3.0.0
+version=3.0.0
 name=jscriptbox
 group=com.diffplug.jscriptbox
 description=JScriptBox: Make your scripting API language-independent
@@ -11,5 +11,8 @@ VER_JAVA=1.8
 VER_BINTRAY=1.1
 VER_FINDBUGS=3.0.1
 
+# Dependencies
+VER_GUAVA=18.0
+
 # Testing
 VER_JUNIT=4.12

src/main/java/com/diffplug/jscriptbox/JScriptBox.java

@@ -34,36 +34,22 @@ public static JScriptBox create() {
 		return new JScriptBox();
 	}
 
-	/** Sets all of the properties contained in the given map. Throws an error if one of the entry keys isn't a valid identifier. */
-	public JScriptBox setAll(Map<String, ?> map) {
-		for (Map.Entry<String, ?> entry : map.entrySet()) {
-			set(entry.getKey()).toValue(entry.getValue());
-		}
-		return this;
-	}
-
-	/** Sets all of the properties contained in the given map for which the key is a valid identifier. */
-	public JScriptBox setAllValid(Map<String, ?> map) {
-		for (Map.Entry<String, ?> entry : map.entrySet()) {
-			if (isValidIdentifier(entry.getKey())) {
-				set(entry.getKey()).toValue(entry.getValue());
-			}
-		}
-		return this;
-	}
-
 	/** Sets a name in the script environment to be a value or a function. */
 	public NameSetter set(String name) {
 		return new NameSetter(name);
 	}
 
-	/** Checks that the given name is a valid identifier. */
+	/**
+	 * Checks that the given name is a valid Java identifier.  It's still possible that
+	 * the name is a restricted keyword in the scripting language that you are creating a
+	 * binding for, but there's no way to know at this point.
+	 */
 	static String checkValidIdentifier(String name) {
 		Check.that(isValidIdentifier(name), "'%0' is not a valid identifier", name);
 		return name;
 	}
 
-	/** Checks that the given name is a valid identifier. */
+	/** Returns true if the given name is a valid Java identifier. */
 	public static boolean isValidIdentifier(String name) {
 		return name.length() > 0 &&
 				Character.isJavaIdentifierStart(name.codePointAt(0)) &&

src/main/java/com/diffplug/jscriptbox/javascript/Nashorn.java

@@ -26,8 +26,18 @@
 import com.diffplug.jscriptbox.Language;
 
 public class Nashorn {
-	/** Language implementation for javascript using the nashorn engine. */
+	/**
+	 * Language implementation for javascript using the nashorn engine.
+	 * <p>
+	 * If any bindings are created which conflict with reserved
+	 * keywords, an IllegalArgumentException will be thrown.
+	 */
 	public static Language language() {
+		return language(OnReservedKeyword.ERROR);
+	}
+
+	/** Language implementation for javascript using the given policy for resolving any potential conflicts with reserved keywords. */
+	public static Language language(OnReservedKeyword policy) {
 		return map -> {
 			ScriptEngine jsEngine = new ScriptEngineManager().getEngineByName("nashorn");
 			ScriptContext context = jsEngine.getContext();
@@ -36,30 +46,45 @@ public static Language language() {
 			context.setAttribute(mapName, map, ScriptContext.ENGINE_SCOPE);
 
 			StringBuilder builder = new StringBuilder();
-			map.entrySet().forEach(entry -> {
+			for (String key : map.keySet()) {
+				if (isReserved(key)) {
+					switch (policy) {
+					case ERROR:
+						throw new IllegalArgumentException("'" + key + "' is a reserved keyword.");
+					case MANGLE:
+						key = key + "_";
+						break;
+					case SKIP:
+						continue;
+					default:
+						throw new IllegalArgumentException("Unhandled enum value '" + policy + "'");
+					}
+				}
 				builder.append("var ");
-				builder.append(normalize(entry.getKey()));
+				builder.append(key);
 				builder.append("=");
 				builder.append(mapName);
 				builder.append(".get('");
-				builder.append(entry.getKey());
+				builder.append(key);
 				builder.append("');\n");
-			});
+			}
 			builder.append("delete " + mapName + ";\n");
 			jsEngine.eval(builder.toString());
 			return jsEngine;
 		};
 	}
 
-	private static String normalize(String input) {
-		if (restrictedWords.contains(input)) {
-			return "_" + input;
-		} else {
-			return input;
-		}
+	/** Describes a policy for dealing with reserved keywords. */
+	public enum OnReservedKeyword {
+		ERROR, MANGLE, SKIP;
+	}
+
+	/** Returns true if the given identifier is a JavaScript reserved keyword. */
+	public static boolean isReserved(String word) {
+		return reservedKeywords.contains(word);
 	}
 
-	private static final Set<String> restrictedWords = new HashSet<>(Arrays.asList(
+	private static final Set<String> reservedKeywords = new HashSet<>(Arrays.asList(
 			// JavaScript Reserved Words
 			"abstract", "arguments", "boolean", "break", "byte",
 			"case", "catch", "char", "class", "const",