Skip to content

Commit 641c4c4

Browse files
committed
✅ Fix backport compatibility with ruby 2.7
1 parent 19bea63 commit 641c4c4

File tree

3 files changed

+13
-11
lines changed

3 files changed

+13
-11
lines changed

lib/net/imap/config/attr_type_coercion.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ def attr_accessor(attr, type: nil)
1919
AttrTypeCoercion.attr_accessor(attr, type: type)
2020
end
2121

22-
module_function def Integer? = NilOrInteger
22+
module_function def Integer?; NilOrInteger end
2323
end
2424
private_constant :Macros
2525

lib/net/imap/response_reader.rb

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ def read_response_buffer
2828

2929
attr_reader :buff, :literal_size
3030

31-
def bytes_read = buff.bytesize
32-
def empty? = buff.empty?
33-
def done? = line_done? && !get_literal_size
34-
def line_done? = buff.end_with?(CRLF)
31+
def bytes_read; buff.bytesize end
32+
def empty?; buff.empty? end
33+
def done?; line_done? && !get_literal_size end
34+
def line_done?; buff.end_with?(CRLF) end
3535
def get_literal_size; /\{(\d+)\}\r\n\z/n =~ buff && $1.to_i end
3636

3737
def read_line
@@ -52,10 +52,10 @@ def read_limit(limit = nil)
5252
[limit, max_response_remaining!].compact.min
5353
end
5454

55-
def max_response_size = client.max_response_size
56-
def max_response_remaining = max_response_size &.- bytes_read
57-
def response_too_large? = max_response_size &.< min_response_size
58-
def min_response_size = bytes_read + min_response_remaining
55+
def max_response_size; client.max_response_size end
56+
def max_response_remaining; max_response_size &.- bytes_read end
57+
def response_too_large?; max_response_size &.< min_response_size end
58+
def min_response_size; bytes_read + min_response_remaining end
5959

6060
def min_response_remaining
6161
empty? ? 3 : done? ? 0 : (literal_size || 0) + 2
@@ -64,7 +64,9 @@ def min_response_remaining
6464
def max_response_remaining!
6565
return max_response_remaining unless response_too_large?
6666
raise ResponseTooLargeError.new(
67-
max_response_size:, bytes_read:, literal_size:,
67+
max_response_size: max_response_size,
68+
bytes_read: bytes_read,
69+
literal_size: literal_size,
6870
)
6971
end
7072

test/net/imap/test_response_reader.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ def setup
1111

1212
class FakeClient
1313
def config; @config ||= Net::IMAP.config.new end
14-
def max_response_size = config.max_response_size
14+
def max_response_size; config.max_response_size end
1515
end
1616

1717
def literal(str) "{#{str.bytesize}}\r\n#{str}" end

0 commit comments

Comments
 (0)