jrjackson 0.4.0-java → 0.4.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 982ae2aa319906690bf3f8f3fa6ecd40306cdeb5
-  data.tar.gz: 3dfb8850a41321f74269587ae09b27a2a0253730
+  metadata.gz: 07684d7dc09c577c8ca59c40029b672740f54df5
+  data.tar.gz: 6b4ada75e21a4aa5db9cbda3c0a58ecc6d91f751
 SHA512:
-  metadata.gz: a162733e1d223aa7da6b973d9bfbbbb8c5c5ec079720c4303a43611c21e3de0749f35fecddac6e514fce85b0b583cca25fb97f5a71c6cc0753235357c9fbd69b
-  data.tar.gz: 5ca7749fd751a2edebd189e830c241cb51997c0a51fa9c844f0517578f0aa4c5fc96244912e0945e6710731e411547ab86ba509a47dfa24d70aeea1d7d4fef37
+  metadata.gz: 20fff6041d8ca57dad6828c43cc942948051d94ac76ce1958507170c556084d69b73ab5235a63d9367a795dd32bdf6f31ab7a46dbc05277c8457347dc979daaa
+  data.tar.gz: abc4caca39b0b37f302824d76ab230498d0cf25d4957dc5028145792493d494a08fcf4967a65a61b179e54f57e14fedd6cc379df173dd13c076a9d552da9d1ee

data/Mavenfile

@@ -1,6 +1,6 @@
 #-*- mode: ruby -*-
 
-VERSION='1.2.19'
+VERSION='1.2.20'
 gemspec :jar => "jrjackson/jars/jrjackson-#{VERSION}.jar"
 
 # overwrite groupId:artifacgtId:version from gem
@@ -15,7 +15,7 @@ properties 'project.build.sourceEncoding' => 'UTF-8',
 
 jar 'junit:junit', '4.11', :scope => :test
 
-jar 'org.jruby:jruby', '9.0.5.0', :scope => :provided
+jar 'org.jruby:jruby', '9.1.5.0', :scope => :provided
 
 plugin :compiler, '3.1', :source => '1.7', :target => '1.7',
        :showDeprecation => false,

data/changelog.md

@@ -1,3 +1,10 @@
+v0.4.1
+  fix for issue 55
+    Refactor AnySerializer acceptable class detection that does not use an exception
+
+v0.4.0
+  Implement `to_s` and Exception serialization
+
 v0.3.9
   Thanks to mkristian, now uses jar_dependencies
     Upgrade to Jackson v2.7.1

data/lib/jrjackson/build_info.rb

@@ -1,11 +1,11 @@
 module JrJackson
   module BuildInfo
     def self.version
-      '0.4.0'
+      '0.4.1'
     end
 
     def self.release_date
-      '2016-05-11'
+      '2016-11-28'
     end
 
     def self.files

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.19</version>
+  <version>1.2.20</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>
@@ -88,7 +88,7 @@ DO NOT MODIFIY - GENERATED CODE
     <dependency>
       <groupId>org.jruby</groupId>
       <artifactId>jruby</artifactId>
-      <version>9.0.5.0</version>
+      <version>9.1.5.0</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
@@ -126,7 +126,7 @@ DO NOT MODIFIY - GENERATED CODE
         </executions>
         <configuration>
           <outputDirectory>lib/jrjackson/jars</outputDirectory>
-          <finalName>jrjackson-1.2.19</finalName>
+          <finalName>jrjackson-1.2.20</finalName>
         </configuration>
       </plugin>
       <plugin>
@@ -137,7 +137,7 @@ DO NOT MODIFIY - GENERATED CODE
             <fileset>
               <directory>lib/jrjackson/jars</directory>
               <includes>
-                <include>jrjackson-1.2.19.jar</include>
+                <include>jrjackson-1.2.20.jar</include>
                 <include>*/**/*.jar</include>
               </includes>
             </fileset>

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

@@ -12,25 +12,25 @@ import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializerProvider;
-import java.io.ByteArrayOutputStream;
+import org.jcodings.specific.UTF8Encoding;
+import org.jruby.Ruby;
+import org.jruby.RubyClass;
 import org.jruby.RubyHash;
 import org.jruby.RubyIO;
 import org.jruby.RubyObject;
 import org.jruby.RubyString;
+import org.jruby.RubySymbol;
 import org.jruby.anno.JRubyMethod;
 import org.jruby.exceptions.RaiseException;
 import org.jruby.ext.stringio.StringIO;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
+import org.jruby.util.ByteList;
 
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.TimeZone;
-import org.jcodings.specific.UTF8Encoding;
-import org.jruby.Ruby;
-import org.jruby.RubyClass;
-import org.jruby.RubySymbol;
-import org.jruby.util.ByteList;
 
 /**
  *

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

@@ -27,6 +27,8 @@ public class RubyAnySerializer extends JsonSerializer<IRubyObject> {
     private static final String CSP = ": ";
     private static final String GT = ">";
 
+    private static final RUBYCLASS[] CLASS_NAMES = RUBYCLASS.values();
+
     public RubyAnySerializer() {
 //        super(IRubyObject.class);
 
@@ -104,78 +106,87 @@ public class RubyAnySerializer extends JsonSerializer<IRubyObject> {
         String rubyClassName = value.getType().getName();
 
         if (value.isNil()) {
-
             jgen.writeNull(); // for RubyNil and NullObjects
+            return;
+        }
 
-        } else if (value instanceof JavaProxy) {
-
+        if (value instanceof JavaProxy) {
             provider.defaultSerializeValue(((JavaProxy) value).getObject(), jgen);
+            return;
+        }
+
+        if (value instanceof RubyStruct) {
+            IRubyObject obj = value.callMethod(value.getRuntime().getCurrentContext(), "to_a");
+            serializeArray(obj, jgen, provider);
+            return;
+        }
 
-        } else if (value instanceof RubyException) {
+        if (value instanceof RubyException) {
             RubyException re = (RubyException) value;
             String msg = re.message(value.getRuntime().getCurrentContext()).toString();
             StringBuilder sb = new StringBuilder(5 + rubyClassName.length() + msg.length());
             sb.append(HLT).append(rubyClassName).append(CSP).append(msg).append(GT);
             jgen.writeString(sb.toString());
+            return;
+        }
 
-        } else if (value.isClass() || value.isModule()) {
-
+        if (value.isClass() || value.isModule()) {
             jgen.writeString(value.inspect().toString());
+            return;
+        }
 
-        } else {
-
-            RUBYCLASS clazz;
+        RUBYCLASS clazz = null;
 
-            try {
-                clazz = RUBYCLASS.valueOf(rubyClassName);
-            } catch (IllegalArgumentException e) {
-                serializeUnknownRubyObject(value.getRuntime().getCurrentContext(), value, jgen, provider);
-                return;
+        for(RUBYCLASS v : CLASS_NAMES) {
+            if(rubyClassName.equals(v.name())) {
+                clazz = v;
+                break;
             }
+        }
 
-            switch (clazz) {
-                case Hash:
-                    serializeHash(value, jgen, provider);
-                    break;
-                case Array:
-                    serializeArray(value, jgen, provider);
-                    break;
-                case String:
-                    RubyUtils.writeBytes(value, jgen);
-                    break;
-                case Symbol:
-                case Date:
-                    // Date to_s -> yyyy-mm-dd
-                    RubyString s = value.asString();
-                    jgen.writeUTF8String(s.getBytes(), 0, s.size());
-                    break;
-                case TrueClass:
-                case FalseClass:
-                    jgen.writeBoolean(value.isTrue());
-                    break;
-                case Float:
-                    jgen.writeNumber(RubyNumeric.num2dbl(value));
-                    break;
-                case Fixnum:
-                    jgen.writeNumber(RubyNumeric.num2long(value));
-                    break;
-                case Bignum:
-                    jgen.writeNumber(((RubyBignum) value).getBigIntegerValue());
-                    break;
-                case BigDecimal:
-                    jgen.writeNumber(((RubyBigDecimal) value).getBigDecimalValue());
-                    break;
-                case Struct:
-                    IRubyObject obj = value.callMethod(value.getRuntime().getCurrentContext(), "to_a");
-                    serializeArray(obj, jgen, provider);
-                    break;
-                case Time:
-                    serializeTime((RubyTime) value, jgen, provider);
-                    break;
-                default:
-                    serializeUnknownRubyObject(value.getRuntime().getCurrentContext(), value, jgen, provider);
-                    break;
-            }
+        if (clazz == null) {
+            serializeUnknownRubyObject(value.getRuntime().getCurrentContext(), value, jgen, provider);
+            return;
+        }
+
+        switch (clazz) {
+            case Hash:
+                serializeHash(value, jgen, provider);
+                break;
+            case Array:
+                serializeArray(value, jgen, provider);
+                break;
+            case String:
+                RubyUtils.writeBytes(value, jgen);
+                break;
+            case Symbol:
+            case Date:
+                // Date to_s -> yyyy-mm-dd
+                RubyString s = value.asString();
+                jgen.writeUTF8String(s.getBytes(), 0, s.size());
+                break;
+            case TrueClass:
+            case FalseClass:
+                jgen.writeBoolean(value.isTrue());
+                break;
+            case Float:
+                jgen.writeNumber(RubyNumeric.num2dbl(value));
+                break;
+            case Fixnum:
+                jgen.writeNumber(RubyNumeric.num2long(value));
+                break;
+            case Bignum:
+                jgen.writeNumber(((RubyBignum) value).getBigIntegerValue());
+                break;
+            case BigDecimal:
+                jgen.writeNumber(((RubyBigDecimal) value).getBigDecimalValue());
+                break;
+            case Time:
+                serializeTime((RubyTime) value, jgen, provider);
+                break;
+            default:
+                serializeUnknownRubyObject(value.getRuntime().getCurrentContext(), value, jgen, provider);
+                break;
         }
     }
 
@@ -253,16 +264,15 @@ public class RubyAnySerializer extends JsonSerializer<IRubyObject> {
 
     enum RUBYCLASS {
         String,
+        Fixnum,
+        Hash,
+        Array,
         Float,
         BigDecimal,
         Time,
-        Array,
-        Hash,
-        Fixnum,
         Bignum,
         Date,
         Symbol,
-        Struct,
         TrueClass,
         FalseClass
     }

data/src/test/java/com/jrjackson/RubyAnySerializerTest.java

@@ -0,0 +1,56 @@
+package com.jrjackson;
+
+import com.fasterxml.jackson.core.JsonEncoding;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import org.jcodings.specific.UTF8Encoding;
+import org.jruby.CompatVersion;
+import org.jruby.Ruby;
+import org.jruby.RubyHash;
+import org.jruby.RubyInstanceConfig;
+import org.jruby.ext.bigdecimal.RubyBigDecimal;
+import org.jruby.util.ByteList;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.io.ByteArrayOutputStream;
+
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+public class RubyAnySerializerTest {
+    private static boolean setupDone = false;
+    public static Ruby ruby;
+
+    @Before
+    public void setUp() throws Exception {
+        if (setupDone) return;
+
+        RubyInstanceConfig config_19 = new RubyInstanceConfig();
+        config_19.setCompatVersion(CompatVersion.RUBY1_9);
+        ruby = Ruby.newInstance(config_19);
+        RubyBigDecimal.createBigDecimal(ruby); // we need to do 'require "bigdecimal"'
+//        JrubyTimestampExtLibrary.createTimestamp(ruby);
+        setupDone = true;
+    }
+
+
+    @Test
+    public void testSerialize() throws Exception {
+        RubyHash rh = RubyHash.newHash(ruby);
+        rh.put("somekey", 123);
+
+        SerializerProvider provider = RubyJacksonModule.createProvider();
+
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        JsonGenerator jgen = RubyJacksonModule.factory.createGenerator(
+                baos, JsonEncoding.UTF8);
+
+        RubyAnySerializer.instance.serialize(rh, jgen, provider);
+        jgen.close();
+        ByteList bl = new ByteList(baos.toByteArray(),
+                UTF8Encoding.INSTANCE);
+        assertThat(bl.toString(), is(equalTo("{\"somekey\":123}")));
+    }
+}

data/test/jrjackson_test.rb

@@ -76,6 +76,9 @@ class JrJacksonTest < Test::Unit::TestCase
 
   CustomStruct = Struct.new(:one, :two, :six)
 
+  class StrangeError < RuntimeError
+
+  end
 
   class ScHandler
     attr_accessor :calls
@@ -522,9 +525,8 @@ class JrJacksonTest < Test::Unit::TestCase
   end
 
   def test_can_serialize_exceptions
-    e = StandardError.new("Something immensely bad happened")
+    e = StrangeError.new("Something immensely bad happened")
     object = {'error' => e}
-
     actual = JrJackson::Json.dump(object)
     assert_equal "{\"error\":\"#{e.inspect}\"}", actual
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jrjackson
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: java
 authors:
 - Guy Boertje
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-05-11 00:00:00.000000000 Z
+date: 2016-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -65,8 +65,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .__jrubyrc
 - .gitignore
+- .jrubyr_c
 - .mvn/extensions.xml
 - Gemfile
 - Mavenfile
@@ -81,7 +81,7 @@ files:
 - lib/com/fasterxml/jackson/module/jackson-module-afterburner/2.7.3/jackson-module-afterburner-2.7.3.jar
 - lib/jrjackson.rb
 - lib/jrjackson/build_info.rb
-- lib/jrjackson/jars/jrjackson-1.2.19.jar
+- lib/jrjackson/jars/jrjackson-1.2.20.jar
 - lib/jrjackson/jrjackson.rb
 - lib/jrjackson_jars.rb
 - lib/require_relative_patch.rb
@@ -128,6 +128,7 @@ files:
 - src/main/java/com/jrjackson/SajParse.java
 - src/main/java/com/jrjackson/SchParse.java
 - src/main/java/com/jrjackson/StreamParse.java
+- src/test/java/com/jrjackson/RubyAnySerializerTest.java
 - test/jrjackson_test.rb
 homepage: http://github.com/guyboertje/jrjackson
 licenses: