jrjackson 0.4.3-java → 0.4.4-java

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: f7c5da0f49c40b8588b90ecd1b060b29d7ade289744586010d3d35be6b9b218d
4
- data.tar.gz: 3cdad361471439a14bac5fcdfeb99a38bc0975001c86ba2a2fc50258b93ee999
3
+ metadata.gz: 7c20d655d6755ab44b435da51b9813a73a0a036688229ad76450aa7188be5c0f
4
+ data.tar.gz: 80b509655b320daeb72aa0df851da143d27a70d98229ec61d5fe21715bdfd022
5
5
  SHA512:
6
- metadata.gz: 51833b5446f8380457ac3e72d7c9a4d29422e69fc0f571d07932131c0e87da560eecad0ed61259c8cda0571b64f4a13a7368073d498f49546345fa3bf165c1d0
7
- data.tar.gz: 8c5abf23abfb18da5cec7ca67adb7b610710c730a75f464f67581eeb7dd7e2f4df98b2e5d703ae0d547106243b40edef736dde711d43cd2f7acb430c9163ab2b
6
+ metadata.gz: b958eb80518ed442271be359f626f303381ac6ebbe303b5922d16b2635cf59a99e8125e30c543768d44efcf270677f6c5798b9dc8efa48bf82a29008dbf6f4ea
7
+ data.tar.gz: 2631f367b9cbb73062e4162f12f3ad89ae811f58a471858eeeb47749e358237644ed901b4cf5e0536fb52926444892022bb193dda7c6bc8b41e9f28a5d9515d9
data/changelog.md CHANGED
@@ -1,3 +1,7 @@
1
+ v0.4.4
2
+ fix for issue 64
3
+ Ruby parse() null/nil handling
4
+
1
5
  v0.4.3
2
6
  bump Jackson to v2.9.1
3
7
  make static_mapper public
@@ -1,11 +1,11 @@
1
1
  module JrJackson
2
2
  module BuildInfo
3
3
  def self.version
4
- '0.4.3'
4
+ '0.4.4'
5
5
  end
6
6
 
7
7
  def self.release_date
8
- '2017-09-21'
8
+ '2017-10-06'
9
9
  end
10
10
 
11
11
  def self.files
@@ -17,7 +17,7 @@ module JrJackson
17
17
  end
18
18
 
19
19
  def self.jar_version
20
- '1.2.21'
20
+ '1.2.22'
21
21
  end
22
22
  end
23
23
  end
data/pom.xml CHANGED
@@ -11,7 +11,7 @@ DO NOT MODIFIY - GENERATED CODE
11
11
  <modelVersion>4.0.0</modelVersion>
12
12
  <groupId>com.jrjackson.jruby</groupId>
13
13
  <artifactId>jrjackson</artifactId>
14
- <version>1.2.21</version>
14
+ <version>1.2.22</version>
15
15
  <name>A JRuby wrapper for the java jackson json processor jar</name>
16
16
  <description>A mostly native JRuby wrapper for the java jackson json processor jar</description>
17
17
  <url>http://github.com/guyboertje/jrjackson</url>
@@ -118,7 +118,7 @@ DO NOT MODIFIY - GENERATED CODE
118
118
  </executions>
119
119
  <configuration>
120
120
  <outputDirectory>lib/jrjackson/jars</outputDirectory>
121
- <finalName>jrjackson-1.2.21</finalName>
121
+ <finalName>jrjackson-1.2.22</finalName>
122
122
  </configuration>
123
123
  </plugin>
124
124
  <plugin>
@@ -129,7 +129,7 @@ DO NOT MODIFIY - GENERATED CODE
129
129
  <fileset>
130
130
  <directory>lib/jrjackson/jars</directory>
131
131
  <includes>
132
- <include>jrjackson-1.2.21.jar</include>
132
+ <include>jrjackson-1.2.22.jar</include>
133
133
  <include>*/**/*.jar</include>
134
134
  </includes>
135
135
  </fileset>
@@ -26,7 +26,7 @@ public class JrJacksonRuby extends JrJacksonBase {
26
26
 
27
27
  // deserialize
28
28
  @JRubyMethod(module = true, name = {"parse_sym", "load_sym"}, required = 2)
29
- public static Object parse_sym(ThreadContext context, IRubyObject self, IRubyObject arg, IRubyObject opts)
29
+ public static IRubyObject parse_sym(ThreadContext context, IRubyObject self, IRubyObject arg, IRubyObject opts)
30
30
  throws JsonProcessingException, IOException, RaiseException {
31
31
 
32
32
  return __parse(context, arg,
@@ -37,7 +37,7 @@ public class JrJacksonRuby extends JrJacksonBase {
37
37
  }
38
38
 
39
39
  @JRubyMethod(module = true, name = {"parse", "load"}, required = 2)
40
- public static Object parse(ThreadContext context, IRubyObject self, IRubyObject arg, IRubyObject opts)
40
+ public static IRubyObject parse(ThreadContext context, IRubyObject self, IRubyObject arg, IRubyObject opts)
41
41
  throws JsonProcessingException, IOException, RaiseException {
42
42
 
43
43
  RubyNameConverter konv = new RubyStringNameConverter();
@@ -63,7 +63,7 @@ public class JrJacksonRuby extends JrJacksonBase {
63
63
  return __parse(context, arg, konv, ikonv, dkonv);
64
64
  }
65
65
 
66
- private static Object __parse(ThreadContext context, IRubyObject arg,
66
+ private static IRubyObject __parse(ThreadContext context, IRubyObject arg,
67
67
  RubyNameConverter keykonv, RubyConverter intconv, RubyConverter decimalconv)
68
68
  throws JsonProcessingException, IOException, RaiseException {
69
69
 
@@ -108,7 +108,7 @@ public class RubyHandler implements IParseHandler<IRubyObject, RubyArray, RubyHa
108
108
 
109
109
  @Override
110
110
  public IRubyObject getResult() {
111
- return _result;
111
+ return _result == null ? _ctx.nil : _result;
112
112
  }
113
113
 
114
114
  @Override
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: jrjackson
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.4.3
4
+ version: 0.4.4
5
5
  platform: java
6
6
  authors:
7
7
  - Guy Boertje
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-09-21 00:00:00.000000000 Z
11
+ date: 2017-10-06 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  requirement: !ruby/object:Gem::Requirement
@@ -70,7 +70,7 @@ files:
70
70
  - lib/com/fasterxml/jackson/module/jackson-module-afterburner/2.9.1/jackson-module-afterburner-2.9.1.jar
71
71
  - lib/jrjackson.rb
72
72
  - lib/jrjackson/build_info.rb
73
- - lib/jrjackson/jars/jrjackson-1.2.21.jar
73
+ - lib/jrjackson/jars/jrjackson-1.2.22.jar
74
74
  - lib/jrjackson/jrjackson.rb
75
75
  - lib/jrjackson_jars.rb
76
76
  - lib/require_relative_patch.rb