diff options
author | Erik Benoist <erik@reverb.com> | 2018-05-22 10:14:04 -0500 |
---|---|---|
committer | Bo Yang <teboring@google.com> | 2018-05-25 13:03:30 -0700 |
commit | c19fcee48f064c6a49d865374c3adb37daa3f0dd (patch) | |
tree | 257f081e01c5939666b55e90f7e2dd70a2795e7e /ruby/lib | |
parent | 5289ee0c2139b691111037806f088e306a31ac70 (diff) | |
download | protobuf-c19fcee48f064c6a49d865374c3adb37daa3f0dd.tar.gz protobuf-c19fcee48f064c6a49d865374c3adb37daa3f0dd.tar.bz2 protobuf-c19fcee48f064c6a49d865374c3adb37daa3f0dd.zip |
Allows the json marshaller to be passed json marshal options (#4252)
Diffstat (limited to 'ruby/lib')
-rw-r--r-- | ruby/lib/google/protobuf.rb | 4 | ||||
-rw-r--r-- | ruby/lib/google/protobuf/message_exts.rb | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ruby/lib/google/protobuf.rb b/ruby/lib/google/protobuf.rb index 9b8d8231..4a805e88 100644 --- a/ruby/lib/google/protobuf.rb +++ b/ruby/lib/google/protobuf.rb @@ -60,8 +60,8 @@ module Google msg.to_proto end - def self.encode_json(msg) - msg.to_json + def self.encode_json(msg, options = {}) + msg.to_json(options) end def self.decode(klass, proto) diff --git a/ruby/lib/google/protobuf/message_exts.rb b/ruby/lib/google/protobuf/message_exts.rb index e10266ba..f432f89f 100644 --- a/ruby/lib/google/protobuf/message_exts.rb +++ b/ruby/lib/google/protobuf/message_exts.rb @@ -40,8 +40,8 @@ module Google module ClassMethods end - def to_json - self.class.encode_json(self) + def to_json(options = {}) + self.class.encode_json(self, options) end def to_proto |