gson 0.6.0-java → 0.6.1-java

data/README.md

@@ -23,6 +23,14 @@ Or install it yourself as:
     Gson::Encoder.new.encode({"abc" => [123, -456.789]})
     => "{\"abc\":[123,-456.789]}"
 
+`Gson::Decoder#decode` also accept optional IO or StringIO object:
+
+    File.open("/tmp/gson.json", "w+") do |io|
+      Gson::Encoder.new.encode({"foo" => "bar"}, io)
+    end
+    File.read("/tmp/gson.json")
+    => "{\"foo\":\"bar\"}"
+
 Additional encoder options:
 
 * `:html_safe`, default `false`, force encoder to wrte JSON that is

data/ext/gson_ext/Decoder.java

@@ -19,8 +19,8 @@ package gson_ext;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonToken;
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.io.Reader;
 import java.io.StringReader;
 import java.util.LinkedList;
@@ -32,7 +32,6 @@ import org.jruby.RubyClass;
 import org.jruby.RubyException;
 import org.jruby.RubyHash;
 import org.jruby.RubyIO;
-import org.jruby.ext.stringio.RubyStringIO;
 import org.jruby.RubyNumeric;
 import org.jruby.RubyObject;
 import org.jruby.RubyString;
@@ -40,9 +39,10 @@ import org.jruby.RubySymbol;
 import org.jruby.anno.JRubyClass;
 import org.jruby.anno.JRubyMethod;
 import org.jruby.exceptions.RaiseException;
+import org.jruby.ext.stringio.RubyStringIO;
+import org.jruby.java.addons.IOJavaAddons;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
-import org.jruby.java.addons.IOJavaAddons;
 
 @JRubyClass(name = "Gson::Decoder")
 public class Decoder extends RubyObject {

data/ext/gson_ext/Encoder.java

@@ -17,26 +17,32 @@
 package gson_ext;
 
 import com.google.gson.stream.JsonWriter;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
 import java.io.StringWriter;
 import java.io.Writer;
-import java.io.IOException;
 import org.jruby.Ruby;
 import org.jruby.RubyArray;
 import org.jruby.RubyBoolean;
 import org.jruby.RubyClass;
 import org.jruby.RubyException;
-import org.jruby.RubyHash;
-import org.jruby.RubyNumeric;
 import org.jruby.RubyFloat;
+import org.jruby.RubyHash;
+import org.jruby.RubyIO;
 import org.jruby.RubyInteger;
+import org.jruby.RubyNumeric;
 import org.jruby.RubyObject;
 import org.jruby.RubyString;
 import org.jruby.RubySymbol;
 import org.jruby.anno.JRubyClass;
 import org.jruby.anno.JRubyMethod;
 import org.jruby.exceptions.RaiseException;
+import org.jruby.ext.stringio.RubyStringIO;
+import org.jruby.java.addons.IOJavaAddons;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
+import org.jruby.util.IOOutputStream;
 
 @JRubyClass(name = "Gson::Encoder")
 public class Encoder extends RubyObject {
@@ -118,23 +124,38 @@ public class Encoder extends RubyObject {
 
     }
 
-
-    @JRubyMethod
-    public IRubyObject encode(ThreadContext context, IRubyObject arg) {
+    @JRubyMethod(required = 1, optional = 1)
+    public IRubyObject encode(ThreadContext context, IRubyObject[] args) {
         Ruby ruby = context.getRuntime();
+        Writer out = null;
+
+        if (args.length < 2 || args[1].isNil()) {
+            out = new StringWriter();
+        } else {
+            IRubyObject io = args[1];
+            if ((io instanceof RubyIO) || (io instanceof RubyStringIO)) {
+                IRubyObject stream = IOJavaAddons.AnyIO.any_to_outputstream(context, io);
+                out = new OutputStreamWriter((OutputStream)stream.toJava(OutputStream.class));
+            } else {
+                throw ruby.newArgumentError("Unsupported source. This method accepts IO");
+            }
+        }
 
-        StringWriter out = new StringWriter();
         JsonWriter writer = new JsonWriter(out);
         writer.setLenient(this.lenient);
         writer.setHtmlSafe(this.htmlSafe);
         writer.setIndent(this.indent);
         writer.setSerializeNulls(this.serializeNulls);
         try {
-            encodeValue(writer, context, arg);
+            encodeValue(writer, context, args[0]);
         } catch (Exception ex) {
             throw EncodeError.newEncodeError(ruby, ex.getMessage());
         }
-        return ruby.newString(out.toString());
+        if (out instanceof StringWriter) {
+            return ruby.newString(out.toString());
+        } else {
+            return context.nil;
+        }
     }
 
     private void encodeValue(JsonWriter writer, ThreadContext context, IRubyObject val)
@@ -180,6 +201,7 @@ public class Encoder extends RubyObject {
         } else {
             writer.value(val.anyToString().toString());
         }
+        writer.flush();
     }
 
 }

data/lib/gson/version.rb

@@ -16,5 +16,5 @@
 #
 
 module Gson
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

data/test/test_encoder.rb

@@ -139,4 +139,11 @@ EOJ
       assert_equal(expected, decoder.decode(dumped_json))
   end
 
+  def test_it_supports_output_streams
+    encoder = Gson::Encoder.new
+    expected = '{"foo":1,"bar":2}'
+    output = StringIO.new
+    encoder.encode({:foo => 1, :bar => 2}, output)
+    assert_equal expected, output.string
+  end
 end

metadata

@@ -2,14 +2,14 @@
 name: gson
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.6.0
+  version: 0.6.1
 platform: java
 authors:
 - Sergey Avseyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-01-05 00:00:00.000000000 Z
+date: 2013-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler