Skip to content

THRIFT-5905: Removed base64 and added logger as an explicit add_dependency #3245

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −7
Open

THRIFT-5905: Removed base64 and added logger as an explicit add_dependency #3245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions lib/rb/lib/thrift/protocol/json_protocol.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions lib/rb/thrift.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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