Call to_s for keys

Author: jhawthorn

ext/rapidjson/encoder.hh

@@ -25,12 +25,16 @@ class RubyObjectEncoder {
         switch(rb_type(key)) {
             case T_SYMBOL:
                 key = rb_sym2str(key);
-		/* FALLTHRU */
+                /* FALLTHRU */
             case T_STRING:
                 writer.Key(RSTRING_PTR(key), RSTRING_LEN(key), false);
                 return;
             default:
-                raise_unknown(key);
+                {
+                    VALUE str = rb_funcall(key, id_to_s, 0);
+                    Check_Type(str, T_STRING);
+                    encode_string(str);
+                }
         }
     }
 
@@ -133,11 +137,6 @@ class RubyObjectEncoder {
         }
     }
 
-    void raise_unknown(VALUE obj) {
-        VALUE inspect = rb_inspect(obj);
-        rb_raise(rb_eEncodeError, "can't encode type: %s", StringValueCStr(inspect));
-    }
-
     public:
         RubyObjectEncoder(): buf(), writer(buf), depth(0) {
         };

test/test_encoder.rb

@@ -59,6 +59,13 @@ def test_encode_hash
     assert_equal '{"foo":"bar"}', encode({ "foo" => "bar" })
   end
 
+  def test_encode_hash_nonstring_keys
+    assert_equal '{"1":2}', encode({1 => 2})
+    assert_equal '{"{1=>2}":3}', encode({{1 => 2} => 3})
+    assert_equal '{"[\\"foo\\"]":"bar"}', encode({["foo"] => "bar"})
+    assert_match(/{"#<Object:0x[0-9a-f]+>":2}/, encode({Object.new => 2}))
+  end
+
   def test_encode_string
     assert_equal '""', encode("")
     assert_equal '"1"', encode("1")