jrjackson 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d1c4ad52124b5b10d5b17ba157f5d7f51cd4f19
-  data.tar.gz: 21381583fde4460338bf62312ddc5ae3d2bb484b
+  metadata.gz: ff0d3008ed2be467a14efa7ce22f17b798aff14f
+  data.tar.gz: 29acde65d94012d051d9ccd24dda9dfb4187cc6b
 SHA512:
-  metadata.gz: 05c0daa5a1719b270c8f26269558fafb82002844be119a603970532f88246a104278c268975efcba9ac9afbddf61a235bb0e956ce6feb77695f8bdcee25781f1
-  data.tar.gz: e2ffaa73398f0a08b4ca39ca50ee5e0dc9ffad2cd9ab9a1d052aa3b48e8cd2f1692e7225591968b7cf7699fc7a722953000f2ba670fa996598a0d4fcdc2e0494
+  metadata.gz: 49cad8b054b626adebd9d6a504b4b2d99df08a685f575d034e0ff957c772ee7f6c4bd2ceeec28b6ac41008f6877b54d95470d8de094a961a4dd3ec20bd3c63cd
+  data.tar.gz: a2f153ba800e763d4774473beeda5a3861b83303ec1fdd743a5751dc897a97df9796438044f08a45f880f464da67a15b8231d874d5fcbd25af49e30dc88fa026

data/README.md

@@ -1,3 +1,5 @@
+
+
 LICENSE applicable to this library:
 
 Apache License 2.0 see http://www.apache.org/licenses/LICENSE-2.0
@@ -14,6 +16,15 @@ There is now a MultiJson adapter added for JrJackson
 
 ***
 
+#### NEWS
+
+26th October 2013 - Added support to serialize arbitary (non JSON datatypes)
+ruby objects.  Normally the toJava internal metod is called, but additionally
+to_h, to_hash, to_a and finally to_json are tried.  Be aware that the to_json
+method might invoke a new selialization session and impact performance. 
+
+***
+
 #### API
 
 ```
@@ -76,8 +87,9 @@ generation/serialize
 json mri generate: 250                  12.02       0.00      12.02     ( 12.022)
 oj mri generate: 250                     7.18       0.00       7.18     (  7.183)
 json java generate: 250                  7.83       0.01       7.84     (  7.289)
-gson generate: 250                       5.44       0.00       5.44     (  5.387)
-jackson generate: 250                    5.32       0.00       5.32     (  5.146)
+gson generate: 250                       5.04       0.00       5.04     (  4.995)
+jackson generate: 250                    4.94       0.08       5.02     (  4.811)
+
 
 parsing/deserialize - after jrjackson parsing profiling
 
@@ -92,9 +104,6 @@ jackson parse string + bigdecimal: 250   6.27       0.00       6.27     (  5.973
 jackson parse symbol keys: 250           5.16       0.00       5.16     (  4.873)
 jackson parse symbol + bigdecimal: 250   4.75       0.06       4.81     (  4.461)
 jackson parse raw: 250                   3.23       0.05       3.28     (  3.021)
-jackson parse raw + bigdecimal: 250      3.06       0.06       3.12     (  2.681)
+jackson parse raw + bigdecimal: 250      3.06       0.06       3.12     (  2.639)
 
 ```
-
-
-

data/dependency-reduced-pom.xml

@@ -4,7 +4,7 @@
   <groupId>com.jrjackson.jruby</groupId>
   <artifactId>jrjackson</artifactId>
   <name>jrjackson</name>
-  <version>1.2.3</version>
+  <version>1.2.4</version>
   <url>http://maven.apache.org</url>
   <build>
     <plugins>

data/lib/jrjackson/jrjackson.rb

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

data/lib/jrjackson/version.rb

@@ -1,3 +1,3 @@
 module JrJackson
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end

data/pom.xml

@@ -5,7 +5,7 @@
   <groupId>com.jrjackson.jruby</groupId>
   <artifactId>jrjackson</artifactId>
   <packaging>jar</packaging>
