jrjackson 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9cfaa7407bdd2661d42803ddeb31cd08cb5f64cd
-  data.tar.gz: 12c5ff2193c1b189cecbea58972a2f7b6aefb622
+  metadata.gz: 40a6bbd8555b9dca8cf37b6e7e2f41692ae2bd2b
+  data.tar.gz: af10130421ae850aea53f6b8396de32530605655
 SHA512:
-  metadata.gz: a6c5d5db9a8874e9f19297de099a048c8913a8ad6df1d0e7758bd0dcfd9ef57a07dae2bd8db4c22b5dc077ff8745667ce23854c63e745cddb65b05c5e2f940db
-  data.tar.gz: 677855c6cd7ae971d70b3865092483b8a55cf136ae07fed3e166440dd8ee843d562db67e72efa4a09513198c0a9c95c6f468e57ad840fbd9d77d5009e7d365bc
+  metadata.gz: bab3ca8847f2dbe92becd2fee1c201a0abd72378c922b0814920cba71ff8390f1fb9237ff1efa32c40ffbf8678d7fa3f255b9e85f45932fd57523de6c5982d2a
+  data.tar.gz: ae557540edc4d20a2e993da24f81d3ea35a092a2dd76b28815bede1ce9cac5a477aa9106277067749bc0a3a3487cc6a264b10d1fb10e09697a913868a6f33305

data/README.md

@@ -18,8 +18,10 @@ There is now a MultiJson adapter added for JrJackson
 
 #### NEWS
 
+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 metod is called, but additionally
+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. 
 

data/changelog.md

@@ -1,8 +1,22 @@
+v0.2.8
+  fixes for issues-28,29,31
+    correction for Time#to_s
+    new options to control date serialization
+    optimizations suggested by @headius
+  jar compiled for jruby 1.7.17
+  jruby 1.7.17
+  jackson 2.4.4
+
+v0.2.7
+  fixes for issues-23,24
+    add to_time as option for serializing Time like objects
+  jar compiled for jruby 1.7.11
+
 v0.2.6
   fix issue-20
     allow jruby to convert Ruby StringIO into Java
     by not type checking passed arg
-    this is because jruby 1.7.9 has changed the type of java object backing Ruby StingIO
+    this is because jruby 1.7.9 has changed the type of java object backing Ruby StringIO
   jar compiled for jruby 1.7.8 (jruby 1.7.9 in the maven repo has an error in the pom.xml)
   jruby 1.7.8, jruby 1.7.9 (tested)
   jackson 2.3.0

data/dependency-reduced-pom.xml

@@ -4,7 +4,7 @@
   <groupId>com.jrjackson.jruby</groupId>
   <artifactId>jrjackson</artifactId>
   <name>jrjackson</name>
-  <version>1.2.9</version>
+  <version>1.2.11</version>
   <url>http://maven.apache.org</url>
   <build>
     <plugins>
@@ -22,14 +22,14 @@
       </plugin>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.16</version>
+        <version>2.17</version>
         <configuration>
           <skipTests>true</skipTests>
         </configuration>
       </plugin>
       <plugin>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>2.1</version>
+        <version>2.3</version>
         <executions>
           <execution>
             <phase>package</phase>
@@ -66,7 +66,7 @@
     <dependency>
       <groupId>org.jruby</groupId>
       <artifactId>jruby</artifactId>
-      <version>1.7.11</version>
+      <version>1.7.17</version>
       <scope>provided</scope>
       <exclusions>
         <exclusion>

data/lib/jrjackson/build_info.rb

@@ -1,7 +1,7 @@
 module JrJackson
   module BuildInfo
     def self.version
-      '0.2.7'
+      '0.2.8'
     end
 
     def self.files

data/lib/jrjackson/jrjackson.rb

@@ -3,8 +3,8 @@ unless RUBY_PLATFORM =~ /java/
   exit 255
 end
 
-require_relative "jars/jrjackson-1.2.9.jar"
-# require_relative "linked/jrjackson-1.2.9.jar"
+require_relative "jars/jrjackson-1.2.11.jar"
+# require_relative "linked/jrjackson-1.2.11.jar"
 
 require 'com/jrjackson/jr_jackson'
 
@@ -31,10 +31,10 @@ module JrJackson
         end
       end
 
-      def dump(object)
+      def dump(object, options = {})
         case object
