jrjackson 0.4.3-java → 0.4.4-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7c5da0f49c40b8588b90ecd1b060b29d7ade289744586010d3d35be6b9b218d
-  data.tar.gz: 3cdad361471439a14bac5fcdfeb99a38bc0975001c86ba2a2fc50258b93ee999
+  metadata.gz: 7c20d655d6755ab44b435da51b9813a73a0a036688229ad76450aa7188be5c0f
+  data.tar.gz: 80b509655b320daeb72aa0df851da143d27a70d98229ec61d5fe21715bdfd022
 SHA512:
-  metadata.gz: 51833b5446f8380457ac3e72d7c9a4d29422e69fc0f571d07932131c0e87da560eecad0ed61259c8cda0571b64f4a13a7368073d498f49546345fa3bf165c1d0
-  data.tar.gz: 8c5abf23abfb18da5cec7ca67adb7b610710c730a75f464f67581eeb7dd7e2f4df98b2e5d703ae0d547106243b40edef736dde711d43cd2f7acb430c9163ab2b
+  metadata.gz: b958eb80518ed442271be359f626f303381ac6ebbe303b5922d16b2635cf59a99e8125e30c543768d44efcf270677f6c5798b9dc8efa48bf82a29008dbf6f4ea
+  data.tar.gz: 2631f367b9cbb73062e4162f12f3ad89ae811f58a471858eeeb47749e358237644ed901b4cf5e0536fb52926444892022bb193dda7c6bc8b41e9f28a5d9515d9

data/changelog.md

@@ -1,3 +1,7 @@
+v0.4.4
+  fix for issue 64
+    Ruby parse() null/nil handling
+
 v0.4.3
   bump Jackson to v2.9.1
   make static_mapper public

data/lib/jrjackson/build_info.rb

@@ -1,11 +1,11 @@
 module JrJackson
   module BuildInfo
     def self.version
-      '0.4.3'
+      '0.4.4'
     end
 
     def self.release_date
-      '2017-09-21'
+      '2017-10-06'
     end
 
     def self.files
@@ -17,7 +17,7 @@ module JrJackson
     end
 
     def self.jar_version
-      '1.2.21'
+      '1.2.22'
     end
   end
 end

data/pom.xml

@@ -11,7 +11,7 @@ DO NOT MODIFIY - GENERATED CODE
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.jrjackson.jruby</groupId>
   <artifactId>jrjackson</artifactId>
-  <version>1.2.21</version>
+  <version>1.2.22</version>
   <name>A JRuby wrapper for the java jackson json processor jar</name>
   <description>A mostly native JRuby wrapper for the java jackson json processor jar</description>
   <url>http://github.com/guyboertje/jrjackson</url>
@@ -118,7 +118,7 @@ DO NOT MODIFIY - GENERATED CODE
         </executions>
         <configuration>
           <outputDirectory>lib/jrjackson/jars</outputDirectory>
-          <finalName>jrjackson-1.2.21</finalName>
+          <finalName>jrjackson-1.2.22</finalName>
         </configuration>
       </plugin>
       <plugin>
@@ -129,7 +129,7 @@ DO NOT MODIFIY - GENERATED CODE
             <fileset>
               <directory>lib/jrjackson/jars</directory>
               <includes>
-                <include>jrjackson-1.2.21.jar</include>
+                <include>jrjackson-1.2.22.jar</include>
                 <include>*/**/*.jar</include>
               </includes>
             </fileset>

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

@@ -26,7 +26,7 @@ public class JrJacksonRuby extends JrJacksonBase {
 
     // deserialize
     @JRubyMethod(module = true, name = {"parse_sym", "load_sym"}, required = 2)
-    public static Object parse_sym(ThreadContext context, IRubyObject self, IRubyObject arg, IRubyObject opts)
+    public static IRubyObject parse_sym(ThreadContext context, IRubyObject self, IRubyObject arg, IRubyObject opts)
             throws JsonProcessingException, IOException, RaiseException {
 
         return __parse(context, arg,
@@ -37,7 +37,7 @@ public class JrJacksonRuby extends JrJacksonBase {
     }
 
     @JRubyMethod(module = true, name = {"parse", "load"}, required = 2)
-    public static Object parse(ThreadContext context, IRubyObject self, IRubyObject arg, IRubyObject opts)
+    public static IRubyObject parse(ThreadContext context, IRubyObject self, IRubyObject arg, IRubyObject opts)
             throws JsonProcessingException, IOException, RaiseException {
 
         RubyNameConverter konv = new RubyStringNameConverter();
@@ -63,7 +63,7 @@ public class JrJacksonRuby extends JrJacksonBase {
         return __parse(context, arg, konv, ikonv, dkonv);
     }
 
-    private static Object __parse(ThreadContext context, IRubyObject arg,
+    private static IRubyObject __parse(ThreadContext context, IRubyObject arg,
                 RubyNameConverter keykonv, RubyConverter intconv, RubyConverter decimalconv)
             throws JsonProcessingException, IOException, RaiseException {
 

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

@@ -108,7 +108,7 @@ public class RubyHandler implements IParseHandler<IRubyObject, RubyArray, RubyHa
 
     @Override
     public IRubyObject getResult() {
-        return _result;
+        return _result == null ? _ctx.nil : _result;
     }
 
     @Override

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jrjackson
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: java
 authors:
 - Guy Boertje
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-09-21 00:00:00.000000000 Z
+date: 2017-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -70,7 +70,7 @@ files:
 - lib/com/fasterxml/jackson/module/jackson-module-afterburner/2.9.1/jackson-module-afterburner-2.9.1.jar
 - lib/jrjackson.rb
 - lib/jrjackson/build_info.rb
-- lib/jrjackson/jars/jrjackson-1.2.21.jar
+- lib/jrjackson/jars/jrjackson-1.2.22.jar
 - lib/jrjackson/jrjackson.rb
 - lib/jrjackson_jars.rb
 - lib/require_relative_patch.rb