aboutsummaryrefslogtreecommitdiff
path: root/ruby/ext/google/protobuf_c/message.c
diff options
context:
space:
mode:
authorJosh Haberman <jhaberman@gmail.com>2016-04-14 18:33:17 -0700
committerJosh Haberman <jhaberman@gmail.com>2016-04-14 18:33:17 -0700
commit194ad621bb7260c4f2f27f3575ce21ab946b786c (patch)
tree9b1e0fedfdd2857a3312e1c383eb697207e53645 /ruby/ext/google/protobuf_c/message.c
parent90c7f6e55eb43d89f345fc4412a99ac9477055da (diff)
downloadprotobuf-194ad621bb7260c4f2f27f3575ce21ab946b786c.tar.gz
protobuf-194ad621bb7260c4f2f27f3575ce21ab946b786c.tar.bz2
protobuf-194ad621bb7260c4f2f27f3575ce21ab946b786c.zip
Ruby JSON: always accept both camelCase and original field names.
For JSON encoding we provide a new option to decide at encode time whether to use camelCase or original proto field names: json = MapMessage.encode_json(m, :preserve_proto_fieldnames => true)
Diffstat (limited to 'ruby/ext/google/protobuf_c/message.c')
-rw-r--r--ruby/ext/google/protobuf_c/message.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ruby/ext/google/protobuf_c/message.c b/ruby/ext/google/protobuf_c/message.c
index 283939c9..3a51fe47 100644
--- a/ruby/ext/google/protobuf_c/message.c
+++ b/ruby/ext/google/protobuf_c/message.c
@@ -475,7 +475,7 @@ VALUE build_class_from_descriptor(Descriptor* desc) {
rb_define_singleton_method(klass, "decode", Message_decode, 1);
rb_define_singleton_method(klass, "encode", Message_encode, 1);
rb_define_singleton_method(klass, "decode_json", Message_decode_json, 1);
- rb_define_singleton_method(klass, "encode_json", Message_encode_json, 1);
+ rb_define_singleton_method(klass, "encode_json", Message_encode_json, -1);
rb_define_singleton_method(klass, "descriptor", Message_descriptor, 0);
return klass;