1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[ruby/openssl] Add support for gets(chomp: true).

Browse Source 
https://github.com/ruby/openssl/commit/8aa3849cff
This commit is contained in:
Samuel Williams 2024-01-01 22:50:32 +13:00 committed by git
parent 08d4e5ebef
commit f7178045bb
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ext/openssl/lib/openssl/buffering.rb
View File

@ -229,7 +229,7 @@ module OpenSSL::Buffering
# #
# Unlike IO#gets the separator must be provided if a limit is provided. # Unlike IO#gets the separator must be provided if a limit is provided.
def gets(eol=$/, limit=nil) def gets(eol=$/, limit=nil, chomp: false)
idx = @rbuffer.index(eol) idx = @rbuffer.index(eol)
until @eof until @eof
break if idx break if idx
@ -244,7 +244,11 @@ module OpenSSL::Buffering
if size && limit && limit >= 0 if size && limit && limit >= 0
size = [size, limit].min size = [size, limit].min
end end
consume_rbuff(size) line = consume_rbuff(size)
if chomp && line
line.chomp!(eol)
end
line
end end
## ##

11
test/openssl/test_pair.rb
View File

@ -115,6 +115,17 @@ module OpenSSL::TestPairM
} }
end end
def test_gets_chomp
ssl_pair {|s1, s2|
s1 << "line1\r\nline2\r\nline3\r\n"
s1.close
assert_equal("line1", s2.gets("\r\n", chomp: true))
assert_equal("line2\r\n", s2.gets("\r\n", chomp: false))
assert_equal("line3", s2.gets(chomp: true))
}
end
def test_gets_eof_limit def test_gets_eof_limit
ssl_pair {|s1, s2| ssl_pair {|s1, s2|
s1.write("hello") s1.write("hello")