-  <version>1.2.3</version>
+  <version>1.2.4</version>
   <name>jrjackson</name>
   <url>http://maven.apache.org</url>
   

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

@@ -144,9 +144,14 @@ public class JrJacksonRaw extends RubyObject {
 
   // serialize
   @JRubyMethod(module = true, name = {"generate", "dump"}, required = 1)
-  public static IRubyObject generate(ThreadContext context, IRubyObject self, IRubyObject arg) {
+  public static IRubyObject generate(ThreadContext context, IRubyObject self, IRubyObject arg)
+    throws IOException, JsonProcessingException
+  {
     Ruby ruby = context.getRuntime();
     Object obj = arg.toJava(Object.class);
+      // String s = mappers.get("raw").writeValueAsString(obj);
+      // return RubyUtils.rubyString(ruby, s);
+
     try {
       String s = mappers.get("raw").writeValueAsString(obj);
       return RubyUtils.rubyString(ruby, s);

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

@@ -1,8 +1,9 @@
 package com.jrjackson;
 
 import org.jruby.Ruby;
-import org.jruby.RubyClass;
 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;

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

@@ -0,0 +1,116 @@
+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;
+
+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;
+    }
+    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;
+    }
+
+    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());
+  }
+
+  @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.
+   */
+  @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,14 +1,16 @@
 package com.jrjackson;
 
 import java.util.*;
+import java.text.SimpleDateFormat;
 
 import org.jruby.*;
-import org.jruby.util.RubyDateFormat;
+// import org.jruby.util.RubyDateFormat;
 
 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.ToStringSerializer;
+import com.fasterxml.jackson.databind.ser.std.DateSerializer;
 import com.fasterxml.jackson.databind.deser.std.UntypedObjectDeserializer;
 import com.fasterxml.jackson.module.afterburner.AfterburnerModule;
 
@@ -43,21 +45,22 @@ public class RubyJacksonModule extends SimpleModule
         asStr()
       );
     }
-    mapper.setDateFormat(new RubyDateFormat("yyyy-MM-dd HH:mm:ss z", Locale.US, true));
+    mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
+    mapper.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss z"));
     return mapper;
   }
 
   public static SimpleModule asRaw()
   { 
     return new RubyJacksonModule().addSerializer(
-      RubySymbol.class, ToStringSerializer.instance
+      RubyObject.class, RubyAnySerializer.instance
     );
   }
 
   public static SimpleModule asSym()
   { 
     return new RubyJacksonModule().addSerializer(
-      RubySymbol.class, ToStringSerializer.instance
+      RubyObject.class, RubyAnySerializer.instance
     ).addDeserializer(
       Object.class, new RubyObjectDeserializer().setSymbolStrategy()
     );
@@ -66,7 +69,7 @@ public class RubyJacksonModule extends SimpleModule
   public static SimpleModule asStr()
   { 
     return new RubyJacksonModule().addSerializer(
-      RubySymbol.class, ToStringSerializer.instance
+      RubyObject.class, RubyAnySerializer.instance
     ).addDeserializer(
       Object.class, new RubyObjectDeserializer().setStringStrategy()
     );

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

@@ -26,8 +26,6 @@ public class RubyObjectDeserializer
 
   protected final static Ruby __ruby__ = Ruby.getGlobalRuntime();
 
-  private static final HashMap<String, RubyKeyConverter> converters = new HashMap<String, RubyKeyConverter>(3);
-
   private RubyKeyConverter converter;
   
   public RubyObjectDeserializer() { 
@@ -74,7 +72,8 @@ public class RubyObjectDeserializer
         return RubyUtils.rubyObject(__ruby__, jp.getEmbeddedObject());
 
       case VALUE_STRING:
-        return RubyUtils.rubyString(__ruby__, jp.getText().getBytes());
+        // 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
@@ -90,7 +89,6 @@ public class RubyObjectDeserializer
           return RubyUtils.rubyBigDecimal(__ruby__, jp.getDecimalValue());
         }
         return RubyUtils.rubyFloat(__ruby__, jp.getDoubleValue());
-        // return RubyUtils.rubyFloat(__ruby__, jp.getText());
 
       case VALUE_TRUE:
         return __ruby__.newBoolean(Boolean.TRUE);

data/test/jrjackson_test.rb

@@ -1,5 +1,9 @@
+# encoding: UTF-8
+
 $LOAD_PATH << File.expand_path('../../lib', __FILE__)
 
+require "java"
+
 require 'test/unit'
 require 'thread'
 require 'bigdecimal'
@@ -7,6 +11,38 @@ require 'jrjackson'
 
 class JrJacksonTest < Test::Unit::TestCase
 
+  class CustomToH
+    attr_accessor :one, :two, :six
+    def initialize(a,b,c)
+      @one, @two, @six = a,b,c
+    end
+    def to_h
+      {'one' => one, 'two' => two, 'six' => six}
+    end
+  end
+
+  class CustomToHash
+    attr_accessor :one, :two, :six
+    def initialize(a,b,c)
+      @one, @two, @six = a,b,c
+    end
+    def to_hash
+      {'one' => one, 'two' => two, 'six' => six}
+    end
+  end
+
+  class CustomToJson
+    attr_accessor :one, :two, :six
+    def initialize(a,b,c)
+      @one, @two, @six = a,b,c
+    end
+    def to_json
+      %Q|{"one":#{one},"two":#{two},"six":#{six}}|
+    end
+  end
+
+  CustomStruct = Struct.new(:one, :two, :six)
+
   def test_threading
     q1, q2, q3 = Queue.new, Queue.new, Queue.new
 
@@ -28,10 +64,30 @@ class JrJacksonTest < Test::Unit::TestCase
     assert a3.values.all? {|v| v.is_a?(Float)}, "Expected all values to be Float"
   end
 
-  def test_serialize_symbols_as_values
-    source = {"first" => :first_symbol, "second" => {"inner" => :inner_symbol}}
-    expected = {:first => "first_symbol", :second => {:inner => "inner_symbol"}}
-    actual = JrJackson::Json.load(JrJackson::Json.dump(source), :symbolize_keys => true)
+  def test_deserialize_JSON_with_UTF8_characters
+    json_string = JrJackson::Json.dump({"utf8" => "żółć"})
+    expected = {utf8: "żółć"}
+    actual = JrJackson::Json.load(json_string, :symbolize_keys => true)
+    assert_equal expected, actual
+  end
+
+  def test_serialize_non_json_datatypes_as_values
+    dt = Time.now
+    co1 = CustomToH.new("uno", :two, 6.0)
+    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}
+    json_string = JrJackson::Json.dump(source)
+    expected = {
+      :sym => "a_symbol",
+      :dt => dt.strftime("%F %T %Z"),
+      :co1 => {:one => "uno", :two => "two", :six => 6.0 },
+      :co2 => {:one => "uno", :two => "two", :six => 6.0 },
+      :co3 => {:one => 1.0, :two => 2.0, :six => 6.0 },
+      :co4 => [1, 2, 6],
+    }
+    actual = JrJackson::Json.load(json_string, :symbolize_keys => true)
     assert_equal expected, actual
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jrjackson
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Guy Boertje
@@ -59,7 +59,7 @@ files:
 - dependency-reduced-pom.xml
 - jrjackson.gemspec
 - lib/jrjackson.rb
-- lib/jrjackson/jars/jrjackson-1.2.3.jar
+- lib/jrjackson/jars/jrjackson-1.2.4.jar
 - lib/jrjackson/jrjackson.rb
 - lib/jrjackson/version.rb
 - lib/require_relative_patch.rb
@@ -69,6 +69,7 @@ files:
 - src/main/java/com/jrjackson/JrJacksonRaw.java
 - src/main/java/com/jrjackson/JrJacksonService.java
 - src/main/java/com/jrjackson/ParseError.java
+- src/main/java/com/jrjackson/RubyAnySerializer.java
 - src/main/java/com/jrjackson/RubyJacksonModule.java
 - src/main/java/com/jrjackson/RubyKeyConverter.java
 - src/main/java/com/jrjackson/RubyObjectDeserializer.java