jrjackson 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40a6bbd8555b9dca8cf37b6e7e2f41692ae2bd2b
-  data.tar.gz: af10130421ae850aea53f6b8396de32530605655
+  metadata.gz: a0da8217b380c2b90375f404bd62e1bd1fd9cfac
+  data.tar.gz: bef6c6e1bd90a0c8eb5159b3499774f46b08923d
 SHA512:
-  metadata.gz: bab3ca8847f2dbe92becd2fee1c201a0abd72378c922b0814920cba71ff8390f1fb9237ff1efa32c40ffbf8678d7fa3f255b9e85f45932fd57523de6c5982d2a
-  data.tar.gz: ae557540edc4d20a2e993da24f81d3ea35a092a2dd76b28815bede1ce9cac5a477aa9106277067749bc0a3a3487cc6a264b10d1fb10e09697a913868a6f33305
+  metadata.gz: 393220a4be40ca38b4147fb62d5e618c423b99ca859895b3da08e671482224dc9f4b9946f58d6ddc2c26699b681398e3c082950c37c8d0391996c8e3c3da3735
+  data.tar.gz: d0020e8cfe4fa216c2bf4015f607123ff119d07df45d44057e362a66c57a158818a07a262c90820e3dbde4de0d8d8a52d868b1434b4bb547a4850368ba9b28e2

data/.jrubyrc

@@ -87,7 +87,7 @@ invokedynamic.invocation=true
 
 # Use SwitchPoint for class modification guards on invocations.
 # Options: [true, false], Default: true.
-invokedynamic.invocation.switchpoint=true
+# invokedynamic.invocation.switchpoint=true
 
 # Also bind indirect method invokers to invokedynamic.
 # Options: [true, false], Default: true.

data/dependency-reduced-pom.xml

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

data/jrjackson.gemspec

@@ -7,7 +7,7 @@ require 'jrjackson/build_info'
 Gem::Specification.new do |s|
   s.name        = 'jrjackson'
   s.version     = JrJackson::BuildInfo.version
-  s.date        = '2013-10-12'
+  s.date        = JrJackson::BuildInfo.release_date
   s.platform    = Gem::Platform::RUBY
   s.authors     = ['Guy Boertje']
   s.email       = ['guyboertje@gmail.com']

data/lib/jrjackson/build_info.rb

@@ -1,7 +1,11 @@
 module JrJackson
   module BuildInfo
     def self.version
-      '0.2.8'
+      '0.2.9'
+    end
+
+    def self.release_date
+      '2015-06-24'
     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.11.jar"
-# require_relative "linked/jrjackson-1.2.11.jar"
+require_relative "jars/jrjackson-1.2.12.jar"
+# require_relative "linked/jrjackson-1.2.12.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.11</version>
+  <version>1.2.12</version>
   <name>jrjackson</name>
   <url>http://maven.apache.org</url>
   

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

@@ -126,11 +126,11 @@ public class JrJacksonRaw extends RubyObject {
         Object obj = args[0].toJava(Object.class);
         RubyHash options = (args.length <= 1) ? RubyHash.newHash(_ruby) : args[1].convertToHash();
         String format = (String) options.get(RubyUtils.rubySymbol(_ruby, "date_format"));
-        
+
         ObjectMapper mapper = RubyJacksonModule.mappedAs("raw", _ruby);
         // same format as Ruby Time #to_s
         SimpleDateFormat simpleFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss Z");
-        
+
         if (format != null) {
             simpleFormat = new SimpleDateFormat(format);
             String timezone = (String) options.get(RubyUtils.rubySymbol(_ruby, "timezone"));
@@ -139,7 +139,6 @@ public class JrJacksonRaw extends RubyObject {
             }
         }
         mapper.setDateFormat(simpleFormat);
-        
         try {
             String s = mapper.writeValueAsString(obj);
             return RubyUtils.rubyString(_ruby, s);

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

@@ -9,12 +9,16 @@ import com.fasterxml.jackson.databind.ser.std.StdSerializer;
 import com.fasterxml.jackson.databind.SerializerProvider;
 
 import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
+import java.math.BigDecimal;
+import java.math.BigInteger;
 
 import org.jruby.*;
+import org.jruby.ext.bigdecimal.RubyBigDecimal;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.internal.runtime.methods.DynamicMethod;
+import org.jruby.runtime.builtin.IRubyObject;
 
-public class RubyAnySerializer extends StdSerializer<RubyObject> {
+public class RubyAnySerializer extends StdSerializer<IRubyObject> {
 
     /**
      * Singleton instance to use.
@@ -23,29 +27,31 @@ public class RubyAnySerializer extends StdSerializer<RubyObject> {
     private static final HashMap<Class, Class> class_maps = new HashMap<Class, Class>();
 
     static {
+        // not need now - clean up required
         class_maps.put(RubyBoolean.class, Boolean.class);
+        class_maps.put(RubyFloat.class, Double.class);
+        class_maps.put(RubyFixnum.class, Long.class);
+        class_maps.put(RubyBignum.class, BigInteger.class);
+        class_maps.put(RubyBigDecimal.class, BigDecimal.class);
     }
 
     public RubyAnySerializer() {
-        super(RubyObject.class);
+        super(IRubyObject.class);
     }
 
     private Class<?> rubyJavaClassLookup(Class target) {
-        Class<?> val = class_maps.get(target);
-        if (val == null) {
-            return Object.class;
-        }
-        return val;
+        return class_maps.get(target);
     }
 
-    private void serializeUnknownRubyObject(ThreadContext ctx, RubyObject rubyObject, JsonGenerator jgen, SerializerProvider provider)
+    private void serializeUnknownRubyObject(ThreadContext ctx, IRubyObject rubyObject, JsonGenerator jgen, SerializerProvider provider)
             throws IOException, JsonGenerationException {
         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);
+            RubyTime dt = (RubyTime) method.call(ctx, rubyObject, meta, "to_time");
+            String time = RubyUtils.jodaTimeString(dt.getDateTime());
+            jgen.writeString(time);
             return;
         }
 
@@ -84,25 +90,68 @@ public class RubyAnySerializer extends StdSerializer<RubyObject> {
     }
 
     @Override
-    public void serialize(RubyObject value, JsonGenerator jgen, SerializerProvider provider)
+    public void serialize(IRubyObject value, JsonGenerator jgen, SerializerProvider provider)
             throws IOException, JsonGenerationException {
         ThreadContext ctx = value.getRuntime().getCurrentContext();
-        if (value instanceof RubySymbol || value instanceof RubyString) {
+        if (value.isNil()) {
+
+            jgen.writeNull(); // for RubyNil and NullObjects
+
+        } else if (value instanceof RubyString) {
+
+            jgen.writeString(value.toString());
+
+        } else if (value instanceof RubySymbol) {
+
             jgen.writeString(value.toString());
+
+        } else if (value instanceof RubyBoolean) {
+
+            jgen.writeBoolean(value.isTrue());
+
+        } else if (value instanceof RubyFloat) {
+
+            jgen.writeNumber(RubyNumeric.num2dbl(value));
+
+        } else if (value instanceof RubyFixnum) {
+
+            jgen.writeNumber(RubyNumeric.num2long(value));
+
+        } else if (value instanceof RubyBignum) {
+
+            jgen.writeNumber(((RubyBignum) value).getBigIntegerValue());
+
+        } else if (value instanceof RubyBigDecimal) {
+
+            jgen.writeNumber(((RubyBigDecimal) value).getBigDecimalValue());
+
         } else if (value instanceof RubyHash) {
-            provider.findTypedValueSerializer(Map.class, true, null).serialize(value, jgen, provider);
+
+            provider.findTypedValueSerializer(value.getJavaClass(), true, null).serialize(value, jgen, provider);
+
         } else if (value instanceof RubyArray) {
-            provider.findTypedValueSerializer(List.class, true, null).serialize(value, jgen, provider);
+
+            provider.findTypedValueSerializer(value.getJavaClass(), true, null).serialize(value, jgen, provider);
+
         } else if (value instanceof RubyStruct) {
-            RubyObject obj = (RubyObject)value.callMethod(ctx, "to_a");
-            provider.findTypedValueSerializer(List.class, true, null).serialize(obj, jgen, provider);
+
+            IRubyObject obj = value.callMethod(ctx, "to_a");
+            provider.findTypedValueSerializer(obj.getJavaClass(), true, null).serialize(obj, jgen, provider);
+
         } else {
-            Object val = value.toJava(rubyJavaClassLookup(value.getClass()));
-            if (val instanceof RubyObject) {
-                serializeUnknownRubyObject(ctx, (RubyObject) val, jgen, provider);
+
+            Class<?> cls = rubyJavaClassLookup(value.getClass());
+            if (cls != null) {
+                Object val = value.toJava(cls);
+                if (val != null) {
+                    provider.defaultSerializeValue(val, jgen);
+                } else {
+                    serializeUnknownRubyObject(ctx, value, jgen, provider);
+                }
             } else {
-                provider.defaultSerializeValue(val, jgen);
+                serializeUnknownRubyObject(ctx, value, jgen, provider);
             }
+
         }
     }
 
@@ -117,7 +166,7 @@ public class RubyAnySerializer extends StdSerializer<RubyObject> {
      * @throws com.fasterxml.jackson.core.JsonGenerationException
      */
     @Override
-    public void serializeWithType(RubyObject value, JsonGenerator jgen, SerializerProvider provider, TypeSerializer typeSer)
+    public void serializeWithType(IRubyObject value, JsonGenerator jgen, SerializerProvider provider, TypeSerializer typeSer)
             throws IOException, JsonGenerationException {
         typeSer.writeTypePrefixForScalar(value, jgen);
         serialize(value, jgen, provider);

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

@@ -1,6 +1,5 @@
 package com.jrjackson;
 
-import java.text.SimpleDateFormat;
 
 import org.jruby.*;
 
@@ -9,11 +8,12 @@ import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.core.util.VersionUtil;
 import com.fasterxml.jackson.module.afterburner.AfterburnerModule;
+import org.jruby.runtime.builtin.IRubyObject;
 
 public class RubyJacksonModule extends SimpleModule {
 
     private static final ObjectMapper static_mapper = new ObjectMapper().registerModule(
-            new RubyJacksonModule().addSerializer(RubyObject.class, RubyAnySerializer.instance)
+            new RubyJacksonModule().addSerializer(IRubyObject.class, RubyAnySerializer.instance)
     );
 
     static {
@@ -49,7 +49,7 @@ public class RubyJacksonModule extends SimpleModule {
 
     public static SimpleModule asSym(Ruby ruby) {
         return new RubyJacksonModule().addSerializer(
-                RubyObject.class, RubyAnySerializer.instance
+                IRubyObject.class, RubyAnySerializer.instance
         ).addDeserializer(
                 Object.class, new RubyObjectDeserializer().withRuby(ruby).setSymbolStrategy()
         );
@@ -57,7 +57,7 @@ public class RubyJacksonModule extends SimpleModule {
 
     public static SimpleModule asStr(Ruby ruby) {
         return new RubyJacksonModule().addSerializer(
-                RubyObject.class, RubyAnySerializer.instance
+                IRubyObject.class, RubyAnySerializer.instance
         ).addDeserializer(
                 Object.class, new RubyObjectDeserializer().withRuby(ruby).setStringStrategy()
         );

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

@@ -4,7 +4,10 @@ import java.util.*;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
-import java.nio.CharBuffer;
+import org.joda.time.DateTime;
+import org.joda.time.DateTimeZone;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
 
 import org.jruby.*;
 import org.jruby.javasupport.JavaUtil;
@@ -13,6 +16,9 @@ import org.jruby.util.SafeDoubleParser;
 
 public class RubyUtils {
 
+    private final static DateTimeFormatter FORMATTER = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss Z").withLocale(Locale.ENGLISH);
+    private final static DateTimeFormatter UTC_FORMATTER = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss 'UTC'").withLocale(Locale.ENGLISH);
+
     public static RubyObject rubyObject(Ruby ruby, Object node) {
         return (RubyObject) JavaUtil.convertJavaToRuby(ruby, node);
     }
@@ -32,7 +38,7 @@ public class RubyUtils {
     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);
     }
@@ -73,4 +79,33 @@ public class RubyUtils {
     public static RubyBoolean rubyBoolean(Ruby ruby, Boolean arg) {
         return ruby.newBoolean(arg);
     }
+
+    public static String jodaTimeString(DateTime dt) {
+        // copied from the RubyTime to_s method
+        // to prevent the double handling of a String -> RubyString -> String
+        DateTimeFormatter simpleDateFormat;
+        if (dt.getZone() == DateTimeZone.UTC) {
+            simpleDateFormat = UTC_FORMATTER;
+        } else {
+            simpleDateFormat = FORMATTER;
+        }
+
+        return simpleDateFormat.print(dt);
+
+        // JrJackson: no access to private boolean isTzRelative
+
+//        String result = simpleDateFormat.print(dt);
+//
+//        if (isTzRelative) {
+//            // display format needs to invert the UTC offset if this object was
+//            // created with a specific offset in the 7-arg form of #new
+//            DateTimeZone dtz = dt.getZone();
+//            int offset = dtz.toTimeZone().getOffset(dt.getMillis());
+//            DateTimeZone invertedDTZ = DateTimeZone.forOffsetMillis(offset);
+//            DateTime invertedDT = dt.withZone(invertedDTZ);
+//            result = simpleDateFormat.print(invertedDT);
+//        }
+//
+//        return result;
+    }
 }

data/test/jrjackson_test.rb

@@ -204,6 +204,16 @@ class JrJacksonTest < Test::Unit::TestCase
     assert_bigdecimal_similar expected, actual
   end
 
+  def test_cannot_serialize_object
+    err = assert_raises(JrJackson::ParseError) { JrJackson::Json.dump({"foo" => Object.new}) }
+    assert_match /Cannot find Serializer for class: org.jruby.RubyObject/, err.message
+  end
+
+  def test_cannot_serialize_basic_object
+    err = assert_raises(JrJackson::ParseError) { JrJackson::Json.dump({"foo" => BasicObject.new}) }
+    assert_match /Cannot find Serializer for class: org.jruby.RubyBasicObject/, err.message
+  end
+
   def assert_bigdecimal_equal(expected, actual)
     assert_equal expected, actual
     assert_equal expected.class, actual.class

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jrjackson
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - Guy Boertje
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-12 00:00:00.000000000 Z
+date: 2015-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -41,7 +41,7 @@ files:
 - jrjackson.gemspec
 - lib/jrjackson.rb
 - lib/jrjackson/build_info.rb
-- lib/jrjackson/jars/jrjackson-1.2.11.jar
+- lib/jrjackson/jars/jrjackson-1.2.12.jar
 - lib/jrjackson/jrjackson.rb
 - lib/require_relative_patch.rb
 - pom.xml
@@ -79,9 +79,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A JRuby wrapper for the java jackson json processor jar
 test_files: []
-has_rdoc: