diff --git a/lib/rb/lib/thrift/protocol/json_protocol.rb b/lib/rb/lib/thrift/protocol/json_protocol.rb index 91e74e46bf8..d03357e61b2 100644 --- a/lib/rb/lib/thrift/protocol/json_protocol.rb +++ b/lib/rb/lib/thrift/protocol/json_protocol.rb @@ -16,9 +16,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -# - -require 'base64' +# module Thrift class LookaheadReader @@ -311,7 +309,7 @@ def write_json_string(str) def write_json_base64(str) @context.write(trans) trans.write(@@kJSONStringDelimiter) - trans.write(Base64.strict_encode64(str)) + trans.write([str].pack('m0')) trans.write(@@kJSONStringDelimiter) end @@ -555,7 +553,7 @@ def read_json_base64 str += '=' end end - Base64.strict_decode64(str) + str.unpack1('m0') end # Reads a sequence of characters, stopping at the first one that is not diff --git a/lib/rb/thrift.gemspec b/lib/rb/thrift.gemspec index 17e1da2cb8e..d3c30a203c0 100644 --- a/lib/rb/thrift.gemspec +++ b/lib/rb/thrift.gemspec @@ -26,15 +26,16 @@ Gem::Specification.new do |s| s.require_paths = %w[lib ext] + s.add_dependency 'logger' + s.add_development_dependency 'bundler', '~> 2.1.4' s.add_development_dependency 'pry', '~> 0.11.3' s.add_development_dependency 'pry-byebug', '~> 3.6' s.add_development_dependency 'pry-stack_explorer', '~> 0.4.9.2' s.add_development_dependency 'rack', '= 2.2.6.4' s.add_development_dependency 'rack-test', '~> 0.8.3' - s.add_development_dependency 'rake', '~> 12.3' + s.add_development_dependency 'rake', '~> 13.3' s.add_development_dependency 'rspec', '~> 3.7' s.add_development_dependency 'srv', '~> 1.0' s.add_development_dependency 'thin', '~> 1.7' end -