Merge branch 'string-matching'

Conflicts:
	.gitignore
	Rakefile
	tests/test_json_encoding.rb

1 files changed, 13 insertions, 2 deletions

diff --git a/java/src/json/ext/OptionsReader.java b/java/src/json/ext/OptionsReader.java
index 3bc8d5f..018ace4 100644
--- a/java/src/json/ext/OptionsReader.java
+++ b/java/src/json/ext/OptionsReader.java
@@ -74,15 +74,20 @@ final class OptionsReader {
      *                        converted to string
      */
     ByteList getString(String key) {
+        RubyString str = getString(key, null);
+        return str == null ? null : str.getByteList().dup();
+    }
+
+    RubyString getString(String key, RubyString defaultValue) {
         IRubyObject value = get(key);
-        if (value == null || !value.isTrue()) return null;
+        if (value == null || !value.isTrue()) return defaultValue;
 
         RubyString str = value.convertToString();
         RuntimeInfo info = getRuntimeInfo();
         if (info.encodingsSupported() && str.encoding(context) != info.utf8) {
             str = (RubyString)str.encode(context, info.utf8);
         }
-        return str.getByteList().dup();
+        return str;
     }
 
     /**
@@ -105,4 +110,10 @@ final class OptionsReader {
         throw runtime.newTypeError(key + " option must be a subclass of "
                                    + defaultValue);
     }
+
+    public RubyHash getHash(String key) {
+        IRubyObject value = get(key);
+        if (value == null || value.isNil()) return new RubyHash(runtime);
+        return (RubyHash) value;
+    }
 }