jrjackson 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ab793dfde79c3ac7811f5f24a59e9041dc8d49e
-  data.tar.gz: e96d91f73dbedf976482f681157a45b2d5e8b740
+  metadata.gz: 549f6826999b9654a348daa2aaed4d80cdcd4014
+  data.tar.gz: ec6bc1ae63c834ee2a7c6ddfc6718f6b89897996
 SHA512:
-  metadata.gz: 0acbeed9bb65e6b93ba3b0d3b9c2dea63ae9dcc39aaefc7b7505abb3484c9b432c110ee1f6a4f52bfd72f8bb1917485f10f9abe0a24ee892f056fede1f07b209
-  data.tar.gz: 3f42fd81462bdc068f75fcae12484ad376a3f5d956c65c681da42e314017cac582cfc323ca9f48e286cf74b748ca823dba7356495bc8f861a319b5807f2fc80c
+  metadata.gz: 2a4c411e0caea3b5b83216382a7446a8eec67cfdded758b8b9b9377ce7b26d7ec6d09f262f39f6f5307acf5bbb5fcb0763e74bdffa7adc29c11405deea7bd0f4
+  data.tar.gz: 3ee2f6c6b9cb930db62214fb66efb495c6505fb209ae7232c509c544ff5fb97e2daa0c04af3e9840858e04d4a1b48260e8dce1f2991e06024e8f45f7623d062c

data/README.md

@@ -12,18 +12,25 @@ __NOTE:__ Smile support has been temporarily dropped
 
 The code has been refactored to use almost all Java.
 
-There is now a MultiJson adapter added for JrJackson
+There is now a MultiJson adapter added for JrJackson.
+
+This release is compatible with JRuby 9.0.0.0 and higher.
 
 ***
 
 #### NEWS
 
+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.
+
 11th May 2014 - Added to_time method call for Ruby object serialization
 
 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 and impact performance. 
+method might invoke a new selialization session (i.e. it may use the JSON gem) 
+and impact performance.
 
 ***
 
@@ -43,7 +50,7 @@ The options hash respects three symbol keys
 + :raw
 
   Will return JRuby wrapped java objects that quack like ruby objects
-  This is the fastest option
+  This is the fastest option but not by much
 
 + :use_bigdecimal
 
@@ -51,6 +58,10 @@ The options hash respects three symbol keys
   If used with the :raw option you will get Java::JavaMath::BigDecimal objects
   otherwise they are Ruby BigDecimal
 
++ :use_smallint
+
+  Will return Integers objects instead of BigInteger
+  
 ```
 JrJackson::Json.dump(obj) -> json string
       aliased as generate
@@ -64,12 +75,15 @@ serialization. See the wiki for more on this.
 
 #### Internals
 
-There are two Ruby sub modules of the JrJackson module
+There are four Ruby sub modules of the JrJackson module
+
+```JrJackson::Json```, this is the general external facade used by MultiJson.
 
-```JrJackson::Json```, this is the general external facade used by MultiJson, and is pure Ruby.
+```JrJackson::Raw```, this exists for backward compatibility, do not use this for new code.
 
-```JrJackson::Raw```, this is used by the Json module, it is defined in Java with annotations
-exposing it as a Ruby module with module methods.
+```JrJackson::Ruby```, this is used by the external facade, you should use this directly. It returns Ruby objects e.g. Hash, Array, Symbol, String, Integer, BigDecimal etc.
+
+```JrJackson::Java```, this is used by the external facade, you should use this directly. It returns Java objects e.g. ArrayList, HashMap, BigDecimal, BigInteger, Long, Float and String, JRuby wraps (mostly) them in a JavaProxy Ruby object.
 
 ***
 
@@ -79,34 +93,55 @@ Credit to Chuck Remes for the benchmark and initial
 investigation when the jruby, json gem and the jackson
 libraries were young.
 
-I compared Json (java) 1.8, Gson 0.6.1 and jackson 2.2.3 on jruby 1.7.5 and OpenJDK 64-Bit Server VM 1.7.0_25-b30
+I compared Json (java) 1.8.3, Gson 0.6.1 and jackson 2.6.1 on jruby 1.7.22 and Oracle Java HotSpot(TM) 64-Bit Server VM 1.8.0_60-b27 +jit [linux-amd64]
 All the benchmarks were run separately. A 727.9KB string of random json data is read from a file and handled 250 times, thereby attempting to balance invocation and parsing benchmarking.
 
 ```
 generation/serialize
 
                                                user     system      total         real
-json mri generate: 250                        12.02       0.00      12.02     ( 12.022)
-oj mri generate: 250                           7.18       0.00       7.18     (  7.183)
-json java generate: 250                        7.83       0.01       7.84     (  7.289)
-gson generate: 250                             5.04       0.00       5.04     (  4.995)
-jackson generate: 250                          4.94       0.08       5.02     (  4.811)
-jackson generate: 250                          4.85       0.04       4.89     (  4.758)
+
+
+json java generate: 250                        6.780      0.620      7.400    (  6.599)
+gson generate: 250                             4.480      0.530      5.010    (  4.688)
+jackson generate: 250                          2.200      0.010      2.210    (  2.128)
+
+json mri parse: 250                            9.620      0.000      9.620    (  9.631)
+oj mri parse: 250                              9.190      0.000      9.190    (  9.199)
+json mri generate: 250                         8.400      0.010      8.410    (  8.419)
+oj mri generate: 250                           6.980      0.010      6.990    (  6.999)
 
 
 parsing/deserialize - after jrjackson parsing profiling
 
                                                user     system      total         real
-json mri parse: 250                            8.35       0.02       8.37     (  8.366)
-oj mri parse: 250                              6.10       0.13       6.23     (  7.527)
-      
-gson parse: 250                               12.02       0.02      12.04     ( 11.774)
-json java parse: 250                          10.35       0.01      10.36     ( 10.204)
-jackson parse string keys: 250                 5.60       0.00       5.60     (  5.356)
-jackson parse string + bigdecimal: 250         5.14       0.01       5.15     (  4.946)
-jackson parse symbol keys: 250                 4.16       0.01       4.17     (  3.989)
-jackson parse symbol + bigdecimal: 250         3.90       0.03       3.93     (  3.597)
-jackson parse raw: 250                         3.08       0.01       3.09     (  2.924)
-jackson parse raw + bigdecimal: 250            2.70       0.06       2.76     (  2.493)
+json java parse: 250                           9.320      0.580      9.900    (  9.467)
+jackson parse string keys: 250                 3.600      0.520      4.120    (  3.823)
+jackson parse string + bigdecimal: 250         3.390      0.640      4.030    (  3.721)
+jackson parse ruby compat: 250                 3.700      0.030      3.730    (  3.516)
+jackson parse ruby ootb: 250                   3.490      0.120      3.610    (  3.420)
+jackson parse sj: 250                          3.290      0.030      3.320    (  3.065)
+jackson parse symbol keys: 250                 3.050      0.120      3.170    (  2.943)
+jackson parse symbol + bigdecimal: 250         2.770      0.020      2.790    (  2.669)
+jackson parse java + bigdecimal: 250           1.880      0.430      2.310    (  2.239)
+jackson parse java + bigdecimal direct: 250    1.950      0.440      2.390    (  2.290)
+jackson parse java ootb: 250                   1.990      0.030      2.020    (  1.925)
+jackson parse java sym bd: 250                 1.920      0.000      1.920    (  1.898)
+```
+
+I have done IPS style benchmarks too.
+
+Generation
+```
+jrjackson:   74539.4 i/s
+    gson:    58288.3 i/s - 1.28x slower
+    JSON:    54597.2 i/s - 1.37x slower
+```
+
+Parsing returning Ruby
+```
+symbol keys
+jrjackson:    95203.9 i/s
+     JSON:    40712.0 i/s - 2.34x slower
 
 ```

data/changelog.md

@@ -1,3 +1,7 @@
+v0.3.4
+  fix multi_json bug
+    not serializing non-string keys
+
 v0.3.3
   fix bigdecimal bug
     add require bigdecimal

data/lib/jrjackson/build_info.rb

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

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

@@ -208,9 +208,12 @@ public class RubyAnySerializer {
 
     private void serializeKey(IRubyObject key, JsonGenerator jgen, SerializerProvider provider)
             throws IOException, JsonGenerationException {
-
-        jgen.writeFieldName(key.asJavaString());
-
+        if(key instanceof RubyString) {
+            jgen.writeFieldName(((RubyString)key).decodeString());
+        } else {
+            // includes RubySymbol and non RubyString objects
+            jgen.writeFieldName(key.toString());
+        }
     }
 
     /**

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

@@ -6,9 +6,7 @@
 package com.jrjackson;
 
 import java.text.DateFormatSymbols;
-import java.text.FieldPosition;
 import java.text.SimpleDateFormat;
-import java.util.Date;
 import java.util.Locale;
 
 /**

data/test/jrjackson_test.rb

@@ -477,6 +477,12 @@ class JrJacksonTest < Test::Unit::TestCase
     assert_equal "{\n  \"foo\" : 5,\n  \"utf8\" : \"żółć\"\n}", actual
   end
 
+  def test_can_serialise_non_string_keys
+    object = {5 => "foo"}
+    actual = JrJackson::Json.dump(object)
+    assert_equal "{\"5\":\"foo\"}", 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.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Guy Boertje
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-09-12 00:00:00.000000000 Z
+date: 2015-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement