jrjackson 0.4.6-java → 0.4.7-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 311e84f8733a84f6434f3e9c708d5ea40f39cc1a2fd0ad388e7e9d1922fef451
-  data.tar.gz: 136222337459fb74915b10d78b6f661c442aa641f0fa21c32f33e2c0f384f725
+  metadata.gz: 54b9843d159031758abedb83ec63b78b0f6d8f9767375cbdc2f369e1d6cc72f9
+  data.tar.gz: f08bfca12d285572e3e8028f7d69e6e52972f3255bfeaa5b46675bc766a1f99c
 SHA512:
-  metadata.gz: b3bed4aa8a1a4e9d3cff5c366c5d196234453433ba75e11829b295bbc6ecd61759ebf4cad6e15d154363f45d68f93ccd22e4f0f73655fcecf8aa8990ec7fe1f6
-  data.tar.gz: a83dd449ed2cc12074b179edb78391161a65464565cc84ca554cc2c0796ad403a7daf74d232b1e2883aaea29b507b198e70c381ac9deb7eb2e21abcbcb69df4f
+  metadata.gz: 0d26095364989129a57bb42c33fec3db622a8ffaf032b782bccde8359ae30a6ff562d588787f69f74babf265ae5f039a767d5f03e4ef3b862bc47c4ca5731f10
+  data.tar.gz: 5475be25b476b8ce6122d87fa444efa253c9d1d54f59eb7bcc6bec440b08b21fd2de3db5e9c0f61fce75a9fdfaf625462edb2a086278e0bb063ceabd721f4d25

data/.gitignore

@@ -4,6 +4,7 @@ target
 Rakefile.old
 .idea
 *.iml
+.ruby-version
 
 linked
 /libyjpagent.so

data/Mavenfile

@@ -14,7 +14,7 @@ properties 'project.build.sourceEncoding' => 'UTF-8',
 
 jar 'junit:junit', '4.11', :scope => :test
 
-jar 'org.jruby:jruby', '9.1.13.0', :scope => :provided
+jar 'org.jruby:jruby', '9.2.4.0', :scope => :provided
 
 plugin :compiler, '3.1', :source => '1.8', :target => '1.8',
        :showDeprecation => false,

data/lib/jrjackson/build_info.rb

@@ -1,11 +1,11 @@
 module JrJackson
   module BuildInfo
     def self.version
-      '0.4.6'
+      '0.4.7'
     end
 
     def self.release_date
-      '2018-04-14'
+      '2018-11-29'
     end
 
     def self.files
@@ -13,11 +13,11 @@ module JrJackson
     end
 
     def self.jackson_version
-      '2.9.5'
+      '2.9.7'
     end
 
     def self.jar_version
-      '1.2.24'
+      '1.2.25'
     end
 
     private

data/run_all_individual_bench.sh

@@ -3,23 +3,23 @@
 chruby-exec ruby-2.2.2 -- ruby benchmarking/individual/json-mri-sourced.rb
 chruby-exec ruby-2.2.2 -- ruby benchmarking/individual/oj-mri-sourced.rb
 
-chruby-exec jruby-9.0.0.0.rc1 -- ruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/gson-jr-sourced.rb
-chruby-exec jruby-9.0.0.0.rc1 -- ruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/json-jr-sourced.rb
+chruby-exec jruby-9.2.0.0 -- ruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/gson-jr-sourced.rb
+chruby-exec jruby-9.2.0.0 -- ruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/json-jr-sourced.rb
 
-chruby-exec jruby-9.0.0.0.rc1 -- ruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/string-jr-sourced.rb
-chruby-exec jruby-9.0.0.0.rc1 -- ruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/str-bd-jr-sourced.rb
+chruby-exec jruby-9.2.0.0 -- ruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/string-jr-sourced.rb
+chruby-exec jruby-9.2.0.0 -- ruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/str-bd-jr-sourced.rb
 
-chruby-exec jruby-9.0.0.0.rc1 -- ruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/symbol-jr-sourced.rb
-chruby-exec jruby-9.0.0.0.rc1 -- ruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/sym-bd-jr-sourced.rb
+chruby-exec jruby-9.2.0.0 -- ruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/symbol-jr-sourced.rb
+chruby-exec jruby-9.2.0.0 -- ruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/sym-bd-jr-sourced.rb
 
-chruby-exec jruby-9.0.0.0.rc1 -- ruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/raw-jr-sourced.rb
-chruby-exec jruby-9.0.0.0.rc1 -- ruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/raw-bd-jr-sourced.rb
+chruby-exec jruby-9.2.0.0 -- ruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/raw-jr-sourced.rb
+chruby-exec jruby-9.2.0.0 -- ruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/raw-bd-jr-sourced.rb
 
-chruby-exec jruby-9.0.0.0.rc1 -- ruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/sj-jr-sourced.rb
+chruby-exec jruby-9.2.0.0 -- ruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/sj-jr-sourced.rb
 
 chruby-exec ruby-2.2.2 -- ruby benchmarking/individual/json-gen-mri-sourced.rb
 chruby-exec ruby-2.2.2 -- ruby benchmarking/individual/oj-gen-mri-sourced.rb
 
-chruby-exec jruby-9.0.0.0.rc1 -- ruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/json-gen-jr-sourced.rb 
-chruby-exec jruby-9.0.0.0.rc1 -- ruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/gson-gen-jr-sourced.rb 
-chruby-exec jruby-9.0.0.0.rc1 -- ruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/raw-gen-jr-sourced.rb 
+chruby-exec jruby-9.2.0.0 -- ruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/json-gen-jr-sourced.rb
+chruby-exec jruby-9.2.0.0 -- ruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/gson-gen-jr-sourced.rb
+chruby-exec jruby-9.2.0.0 -- ruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/raw-gen-jr-sourced.rb

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

@@ -173,6 +173,7 @@ public class RubyAnySerializer extends JsonSerializer<IRubyObject> {
                 jgen.writeNumber(RubyNumeric.num2dbl(value));
                 break;
             case Fixnum:
+            case Integer:
                 jgen.writeNumber(RubyNumeric.num2long(value));
                 break;
             case Bignum:
@@ -265,6 +266,7 @@ public class RubyAnySerializer extends JsonSerializer<IRubyObject> {
     enum RUBYCLASS {
         String,
         Fixnum,
+        Integer,
         Hash,
         Array,
         Float,

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

@@ -12,11 +12,9 @@ import org.jruby.Ruby;
 import org.jruby.runtime.builtin.IRubyObject;
 
 import java.text.SimpleDateFormat;
+import java.util.TimeZone;
 
 public class RubyJacksonModule extends SimpleModule {
-
-    private static final SimpleDateFormat RDF = new RubyDateFormat("yyyy-MM-dd HH:mm:ss Z");
-
     public static final ObjectMapper static_mapper = new ObjectMapper();
     public static final JsonFactory factory = new JsonFactory(static_mapper).disable(JsonFactory.Feature.FAIL_ON_SYMBOL_HASH_OVERFLOW);
 
@@ -56,11 +54,9 @@ public class RubyJacksonModule extends SimpleModule {
     }
 
     public static DefaultSerializerProvider createProvider() {
-        static_mapper.setDateFormat(RDF);
-        return ((DefaultSerializerProvider) static_mapper.getSerializerProvider()).createInstance(
-                static_mapper.getSerializationConfig(),
-                static_mapper.getSerializerFactory()
-        );
+        SimpleDateFormat rdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss Z");
+        rdf.setTimeZone(TimeZone.getTimeZone("UTC"));
+        return createProvider(rdf);
     }
 
     public static ObjectMapper rawBigNumberMapper() {

data/test/jrjackson_test.rb

@@ -70,7 +70,7 @@ class JrJacksonTest < Test::Unit::TestCase
       @now = tm
     end
     def to_time
-      @now.to_time
+      @now.to_time.utc
     end
   end
 
@@ -281,7 +281,7 @@ class JrJacksonTest < Test::Unit::TestCase
   end
 
   def test_serialize_non_json_datatypes_as_values
-    dt = Time.now
+    dt = Time.now.utc
     today = Date.today
     co1 = CustomToH.new("uno", :two, 6.0)
     co2 = CustomToHash.new("uno", :two, 6.0)
@@ -292,12 +292,12 @@ class JrJacksonTest < Test::Unit::TestCase
     json_string = JrJackson::Json.dump(source)
     expected = {
       :sym => "a_symbol",
-      :dt => dt.to_s,
+      :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],
-      :co5 => today.to_time.to_s
+      :co5 => today.to_time.utc.strftime('%F %T %z')
     }
     actual = JrJackson::Json.load(json_string, :symbolize_keys => true)
     assert_equal expected, actual
@@ -340,7 +340,7 @@ class JrJacksonTest < Test::Unit::TestCase
     time = Time.new(2014,6,10,18,18,40, "-04:00")
     # using date_format option
     assert_equal "{\"time\":\"2014-06-10\"}", JrJackson::Json.dump({"time" => time}, :date_format => "yyyy-MM-dd")
-    assert_match /\{"time"\:"\d{4}-\d\d-\d\dT\d\d:\d\d:\d\d\.\d{3}[+-]\d{4}"\}/, JrJackson::Json.dump({"time" => time}, :date_format => "yyyy-MM-dd'T'HH:mm:ss.SSSZ")
+    assert_match(/\{"time"\:"\d{4}-\d\d-\d\dT\d\d:\d\d:\d\d\.\d{3}[+-]\d{4}"\}/, JrJackson::Json.dump({"time" => time}, :date_format => "yyyy-MM-dd'T'HH:mm:ss.SSSZ"))
   end
 
   def test_serialize_date_date_format_timezone
@@ -370,7 +370,7 @@ class JrJacksonTest < Test::Unit::TestCase
     assert_equal "żółć", actual["utf8"]
     assert_equal Java::JavaUtil::HashMap, actual["zzz"].class
     assert_equal Bignum, actual["zzz"]["bar"].class
-    assert_equal -9, actual["zzz"]["bar"]
+    assert_equal(-9, actual["zzz"]["bar"])
   end
 
   def test_can_parse_returning_ruby_objects_string_keys
@@ -451,7 +451,7 @@ class JrJacksonTest < Test::Unit::TestCase
   end
 
   def test_can_parse_big_decimals
-    expected = BigDecimal.new '0.12345678901234567890123456789'
+    expected = BigDecimal('0.12345678901234567890123456789')
     json = '{"foo":0.12345678901234567890123456789}'
 
     actual = JrJackson::Json.parse(json, :use_bigdecimal => true)['foo']
@@ -514,7 +514,7 @@ class JrJacksonTest < Test::Unit::TestCase
 
   def test_can_mix_java_and_ruby_objects
     json = '{"utf8":"żółć", "moo": "bar", "arr": [2,3,4], "flo": 3.33}'
-    timeobj = Time.new(2015,11,11,11,11,11).utc
+    timeobj = Time.new(2015,11,11,11,11,11,0).utc
     expected = '{"mixed":{"arr":[2,3,4],"utf8":"żółć","flo":3.33,"zzz":{"one":1.0,"two":2,"six":6.0},"moo":"bar"},"time":"2015-11-11 11:11:11 +0000"}'
     object = JrJackson::Json.parse_java(json)
     object["zzz"] = CustomToJson.new(1.0, 2, 6.0)
@@ -546,7 +546,7 @@ class JrJacksonTest < Test::Unit::TestCase
   end
 
   def assert_bigdecimal_similar(expected, actual)
-    assert_equal BigDecimal.new(expected.to_s).round(11), BigDecimal.new(actual.to_s).round(11)
+    assert_equal BigDecimal(expected.to_s).round(11), BigDecimal(actual.to_s).round(11)
     assert_equal Java::JavaMath::BigDecimal, actual.class
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jrjackson
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: java
 authors:
 - Guy Boertje
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-04-14 00:00:00.000000000 Z
+date: 2018-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -60,13 +60,13 @@ files:
 - alt_bench.rb
 - changelog.md
 - jrjackson.gemspec
-- lib/com/fasterxml/jackson/core/jackson-annotations/2.9.5/jackson-annotations-2.9.5.jar
-- lib/com/fasterxml/jackson/core/jackson-core/2.9.5/jackson-core-2.9.5.jar
-- lib/com/fasterxml/jackson/core/jackson-databind/2.9.5/jackson-databind-2.9.5.jar
-- lib/com/fasterxml/jackson/module/jackson-module-afterburner/2.9.5/jackson-module-afterburner-2.9.5.jar
+- lib/com/fasterxml/jackson/core/jackson-annotations/2.9.7/jackson-annotations-2.9.7.jar
+- lib/com/fasterxml/jackson/core/jackson-core/2.9.7/jackson-core-2.9.7.jar
+- lib/com/fasterxml/jackson/core/jackson-databind/2.9.7/jackson-databind-2.9.7.jar
+- 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.24.jar
+- lib/jrjackson/jars/jrjackson-1.2.25.jar
 - lib/jrjackson/jrjackson.rb
 - lib/jrjackson_jars.rb
 - lib/require_relative_patch.rb
@@ -134,12 +134,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
-- jar com.fasterxml.jackson.core:jackson-core, 2.9.5
-- jar com.fasterxml.jackson.core:jackson-annotations, 2.9.5
-- jar com.fasterxml.jackson.core:jackson-databind, 2.9.5
-- jar com.fasterxml.jackson.module:jackson-module-afterburner, 2.9.5
+- jar com.fasterxml.jackson.core:jackson-core, 2.9.7
+- jar com.fasterxml.jackson.core:jackson-annotations, 2.9.7
+- jar com.fasterxml.jackson.core:jackson-databind, 2.9.7
+- jar com.fasterxml.jackson.module:jackson-module-afterburner, 2.9.7
 rubyforge_project:
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key:
 specification_version: 4
 summary: A JRuby wrapper for the java jackson json processor jar