jrjackson 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff0d3008ed2be467a14efa7ce22f17b798aff14f
-  data.tar.gz: 29acde65d94012d051d9ccd24dda9dfb4187cc6b
+  metadata.gz: dbc02833dd5b438dabc8a6e6c3b0a42e9fcd4cca
+  data.tar.gz: 3d86d6411ee599ac5ea84c1d7ec0eadfb07b825a
 SHA512:
-  metadata.gz: 49cad8b054b626adebd9d6a504b4b2d99df08a685f575d034e0ff957c772ee7f6c4bd2ceeec28b6ac41008f6877b54d95470d8de094a961a4dd3ec20bd3c63cd
-  data.tar.gz: a2f153ba800e763d4774473beeda5a3861b83303ec1fdd743a5751dc897a97df9796438044f08a45f880f464da67a15b8231d874d5fcbd25af49e30dc88fa026
+  metadata.gz: 6560285bd96536a57d0fcf723ef9ead449a1cc07514cf80cb12d6cfe4d475e042d8e5c66b9fd257348a94dc1cdcf4f47b886bc3fe76cd29cbae323910126733a
+  data.tar.gz: 4e6b988dd92ddf09181f4a3ff687be04eb2221fd71746c5859a9734e50cafba24fce6e9ffc200d0f0dc284f826f5851b577937c511d2a50d2079abdbdfab8e64

data/README.md

@@ -77,33 +77,34 @@ 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.4 and OpenJDK 64-Bit Server VM 1.7.0_21-b02
+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
 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)
+                                               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)
 
 
 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           6.27       0.02       6.29     (  6.010)
