jrjackson 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d63bce555fba540b7808ed4aa063dc1667f12da1
-  data.tar.gz: 7adb744277620a7abc717346375915dd162842cf
+  metadata.gz: ab68c0e2bee027c6cf4eb4559e909ccf4337d07b
+  data.tar.gz: 5af55667f2aeb5eeccc347e052cf6efa50f33ee4
 SHA512:
-  metadata.gz: fbc0fb60b787ac7ca89052e648b5624096416b8f47faf29520b5dd7234072094e1f901fe907fe55d3fd211154c77ef6631168387c28f0656a36bcd748505f39c
-  data.tar.gz: d21d9ff0ff5b338f306e8348af25c835ff5dcacc48b36952b165008aac4933b29bc23b16a6f1fb019e7a73168006dda8b4400d59a0149738267fd2ec25053129
+  metadata.gz: 4a5509ef62f030a7f2d072926a9eecdfae1aa2bc69ba0df8154f3ad39b810e6ba1830ed0db54a205f251dc53b046f9b8fe5400e282aa3308cac78437e89d89b8
+  data.tar.gz: 90b940cf954d7dc2017cc83697d066fca867737ff75a023a28bd7d0459fa85e393cc225c288b9fc4311bffd7b4cdb916bc672d9e4b49feae29b01ffa6325e563

data/dependency-reduced-pom.xml

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

data/lib/jrjackson/build_info.rb

@@ -1,11 +1,11 @@
 module JrJackson
   module BuildInfo
     def self.version
-      '0.3.6'
+      '0.3.7'
     end
 
     def self.release_date
-      '2015-10-19'
+      '2015-11-09'
     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.16.jar"
-# require_relative "linked/jrjackson-1.2.16.jar"
+require_relative "jars/jrjackson-1.2.17.jar"
+# require_relative "linked/jrjackson-1.2.17.jar"
 
 require 'com/jrjackson/jr_jackson'
 require 'bigdecimal'

data/pom.xml

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

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

@@ -47,10 +47,6 @@ public class JrJacksonBase extends RubyObject {
         RubyHash options = (args.length <= 1) ? RubyHash.newHash(_ruby) : args[1].convertToHash();
         String format = (String) options.get(RubyUtils.rubySymbol(_ruby, "date_format"));
 
-//        StringWriter out = new StringWriter();
-//        JsonGenerator jgen = RubyJacksonModule.factory.createGenerator(out);
-
-
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         JsonGenerator jgen = RubyJacksonModule.factory.createGenerator(
                 baos, JsonEncoding.UTF8);
@@ -78,7 +74,6 @@ public class JrJacksonBase extends RubyObject {
             ByteList bl = new ByteList(baos.toByteArray(),
                     UTF8Encoding.INSTANCE);
             return RubyString.newString(_ruby, bl);
-//            return RubyUtils.rubyString(_ruby, out.toString());
         } catch (JsonProcessingException e) {
             throw ParseError.newParseError(_ruby, e.getLocalizedMessage());
         }

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

@@ -2,6 +2,7 @@ package com.jrjackson;
 
 import com.fasterxml.jackson.core.JsonGenerationException;
 import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
 import org.jruby.ext.bigdecimal.RubyBigDecimal;
@@ -28,7 +29,7 @@ import org.jruby.RubyStruct;
 import org.jruby.RubySymbol;
 import org.jruby.RubyTime;
 
-public class RubyAnySerializer {
+public class RubyAnySerializer extends JsonSerializer<IRubyObject> {
 
     /**
      * Singleton instance to use.""
@@ -43,7 +44,7 @@ public class RubyAnySerializer {
     private void serializeUnknownRubyObject(ThreadContext ctx, IRubyObject rubyObject, JsonGenerator jgen, SerializerProvider provider)
             throws IOException, JsonGenerationException {
         RubyClass meta = rubyObject.getMetaClass();
-        
+
         DynamicMethod method = meta.searchMethod("to_json_data");
         if (!method.isUndefined()) {
             RubyObject obj = (RubyObject) method.call(ctx, rubyObject, meta, "to_json_data");
@@ -54,7 +55,7 @@ public class RubyAnySerializer {
             }
             return;
         }
-        
+
         method = meta.searchMethod("to_time");
         if (!method.isUndefined()) {
             RubyTime dt = (RubyTime) method.call(ctx, rubyObject, meta, "to_time");
@@ -97,7 +98,7 @@ public class RubyAnySerializer {
         throw new JsonGenerationException("Cannot find Serializer for class: " + rubyObject.getClass().getName());
     }
 
-//    @Override
+    @Override
     public void serialize(IRubyObject value, JsonGenerator jgen, SerializerProvider provider)
             throws IOException, JsonGenerationException {
 
@@ -226,6 +227,7 @@ public class RubyAnySerializer {
      * @throws java.io.IOException
      * @throws com.fasterxml.jackson.core.JsonGenerationException
      */
+    @Override
     public void serializeWithType(IRubyObject value, JsonGenerator jgen, SerializerProvider provider, TypeSerializer typeSer)
             throws IOException, JsonGenerationException {
         typeSer.writeTypePrefixForScalar(value, jgen);

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

@@ -11,6 +11,7 @@ import com.fasterxml.jackson.module.afterburner.AfterburnerModule;
 import java.text.SimpleDateFormat;
 
 import org.jruby.Ruby;
+import org.jruby.runtime.builtin.IRubyObject;
 
 public class RubyJacksonModule extends SimpleModule {
 
@@ -23,7 +24,7 @@ public class RubyJacksonModule extends SimpleModule {
     }
 
     private RubyJacksonModule() {
-        super("JrJacksonStrModule", new Version(1, 2, 16, "0", "com.jrjackson.jruby", "jrjackson"));
+        super("JrJacksonStrModule", new Version(1, 2, 17, "0", "com.jrjackson.jruby", "jrjackson"));
     }
 
     public static ObjectMapper mapperWith(Ruby ruby, RubyKeyConverter nameConverter,
@@ -50,7 +51,12 @@ public class RubyJacksonModule extends SimpleModule {
     }
 
     public static DefaultSerializerProvider createProvider(SimpleDateFormat sdf) {
-        static_mapper.setDateFormat(sdf);
+        static_mapper.setDateFormat(sdf)
+            .registerModule(
+                new RubyJacksonModule().addSerializer(
+                    IRubyObject.class, RubyAnySerializer.instance
+                )
+            );
         return ((DefaultSerializerProvider)static_mapper.getSerializerProvider()).createInstance(
             static_mapper.getSerializationConfig(),
             static_mapper.getSerializerFactory()
@@ -63,5 +69,4 @@ public class RubyJacksonModule extends SimpleModule {
         return static_mapper;
     }
 
-
 }

data/test/jrjackson_test.rb

@@ -511,6 +511,17 @@ class JrJacksonTest < Test::Unit::TestCase
     assert_equal "{\"matched\":\"bar\"}", actual
   end
 
+  def test_can_mix_java_and_ruby_objects
+    json = '{"utf8":"żółć", "moo": "bar", "arr": [2,3,4], "flo": 3.33}'
+
+    expected = '{"mixed":{"arr":[2,3,4],"utf8":"żółć","flo":3.33,"zzz":{"one":1.0,"two":2,"six":6.0},"moo":"bar"}}'
+    object = JrJackson::Json.parse_java(json)
+    object["zzz"] = CustomToJson.new(1.0, 2, 6.0)
+    mixed = {"mixed" => object}
+    actual = JrJackson::Json.dump(mixed)
+    assert_equal expected, actual
+  end
+
   # -----------------------------
 
   def assert_bigdecimal_equal(expected, actual)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jrjackson
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Guy Boertje
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-10-19 00:00:00.000000000 Z
+date: 2015-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ files:
 - jrjackson.gemspec
 - lib/jrjackson.rb
 - lib/jrjackson/build_info.rb
-- lib/jrjackson/jars/jrjackson-1.2.16.jar
+- lib/jrjackson/jars/jrjackson-1.2.17.jar
 - lib/jrjackson/jrjackson.rb
 - lib/require_relative_patch.rb
 - pom.xml