jrjackson 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 549f6826999b9654a348daa2aaed4d80cdcd4014
-  data.tar.gz: ec6bc1ae63c834ee2a7c6ddfc6718f6b89897996
+  metadata.gz: 81ef805539c250761b4457aea4fa82cfd23121e6
+  data.tar.gz: 8cfafab8e06ce0f3938e8d287d76f55064e55719
 SHA512:
-  metadata.gz: 2a4c411e0caea3b5b83216382a7446a8eec67cfdded758b8b9b9377ce7b26d7ec6d09f262f39f6f5307acf5bbb5fcb0763e74bdffa7adc29c11405deea7bd0f4
-  data.tar.gz: 3ee2f6c6b9cb930db62214fb66efb495c6505fb209ae7232c509c544ff5fb97e2daa0c04af3e9840858e04d4a1b48260e8dce1f2991e06024e8f45f7623d062c
+  metadata.gz: 5cf160de8ff9750286c0c795399a68f98a667c6bcccb82c77b2c349dc1c22acaaaee66d4ac9fcc95cc246ee9d2f308480562a17b42c7978f0e085629e767b3dd
+  data.tar.gz: 52036310b4d62ca09766ffc99ee0464dfdee560051ad046fc01d282bc5e183ce02d4506966e428208918d96acc4d87438ad1b32269bcadefdaa03547865fbb08

data/README.md

@@ -20,6 +20,9 @@ This release is compatible with JRuby 9.0.0.0 and higher.
 
 #### NEWS
 
+07 October 2015 - during serialisation, check and execute `to_json_data` method
+first.
+
 13th September 2015 - added support for a `to_json_data` method lookup.
 Use this if you want to provide a JSON native data structure that best
 represents your custom object.
@@ -29,7 +32,7 @@ represents your custom object.
 26th October 2013 - Added support to serialize arbitary (non JSON datatypes)
 ruby objects.  Normally the toJava internal method 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 (i.e. it may use the JSON gem) 
+method might invoke a new selialization session (i.e. it may use the JSON gem)
 and impact performance.
 
 ***
@@ -61,7 +64,7 @@ The options hash respects three symbol keys
 + :use_smallint
 
   Will return Integers objects instead of BigInteger
-  
+
 ```
 JrJackson::Json.dump(obj) -> json string
       aliased as generate

data/changelog.md

@@ -1,3 +1,6 @@
+v0.3.5
+  give highest precedence to the to_json_data method
+
 v0.3.4
   fix multi_json bug
     not serializing non-string keys
@@ -90,7 +93,7 @@ v0.2.0
   extract all Java -> Ruby generation to reusable RubyUtils static class
   support BigDecimal
   remove JSON Api
-  fixes issues 5, 6, 8, 
+  fixes issues 5, 6, 8,
 
   jruby 1.7.3
   jackson 2.2.2

data/lib/jrjackson/build_info.rb

@@ -1,11 +1,11 @@
 module JrJackson
   module BuildInfo
     def self.version
-      '0.3.4'
+      '0.3.5'
     end
 
     def self.release_date
-      '2015-09-13'
+      '2015-10-07'
     end
 
     def self.files

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

@@ -43,8 +43,19 @@ 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_time");
+        
+        DynamicMethod method = meta.searchMethod("to_json_data");
+        if (!method.isUndefined()) {
+            RubyObject obj = (RubyObject) method.call(ctx, rubyObject, meta, "to_json_data");
+            if (obj instanceof RubyString) {
+                RubyUtils.writeBytes(obj, jgen);
+            } else {
+                serialize(obj, jgen, provider);
+            }
+            return;
+        }
+        
+        method = meta.searchMethod("to_time");
         if (!method.isUndefined()) {
             RubyTime dt = (RubyTime) method.call(ctx, rubyObject, meta, "to_time");
             serializeTime(dt, jgen, provider);
@@ -72,17 +83,6 @@ public class RubyAnySerializer {
             return;
         }
 
-        method = meta.searchMethod("to_json_data");
-        if (!method.isUndefined()) {
-            RubyObject obj = (RubyObject) method.call(ctx, rubyObject, meta, "to_json_data");
-            if (obj instanceof RubyString) {
-                RubyUtils.writeBytes(obj, jgen);
-            } else {
-                serialize(obj, jgen, provider);
-            }
-            return;
-        }
-
         method = meta.searchMethod("to_json");
         if (!method.isUndefined()) {
             RubyObject obj = (RubyObject) method.call(ctx, rubyObject, meta, "to_json");

data/test/jrjackson_test.rb

@@ -22,6 +22,19 @@ class JrJacksonTest < Test::Unit::TestCase
 #   end
 # end
 
+  class ToJsonData
+    attr_reader :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
+    def to_json_data
+      [one, two, six]
+    end
+  end
+
   class CustomToH
     attr_accessor :one, :two, :six
     def initialize(a,b,c)
@@ -207,6 +220,13 @@ class JrJacksonTest < Test::Unit::TestCase
     )
   end
 
+  def test_to_json_data
+    object = ToJsonData.new("uno", :two, 6.0)
+    expected = "[1,[\"uno\",\"two\",6.0]]"
+    actual = JrJackson::Json.dump([1, object])
+    assert_equal expected, actual
+  end
+
   def test_datetime
     h = {datetime: DateTime.parse("2014-01-27T18:24:46+01:00")}
     expected = '{"datetime":"2014-01-27 17:24:46 +0000"}'
@@ -472,7 +492,7 @@ class JrJacksonTest < Test::Unit::TestCase
 
   def test_supports_pretty_printing
     object = {"foo" => 5, "utf8" => "żółć"}
-    
+
     actual = JrJackson::Json.dump(object, :pretty => true)
     assert_equal "{\n  \"foo\" : 5,\n  \"utf8\" : \"żółć\"\n}", actual
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jrjackson
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Guy Boertje
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-09-13 00:00:00.000000000 Z
+date: 2015-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement