src/main/java/com/jrjackson/RubyObjectDeserializer.java in jrjackson-0.2.3 vs src/main/java/com/jrjackson/RubyObjectDeserializer.java in jrjackson-0.2.4

@@ -20,20 +20,26 @@
 public class RubyObjectDeserializer
   extends StdDeserializer<RubyObject>
 {
   private static final long serialVersionUID = 1L;
 
-  private final static RubyObject[] NO_OBJECTS = new RubyObject[0];
+  // private final static RubyObject[] NO_OBJECTS = new RubyObject[0];
 
-  protected final static Ruby __ruby__ = Ruby.getGlobalRuntime();
+  private Ruby _ruby;
 
   private RubyKeyConverter converter;
   
-  public RubyObjectDeserializer() { 
+  public RubyObjectDeserializer() {
     super(RubyObject.class);
   }
 
+  public RubyObjectDeserializer withRuby(Ruby ruby)
+  {
+    _ruby = ruby;
+    return this;
+  }
+
   public RubyObjectDeserializer setStringStrategy()
   {
     converter = new RubyStringConverter();
     return this;
   }
@@ -43,14 +49,10 @@
     converter = new RubySymbolConverter();
     return this;
   }
 
   /**
-   * @since 2.2
-  */
-
-  /**
   /**********************************************************
   /* Deserializer API
   /**********************************************************
    */
   
@@ -64,42 +66,42 @@
 
       case START_ARRAY:
         return mapArray(jp, ctxt);
 
       case FIELD_NAME:
-        return converter.convert(jp);
+        return converter.convert(_ruby, jp);
 
       case VALUE_EMBEDDED_OBJECT:
-        return RubyUtils.rubyObject(__ruby__, jp.getEmbeddedObject());
+        return RubyUtils.rubyObject(_ruby, jp.getEmbeddedObject());
 
       case VALUE_STRING:
-        // return RubyUtils.rubyString(__ruby__, jp.getText().getBytes("UTF-8"));
-        return RubyUtils.rubyString(__ruby__, jp.getText());
+        // return RubyUtils.rubyString(_ruby, jp.getText().getBytes("UTF-8"));
+        return RubyUtils.rubyString(_ruby, jp.getText());
 
       case VALUE_NUMBER_INT:
         /* [JACKSON-100]: caller may want to get all integral values
          * returned as BigInteger, for consistency
          */
         if (ctxt.isEnabled(DeserializationFeature.USE_BIG_INTEGER_FOR_INTS)) {
-            return RubyUtils.rubyBignum(__ruby__, jp.getBigIntegerValue());
+            return RubyUtils.rubyBignum(_ruby, jp.getBigIntegerValue());
           }
-        return RubyUtils.rubyFixnum(__ruby__, jp.getLongValue());
+        return RubyUtils.rubyFixnum(_ruby, jp.getLongValue());
 
       case VALUE_NUMBER_FLOAT:
         if (ctxt.isEnabled(DeserializationFeature.USE_BIG_DECIMAL_FOR_FLOATS)) {
-          return RubyUtils.rubyBigDecimal(__ruby__, jp.getDecimalValue());
+          return RubyUtils.rubyBigDecimal(_ruby, jp.getDecimalValue());
         }
-        return RubyUtils.rubyFloat(__ruby__, jp.getDoubleValue());
+        return RubyUtils.rubyFloat(_ruby, jp.getDoubleValue());
 
       case VALUE_TRUE:
-        return __ruby__.newBoolean(Boolean.TRUE);
+        return _ruby.newBoolean(Boolean.TRUE);
 
       case VALUE_FALSE:
-        return __ruby__.newBoolean(Boolean.FALSE);
+        return _ruby.newBoolean(Boolean.FALSE);
 
       case VALUE_NULL: // should not get this but...
-        return null;
+        return (RubyObject)_ruby.getNil();
 
       case END_ARRAY: // invalid
       case END_OBJECT: // invalid
       default:
         throw ctxt.mappingException(Object.class);
@@ -121,11 +123,11 @@
     // if (ctxt.isEnabled(DeserializationFeature.USE_JAVA_ARRAY_FOR_JSON_ARRAY)) {
     //     return mapArrayToArray(jp, ctxt);
     // }
     // Minor optimization to handle small lists (default size for ArrayList is 10)
     if (jp.nextToken() == JsonToken.END_ARRAY) {
-      return RubyArray.newArray(__ruby__);
+      return RubyArray.newArray(_ruby);
     }
     ObjectBuffer buffer = ctxt.leaseObjectBuffer();
     Object[] values = buffer.resetAndStart();
     int ptr = 0;
     long totalSize = 0;
@@ -137,11 +139,11 @@
         ptr = 0;
       }
       values[ptr++] = value;
     } while (jp.nextToken() != JsonToken.END_ARRAY);
       // let's create almost full array, with 1/8 slack
-    RubyArray result = RubyArray.newArray(__ruby__, (totalSize + (totalSize >> 3) + 1));
+    RubyArray result = RubyArray.newArray(_ruby, (totalSize + (totalSize >> 3) + 1));
     buffer.completeAndClearBuffer(values, ptr, result);
     return result;
   }
 
   /**
@@ -155,32 +157,32 @@
       t = jp.nextToken();
     }
     // 1.6: minor optimization; let's handle 1 and 2 entry cases separately
     if (t != JsonToken.FIELD_NAME) { // and empty one too
         // empty map might work; but caller may want to modify... so better just give small modifiable
-      return RubyHash.newHash(__ruby__);
+      return RubyHash.newHash(_ruby);
     }
 
-    RubyObject field1 = converter.convert(jp);
+    RubyObject field1 = converter.convert(_ruby, jp);
     jp.nextToken();
     RubyObject value1 = deserialize(jp, ctxt);
     if (jp.nextToken() != JsonToken.FIELD_NAME) { // single entry; but we want modifiable
-      return RuntimeHelpers.constructHash(__ruby__, field1, value1);
+      return RuntimeHelpers.constructHash(_ruby, field1, value1);
     }
 
-    RubyObject field2 = converter.convert(jp);
+    RubyObject field2 = converter.convert(_ruby, jp);
     jp.nextToken();
     RubyObject value2 = deserialize(jp, ctxt);
     if (jp.nextToken() != JsonToken.FIELD_NAME) {
-      return RuntimeHelpers.constructHash(__ruby__, field1, value1, field2, value2);
+      return RuntimeHelpers.constructHash(_ruby, field1, value1, field2, value2);
     }
 
     // And then the general case; default map size is 16
-    RubyHash result = RuntimeHelpers.constructHash(__ruby__, field1, value1, field2, value2);
+    RubyHash result = RuntimeHelpers.constructHash(_ruby, field1, value1, field2, value2);
     do {
-      RubyObject fieldName = converter.convert(jp);
+      RubyObject fieldName = converter.convert(_ruby, jp);
       jp.nextToken();
-      result.fastASetCheckString(__ruby__, fieldName, deserialize(jp, ctxt));
+      result.fastASetCheckString(_ruby, fieldName, deserialize(jp, ctxt));
     } while (jp.nextToken() != JsonToken.END_OBJECT);
     return result;
   }
 }