-        when Array, Hash, String, Java::JavaUtil::LinkedHashMap
-          JrJackson::Raw.generate(object)
+        when Hash, Array, String, Java::JavaUtil::Map, Java::JavaUtil::List
+          JrJackson::Raw.generate(object, options)
         when true, false
           object.to_s
         when nil

data/pom.xml

@@ -5,7 +5,7 @@
   <groupId>com.jrjackson.jruby</groupId>
   <artifactId>jrjackson</artifactId>
   <packaging>jar</packaging>
-  <version>1.2.9</version>
+  <version>1.2.11</version>
   <name>jrjackson</name>
   <url>http://maven.apache.org</url>
   
@@ -23,28 +23,28 @@
     <dependency>
       <groupId>org.jruby</groupId>
       <artifactId>jruby</artifactId>
-      <version>1.7.11</version>
+      <version>1.7.17</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
-      <version>2.3.0</version>
+      <version>2.4.4</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-annotations</artifactId>
-      <version>2.3.0</version>
+      <version>2.4.4</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>2.3.0</version>
+      <version>2.4.4</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.module</groupId>
       <artifactId>jackson-module-afterburner</artifactId>
-      <version>2.3.0</version>
+      <version>2.4.4</version>
     </dependency>
   </dependencies>
   <build>
@@ -65,7 +65,7 @@
         <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-surefire-plugin</artifactId>
-            <version>2.16</version>
+            <version>2.17</version>
             <configuration>
                 <skipTests>true</skipTests>
             </configuration>
@@ -73,7 +73,7 @@
         <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-shade-plugin</artifactId>
-            <version>2.1</version>
+            <version>2.3</version>
             <executions>
                 <execution>
                     <phase>package</phase>

data/run_all_individual_bench.sh

@@ -1,23 +1,23 @@
 #!/bin/sh
 
-ruby benchmarking/individual/json-mri-sourced.rb
-ruby benchmarking/individual/oj-mri-sourced.rb
+chruby-exec ruby-2.2.0 -- ruby benchmarking/individual/json-mri-sourced.rb
+chruby-exec ruby-2.2.0 -- ruby benchmarking/individual/oj-mri-sourced.rb
 
-chruby-exec jruby -- jruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/gson-jr-sourced.rb
-chruby-exec jruby -- jruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/json-jr-sourced.rb
+chruby-exec jruby-1.7.17 -- ruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/gson-jr-sourced.rb
+chruby-exec jruby-1.7.17 -- ruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/json-jr-sourced.rb
 
-chruby-exec jruby -- jruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/string-jr-sourced.rb
-chruby-exec jruby -- jruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/str-bd-jr-sourced.rb
+chruby-exec jruby-1.7.17 -- ruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/string-jr-sourced.rb
+chruby-exec jruby-1.7.17 -- ruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/str-bd-jr-sourced.rb
 
-chruby-exec jruby -- jruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/symbol-jr-sourced.rb
-chruby-exec jruby -- jruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/sym-bd-jr-sourced.rb
+chruby-exec jruby-1.7.17 -- ruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/symbol-jr-sourced.rb
+chruby-exec jruby-1.7.17 -- ruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/sym-bd-jr-sourced.rb
 
-chruby-exec jruby -- jruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/raw-jr-sourced.rb
-chruby-exec jruby -- jruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/raw-bd-jr-sourced.rb
+chruby-exec jruby-1.7.17 -- ruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/raw-jr-sourced.rb
+chruby-exec jruby-1.7.17 -- ruby -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
+chruby-exec ruby-2.2.0 -- ruby benchmarking/individual/json-gen-mri-sourced.rb
+chruby-exec ruby-2.2.0 -- ruby benchmarking/individual/oj-gen-mri-sourced.rb
 
-chruby-exec jruby -- jruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/json-gen-jr-sourced.rb 
-chruby-exec jruby -- jruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/gson-gen-jr-sourced.rb 
-chruby-exec jruby -- jruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/raw-gen-jr-sourced.rb 
+chruby-exec jruby-1.7.17 -- ruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/json-gen-jr-sourced.rb 
+chruby-exec jruby-1.7.17 -- ruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/gson-gen-jr-sourced.rb 
+chruby-exec jruby-1.7.17 -- ruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/raw-gen-jr-sourced.rb 

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

@@ -6,20 +6,23 @@ import org.jruby.RubyObject;
 import org.jruby.RubyString;
 import org.jruby.RubySymbol;
 import org.jruby.RubyHash;
+import org.jruby.RubyIO;
 import org.jruby.anno.JRubyMethod;
 import org.jruby.anno.JRubyModule;
-import org.jruby.java.addons.IOJavaAddons;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
+import org.jruby.ext.stringio.StringIO;
 
-import java.io.InputStream;
 import java.io.IOException;
-import java.util.*;
+
+import java.text.SimpleDateFormat;
+import java.util.TimeZone;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.core.JsonProcessingException;
 
+
 @JRubyModule(name = "JrJacksonRaw")
 public class JrJacksonRaw extends RubyObject {
 
@@ -41,7 +44,7 @@ public class JrJacksonRaw extends RubyObject {
             throws IOException {
         RubyHash options = null;
         ObjectMapper local = null;
-        Ruby _ruby = context.getRuntime();
+        Ruby _ruby = context.runtime;
 
         if (opts != context.nil) {
             options = opts.convertToHash();
@@ -68,37 +71,44 @@ public class JrJacksonRaw extends RubyObject {
     @JRubyMethod(module = true, name = {"parse_raw", "load_raw"}, required = 1)
     public static IRubyObject parse_raw(ThreadContext context, IRubyObject self, IRubyObject arg)
             throws IOException {
-        ObjectMapper mapper = RubyJacksonModule.mappedAs("raw", context.getRuntime());
+        ObjectMapper mapper = RubyJacksonModule.mappedAs("raw", context.runtime);
         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 {
-        ObjectMapper mapper = RubyJacksonModule.mappedAs("sym", context.getRuntime());
+        ObjectMapper mapper = RubyJacksonModule.mappedAs("sym", context.runtime);
         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 {
-        ObjectMapper mapper = RubyJacksonModule.mappedAs("str", context.getRuntime());
+        ObjectMapper mapper = RubyJacksonModule.mappedAs("str", context.runtime);
         return _parse(context, arg, mapper);
     }
 
     private static IRubyObject _parse(ThreadContext context, IRubyObject arg, ObjectMapper mapper)
             throws IOException {
-        Ruby ruby = context.getRuntime();
+        Ruby ruby = context.runtime;
+        // same format as Ruby Time #to_s
+        SimpleDateFormat simpleFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss Z");
+        mapper.setDateFormat(simpleFormat);
         try {
             Object o;
             if (arg instanceof RubyString) {
                 o = mapper.readValue(
-                        ((RubyString) arg).getBytes(), Object.class
+                  ((RubyString) arg).getByteList().bytes(), Object.class
+                );
+            } else if (arg instanceof StringIO) {
+                RubyString content = (RubyString)((StringIO) arg).string(context);
+                o = mapper.readValue(
+                  content.getByteList().bytes(), Object.class
                 );
             } else {
                 // must be an IO object then
-                IRubyObject stream = IOJavaAddons.AnyIO.any_to_inputstream(context, arg);
-                o = mapper.readValue((InputStream) stream.toJava(InputStream.class), Object.class);
+                o = mapper.readValue(((RubyIO)arg).getInStream(), Object.class);
             }
             return RubyUtils.rubyObject(ruby, o);
         } catch (JsonProcessingException e) {
@@ -109,13 +119,28 @@ public class JrJacksonRaw extends RubyObject {
     }
 
     // serialize
-    @JRubyMethod(module = true, name = {"generate", "dump"}, required = 1)
-    public static IRubyObject generate(ThreadContext context, IRubyObject self, IRubyObject arg)
+    @JRubyMethod(module = true, name = {"generate", "dump"}, required = 1, optional = 1)
+    public static IRubyObject generate(ThreadContext context, IRubyObject self, IRubyObject[] args)
             throws IOException, JsonProcessingException {
-        Ruby _ruby = context.getRuntime();
-        Object obj = arg.toJava(Object.class);
+        Ruby _ruby = context.runtime;
+        Object obj = args[0].toJava(Object.class);
+        RubyHash options = (args.length <= 1) ? RubyHash.newHash(_ruby) : args[1].convertToHash();
+        String format = (String) options.get(RubyUtils.rubySymbol(_ruby, "date_format"));
+        
+        ObjectMapper mapper = RubyJacksonModule.mappedAs("raw", _ruby);
+        // same format as Ruby Time #to_s
+        SimpleDateFormat simpleFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss Z");
+        
+        if (format != null) {
+            simpleFormat = new SimpleDateFormat(format);
+            String timezone = (String) options.get(RubyUtils.rubySymbol(_ruby, "timezone"));
+            if (timezone != null) {
+                simpleFormat.setTimeZone(TimeZone.getTimeZone(timezone));
+            }
+        }
+        mapper.setDateFormat(simpleFormat);
+        
         try {
-            ObjectMapper mapper = RubyJacksonModule.mappedAs("raw", _ruby);
             String s = mapper.writeValueAsString(obj);
             return RubyUtils.rubyString(_ruby, s);
         } catch (JsonProcessingException e) {

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

@@ -38,9 +38,8 @@ public class RubyAnySerializer extends StdSerializer<RubyObject> {
         return val;
     }
 
-    private void serializeUnknownRubyObject(RubyObject rubyObject, JsonGenerator jgen, SerializerProvider provider)
+    private void serializeUnknownRubyObject(ThreadContext ctx, RubyObject rubyObject, JsonGenerator jgen, SerializerProvider provider)
             throws IOException, JsonGenerationException {
-        ThreadContext ctx = rubyObject.getRuntime().getCurrentContext();
         RubyClass meta = rubyObject.getMetaClass();
 
         DynamicMethod method = meta.searchMethod("to_time");
@@ -87,16 +86,20 @@ public class RubyAnySerializer extends StdSerializer<RubyObject> {
     @Override
     public void serialize(RubyObject value, JsonGenerator jgen, SerializerProvider provider)
             throws IOException, JsonGenerationException {
+        ThreadContext ctx = value.getRuntime().getCurrentContext();
         if (value instanceof RubySymbol || value instanceof RubyString) {
             jgen.writeString(value.toString());
         } else if (value instanceof RubyHash) {
             provider.findTypedValueSerializer(Map.class, true, null).serialize(value, jgen, provider);
         } else if (value instanceof RubyArray) {
             provider.findTypedValueSerializer(List.class, true, null).serialize(value, jgen, provider);
+        } else if (value instanceof RubyStruct) {
+            RubyObject obj = (RubyObject)value.callMethod(ctx, "to_a");
+            provider.findTypedValueSerializer(List.class, true, null).serialize(obj, jgen, provider);
         } else {
             Object val = value.toJava(rubyJavaClassLookup(value.getClass()));
             if (val instanceof RubyObject) {
-                serializeUnknownRubyObject((RubyObject) val, jgen, provider);
+                serializeUnknownRubyObject(ctx, (RubyObject) val, jgen, provider);
             } else {
                 provider.defaultSerializeValue(val, jgen);
             }

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

@@ -19,7 +19,6 @@ public class RubyJacksonModule extends SimpleModule {
     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() {
@@ -45,14 +44,9 @@ public class RubyJacksonModule extends SimpleModule {
             );
         }
         mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
-        mapper.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss z"));
         return mapper;
     }
 
-    // public static SimpleModule asRaw()
-    // { 
-    //   return static_mapper;
-    // }
     public static SimpleModule asSym(Ruby ruby) {
         return new RubyJacksonModule().addSerializer(
                 RubyObject.class, RubyAnySerializer.instance

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

@@ -1,7 +1,6 @@
 package com.jrjackson;
 
 import java.io.IOException;
-import java.util.*;
 
 import com.fasterxml.jackson.core.*;
 
@@ -23,7 +22,8 @@ public class RubyObjectDeserializer
 
     private Ruby _ruby;
 
-    private RubyKeyConverter converter;
+    private RubyKeyConverter key_converter;
+    final private RubyStringConverter str_converter = new RubyStringConverter();
 
     public RubyObjectDeserializer() {
         super(RubyObject.class);
@@ -35,12 +35,12 @@ public class RubyObjectDeserializer
     }
 
     public RubyObjectDeserializer setStringStrategy() {
-        converter = new RubyStringConverter();
+        key_converter = str_converter;
         return this;
     }
 
     public RubyObjectDeserializer setSymbolStrategy() {
-        converter = new RubySymbolConverter();
+        key_converter = new RubySymbolConverter();
         return this;
     }
 
@@ -65,20 +65,20 @@ public class RubyObjectDeserializer
                 return mapArray(jp, ctxt);
 
             case FIELD_NAME:
-                return converter.convert(_ruby, jp);
+                return key_converter.convert(_ruby, jp);
 
             case VALUE_EMBEDDED_OBJECT:
                 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 str_converter.convert(_ruby, jp);
 
             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)) {
+                JsonParser.NumberType numberType = jp.getNumberType();
+                if (ctxt.isEnabled(DeserializationFeature.USE_BIG_INTEGER_FOR_INTS) || numberType == JsonParser.NumberType.BIG_INTEGER) {
                     return RubyUtils.rubyBignum(_ruby, jp.getBigIntegerValue());
                 }
                 return RubyUtils.rubyFixnum(_ruby, jp.getLongValue());
@@ -165,14 +165,14 @@ public class RubyObjectDeserializer
             return RubyHash.newHash(_ruby);
         }
 
-        RubyObject field1 = converter.convert(_ruby, jp);
+        RubyObject field1 = key_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);
         }
 
-        RubyObject field2 = converter.convert(_ruby, jp);
+        RubyObject field2 = key_converter.convert(_ruby, jp);
         jp.nextToken();
         RubyObject value2 = deserialize(jp, ctxt);
         if (jp.nextToken() != JsonToken.FIELD_NAME) {
@@ -182,7 +182,7 @@ public class RubyObjectDeserializer
         // And then the general case; default map size is 16
         RubyHash result = RuntimeHelpers.constructHash(_ruby, field1, value1, field2, value2);
         do {
-            RubyObject fieldName = converter.convert(_ruby, jp);
+            RubyObject fieldName = key_converter.convert(_ruby, jp);
             jp.nextToken();
             result.fastASetCheckString(_ruby, fieldName, deserialize(jp, ctxt));
         } while (jp.nextToken() != JsonToken.END_OBJECT);

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

@@ -3,6 +3,7 @@ package com.jrjackson;
 import com.fasterxml.jackson.core.*;
 
 import java.io.IOException;
+import java.nio.CharBuffer;
 import org.jruby.Ruby;
 import org.jruby.RubyObject;
 
@@ -10,6 +11,9 @@ public class RubyStringConverter implements RubyKeyConverter {
 
     @Override
     public RubyObject convert(Ruby ruby, JsonParser jp) throws IOException {
-        return RubyUtils.rubyString(ruby, jp.getText().getBytes());
+        // return RubyUtils.rubyString(ruby, jp.getText());
+        return RubyUtils.rubyString(ruby, 
+            CharBuffer.wrap(jp.getTextCharacters(), 0, jp.getTextLength())
+        );
     }
 }

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

@@ -4,6 +4,7 @@ import java.util.*;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.nio.CharBuffer;
 
 import org.jruby.*;
 import org.jruby.javasupport.JavaUtil;
@@ -24,10 +25,14 @@ public class RubyUtils {
         return RubyString.newString(ruby, node);
     }
 
+    public static RubyString rubyString(Ruby ruby, CharSequence node) {
+        return RubyString.newUnicodeString(ruby, node);
+    }
+
     public static RubySymbol rubySymbol(Ruby ruby, String node) {
         return RubySymbol.newSymbol(ruby, node);
     }
-
+   
     public static RubyArray rubyArray(Ruby ruby, Object[] arg) {
         return (RubyArray) JavaUtil.convertJavaToRuby(ruby, arg);
     }

data/test/jrjackson_test.rb

@@ -9,6 +9,7 @@ require 'thread'
 require 'bigdecimal'
 require 'jrjackson'
 require 'stringio'
+require 'time'
 
 class JrJacksonTest < Test::Unit::TestCase
 
@@ -92,17 +93,66 @@ class JrJacksonTest < Test::Unit::TestCase
     json_string = JrJackson::Json.dump(source)
     expected = {
       :sym => "a_symbol",
-      :dt => dt.strftime("%F %T %Z"),
+      :dt => dt.strftime("%F %T %z"),
       :co1 => {:one => "uno", :two => "two", :six => 6.0 },
       :co2 => {:one => "uno", :two => "two", :six => 6.0 },
       :co3 => {:one => 1.0, :two => 2.0, :six => 6.0 },
       :co4 => [1, 2, 6],
-      :co5 => dt.strftime("%F %T %Z")
+      :co5 => dt.strftime("%F %T %z")
     }
     actual = JrJackson::Json.load(json_string, :symbolize_keys => true)
     assert_equal expected, actual
   end
 
+  def test_raw_serialize_base_classes
+    # String
+    assert_equal JrJackson::Json.dump("foo"), "\"foo\""
+
+    # Hash and implementations of the Java Hash interface
+    assert_equal JrJackson::Json.dump({"foo" => 1}), "{\"foo\":1}"
+    assert_equal JrJackson::Json.dump(Java::JavaUtil::HashMap.new({"foo" => 1})), "{\"foo\":1}"
+    assert_equal JrJackson::Json.dump(Java::JavaUtil::LinkedHashMap.new({"foo" => 1})), "{\"foo\":1}"
+
+    # Array and implementations of the Java List interface
+    assert_equal JrJackson::Json.dump(["foo", 1]), "[\"foo\",1]"
+    assert_equal JrJackson::Json.dump(Java::JavaUtil::ArrayList.new(["foo", 1])), "[\"foo\",1]"
+    assert_equal JrJackson::Json.dump(Java::JavaUtil::LinkedList.new(["foo", 1])), "[\"foo\",1]"
+    assert_equal JrJackson::Json.dump(Java::JavaUtil::Vector.new(["foo", 1])), "[\"foo\",1]"
+
+    # true/false
+    assert_equal JrJackson::Json.dump(true), "true"
+    assert_equal JrJackson::Json.dump(false), "false"
+
+    # nil
+    assert_equal JrJackson::Json.dump(nil), "null"
+  end
+
+  def test_serialize_date
+    # default date format
+    time_string = "2014-06-10 18:18:40 EDT"
+    source_time = Time.parse(time_string)
+    serialized_output = JrJackson::Json.dump({"time" => source_time})
+    other_time = Time.parse(serialized_output.split('"')[-2])
+    assert_equal other_time.to_f, source_time.to_f
+  end
+
+  def test_serialize_date_date_format
+
+    time = Time.new(2014,6,10,18,18,40, "-04:00")
+    # using date_format option
+    assert_equal "{\"time\":\"2014-06-10\"}", JrJackson::Json.dump({"time" => time}, :date_format => "yyyy-MM-dd")
+    assert_match /\{"time"\:"\d{4}-\d\d-\d\dT\d\d:\d\d:\d\d\.\d{3}[+-]\d{4}"\}/, JrJackson::Json.dump({"time" => time}, :date_format => "yyyy-MM-dd'T'HH:mm:ss.SSSZ")
+  end
+
+  def test_serialize_date_date_format_timezone
+
+    time = Time.new(2014,6,10,18,18,40, "-04:00")
+    # using date_format and timezone options
+    assert_equal "{\"time\":\"2014-06-10T22:18:40.000+0000\"}", JrJackson::Json.dump({"time" => time}, :date_format => "yyyy-MM-dd'T'HH:mm:ss.SSSZ", :timezone => "UTC")
+    # iso8601 date_format and timezone
+    assert_equal "{\"time\":\"2014-06-10T22:18:40.000Z\"}", JrJackson::Json.dump({"time" => time}, :date_format => "yyyy-MM-dd'T'HH:mm:ss.SSSX", :timezone => "UTC")
+  end
+
   def test_can_parse_nulls
     expected = {"foo" => nil}
     json = '{"foo":null}'
@@ -111,8 +161,17 @@ class JrJacksonTest < Test::Unit::TestCase
   end
 
   def test_stringio
-    expected = {"foo" => 5}
-    json = ::StringIO.new('{"foo":5}')
+    expected = {"foo" => 5, "utf8" => "żółć"}
+    json = ::StringIO.new('{"foo":5, "utf8":"żółć"}')
+    actual = JrJackson::Json.load(json)
+    assert_equal expected, actual
+  end
+
+  def test_ruby_io
+    expected = {"foo" => 5, "bar" => 6, "utf8" => "żółć"}
+    json, w = IO.pipe
+    w.write('{"foo":5, "bar":6, "utf8":"żółć"}')
+    w.close
     actual = JrJackson::Json.load(json)
     assert_equal expected, actual
   end
@@ -123,6 +182,14 @@ class JrJacksonTest < Test::Unit::TestCase
     end
   end
 
+  def test_can_parse_bignum
+    expected = 12345678901234567890123456789
+    json = '{"foo":12345678901234567890123456789}'
+
+    actual = JrJackson::Json.parse(json)['foo']
+    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.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Guy Boertje
@@ -41,7 +41,7 @@ files:
 - jrjackson.gemspec
 - lib/jrjackson.rb
 - lib/jrjackson/build_info.rb
-- lib/jrjackson/jars/jrjackson-1.2.9.jar
+- lib/jrjackson/jars/jrjackson-1.2.11.jar
 - lib/jrjackson/jrjackson.rb
 - lib/require_relative_patch.rb
 - pom.xml
@@ -79,8 +79,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A JRuby wrapper for the java jackson json processor jar
 test_files: []
+has_rdoc: