🚧 Ruby 2.7 compatibility (incomplete)

Author: nevans

lib/net/imap.rb

@@ -932,7 +932,8 @@ def idle_response_timeout;  config.idle_response_timeout   end
 
     # :stopdoc:
     def max_response_size
-      config.max_response_size(connection_state:, tls_verified: tls_verified?)
+      config.max_response_size(connection_state: connection_state,
+                               tls_verified: tls_verified?)
     end
 
     def max_response_size=(val)
@@ -2982,7 +2983,10 @@ def receive_responses
             when ContinuationRequest
               @continuation_request_arrival.signal
             end
-            state_unselected! if resp in {data: {code: {name: "CLOSED"}}}
+            case resp
+            in {data: {code: {name: "CLOSED"}}} then state_unselected!
+            else
+            end
             @response_handlers.each do |handler|
               handler.call(resp)
             end
@@ -3105,8 +3109,11 @@ def response_limit!(bytes_read, literal_size = nil)
       limit -= bytes_read
       unless (literal_size || 0) < limit
         raise ResponseTooLargeError.new(
-          state: @state, tls_verified: tls_verified?,
-          max_response_size:, bytes_read:, literal_size:,
+          connection_state: connection_state,
+          tls_verified: tls_verified?,
+          max_response_size: max_response_size,
+          bytes_read: bytes_read,
+          literal_size: literal_size,
         )
       end
       limit

lib/net/imap/config.rb

@@ -387,7 +387,7 @@ def max_response_size(connection_state: nil, tls_verified: nil)
       # Set to :reset to #reset all of the attributes to inherit
       # from the #parent config.
       def max_response_size=(bytes)
-        if bytes in :reset
+        if bytes == :reset
           reset :max_response_size_tls_verified
           reset :max_response_size_tls_unverified
           reset :max_response_size_state_not_authenticated

lib/net/imap/config/attr_type_coercion.rb

@@ -19,8 +19,8 @@ def attr_accessor(attr, type: nil)
             AttrTypeCoercion.attr_accessor(attr, type: type)
           end
 
-          module_function def Integer?       = NInteger
-          module_function def IntegerOrProc? = NIntegerOrProc
+          module_function def Integer?;       NInteger end
+          module_function def IntegerOrProc?; NIntegerOrProc end
         end
         private_constant :Macros
 
@@ -29,10 +29,17 @@ def self.included(mod)
         end
         private_class_method :included
 
-        def self.safe(...) = Ractor.make_shareable nil.instance_eval(...).freeze
+        if defined?(Ractor.make_shareable)
+          def self.safe(...) Ractor.make_shareable nil.instance_eval(...).freeze end
+        else
+          def self.safe(...) nil.instance_eval(...).freeze end
+        end
         private_class_method :safe
 
-        Types = Hash.new do |h, type| type => Proc | nil; safe{type} end
+        Types = Hash.new do |h, type|
+          type.nil? || Proc === type or raise TypeError, "type not nil or Proc"
+          safe{type}
+        end
         Types[:boolean] = Boolean = safe{-> {!!_1}}
         Types[Integer]  = safe{->{Integer(_1)}}
 
@@ -44,7 +51,7 @@ def self.attr_accessor(attr, type: nil)
 
         Procable = safe{->val {
           val = val.to_proc if val.respond_to?(:to_proc)
-          val in Proc or raise TypeError, "expected Proc, got %p" [val]
+          Proc === val or raise TypeError, "expected Proc, got %p" [val]
           val
         }}
 

lib/net/imap/errors.rb

@@ -21,7 +21,7 @@ class ResponseTooLargeError < ResponseReadError
       attr_reader :max_response_size, :state, :tls_verified
       alias tls_verified? tls_verified
 
-      def initialize(msg = nil, *,
+      def initialize(msg = nil, *args,
                      bytes_read:        nil,
                      literal_size:      nil,
                      state:             nil,
@@ -36,7 +36,7 @@ def initialize(msg = nil, *,
           "Response size", response_size_msg, "exceeds max_response_size",
           max_response_size && "(#{max_response_size}B)",
         ].compact.join(" ")
-        super(msg, *)
+        super(msg, *args)
       end
 
       private
@@ -52,12 +52,12 @@ def response_size_msg
     class SocketReadLimitError < ResponseReadError
       attr_reader :socket_read_limit
 
-      def initialize(msg = nil, *, socket_read_limit: nil)
+      def initialize(msg = nil, *args, socket_read_limit: nil)
         @socket_read_limit = socket_read_limit
         msg ||= [
           "Socket read limit", socket_read_limit, "<= 0",
         ].compact.join(" ")
-        super(msg, *)
+        super(msg, *args)
       end
     end
 

test/net/imap/test_config.rb

@@ -429,7 +429,8 @@ def duck.to_r;   1/11111 end
   test "#max_response_size(state, tls_verified: bool)" do
     config = Config.new 0.5 # backported
     max_response_size_for = -> (connection_state, tls_verified) {
-      config.max_response_size(connection_state:, tls_verified:)
+      config.max_response_size(connection_state: connection_state,
+                               tls_verified: tls_verified)
     }
     assert_equal  10 << 10, max_response_size_for.(:not_authenticated, false)
     assert_equal  10 << 10, max_response_size_for.(:not_authenticated, true)
@@ -459,7 +460,8 @@ def duck.to_r;   1/11111 end
   test "#max_response_size=(Integer | nil | :reset)" do
     config = Config.new 0.5 # backported
     max_response_size_for = -> (connection_state, tls_verified) {
-      config.max_response_size(connection_state:, tls_verified:)
+      config.max_response_size(connection_state: connection_state,
+                               tls_verified: tls_verified)
     }
 
     config.max_response_size = 10_000

test/net/imap/test_imap_socket_read_limit.rb

@@ -65,7 +65,7 @@ def setup_illegal_CRs_response_on_noop(server)
       setup_various_responses_on_noop(server)
       responses = []
       imap.add_response_handler do
-        responses << _1.data if _1 in Net::IMAP::UntaggedResponse
+        responses << _1.data if Net::IMAP::UntaggedResponse === _1
       end
 
       imap.noop
@@ -126,7 +126,10 @@ def setup_illegal_CRs_response_on_noop(server)
 
       calls.each do |args|
         assert_equal 4, args.count
-        assert_pattern do args => [Integer, Integer | nil, Array, ^imap] end
+        assert_kind_of Integer, args[0]
+        assert [Integer, NilClass].include? args[1].class
+        assert_kind_of Array, args[2]
+        assert_same imap, args[3]
       end
 
       # check (and drop) the IMAP client