From a8e2359329cf9ca1d00720ff77957f6dd0c678ba Mon Sep 17 00:00:00 2001 From: Erik Benoist Date: Tue, 22 May 2018 10:14:04 -0500 Subject: Allows the json marshaller to be passed json marshal options (#4252) --- ruby/lib/google/protobuf.rb | 4 ++-- ruby/lib/google/protobuf/message_exts.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'ruby/lib') 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 -- cgit v1.2.3