jrjackson 0.4.7-java → 0.4.8-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54b9843d159031758abedb83ec63b78b0f6d8f9767375cbdc2f369e1d6cc72f9
-  data.tar.gz: f08bfca12d285572e3e8028f7d69e6e52972f3255bfeaa5b46675bc766a1f99c
+  metadata.gz: 60ac61ae600aa8890e18f0fac4882158d5a61983a46f727a4110536dae859c15
+  data.tar.gz: dac5dde733b16e27bcd2ec7bf9be2e1a381df3f9f014e528f569a691f289d4a2
 SHA512:
-  metadata.gz: 0d26095364989129a57bb42c33fec3db622a8ffaf032b782bccde8359ae30a6ff562d588787f69f74babf265ae5f039a767d5f03e4ef3b862bc47c4ca5731f10
-  data.tar.gz: 5475be25b476b8ce6122d87fa444efa253c9d1d54f59eb7bcc6bec440b08b21fd2de3db5e9c0f61fce75a9fdfaf625462edb2a086278e0bb063ceabd721f4d25
+  metadata.gz: b676bb38063011d3a562b07eef490566e7eef568780f79f51904ab2ced4db8df5a05d4ad9b09db8db9c98a2f7a8b22694266ca43f6c8b1261fd651a077d6b717
+  data.tar.gz: ed12fc31c05a55c788b8b685059eb920698e05bd4423f8a5dfb21a7e2ab6ffd51e48b946ab1586877d9c1742856d70e3e3af84b4bcd73a8572e22e5494647efd

data/changelog.md

@@ -1,3 +1,6 @@
+v0.4.8
+  fix serialisation of big numbers as Ruby 2.4 unifies Fixnum and Bignum into Integer 
+
 v0.4.4
   fix for issue 64
     Ruby parse() null/nil handling

data/jrjackson.gemspec

@@ -16,6 +16,7 @@ Gem::Specification.new do |s|
   s.summary     = %q{A JRuby wrapper for the java jackson json processor jar}
   s.description = %q{A mostly native JRuby wrapper for the java jackson json processor jar}
   s.license     = 'Apache License 2.0'
+  s.require_paths = ["lib"]
 
   s.add_development_dependency 'bundler', '~> 1.10'
   s.add_development_dependency 'jar-dependencies', '< 2.0', '>= 0.3.2'

data/lib/jrjackson/build_info.rb

@@ -1,11 +1,11 @@
 module JrJackson
   module BuildInfo
     def self.version
-      '0.4.7'
+      '0.4.8'
     end
 
     def self.release_date
-      '2018-11-29'
+      '2019-05-01'
     end
 
     def self.files
@@ -17,7 +17,7 @@ module JrJackson
     end
 
     def self.jar_version
-      '1.2.25'
+      '1.2.26'
     end
 
     private

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

@@ -5,7 +5,15 @@ 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.*;
+import org.jruby.RubyArray;
+import org.jruby.RubyClass;
+import org.jruby.RubyException;
+import org.jruby.RubyHash;
+import org.jruby.RubyNumeric;
+import org.jruby.RubyObject;
+import org.jruby.RubyString;
+import org.jruby.RubyStruct;
+import org.jruby.RubyTime;
 import org.jruby.ext.bigdecimal.RubyBigDecimal;
 import org.jruby.internal.runtime.methods.DynamicMethod;
 import org.jruby.java.proxies.JavaProxy;
@@ -172,12 +180,14 @@ public class RubyAnySerializer extends JsonSerializer<IRubyObject> {
             case Float:
                 jgen.writeNumber(RubyNumeric.num2dbl(value));
                 break;
+            case Bignum:
             case Fixnum:
             case Integer:
-                jgen.writeNumber(RubyNumeric.num2long(value));
-                break;
-            case Bignum:
-                jgen.writeNumber(((RubyBignum) value).getBigIntegerValue());
+                if (value.getJavaClass() == long.class) {
+                    jgen.writeNumber(((RubyNumeric) value).getLongValue());
+                } else {
+                    jgen.writeNumber(((RubyNumeric) value).getBigIntegerValue());
+                }
                 break;
             case BigDecimal:
                 jgen.writeNumber(((RubyBigDecimal) value).getBigDecimalValue());

data/test/jrjackson_test.rb

@@ -369,7 +369,12 @@ class JrJacksonTest < Test::Unit::TestCase
     assert_equal "bar", actual["moo"]
     assert_equal "żółć", actual["utf8"]
     assert_equal Java::JavaUtil::HashMap, actual["zzz"].class
-    assert_equal Bignum, actual["zzz"]["bar"].class
+    if 1.class == Integer
+      # avoid deprecation warning as Ruby 2.4 unifies Fixnum and Bignum into Integer
+      assert_equal Integer, actual["zzz"]["bar"].class
+    else
+      assert_equal Bignum, actual["zzz"]["bar"].class
+    end
     assert_equal(-9, actual["zzz"]["bar"])
   end
 
@@ -537,6 +542,12 @@ class JrJacksonTest < Test::Unit::TestCase
     assert_equal "{\"foo\":\"#{BasicObject.inspect}\"}", actual
   end
 
+  def test_can_handle_big_numbers
+    object = {"foo" => 2**63, "bar" => 65536}
+    actual = JrJackson::Json.dump(object)
+    assert_equal "{\"foo\":9223372036854775808,\"bar\":65536}", 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.4.7
+  version: 0.4.8
 platform: java
 authors:
 - Guy Boertje
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-11-29 00:00:00.000000000 Z
+date: 2019-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ files:
 - lib/com/fasterxml/jackson/module/jackson-module-afterburner/2.9.7/jackson-module-afterburner-2.9.7.jar
 - lib/jrjackson.rb
 - lib/jrjackson/build_info.rb
-- lib/jrjackson/jars/jrjackson-1.2.25.jar
+- lib/jrjackson/jars/jrjackson-1.2.26.jar
 - lib/jrjackson/jrjackson.rb
 - lib/jrjackson_jars.rb
 - lib/require_relative_patch.rb