jrjackson 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f9e650b921f331f6c35671692b6ea5b37e79bd4
-  data.tar.gz: c2724492377c6d3edca12a2da84314c5ed250c14
+  metadata.gz: 9cfaa7407bdd2661d42803ddeb31cd08cb5f64cd
+  data.tar.gz: 12c5ff2193c1b189cecbea58972a2f7b6aefb622
 SHA512:
-  metadata.gz: 18a45247d04538ddce6d35c9dd9a8462e9569b243132f443d2ab373362e7eaf4685966c48c79a435366f97024e49961acd8722cef2826a9acaf33ad6d1c9ac48
-  data.tar.gz: 6d71d6fce9f140dad56018c3025b48dca19d2c243b87845bc4b69f1e5eb44a0843bbacb8414e8758f6f39351b27ee9cd8d12c423ff7a3f29c2012df58eaaca50
+  metadata.gz: a6c5d5db9a8874e9f19297de099a048c8913a8ad6df1d0e7758bd0dcfd9ef57a07dae2bd8db4c22b5dc077ff8745667ce23854c63e745cddb65b05c5e2f940db
+  data.tar.gz: 677855c6cd7ae971d70b3865092483b8a55cf136ae07fed3e166440dd8ee843d562db67e72efa4a09513198c0a9c95c6f468e57ad840fbd9d77d5009e7d365bc

data/dependency-reduced-pom.xml

@@ -4,7 +4,7 @@
   <groupId>com.jrjackson.jruby</groupId>
   <artifactId>jrjackson</artifactId>
   <name>jrjackson</name>
-  <version>1.2.8</version>
+  <version>1.2.9</version>
   <url>http://maven.apache.org</url>
   <build>
     <plugins>
@@ -24,8 +24,7 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <version>2.16</version>
         <configuration>
-          <parallel>methods</parallel>
-          <threadCount>10</threadCount>
+          <skipTests>true</skipTests>
         </configuration>
       </plugin>
       <plugin>
@@ -67,8 +66,18 @@
     <dependency>
       <groupId>org.jruby</groupId>
       <artifactId>jruby</artifactId>
-      <version>1.7.8</version>
-      <scope>compile</scope>
+      <version>1.7.11</version>
+      <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>jruby-core</artifactId>
+          <groupId>org.jruby</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>jruby-stdlib</artifactId>
+          <groupId>org.jruby</groupId>
+        </exclusion>
+      </exclusions>
     </dependency>
   </dependencies>
   <properties>

data/lib/jrjackson/build_info.rb

@@ -1,7 +1,7 @@
 module JrJackson
   module BuildInfo
     def self.version
-      '0.2.6'
+      '0.2.7'
     end
 
     def self.files

data/lib/jrjackson/jrjackson.rb

@@ -3,8 +3,8 @@ unless RUBY_PLATFORM =~ /java/
   exit 255
 end
 
-require_relative "jars/jrjackson-1.2.8.jar"
-# require_relative "linked/jrjackson-1.2.8.jar"
+require_relative "jars/jrjackson-1.2.9.jar"
+# require_relative "linked/jrjackson-1.2.9.jar"
 
 require 'com/jrjackson/jr_jackson'
 

data/pom.xml

@@ -5,7 +5,7 @@
   <groupId>com.jrjackson.jruby</groupId>
   <artifactId>jrjackson</artifactId>
   <packaging>jar</packaging>
-  <version>1.2.8</version>
+  <version>1.2.9</version>
   <name>jrjackson</name>
   <url>http://maven.apache.org</url>
   
@@ -23,7 +23,8 @@
     <dependency>
       <groupId>org.jruby</groupId>
       <artifactId>jruby</artifactId>
-      <version>1.7.8</version>
+      <version>1.7.11</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
@@ -66,8 +67,7 @@
             <artifactId>maven-surefire-plugin</artifactId>
             <version>2.16</version>
             <configuration>
-                <parallel>methods</parallel>
-                <threadCount>10</threadCount>
+                <skipTests>true</skipTests>
             </configuration>
         </plugin>
         <plugin>

data/src/main/java/com/jrjackson/JrJacksonRaw.java

@@ -23,117 +23,105 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 @JRubyModule(name = "JrJacksonRaw")
 public class JrJacksonRaw extends RubyObject {
 
-  public JrJacksonRaw(Ruby ruby, RubyClass metaclass) {
-    super(ruby, metaclass);
-  }
-
-  private static boolean flagged(RubyHash opts, RubySymbol key) {
-    Object val = opts.get(key);
-    if (val == null) {
-      return false;
+    public JrJacksonRaw(Ruby ruby, RubyClass metaclass) {
+        super(ruby, metaclass);
     }
-    return (Boolean) val;
-  }
-
-  // deserialize
-  @JRubyMethod(module = true, name = {"parse", "load"}, required = 2)
-  public static IRubyObject parse(ThreadContext context, IRubyObject self, IRubyObject arg, IRubyObject opts)
-    throws IOException
-  {
-    RubyHash options = null;
-    ObjectMapper local = null;
-    Ruby _ruby = context.getRuntime();
 
-    if (opts != context.nil) {
-      options = opts.convertToHash();
-      if (flagged(options, RubyUtils.rubySymbol(_ruby, "symbolize_keys"))) {
-        local = RubyJacksonModule.mappedAs("sym", _ruby);
-      }
-      if (flagged(options, RubyUtils.rubySymbol(_ruby, "raw"))) {
-        local = RubyJacksonModule.mappedAs("raw", _ruby);
-      }
-      if (local == null) {
-        local = RubyJacksonModule.mappedAs("str", _ruby);
-      }
-      if (flagged(options, RubyUtils.rubySymbol(_ruby, "use_bigdecimal"))) {
-        local.enable(DeserializationFeature.USE_BIG_DECIMAL_FOR_FLOATS);
-      }
-      else {
-        local.disable(DeserializationFeature.USE_BIG_DECIMAL_FOR_FLOATS);
-      }
-    }
-    else {
-      local = RubyJacksonModule.mappedAs("str", _ruby);
+    private static boolean flagged(RubyHash opts, RubySymbol key) {
+        Object val = opts.get(key);
+        if (val == null) {
+            return false;
+        }
+        return (Boolean) val;
     }
-    return _parse(context, arg, local);
-  }
-
-  @JRubyMethod(module = true, name = {"parse_raw", "load_raw"}, required = 1)
-  public static IRubyObject parse_raw(ThreadContext context, IRubyObject self, IRubyObject arg)
-    throws IOException
-  {
-    ObjectMapper mapper = RubyJacksonModule.mappedAs("raw", context.getRuntime());
-    return _parse(context, arg, mapper);
-  }
-
-  @JRubyMethod(module = true, name = {"parse_sym", "load_sym"}, required = 1)
-  public static IRubyObject parse_sym(ThreadContext context, IRubyObject self, IRubyObject arg)
-    throws IOException
-  {
-    ObjectMapper mapper = RubyJacksonModule.mappedAs("sym", context.getRuntime());
-    return _parse(context, arg, mapper);
-  }
 
-  @JRubyMethod(module = true, name = {"parse_str", "load_str"}, required = 1)
-  public static IRubyObject parse_str(ThreadContext context, IRubyObject self, IRubyObject arg)
-    throws IOException
-  {
-    ObjectMapper mapper = RubyJacksonModule.mappedAs("str", context.getRuntime());
-    return _parse(context, arg, mapper);
-  }
+    // deserialize
+    @JRubyMethod(module = true, name = {"parse", "load"}, required = 2)
+    public static IRubyObject parse(ThreadContext context, IRubyObject self, IRubyObject arg, IRubyObject opts)
+            throws IOException {
+        RubyHash options = null;
+        ObjectMapper local = null;
+        Ruby _ruby = context.getRuntime();
 
-  private static IRubyObject _parse(ThreadContext context, IRubyObject arg, ObjectMapper mapper) 
-    throws IOException
-  {
-    Ruby ruby = context.getRuntime();
-    try {
-      Object o;
-      if (arg instanceof RubyString) {
-        o = mapper.readValue(
-          ((RubyString)arg).getBytes(), Object.class
-        );
-      } else {
-        // must be an IO object then
-        IRubyObject stream = IOJavaAddons.AnyIO.any_to_inputstream(context, arg);
-        o = mapper.readValue((InputStream)stream.toJava(InputStream.class), Object.class);
-      }
-      return RubyUtils.rubyObject(ruby, o);
+        if (opts != context.nil) {
+            options = opts.convertToHash();
+            if (flagged(options, RubyUtils.rubySymbol(_ruby, "symbolize_keys"))) {
+                local = RubyJacksonModule.mappedAs("sym", _ruby);
+            }
+            if (flagged(options, RubyUtils.rubySymbol(_ruby, "raw"))) {
+                local = RubyJacksonModule.mappedAs("raw", _ruby);
+            }
+            if (local == null) {
+                local = RubyJacksonModule.mappedAs("str", _ruby);
+            }
+            if (flagged(options, RubyUtils.rubySymbol(_ruby, "use_bigdecimal"))) {
+                local.enable(DeserializationFeature.USE_BIG_DECIMAL_FOR_FLOATS);
+            } else {
+                local.disable(DeserializationFeature.USE_BIG_DECIMAL_FOR_FLOATS);
+            }
+        } else {
+            local = RubyJacksonModule.mappedAs("str", _ruby);
+        }
+        return _parse(context, arg, local);
     }
-    catch (JsonProcessingException e) {
-      throw ParseError.newParseError(ruby, e.getLocalizedMessage());
+
+    @JRubyMethod(module = true, name = {"parse_raw", "load_raw"}, required = 1)
+    public static IRubyObject parse_raw(ThreadContext context, IRubyObject self, IRubyObject arg)
+            throws IOException {
+        ObjectMapper mapper = RubyJacksonModule.mappedAs("raw", context.getRuntime());
+        return _parse(context, arg, mapper);
     }
-    catch (IOException e) {
-      throw ruby.newIOError(e.getLocalizedMessage());
+
+    @JRubyMethod(module = true, name = {"parse_sym", "load_sym"}, required = 1)
+    public static IRubyObject parse_sym(ThreadContext context, IRubyObject self, IRubyObject arg)
+            throws IOException {
+        ObjectMapper mapper = RubyJacksonModule.mappedAs("sym", context.getRuntime());
+        return _parse(context, arg, mapper);
     }
-  }
 
-  // serialize
-  @JRubyMethod(module = true, name = {"generate", "dump"}, required = 1)
-  public static IRubyObject generate(ThreadContext context, IRubyObject self, IRubyObject arg)
-    throws IOException, JsonProcessingException
-  {
-    Ruby _ruby = context.getRuntime();
-    Object obj = arg.toJava(Object.class);
-    try {
-      ObjectMapper mapper = RubyJacksonModule.mappedAs("raw", _ruby);
-      String s = mapper.writeValueAsString(obj);
-      return RubyUtils.rubyString(_ruby, s);
+    @JRubyMethod(module = true, name = {"parse_str", "load_str"}, required = 1)
+    public static IRubyObject parse_str(ThreadContext context, IRubyObject self, IRubyObject arg)
+            throws IOException {
+        ObjectMapper mapper = RubyJacksonModule.mappedAs("str", context.getRuntime());
+        return _parse(context, arg, mapper);
     }
-    catch (JsonProcessingException e) {
-      throw ParseError.newParseError(_ruby, e.getLocalizedMessage());
+
+    private static IRubyObject _parse(ThreadContext context, IRubyObject arg, ObjectMapper mapper)
+            throws IOException {
+        Ruby ruby = context.getRuntime();
+        try {
+            Object o;
+            if (arg instanceof RubyString) {
+                o = mapper.readValue(
+                        ((RubyString) arg).getBytes(), Object.class
+                );
+            } else {
+                // must be an IO object then
+                IRubyObject stream = IOJavaAddons.AnyIO.any_to_inputstream(context, arg);
+                o = mapper.readValue((InputStream) stream.toJava(InputStream.class), Object.class);
+            }
+            return RubyUtils.rubyObject(ruby, o);
+        } catch (JsonProcessingException e) {
+            throw ParseError.newParseError(ruby, e.getLocalizedMessage());
+        } catch (IOException e) {
+            throw ruby.newIOError(e.getLocalizedMessage());
+        }
     }
-    catch (IOException e) {
-      throw _ruby.newIOError(e.getLocalizedMessage());
+
+    // serialize
+    @JRubyMethod(module = true, name = {"generate", "dump"}, required = 1)
+    public static IRubyObject generate(ThreadContext context, IRubyObject self, IRubyObject arg)
+            throws IOException, JsonProcessingException {
+        Ruby _ruby = context.getRuntime();
+        Object obj = arg.toJava(Object.class);
+        try {
+            ObjectMapper mapper = RubyJacksonModule.mappedAs("raw", _ruby);
+            String s = mapper.writeValueAsString(obj);
+            return RubyUtils.rubyString(_ruby, s);
+        } catch (JsonProcessingException e) {
+            throw ParseError.newParseError(_ruby, e.getLocalizedMessage());
+        } catch (IOException e) {
+            throw _ruby.newIOError(e.getLocalizedMessage());
+        }
     }
-  }
 }

data/src/main/java/com/jrjackson/JrJacksonService.java

@@ -3,22 +3,21 @@ package com.jrjackson;
 import org.jruby.Ruby;
 import org.jruby.RubyModule;
 import org.jruby.RubyClass;
-import org.jruby.RubyObject;
-import org.jruby.runtime.ObjectAllocator;
-import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.runtime.load.BasicLibraryService;
 
 import java.io.IOException;
 
 public class JrJacksonService implements BasicLibraryService {
-  public boolean basicLoad(final Ruby ruby) throws IOException {
-    RubyModule jr_jackson = ruby.defineModule("JrJackson");
 
-    RubyModule jr_jackson_raw = ruby.defineModuleUnder("Raw", jr_jackson);
-    jr_jackson_raw.defineAnnotatedMethods(JrJacksonRaw.class);
+    @Override
+    public boolean basicLoad(final Ruby ruby) throws IOException {
+        RubyModule jr_jackson = ruby.defineModule("JrJackson");
 
-    RubyClass runtimeError = ruby.getRuntimeError();
-    RubyClass parseError = jr_jackson.defineClassUnder("ParseError", runtimeError, runtimeError.getAllocator());
-    return true;
-  }
+        RubyModule jr_jackson_raw = ruby.defineModuleUnder("Raw", jr_jackson);
+        jr_jackson_raw.defineAnnotatedMethods(JrJacksonRaw.class);
+
+        RubyClass runtimeError = ruby.getRuntimeError();
+        RubyClass parseError = jr_jackson.defineClassUnder("ParseError", runtimeError, runtimeError.getAllocator());
+        return true;
+    }
 }

data/src/main/java/com/jrjackson/ParseError.java

@@ -8,8 +8,9 @@ import org.jruby.exceptions.RaiseException;
 
 @JRubyClass(name = "JrJackson::ParseError", parent = "RuntimeError")
 public class ParseError {
-  public static RaiseException newParseError(Ruby ruby, String message) {
-    RubyClass errorClass = ruby.getModule("JrJackson").getClass("ParseError");
-    return new RaiseException(RubyException.newException(ruby, errorClass, message), true);
-  }
+
+    public static RaiseException newParseError(Ruby ruby, String message) {
+        RubyClass errorClass = ruby.getModule("JrJackson").getClass("ParseError");
+        return new RaiseException(RubyException.newException(ruby, errorClass, message), true);
+    }
 }

data/src/main/java/com/jrjackson/RubyAnySerializer.java

@@ -1,13 +1,11 @@
 package com.jrjackson;
 
 import java.io.IOException;
-import java.lang.reflect.Type;
 import java.util.*;
 
 import com.fasterxml.jackson.core.*;
 
 import com.fasterxml.jackson.databind.ser.std.StdSerializer;
-import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.SerializerProvider;
 
 import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
@@ -16,101 +14,110 @@ import org.jruby.*;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.internal.runtime.methods.DynamicMethod;
 
-public class RubyAnySerializer extends StdSerializer<RubyObject>
-{
-  /**
-   * Singleton instance to use.
-   */
-  public static final RubyAnySerializer instance = new RubyAnySerializer();
-  private static HashMap<Class, Class> class_maps = new HashMap<Class, Class>();
-
-  static {
-    class_maps.put(RubyBoolean.class, Boolean.class);
-  }
-
-  public RubyAnySerializer() { super(RubyObject.class); }
-
-  private Class<?> rubyJavaClassLookup(Class target)
-  {
-    Class<?> val = class_maps.get(target);
-    if (val == null) {
-      return Object.class;
+public class RubyAnySerializer extends StdSerializer<RubyObject> {
+
+    /**
+     * Singleton instance to use.
+     */
+    public static final RubyAnySerializer instance = new RubyAnySerializer();
+    private static final HashMap<Class, Class> class_maps = new HashMap<Class, Class>();
+
+    static {
+        class_maps.put(RubyBoolean.class, Boolean.class);
     }
-    return val;
-  }
-
-  private void serializeUnknownRubyObject(RubyObject rubyObject, JsonGenerator jgen, SerializerProvider provider)
-    throws IOException, JsonGenerationException
-  {
-    ThreadContext ctx = rubyObject.getRuntime().getCurrentContext();
-    RubyClass meta = rubyObject.getMetaClass();
-    DynamicMethod method = meta.searchMethod("to_h");
-    if (!method.isUndefined()) {
-      RubyObject obj = (RubyObject)method.call(ctx, rubyObject, meta, "to_h");
-      provider.findTypedValueSerializer(Map.class, true, null).serialize(obj, jgen, provider);
-      return;
+
+    public RubyAnySerializer() {
+        super(RubyObject.class);
     }
 
-    method = meta.searchMethod("to_hash");
-    if (!method.isUndefined()) {
-      RubyObject obj = (RubyObject)method.call(ctx, rubyObject, meta, "to_hash");
-      provider.findTypedValueSerializer(Map.class, true, null).serialize(obj, jgen, provider);
-      return;
+    private Class<?> rubyJavaClassLookup(Class target) {
+        Class<?> val = class_maps.get(target);
+        if (val == null) {
+            return Object.class;
+        }
+        return val;
     }
 
-    method = meta.searchMethod("to_a");
-    if (!method.isUndefined()) {
-      RubyObject obj = (RubyObject)method.call(ctx, rubyObject, meta, "to_a");
-      provider.findTypedValueSerializer(List.class, true, null).serialize(obj, jgen, provider);
-      return;
+    private void serializeUnknownRubyObject(RubyObject rubyObject, JsonGenerator jgen, SerializerProvider provider)
+            throws IOException, JsonGenerationException {
+        ThreadContext ctx = rubyObject.getRuntime().getCurrentContext();
+        RubyClass meta = rubyObject.getMetaClass();
+
+        DynamicMethod method = meta.searchMethod("to_time");
+        if (!method.isUndefined()) {
+            RubyObject obj = (RubyObject) method.call(ctx, rubyObject, meta, "to_time");
+            provider.defaultSerializeValue(obj, jgen);
+            return;
+        }
+
+        method = meta.searchMethod("to_h");
+        if (!method.isUndefined()) {
+            RubyObject obj = (RubyObject) method.call(ctx, rubyObject, meta, "to_h");
+            provider.findTypedValueSerializer(Map.class, true, null).serialize(obj, jgen, provider);
+            return;
+        }
+
+        method = meta.searchMethod("to_hash");
+        if (!method.isUndefined()) {
+            RubyObject obj = (RubyObject) method.call(ctx, rubyObject, meta, "to_hash");
+            provider.findTypedValueSerializer(Map.class, true, null).serialize(obj, jgen, provider);
+            return;
+        }
+
+        method = meta.searchMethod("to_a");
+        if (!method.isUndefined()) {
+            RubyObject obj = (RubyObject) method.call(ctx, rubyObject, meta, "to_a");
+            provider.findTypedValueSerializer(List.class, true, null).serialize(obj, jgen, provider);
+            return;
+        }
+
+        method = meta.searchMethod("to_json");
+        if (!method.isUndefined()) {
+            RubyObject obj = (RubyObject) method.call(ctx, rubyObject, meta, "to_json");
+            if (obj instanceof RubyString) {
+                jgen.writeRawValue(obj.toString());
+            } else {
+                provider.defaultSerializeValue(obj, jgen);
+            }
+            return;
+        }
+        throw new JsonGenerationException("Cannot find Serializer for class: " + rubyObject.getClass().getName());
     }
 
-    method = meta.searchMethod("to_json");
-    if (!method.isUndefined()) {
-      RubyObject obj = (RubyObject)method.call(ctx, rubyObject, meta, "to_json");
-      if (obj instanceof RubyString) {
-        jgen.writeRawValue(obj.toString());
-      } else {
-        provider.defaultSerializeValue(obj, jgen);
-      }
-      return;
+    @Override
+    public void serialize(RubyObject value, JsonGenerator jgen, SerializerProvider provider)
+            throws IOException, JsonGenerationException {
+        if (value instanceof RubySymbol || value instanceof RubyString) {
+            jgen.writeString(value.toString());
+        } else if (value instanceof RubyHash) {
+            provider.findTypedValueSerializer(Map.class, true, null).serialize(value, jgen, provider);
+        } else if (value instanceof RubyArray) {
+            provider.findTypedValueSerializer(List.class, true, null).serialize(value, jgen, provider);
+        } else {
+            Object val = value.toJava(rubyJavaClassLookup(value.getClass()));
+            if (val instanceof RubyObject) {
+                serializeUnknownRubyObject((RubyObject) val, jgen, provider);
+            } else {
+                provider.defaultSerializeValue(val, jgen);
+            }
+        }
     }
-    throw new JsonGenerationException("Cannot find Serializer for class: " + rubyObject.getClass().getName());
-  }
-
-  @Override
-  public void serialize(RubyObject value, JsonGenerator jgen, SerializerProvider provider)
-    throws IOException, JsonGenerationException
-  {
-    if (value instanceof RubySymbol || value instanceof RubyString) {
-      jgen.writeString(value.toString());
-    } else if (value instanceof RubyHash) {
-      provider.findTypedValueSerializer(Map.class, true, null).serialize(value, jgen, provider);
-    } else if (value instanceof RubyArray) {
-      provider.findTypedValueSerializer(List.class, true, null).serialize(value, jgen, provider);
-    } else {
-      Object val = value.toJava(rubyJavaClassLookup(value.getClass()));
-      if ( val instanceof RubyObject) {
-        serializeUnknownRubyObject((RubyObject)val, jgen, provider);
-      } else {
-        provider.defaultSerializeValue(val, jgen);
-      }
+
+    /**
+     * Default implementation will write type prefix, call regular serialization method (since assumption is that value itself does not need JSON Array or Object start/end markers), and then write type suffix. This should work for most cases; some sub-classes may want to change this behavior.
+     *
+     * @param value
+     * @param jgen
+     * @param provider
+     * @param typeSer
+     * @throws java.io.IOException
+     * @throws com.fasterxml.jackson.core.JsonGenerationException
+     */
+    @Override
+    public void serializeWithType(RubyObject value, JsonGenerator jgen, SerializerProvider provider, TypeSerializer typeSer)
+            throws IOException, JsonGenerationException {
+        typeSer.writeTypePrefixForScalar(value, jgen);
+        serialize(value, jgen, provider);
+        typeSer.writeTypeSuffixForScalar(value, jgen);
     }
-  }
-
-  /**
-   * Default implementation will write type prefix, call regular serialization
-   * method (since assumption is that value itself does not need JSON
-   * Array or Object start/end markers), and then write type suffix.
-   * This should work for most cases; some sub-classes may want to
-   * change this behavior.
-   */
-  @Override
-  public void serializeWithType(RubyObject value, JsonGenerator jgen, SerializerProvider provider, TypeSerializer typeSer)
-    throws IOException, JsonGenerationException
-  {
-    typeSer.writeTypePrefixForScalar(value, jgen);
-    serialize(value, jgen, provider);
-    typeSer.writeTypeSuffixForScalar(value, jgen);
-  }
 }

data/src/main/java/com/jrjackson/RubyJacksonModule.java

@@ -1,6 +1,5 @@
 package com.jrjackson;
 
-import java.util.*;
 import java.text.SimpleDateFormat;
 
 import org.jruby.*;
@@ -9,73 +8,64 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.core.util.VersionUtil;
-import com.fasterxml.jackson.databind.ser.std.DateSerializer;
-import com.fasterxml.jackson.databind.deser.std.UntypedObjectDeserializer;
 import com.fasterxml.jackson.module.afterburner.AfterburnerModule;
 
-public class RubyJacksonModule extends SimpleModule
-{
+public class RubyJacksonModule extends SimpleModule {
 
-  private static final ObjectMapper static_mapper = new ObjectMapper().registerModule(
-    new RubyJacksonModule().addSerializer(RubyObject.class, RubyAnySerializer.instance)
-  );
-
-  static {
-    static_mapper.registerModule(new AfterburnerModule());
-    static_mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
-    static_mapper.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss z"));
-  }
+    private static final ObjectMapper static_mapper = new ObjectMapper().registerModule(
+            new RubyJacksonModule().addSerializer(RubyObject.class, RubyAnySerializer.instance)
+    );
 
-  private RubyJacksonModule()
-  {
-    super("JrJacksonStrModule", VersionUtil.versionFor(RubyJacksonModule.class));
-  }
+    static {
+        static_mapper.registerModule(new AfterburnerModule());
+        static_mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
+        static_mapper.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss z"));
+    }
 
-  public static ObjectMapper mappedAs(String key, Ruby ruby)
-  {
-    if (key == "raw") {
-      return static_mapper;
+    private RubyJacksonModule() {
+        super("JrJacksonStrModule", VersionUtil.versionFor(RubyJacksonModule.class));
     }
 
-    ObjectMapper mapper = new ObjectMapper().registerModule(
-      new AfterburnerModule()
-    );
+    public static ObjectMapper mappedAs(String key, Ruby ruby) {
+        if ("raw".equals(key)) {
+            return static_mapper;
+        }
 
-    if (key == "sym") {
-      mapper.registerModule(
-        asSym(ruby)
-      );
-    }
-    else {
-      mapper.registerModule(
-        asStr(ruby)
-      );
-    }
-    mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
-    mapper.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss z"));
-    return mapper;
-  }
+        ObjectMapper mapper = new ObjectMapper().registerModule(
+                new AfterburnerModule()
+        );
 
-  // public static SimpleModule asRaw()
-  // { 
-  //   return static_mapper;
-  // }
+        if ("sym".equals(key)) {
+            mapper.registerModule(
+                    asSym(ruby)
+            );
+        } else {
+            mapper.registerModule(
+                    asStr(ruby)
+            );
+        }
+        mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
+        mapper.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss z"));
+        return mapper;
+    }
 
-  public static SimpleModule asSym(Ruby ruby)
-  { 
-    return new RubyJacksonModule().addSerializer(
-      RubyObject.class, RubyAnySerializer.instance
-    ).addDeserializer(
-      Object.class, new RubyObjectDeserializer().withRuby(ruby).setSymbolStrategy()
-    );
-  }
+    // public static SimpleModule asRaw()
+    // { 
+    //   return static_mapper;
+    // }
+    public static SimpleModule asSym(Ruby ruby) {
+        return new RubyJacksonModule().addSerializer(
+                RubyObject.class, RubyAnySerializer.instance
+        ).addDeserializer(
+                Object.class, new RubyObjectDeserializer().withRuby(ruby).setSymbolStrategy()
+        );
+    }
 
-  public static SimpleModule asStr(Ruby ruby)
-  { 
-    return new RubyJacksonModule().addSerializer(
-      RubyObject.class, RubyAnySerializer.instance
-    ).addDeserializer(
-      Object.class, new RubyObjectDeserializer().withRuby(ruby).setStringStrategy()
-    );
-  }
+    public static SimpleModule asStr(Ruby ruby) {
+        return new RubyJacksonModule().addSerializer(
+                RubyObject.class, RubyAnySerializer.instance
+        ).addDeserializer(
+                Object.class, new RubyObjectDeserializer().withRuby(ruby).setStringStrategy()
+        );
+    }
 }

data/src/main/java/com/jrjackson/RubyKeyConverter.java

@@ -6,7 +6,7 @@ import java.io.IOException;
 import org.jruby.Ruby;
 import org.jruby.RubyObject;
 
-public interface RubyKeyConverter
-{
-  public RubyObject convert(Ruby ruby, JsonParser jp) throws IOException;
+public interface RubyKeyConverter {
+
+    public RubyObject convert(Ruby ruby, JsonParser jp) throws IOException;
 }

data/src/main/java/com/jrjackson/RubyObjectDeserializer.java

@@ -16,173 +16,176 @@ import org.jruby.RubyArray;
 import org.jruby.RubyHash;
 import org.jruby.javasupport.util.RuntimeHelpers;
 
-
 public class RubyObjectDeserializer
-  extends StdDeserializer<RubyObject>
-{
-  private static final long serialVersionUID = 1L;
-
-  // private final static RubyObject[] NO_OBJECTS = new RubyObject[0];
-
-  private Ruby _ruby;
-
-  private RubyKeyConverter converter;
-  
-  public RubyObjectDeserializer() {
-    super(RubyObject.class);
-  }
-
-  public RubyObjectDeserializer withRuby(Ruby ruby)
-  {
-    _ruby = ruby;
-    return this;
-  }
-
-  public RubyObjectDeserializer setStringStrategy()
-  {
-    converter = new RubyStringConverter();
-    return this;
-  }
-
-  public RubyObjectDeserializer setSymbolStrategy()
-  {
-    converter = new RubySymbolConverter();
-    return this;
-  }
-
-  /**
-  /**********************************************************
-  /* Deserializer API
-  /**********************************************************
-   */
-  
-  @Override
-  public RubyObject deserialize(JsonParser jp, DeserializationContext ctxt)
-    throws IOException, JsonProcessingException
-  {
-    switch (jp.getCurrentToken()) {
-      case START_OBJECT:
-        return mapObject(jp, ctxt);
-
-      case START_ARRAY:
-        return mapArray(jp, ctxt);
-
-      case FIELD_NAME:
-        return converter.convert(_ruby, jp);
-
-      case VALUE_EMBEDDED_OBJECT:
-        return RubyUtils.rubyObject(_ruby, jp.getEmbeddedObject());
-
-      case VALUE_STRING:
-        // 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.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.rubyFloat(_ruby, jp.getDoubleValue());
+        extends StdDeserializer<RubyObject> {
 
-      case VALUE_TRUE:
-        return _ruby.newBoolean(Boolean.TRUE);
+    private static final long serialVersionUID = 1L;
 
-      case VALUE_FALSE:
-        return _ruby.newBoolean(Boolean.FALSE);
+    private Ruby _ruby;
 
-      case VALUE_NULL: // should not get this but...
-        return (RubyObject)_ruby.getNil();
+    private RubyKeyConverter converter;
 
-      case END_ARRAY: // invalid
-      case END_OBJECT: // invalid
-      default:
-        throw ctxt.mappingException(Object.class);
+    public RubyObjectDeserializer() {
+        super(RubyObject.class);
     }
-  }
-
-  /**
-  /**********************************************************
-  /* Internal methods
-  /**********************************************************
-  */
-  
-  /**
-   * Method called to map a JSON Array into a Java value.
-   */
-  protected RubyObject mapArray(JsonParser jp, DeserializationContext ctxt)
-  throws IOException, JsonProcessingException
-  {
-    // 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);
+
+    public RubyObjectDeserializer withRuby(Ruby ruby) {
+        _ruby = ruby;
+        return this;
     }
-    ObjectBuffer buffer = ctxt.leaseObjectBuffer();
-    Object[] values = buffer.resetAndStart();
-    int ptr = 0;
-    long totalSize = 0;
-    do {
-      Object value = deserialize(jp, ctxt);
-      ++totalSize;
-      if (ptr >= values.length) {
-        values = buffer.appendCompletedChunk(values);
-        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));
-    buffer.completeAndClearBuffer(values, ptr, result);
-    return result;
-  }
-
-  /**
-   * Method called to map a JSON Object into a Java value.
-   */
-  protected RubyObject mapObject(JsonParser jp, DeserializationContext ctxt)
-  throws IOException, JsonProcessingException
-  {
-    JsonToken t = jp.getCurrentToken();
-    if (t == JsonToken.START_OBJECT) {
-      t = jp.nextToken();
+
+    public RubyObjectDeserializer setStringStrategy() {
+        converter = new RubyStringConverter();
+        return this;
     }
-    // 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);
+
+    public RubyObjectDeserializer setSymbolStrategy() {
+        converter = new RubySymbolConverter();
+        return this;
     }
 
-    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);
+    /**
+     * /**********************************************************
+     * /* Deserializer API /**********************************************************
+     * @param jp
+     * @param ctxt
+     * @return 
+     * @throws java.io.IOException
+     * @throws com.fasterxml.jackson.core.JsonProcessingException
+     */
+    
+    @Override
+    public RubyObject deserialize(JsonParser jp, DeserializationContext ctxt)
+            throws IOException, JsonProcessingException {
+        switch (jp.getCurrentToken()) {
+            case START_OBJECT:
+                return mapObject(jp, ctxt);
+
+            case START_ARRAY:
+                return mapArray(jp, ctxt);
+
+            case FIELD_NAME:
+                return converter.convert(_ruby, jp);
+
+            case VALUE_EMBEDDED_OBJECT:
+                return RubyUtils.rubyObject(_ruby, jp.getEmbeddedObject());
+
+            case VALUE_STRING:
+                // 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.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.rubyFloat(_ruby, jp.getDoubleValue());
+
+            case VALUE_TRUE:
+                return _ruby.newBoolean(Boolean.TRUE);
+
+            case VALUE_FALSE:
+                return _ruby.newBoolean(Boolean.FALSE);
+
+            case VALUE_NULL: // should not get this but...
+                return (RubyObject) _ruby.getNil();
+
+            case END_ARRAY: // invalid
+            case END_OBJECT: // invalid
+            default:
+                throw ctxt.mappingException(Object.class);
+        }
     }
 
-    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);
+    /**
+     * /**********************************************************
+     * /* Internal methods /**********************************************************
+     */
+    /**
+     * Method called to map a JSON Array into a Java value.
+     * @param jp
+     * @param ctxt
+     * @return RubyObject
+     * @throws java.io.IOException 
+     * @throws com.fasterxml.jackson.core.JsonProcessingException 
+     */
+    protected RubyObject mapArray(JsonParser jp, DeserializationContext ctxt)
+            throws IOException, JsonProcessingException {
+    // 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);
+        }
+        ObjectBuffer buffer = ctxt.leaseObjectBuffer();
+        Object[] values = buffer.resetAndStart();
+        int ptr = 0;
+        long totalSize = 0;
+        do {
+            Object value = deserialize(jp, ctxt);
+            ++totalSize;
+            if (ptr >= values.length) {
+                values = buffer.appendCompletedChunk(values);
+                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));
+        buffer.completeAndClearBuffer(values, ptr, result);
+        return result;
     }
 
-    // And then the general case; default map size is 16
-    RubyHash result = RuntimeHelpers.constructHash(_ruby, field1, value1, field2, value2);
-    do {
-      RubyObject fieldName = converter.convert(_ruby, jp);
-      jp.nextToken();
-      result.fastASetCheckString(_ruby, fieldName, deserialize(jp, ctxt));
-    } while (jp.nextToken() != JsonToken.END_OBJECT);
-    return result;
-  }
+    /**
+     * Method called to map a JSON Object into a Java value.
+     * @param jp
+     * @param ctxt
+     * @return RubyObject
+     * @throws java.io.IOException 
+     * @throws com.fasterxml.jackson.core.JsonProcessingException 
+     */
+    protected RubyObject mapObject(JsonParser jp, DeserializationContext ctxt)
+            throws IOException, JsonProcessingException {
+        JsonToken t = jp.getCurrentToken();
+        if (t == JsonToken.START_OBJECT) {
+            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);
+        }
+
+        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);
+        }
+
+        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);
+        }
+
+        // And then the general case; default map size is 16
+        RubyHash result = RuntimeHelpers.constructHash(_ruby, field1, value1, field2, value2);
+        do {
+            RubyObject fieldName = converter.convert(_ruby, jp);
+            jp.nextToken();
+            result.fastASetCheckString(_ruby, fieldName, deserialize(jp, ctxt));
+        } while (jp.nextToken() != JsonToken.END_OBJECT);
+        return result;
+    }
 }

data/src/main/java/com/jrjackson/RubyStringConverter.java

@@ -6,9 +6,10 @@ import java.io.IOException;
 import org.jruby.Ruby;
 import org.jruby.RubyObject;
 
-public class RubyStringConverter implements RubyKeyConverter
-{
-  public RubyObject convert(Ruby ruby, JsonParser jp) throws IOException {
-    return RubyUtils.rubyString(ruby, jp.getText().getBytes());
-  }
+public class RubyStringConverter implements RubyKeyConverter {
+
+    @Override
+    public RubyObject convert(Ruby ruby, JsonParser jp) throws IOException {
+        return RubyUtils.rubyString(ruby, jp.getText().getBytes());
+    }
 }

data/src/main/java/com/jrjackson/RubySymbolConverter.java

@@ -6,9 +6,9 @@ import java.io.IOException;
 import org.jruby.Ruby;
 import org.jruby.RubyObject;
 
-public class RubySymbolConverter implements RubyKeyConverter
-{
-  public RubyObject convert(Ruby ruby, JsonParser jp) throws IOException {
-    return RubyUtils.rubySymbol(ruby, jp.getText());
-  }
+public class RubySymbolConverter implements RubyKeyConverter {
+
+    public RubyObject convert(Ruby ruby, JsonParser jp) throws IOException {
+        return RubyUtils.rubySymbol(ruby, jp.getText());
+    }
 }

data/src/main/java/com/jrjackson/RubyUtils.java

@@ -1,6 +1,5 @@
 package com.jrjackson;
 
-import java.io.IOException;
 import java.util.*;
 
 import java.math.BigDecimal;
@@ -8,82 +7,65 @@ import java.math.BigInteger;
 
 import org.jruby.*;
 import org.jruby.javasupport.JavaUtil;
-import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.ext.bigdecimal.RubyBigDecimal;
-import org.jruby.runtime.Block;
 import org.jruby.util.SafeDoubleParser;
 
-public class RubyUtils
-{
-  
-  public static RubyObject rubyObject(Ruby ruby, Object node)
-  {
-    return (RubyObject)JavaUtil.convertJavaToRuby(ruby, node);
-  }
-
-  public static RubyString rubyString(Ruby ruby, String node)
-  {
-    return RubyString.newUnicodeString(ruby, node);
-  }
-
-  public static RubyString rubyString(Ruby ruby, byte[] node)
-  {
-    return RubyString.newString(ruby, node);
-  }
-
-  public static RubySymbol rubySymbol(Ruby ruby, String node)
-  {
-    return RubySymbol.newSymbol(ruby, node);
-  }
-
-  public static RubyArray rubyArray(Ruby ruby, Object[] arg)
-  {
-    return (RubyArray)JavaUtil.convertJavaToRuby(ruby, arg);
-  }
-
-  public static RubyArray rubyArray(Ruby ruby, List arg)
-  {
-    return (RubyArray)JavaUtil.convertJavaToRuby(ruby, arg);
-  }
-  
-  public static RubyHash rubyHash(Ruby ruby, Map arg)
-  {
-    return (RubyHash)JavaUtil.convertJavaToRuby(ruby, arg);
-  }
-
-  public static RubyFixnum rubyFixnum(Ruby ruby, int arg)
-  {
-    return ruby.newFixnum(arg);
-  }
-
-  public static RubyFixnum rubyFixnum(Ruby ruby, long arg)
-  {
-    return ruby.newFixnum(arg);
-  }
-
-  public static RubyBignum rubyBignum(Ruby ruby, BigInteger arg)
-  {
-    return RubyBignum.newBignum(ruby, arg);
-  }
-
-  public static RubyFloat rubyFloat(Ruby ruby, double arg)
-  {
-    return ruby.newFloat(arg);
-  }
-
-  public static RubyFloat rubyFloat(Ruby ruby, String arg)
-  {
-    double d = SafeDoubleParser.parseDouble(arg);
-    return ruby.newFloat(d);
-  }
-
-  public static RubyBigDecimal rubyBigDecimal(Ruby ruby, BigDecimal arg)
-  {
-    return new RubyBigDecimal(ruby, arg);
-  }
-
-  public static RubyBoolean rubyBoolean(Ruby ruby, Boolean arg)
-  {
-    return ruby.newBoolean(arg);
-  }
+public class RubyUtils {
+
+    public static RubyObject rubyObject(Ruby ruby, Object node) {
+        return (RubyObject) JavaUtil.convertJavaToRuby(ruby, node);
+    }
+
+    public static RubyString rubyString(Ruby ruby, String node) {
+        return RubyString.newUnicodeString(ruby, node);
+    }
+
+    public static RubyString rubyString(Ruby ruby, byte[] node) {
+        return RubyString.newString(ruby, node);
+    }
+
+    public static RubySymbol rubySymbol(Ruby ruby, String node) {
+        return RubySymbol.newSymbol(ruby, node);
+    }
+
+    public static RubyArray rubyArray(Ruby ruby, Object[] arg) {
+        return (RubyArray) JavaUtil.convertJavaToRuby(ruby, arg);
+    }
+
+    public static RubyArray rubyArray(Ruby ruby, List arg) {
+        return (RubyArray) JavaUtil.convertJavaToRuby(ruby, arg);
+    }
+
+    public static RubyHash rubyHash(Ruby ruby, Map arg) {
+        return (RubyHash) JavaUtil.convertJavaToRuby(ruby, arg);
+    }
+
+    public static RubyFixnum rubyFixnum(Ruby ruby, int arg) {
+        return ruby.newFixnum(arg);
+    }
+
+    public static RubyFixnum rubyFixnum(Ruby ruby, long arg) {
+        return ruby.newFixnum(arg);
+    }
+
+    public static RubyBignum rubyBignum(Ruby ruby, BigInteger arg) {
+        return RubyBignum.newBignum(ruby, arg);
+    }
+
+    public static RubyFloat rubyFloat(Ruby ruby, double arg) {
+        return ruby.newFloat(arg);
+    }
+
+    public static RubyFloat rubyFloat(Ruby ruby, String arg) {
+        double d = SafeDoubleParser.parseDouble(arg);
+        return ruby.newFloat(d);
+    }
+
+    public static RubyBigDecimal rubyBigDecimal(Ruby ruby, BigDecimal arg) {
+        return new RubyBigDecimal(ruby, arg);
+    }
+
+    public static RubyBoolean rubyBoolean(Ruby ruby, Boolean arg) {
+        return ruby.newBoolean(arg);
+    }
 }

data/test/jrjackson_test.rb

@@ -42,6 +42,15 @@ class JrJacksonTest < Test::Unit::TestCase
     end
   end
 
+  class CustomToTime
+    def initialize(tm = Time.now)
+      @now = tm
+    end
+    def to_time
+      @now
+    end
+  end
+
   CustomStruct = Struct.new(:one, :two, :six)
 
   def test_threading
@@ -78,7 +87,8 @@ class JrJacksonTest < Test::Unit::TestCase
     co2 = CustomToHash.new("uno", :two, 6.0)
     co3 = CustomToJson.new(1.0, 2, 6.0)
     co4 = CustomStruct.new(1, 2, 6)
-    source = {"sym" => :a_symbol, "dt" => dt, "co1" => co1, "co2" => co2, "co3" => co3, "co4" => co4}
+    co5 = CustomToTime.new(dt)
+    source = {'sym' => :a_symbol, 'dt' => dt, 'co1' => co1, 'co2' => co2, 'co3' => co3, 'co4' => co4, 'co5' => co5}
     json_string = JrJackson::Json.dump(source)
     expected = {
       :sym => "a_symbol",
@@ -87,6 +97,7 @@ class JrJacksonTest < Test::Unit::TestCase
       :co2 => {:one => "uno", :two => "two", :six => 6.0 },
       :co3 => {:one => 1.0, :two => 2.0, :six => 6.0 },
       :co4 => [1, 2, 6],
+      :co5 => dt.strftime("%F %T %Z")
     }
     actual = JrJackson::Json.load(json_string, :symbolize_keys => true)
     assert_equal expected, actual

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jrjackson
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Guy Boertje
@@ -41,7 +41,7 @@ files:
 - jrjackson.gemspec
 - lib/jrjackson.rb
 - lib/jrjackson/build_info.rb
-- lib/jrjackson/jars/jrjackson-1.2.8.jar
+- lib/jrjackson/jars/jrjackson-1.2.9.jar
 - lib/jrjackson/jrjackson.rb
 - lib/require_relative_patch.rb
 - pom.xml