-jackson parse string + bigdecimal: 250   6.27       0.00       6.27     (  5.973)
-jackson parse symbol keys: 250           5.16       0.00       5.16     (  4.873)
-jackson parse symbol + bigdecimal: 250   4.75       0.06       4.81     (  4.461)
-jackson parse raw: 250                   3.23       0.05       3.28     (  3.021)
-jackson parse raw + bigdecimal: 250      3.06       0.06       3.12     (  2.639)
+                                               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)
 
 ```

data/benchmarking/fixtures/bench_options.rb

@@ -11,4 +11,8 @@ module BenchOptions
   def source
     "benchmarking/fixtures/source#{CURRENT}.json"
   end
+
+  def output_width
+    44
+  end
 end

data/benchmarking/individual/gson-gen-jr-sourced.rb

@@ -8,7 +8,7 @@ require File.expand_path('benchmarking/fixtures/bench_options')
 filename = File.expand_path(BenchOptions.source)
 hsh = JrJackson::Json.load(File.read(filename), use_bigdecimal: false, symbolize_keys: true)
 
-Benchmark.bmbm("jackson parse symbol + bigdecimal:  ".size) do |x|
+Benchmark.bmbm(BenchOptions.output_width) do |x|
   x.report("gson generate: #{BenchOptions.iterations}") do
     BenchOptions.iterations.times { ::Gson::Encoder.new({}).encode(hsh) }
   end

data/benchmarking/individual/gson-jr-sourced.rb

@@ -7,7 +7,7 @@ filename = File.expand_path(BenchOptions.source)
 
 dumped_string = File.read(filename)
 
-Benchmark.bmbm("jackson parse symbol + bigdecimal:  ".size) do |x|
+Benchmark.bmbm(BenchOptions.output_width) do |x|
   x.report("gson parse: #{BenchOptions.iterations}") do
     BenchOptions.iterations.times { ::Gson::Decoder.new({}).decode(dumped_string) }
   end

data/benchmarking/individual/json-gen-jr-sourced.rb

@@ -8,7 +8,7 @@ require File.expand_path('benchmarking/fixtures/bench_options')
 filename = File.expand_path(BenchOptions.source)
 hsh = JSON.parse(File.read(filename))
 
-Benchmark.bmbm("jackson parse symbol + bigdecimal:  ".size) do |x|
+Benchmark.bmbm(BenchOptions.output_width) do |x|
   x.report("json java generate: #{BenchOptions.iterations}") do
     BenchOptions.iterations.times { JSON.generate(hsh) }
   end

data/benchmarking/individual/json-gen-mri-sourced.rb

@@ -9,7 +9,7 @@ filename = File.expand_path(BenchOptions.source)
 JSON.parser = JSON::Ext::Parser
 hsh = JSON.parse(File.read(filename))
 
-Benchmark.bmbm("jackson parse symbol + bigdecimal:  ".size) do |x|
+Benchmark.bmbm(BenchOptions.output_width) do |x|
   x.report("json mri generate: #{BenchOptions.iterations}") do
     BenchOptions.iterations.times { JSON.fast_generate(hsh) }
   end

data/benchmarking/individual/json-jr-sourced.rb

@@ -7,7 +7,7 @@ filename = File.expand_path(BenchOptions.source)
 
 dumped_string = File.read(filename)
 
-Benchmark.bmbm("jackson parse symbol + bigdecimal:  ".size) do |x|
+Benchmark.bmbm(BenchOptions.output_width) do |x|
   x.report("json java parse: #{BenchOptions.iterations}") do
     BenchOptions.iterations.times { ::JSON.parse(dumped_string) }
   end

data/benchmarking/individual/json-mri-sourced.rb

@@ -8,7 +8,7 @@ filename = File.expand_path(BenchOptions.source)
 
 dumped_string = File.read(filename)
 
-Benchmark.bmbm("jackson parse symbol + bigdecimal:  ".size) do |x|
+Benchmark.bmbm(BenchOptions.output_width) do |x|
   x.report("json mri parse: #{BenchOptions.iterations}") do
     BenchOptions.iterations.times { JSON::Ext::Parser.new(dumped_string).parse }
   end

data/benchmarking/individual/oj-gen-mri-sourced.rb

@@ -6,7 +6,7 @@ require File.expand_path('benchmarking/fixtures/bench_options')
 filename = File.expand_path(BenchOptions.source)
 hsh = Oj.compat_load(File.read(filename))
 
-Benchmark.bmbm("jackson parse symbol + bigdecimal:  ".size) do |x|
+Benchmark.bmbm(BenchOptions.output_width) do |x|
   x.report("oj mri generate: #{BenchOptions.iterations}") do
     BenchOptions.iterations.times { Oj.dump(hsh) }
   end

data/benchmarking/individual/oj-mri-sourced.rb

@@ -7,7 +7,7 @@ filename = File.expand_path(BenchOptions.source)
 
 dumped_string = File.read(filename)
 
-Benchmark.bmbm("jackson parse symbol + bigdecimal:  ".size) do |x|
+Benchmark.bmbm(BenchOptions.output_width) do |x|
   x.report("oj mri parse: #{BenchOptions.iterations}") do
     BenchOptions.iterations.times { Oj.compat_load(dumped_string) }
   end

data/benchmarking/individual/raw-bd-jr-sourced.rb

@@ -9,7 +9,7 @@ filename = File.expand_path(BenchOptions.source)
 opts = {use_bigdecimal: true, raw: true}
 dumped_string = File.read(filename)
 
-Benchmark.bmbm("jackson parse symbol + bigdecimal:  ".size) do |x| 
+Benchmark.bmbm(BenchOptions.output_width) do |x| 
   x.report("jackson parse raw + bigdecimal: #{BenchOptions.iterations}") do
     BenchOptions.iterations.times { JrJackson::Json.load(dumped_string, opts) }
   end

data/benchmarking/individual/raw-gen-jr-sourced.rb

@@ -7,7 +7,7 @@ require File.expand_path('benchmarking/fixtures/bench_options')
 filename = File.expand_path(BenchOptions.source)
 hsh = JrJackson::Json.load(File.read(filename), use_bigdecimal: false, symbolize_keys: true)
 
-Benchmark.bmbm("jackson parse symbol + bigdecimal:  ".size) do |x|
+Benchmark.bmbm(BenchOptions.output_width) do |x|
   x.report("jackson generate: #{BenchOptions.iterations}") do
     BenchOptions.iterations.times { JrJackson::Raw.generate(hsh) }
   end

data/benchmarking/individual/raw-jr-sourced.rb

@@ -9,7 +9,7 @@ filename = File.expand_path(BenchOptions.source)
 opts = {raw: true}
 dumped_string = File.read(filename)
 
-Benchmark.bmbm("jackson parse symbol + bigdecimal:  ".size) do |x| 
+Benchmark.bmbm(BenchOptions.output_width) do |x| 
   x.report("jackson parse raw: #{BenchOptions.iterations}") do
     BenchOptions.iterations.times { JrJackson::Json.load(dumped_string, opts) }
   end

data/benchmarking/individual/str-bd-jr-sourced.rb

@@ -9,7 +9,7 @@ filename = File.expand_path(BenchOptions.source)
 opts = {use_bigdecimal: true}
 dumped_string = File.read(filename)
 
-Benchmark.bmbm("jackson parse symbol + bigdecimal:  ".size) do |x|
+Benchmark.bmbm(BenchOptions.output_width) do |x|
   x.report("jackson parse string + bigdecimal: #{BenchOptions.iterations}") do
     BenchOptions.iterations.times { JrJackson::Json.load(dumped_string, opts) }
   end

data/benchmarking/individual/string-jr-sourced.rb

@@ -9,7 +9,7 @@ filename = File.expand_path(BenchOptions.source)
 opts = nil
 dumped_string = File.read(filename)
 
-Benchmark.bmbm("jackson parse symbol + bigdecimal:  ".size) do |x|
+Benchmark.bmbm(BenchOptions.output_width) do |x|
   x.report("jackson parse string keys: #{BenchOptions.iterations}") do
     BenchOptions.iterations.times { JrJackson::Json.load(dumped_string, opts) }
   end

data/benchmarking/individual/sym-bd-jr-sourced.rb

@@ -9,7 +9,7 @@ filename = File.expand_path(BenchOptions.source)
 opts = {use_bigdecimal: true, symbolize_keys: true}
 dumped_string = File.read(filename)
 
-Benchmark.bmbm("jackson parse symbol + bigdecimal:  ".size) do |x|
+Benchmark.bmbm(BenchOptions.output_width) do |x|
   x.report("jackson parse symbol + bigdecimal: #{BenchOptions.iterations}") do
     BenchOptions.iterations.times { JrJackson::Json.load(dumped_string, opts) }
   end

data/benchmarking/individual/symbol-jr-sourced.rb

@@ -9,7 +9,7 @@ filename = File.expand_path(BenchOptions.source)
 opts = {use_bigdecimal: false, symbolize_keys: true}
 dumped_string = File.read(filename)
 
-Benchmark.bmbm("jackson parse symbol + bigdecimal:  ".size) do |x|
+Benchmark.bmbm(BenchOptions.output_width) do |x|
   x.report("jackson parse symbol keys: #{BenchOptions.iterations}") do
     BenchOptions.iterations.times { JrJackson::Json.load(dumped_string, opts) }
   end

data/dependency-reduced-pom.xml

@@ -4,7 +4,7 @@
   <groupId>com.jrjackson.jruby</groupId>
   <artifactId>jrjackson</artifactId>
   <name>jrjackson</name>
-  <version>1.2.4</version>
+  <version>1.2.6</version>
   <url>http://maven.apache.org</url>
   <build>
     <plugins>
@@ -65,7 +65,7 @@
     <dependency>
       <groupId>org.jruby</groupId>
       <artifactId>jruby</artifactId>
-      <version>1.7.4</version>
+      <version>1.7.5</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>

data/lib/jrjackson/jrjackson.rb

@@ -3,8 +3,8 @@ unless RUBY_PLATFORM =~ /java/
   exit 255
 end
 
-require_relative "jars/jrjackson-1.2.4.jar"
-# require_relative "linked/jrjackson-1.2.4.jar"
+require_relative "jars/jrjackson-1.2.6.jar"
+# require_relative "linked/jrjackson-1.2.6.jar"
 
 require 'com/jrjackson/jr_jackson'
 
@@ -33,7 +33,7 @@ module JrJackson
 
       def dump(object)
         case object
-        when Array, Hash, String
+        when Array, Hash, String, Java::JavaUtil::LinkedHashMap
           JrJackson::Raw.generate(object)
         when true, false
           object.to_s

data/lib/jrjackson/version.rb

@@ -1,3 +1,3 @@
 module JrJackson
-  VERSION = '0.2.3'
+  VERSION = '0.2.4'
 end

data/pom.xml

@@ -5,7 +5,7 @@
   <groupId>com.jrjackson.jruby</groupId>
   <artifactId>jrjackson</artifactId>
   <packaging>jar</packaging>
-  <version>1.2.4</version>
+  <version>1.2.6</version>
   <name>jrjackson</name>
   <url>http://maven.apache.org</url>
   
@@ -23,7 +23,7 @@
     <dependency>
       <groupId>org.jruby</groupId>
       <artifactId>jruby</artifactId>
-      <version>1.7.4</version>
+      <version>1.7.5</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>

data/run_all_individual_bench.sh

@@ -1,10 +1,10 @@
 #!/bin/sh
 
-ruby benchmarking/individual/json-mri-sourced.rb
-ruby benchmarking/individual/oj-mri-sourced.rb
+# ruby benchmarking/individual/json-mri-sourced.rb
+# ruby benchmarking/individual/oj-mri-sourced.rb
 
-jruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/gson-jr-sourced.rb
-jruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/json-jr-sourced.rb
+# jruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/gson-jr-sourced.rb
+# jruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/json-jr-sourced.rb
 
 jruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/string-jr-sourced.rb
 jruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/str-bd-jr-sourced.rb
@@ -15,9 +15,9 @@ jruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/sym-bd-jr-sourc
 jruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/raw-jr-sourced.rb
 jruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/raw-bd-jr-sourced.rb
 
-ruby benchmarking/individual/json-gen-mri-sourced.rb
-ruby benchmarking/individual/oj-gen-mri-sourced.rb
+# ruby benchmarking/individual/json-gen-mri-sourced.rb
+# ruby benchmarking/individual/oj-gen-mri-sourced.rb
 
-jruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/json-gen-jr-sourced.rb 
-jruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/gson-gen-jr-sourced.rb 
+# jruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/json-gen-jr-sourced.rb 
+# jruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/gson-gen-jr-sourced.rb 
 jruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/raw-gen-jr-sourced.rb 

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

@@ -25,38 +25,13 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 
 @JRubyModule(name = "JrJacksonRaw")
 public class JrJacksonRaw extends RubyObject {
-  private static final HashMap<String, ObjectMapper> mappers = new HashMap<String, ObjectMapper>(3);
-  private static final HashMap<String, RubySymbol> symbols = new HashMap<String, RubySymbol>(3);
-
-  private static final Ruby _ruby = Ruby.getGlobalRuntime();
-
-  static {
-    mappers.put("str",
-      RubyJacksonModule.mappedAs("str")
-    );
-    mappers.put("sym",
-      RubyJacksonModule.mappedAs("sym")
-    );
-    mappers.put("raw",
-      RubyJacksonModule.mappedAs("raw")
-    );
-    symbols.put("sym",
-      RubyUtils.rubySymbol(_ruby, "symbolize_keys")
-    );
-    symbols.put("raw",
-      RubyUtils.rubySymbol(_ruby, "raw")
-    );
-    symbols.put("bigdecimal",
-      RubyUtils.rubySymbol(_ruby, "use_bigdecimal")
-    );
-  }
 
   public JrJacksonRaw(Ruby ruby, RubyClass metaclass) {
     super(ruby, metaclass);
   }
 
-  private static boolean flagged(RubyHash opts, String key) {
-    Object val = opts.get(symbols.get(key));
+  private static boolean flagged(RubyHash opts, RubySymbol key) {
+    Object val = opts.get(key);
     if (val == null) {
       return false;
     }
@@ -69,19 +44,21 @@ public class JrJacksonRaw extends RubyObject {
     throws IOException
   {
     RubyHash options = null;
-    String key = "str";
-    ObjectMapper local;
+    ObjectMapper local = null;
+    Ruby _ruby = context.getRuntime();
 
     if (opts != context.nil) {
       options = opts.convertToHash();
-      if (flagged(options, "sym")) {
-        key = "sym";
+      if (flagged(options, RubyUtils.rubySymbol(_ruby, "symbolize_keys"))) {
+        local = RubyJacksonModule.mappedAs("sym", _ruby);
       }
-      if (flagged(options, "raw")) {
-        key = "raw";
+      if (flagged(options, RubyUtils.rubySymbol(_ruby, "raw"))) {
+        local = RubyJacksonModule.mappedAs("raw", _ruby);
       }
-      local = mappers.get(key).copy();
-      if (flagged(options, "bigdecimal")) {
+      if (local == null) {
+        local = RubyJacksonModule.mappedAs("str", _ruby);
+      }
+      if (flagged(options, RubyUtils.rubySymbol(_ruby, "use_bigdecimal"))) {
         local.enable(DeserializationFeature.USE_BIG_DECIMAL_FOR_FLOATS);
       }
       else {
@@ -89,7 +66,7 @@ public class JrJacksonRaw extends RubyObject {
       }
     }
     else {
-      local = mappers.get(key).copy();
+      local = RubyJacksonModule.mappedAs("str", _ruby);
     }
     return _parse(context, arg, local);
   }
@@ -98,28 +75,30 @@ public class JrJacksonRaw extends RubyObject {
   public static IRubyObject parse_raw(ThreadContext context, IRubyObject self, IRubyObject arg)
     throws IOException
   {
-    return _parse(context, arg, mappers.get("raw"));
+    ObjectMapper mapper = RubyJacksonModule.mappedAs("raw", context.getRuntime());
+    return _parse(context, arg, mapper);
   }
 
   @JRubyMethod(module = true, name = {"parse_sym", "load_sym"}, required = 1)
   public static IRubyObject parse_sym(ThreadContext context, IRubyObject self, IRubyObject arg)
     throws IOException
   {
-    return _parse(context, arg, mappers.get("sym"));
+    ObjectMapper mapper = RubyJacksonModule.mappedAs("sym", context.getRuntime());
+    return _parse(context, arg, mapper);
   }
 
   @JRubyMethod(module = true, name = {"parse_str", "load_str"}, required = 1)
   public static IRubyObject parse_str(ThreadContext context, IRubyObject self, IRubyObject arg)
     throws IOException
   {
-    return _parse(context, arg, mappers.get("str"));
+    ObjectMapper mapper = RubyJacksonModule.mappedAs("str", context.getRuntime());
+    return _parse(context, arg, mapper);
   }
 
-  public static IRubyObject _parse(ThreadContext context, IRubyObject arg, ObjectMapper mapper) 
+  private static IRubyObject _parse(ThreadContext context, IRubyObject arg, ObjectMapper mapper) 
     throws IOException
   {
     Ruby ruby = context.getRuntime();
-
     try {
       Object o;
       if (arg instanceof RubyString) {
@@ -147,20 +126,18 @@ public class JrJacksonRaw extends RubyObject {
   public static IRubyObject generate(ThreadContext context, IRubyObject self, IRubyObject arg)
     throws IOException, JsonProcessingException
   {
-    Ruby ruby = context.getRuntime();
+    Ruby _ruby = context.getRuntime();
     Object obj = arg.toJava(Object.class);
-      // String s = mappers.get("raw").writeValueAsString(obj);
-      // return RubyUtils.rubyString(ruby, s);
-
     try {
-      String s = mappers.get("raw").writeValueAsString(obj);
-      return RubyUtils.rubyString(ruby, s);
+      ObjectMapper mapper = RubyJacksonModule.mappedAs("raw", _ruby);
+      String s = mapper.writeValueAsString(obj);
+      return RubyUtils.rubyString(_ruby, s);
     }
     catch (JsonProcessingException e) {
-      throw ParseError.newParseError(ruby, e.getLocalizedMessage());
+      throw ParseError.newParseError(_ruby, e.getLocalizedMessage());
     }
     catch (IOException e) {
-      throw ruby.newIOError(e.getLocalizedMessage());
+      throw _ruby.newIOError(e.getLocalizedMessage());
     }
   }
 }

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

@@ -4,7 +4,6 @@ import java.util.*;
 import java.text.SimpleDateFormat;
 
 import org.jruby.*;
-// import org.jruby.util.RubyDateFormat;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.module.SimpleModule;
@@ -17,32 +16,39 @@ import com.fasterxml.jackson.module.afterburner.AfterburnerModule;
 public class RubyJacksonModule extends SimpleModule
 {
 
+  private static final ObjectMapper static_mapper = new ObjectMapper().registerModule(
+    new RubyJacksonModule().addSerializer(RubyObject.class, RubyAnySerializer.instance)
+  );
+
+  static {
+    static_mapper.registerModule(new AfterburnerModule());
+    static_mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
+    static_mapper.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss z"));
+  }
+
   private RubyJacksonModule()
   {
     super("JrJacksonStrModule", VersionUtil.versionFor(RubyJacksonModule.class));
   }
 
-  public static ObjectMapper mappedAs(String key)
+  public static ObjectMapper mappedAs(String key, Ruby ruby)
   {
-    ObjectMapper mapper = new ObjectMapper();
-    
-    mapper.registerModule(
+    if (key == "raw") {
+      return static_mapper;
+    }
+
+    ObjectMapper mapper = new ObjectMapper().registerModule(
       new AfterburnerModule()
     );
 
     if (key == "sym") {
       mapper.registerModule(
-        asSym()
-      );
-    }
-    else if (key == "raw") {
-      mapper.registerModule(
-        asRaw()
+        asSym(ruby)
       );
     }
     else {
       mapper.registerModule(
-        asStr()
+        asStr(ruby)
       );
     }
     mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
@@ -50,28 +56,26 @@ public class RubyJacksonModule extends SimpleModule
     return mapper;
   }
 
-  public static SimpleModule asRaw()
-  { 
-    return new RubyJacksonModule().addSerializer(
-      RubyObject.class, RubyAnySerializer.instance
-    );
-  }
+  // public static SimpleModule asRaw()
+  // { 
+  //   return static_mapper;
+  // }
 
-  public static SimpleModule asSym()
+  public static SimpleModule asSym(Ruby ruby)
   { 
     return new RubyJacksonModule().addSerializer(
       RubyObject.class, RubyAnySerializer.instance
     ).addDeserializer(
-      Object.class, new RubyObjectDeserializer().setSymbolStrategy()
+      Object.class, new RubyObjectDeserializer().withRuby(ruby).setSymbolStrategy()
     );
   }
 
-  public static SimpleModule asStr()
+  public static SimpleModule asStr(Ruby ruby)
   { 
     return new RubyJacksonModule().addSerializer(
       RubyObject.class, RubyAnySerializer.instance
     ).addDeserializer(
-      Object.class, new RubyObjectDeserializer().setStringStrategy()
+      Object.class, new RubyObjectDeserializer().withRuby(ruby).setStringStrategy()
     );
   }
 }

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

@@ -8,5 +8,5 @@ import org.jruby.RubyObject;
 
 public interface RubyKeyConverter
 {
-  public RubyObject convert(JsonParser jp) throws IOException;
+  public RubyObject convert(Ruby ruby, JsonParser jp) throws IOException;
 }

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

@@ -22,16 +22,22 @@ public class RubyObjectDeserializer
 {
   private static final long serialVersionUID = 1L;
 
-  private final static RubyObject[] NO_OBJECTS = new RubyObject[0];
+  // private final static RubyObject[] NO_OBJECTS = new RubyObject[0];
 
-  protected final static Ruby __ruby__ = Ruby.getGlobalRuntime();
+  private Ruby _ruby;
 
   private RubyKeyConverter converter;
   
-  public RubyObjectDeserializer() { 
+  public RubyObjectDeserializer() {
     super(RubyObject.class);
   }
 
+  public RubyObjectDeserializer withRuby(Ruby ruby)
+  {
+    _ruby = ruby;
+    return this;
+  }
+
   public RubyObjectDeserializer setStringStrategy()
   {
     converter = new RubyStringConverter();
@@ -44,10 +50,6 @@ public class RubyObjectDeserializer
     return this;
   }
 
-  /**
-   * @since 2.2
-  */
-
   /**
   /**********************************************************
   /* Deserializer API
@@ -66,38 +68,38 @@ public class RubyObjectDeserializer
         return mapArray(jp, ctxt);
 
       case FIELD_NAME:
-        return converter.convert(jp);
+        return converter.convert(_ruby, jp);
 
       case VALUE_EMBEDDED_OBJECT:
-        return RubyUtils.rubyObject(__ruby__, jp.getEmbeddedObject());
+        return RubyUtils.rubyObject(_ruby, jp.getEmbeddedObject());
 
       case VALUE_STRING:
-        // return RubyUtils.rubyString(__ruby__, jp.getText().getBytes("UTF-8"));
-        return RubyUtils.rubyString(__ruby__, jp.getText());
+        // return RubyUtils.rubyString(_ruby, jp.getText().getBytes("UTF-8"));
+        return RubyUtils.rubyString(_ruby, jp.getText());
 
       case VALUE_NUMBER_INT:
         /* [JACKSON-100]: caller may want to get all integral values
          * returned as BigInteger, for consistency
          */
         if (ctxt.isEnabled(DeserializationFeature.USE_BIG_INTEGER_FOR_INTS)) {
-            return RubyUtils.rubyBignum(__ruby__, jp.getBigIntegerValue());
+            return RubyUtils.rubyBignum(_ruby, jp.getBigIntegerValue());
           }
-        return RubyUtils.rubyFixnum(__ruby__, jp.getLongValue());
+        return RubyUtils.rubyFixnum(_ruby, jp.getLongValue());
 
       case VALUE_NUMBER_FLOAT:
         if (ctxt.isEnabled(DeserializationFeature.USE_BIG_DECIMAL_FOR_FLOATS)) {
-          return RubyUtils.rubyBigDecimal(__ruby__, jp.getDecimalValue());
+          return RubyUtils.rubyBigDecimal(_ruby, jp.getDecimalValue());
         }
-        return RubyUtils.rubyFloat(__ruby__, jp.getDoubleValue());
+        return RubyUtils.rubyFloat(_ruby, jp.getDoubleValue());
 
       case VALUE_TRUE:
-        return __ruby__.newBoolean(Boolean.TRUE);
+        return _ruby.newBoolean(Boolean.TRUE);
 
       case VALUE_FALSE:
-        return __ruby__.newBoolean(Boolean.FALSE);
+        return _ruby.newBoolean(Boolean.FALSE);
 
       case VALUE_NULL: // should not get this but...
-        return null;
+        return (RubyObject)_ruby.getNil();
 
       case END_ARRAY: // invalid
       case END_OBJECT: // invalid
@@ -123,7 +125,7 @@ public class RubyObjectDeserializer
     // }
     // Minor optimization to handle small lists (default size for ArrayList is 10)
     if (jp.nextToken() == JsonToken.END_ARRAY) {
-      return RubyArray.newArray(__ruby__);
+      return RubyArray.newArray(_ruby);
     }
     ObjectBuffer buffer = ctxt.leaseObjectBuffer();
     Object[] values = buffer.resetAndStart();
@@ -139,7 +141,7 @@ public class RubyObjectDeserializer
       values[ptr++] = value;
     } while (jp.nextToken() != JsonToken.END_ARRAY);
       // let's create almost full array, with 1/8 slack
-    RubyArray result = RubyArray.newArray(__ruby__, (totalSize + (totalSize >> 3) + 1));
+    RubyArray result = RubyArray.newArray(_ruby, (totalSize + (totalSize >> 3) + 1));
     buffer.completeAndClearBuffer(values, ptr, result);
     return result;
   }
@@ -157,29 +159,29 @@ public class RubyObjectDeserializer
     // 1.6: minor optimization; let's handle 1 and 2 entry cases separately
     if (t != JsonToken.FIELD_NAME) { // and empty one too
         // empty map might work; but caller may want to modify... so better just give small modifiable
-      return RubyHash.newHash(__ruby__);
+      return RubyHash.newHash(_ruby);
     }
 
-    RubyObject field1 = converter.convert(jp);
+    RubyObject field1 = converter.convert(_ruby, jp);
     jp.nextToken();
     RubyObject value1 = deserialize(jp, ctxt);
     if (jp.nextToken() != JsonToken.FIELD_NAME) { // single entry; but we want modifiable
-      return RuntimeHelpers.constructHash(__ruby__, field1, value1);
+      return RuntimeHelpers.constructHash(_ruby, field1, value1);
     }
 
-    RubyObject field2 = converter.convert(jp);
+    RubyObject field2 = converter.convert(_ruby, jp);
     jp.nextToken();
     RubyObject value2 = deserialize(jp, ctxt);
     if (jp.nextToken() != JsonToken.FIELD_NAME) {
-      return RuntimeHelpers.constructHash(__ruby__, field1, value1, field2, value2);
+      return RuntimeHelpers.constructHash(_ruby, field1, value1, field2, value2);
     }
 
     // And then the general case; default map size is 16
-    RubyHash result = RuntimeHelpers.constructHash(__ruby__, field1, value1, field2, value2);
+    RubyHash result = RuntimeHelpers.constructHash(_ruby, field1, value1, field2, value2);
     do {
-      RubyObject fieldName = converter.convert(jp);
+      RubyObject fieldName = converter.convert(_ruby, jp);
       jp.nextToken();
-      result.fastASetCheckString(__ruby__, fieldName, deserialize(jp, ctxt));
+      result.fastASetCheckString(_ruby, fieldName, deserialize(jp, ctxt));
     } while (jp.nextToken() != JsonToken.END_OBJECT);
     return result;
   }

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

@@ -8,7 +8,7 @@ import org.jruby.RubyObject;
 
 public class RubyStringConverter implements RubyKeyConverter
 {
-  public RubyObject convert(JsonParser jp) throws IOException {
-    return RubyUtils.rubyString(Ruby.getGlobalRuntime(), jp.getText().getBytes());
+  public RubyObject convert(Ruby ruby, JsonParser jp) throws IOException {
+    return RubyUtils.rubyString(ruby, jp.getText().getBytes());
   }
 }

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

@@ -8,7 +8,7 @@ import org.jruby.RubyObject;
 
 public class RubySymbolConverter implements RubyKeyConverter
 {
-  public RubyObject convert(JsonParser jp) throws IOException {
-    return RubyUtils.rubySymbol(Ruby.getGlobalRuntime(), jp.getText());
+  public RubyObject convert(Ruby ruby, JsonParser jp) throws IOException {
+    return RubyUtils.rubySymbol(ruby, jp.getText());
   }
 }

data/test/jrjackson_test.rb

@@ -91,6 +91,13 @@ class JrJacksonTest < Test::Unit::TestCase
     assert_equal expected, actual
   end
 
+  def test_can_parse_nulls
+    expected = {"foo" => nil}
+    json = '{"foo":null}'
+    actual = JrJackson::Json.parse(json)
+    assert_equal expected, actual
+  end
+
   def test_can_parse_big_decimals
     expected = BigDecimal.new '0.12345678901234567890123456789'
     json = '{"foo":0.12345678901234567890123456789}'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jrjackson
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Guy Boertje
@@ -59,7 +59,7 @@ files:
 - dependency-reduced-pom.xml
 - jrjackson.gemspec
 - lib/jrjackson.rb
-- lib/jrjackson/jars/jrjackson-1.2.4.jar
+- lib/jrjackson/jars/jrjackson-1.2.6.jar
 - lib/jrjackson/jrjackson.rb
 - lib/jrjackson/version.rb
 - lib/require_relative_patch.rb