gson 0.5.0-java → 0.6.0-java

data/ext/gson_ext/Encoder.java

@@ -75,8 +75,8 @@ public class Encoder extends RubyObject {
     @JRubyMethod(optional = 1)
     public IRubyObject initialize(ThreadContext context, IRubyObject[] args) {
         Ruby ruby = context.getRuntime();
-        this.options = context.nil;
-        if (args.length < 1) {
+        if (args.length < 1 || args[0].isNil()) {
+            this.options = RubyHash.newHash(ruby);
             return context.nil;
         }
         if (!(args[0] instanceof RubyHash)) {
@@ -173,8 +173,12 @@ public class Encoder extends RubyObject {
             writer.value((Double)((RubyFloat)val).getDoubleValue());
         } else if (val instanceof RubyBoolean) {
             writer.value(val.isTrue());
-        } else if (val.respondsTo("to_json")) {
-            encodeValue(writer, context, val.callMethod(context, "to_json", this.options));
+        } else if (val.respondsTo("as_json")) {
+            encodeValue(writer, context, val.callMethod(context, "as_json", this.options));
+        } else if (val.respondsTo("to_s")) {
+            writer.value(val.toString());
+        } else {
+            writer.value(val.anyToString().toString());
         }
     }
 

data/lib/gson/version.rb

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

data/test/test_encoder.rb

@@ -99,4 +99,44 @@ EOJ
     end
   end
 
+  class Custom
+    attr_accessor :foo, :bar
+
+    def initialize(foo, bar)
+      @foo = foo
+      @bar = bar
+    end
+
+    def as_json(options = {})
+      {:foo => @foo, :bar => @bar}
+    end
+  end
+
+  def test_it_dumps_custom_objects_wich_implement_as_json
+    encoder = Gson::Encoder.new
+    expected = '{"foo":1,"bar":2}'
+    assert_equal expected, encoder.encode(Custom.new(1, 2))
+  end
+
+  def test_it_converts_unknown_objects_to_string
+      time = Time.at(1355218745).utc
+
+      # time does not respond to to_json method
+      def time.respond_to?(method, *args)
+        return false if method == :to_json
+        super
+      end
+
+      encoder = Gson::Encoder.new
+      decoder = Gson::Decoder.new
+
+      dumped_json = encoder.encode(time)
+      expected = if RUBY_VERSION > '1.9'
+                   '2012-12-11 09:39:05 UTC'
+                 else
+                   'Tue Dec 11 09:39:05 UTC 2012'
+                 end
+      assert_equal(expected, decoder.decode(dumped_json))
+  end
+
 end

metadata

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