WIP: ClientProtocolReceiver

Author: nevans

lib/net/imap.rb

@@ -3484,8 +3484,8 @@ def tcp_socket(host, port)
     end
 
     def receive_responses
-      connection_closed = false
-      until connection_closed
+      @connection_closed = false
+      until @connection_closed
         synchronize do
           @exception = nil
         end
@@ -3505,44 +3505,7 @@ def receive_responses
           end
           break
         end
-        begin
-          synchronize do
-            case resp
-            when TaggedResponse
-              @tagged_responses[resp.tag] = resp
-              @tagged_response_arrival.broadcast
-              case resp.tag
-              when @logout_command_tag
-                state_logout!
-                return
-              when @continued_command_tag
-                @continuation_request_exception =
-                  RESPONSE_ERRORS[resp.name].new(resp)
-                @continuation_request_arrival.signal
-              end
-            when UntaggedResponse
-              record_untagged_response(resp)
-              if resp.name == "BYE" && @logout_command_tag.nil?
-                state_logout!
-                @sock.close
-                @exception = ByeResponseError.new(resp)
-                connection_closed = true
-              end
-            when ContinuationRequest
-              @continuation_request_arrival.signal
-            end
-            state_unselected! if resp in {data: {code: {name: "CLOSED"}}}
-            @response_handlers.each do |handler|
-              handler.call(resp)
-            end
-          end
-        rescue Exception => e
-          @exception = e
-          synchronize do
-            @tagged_response_arrival.broadcast
-            @continuation_request_arrival.broadcast
-          end
-        end
+        handle_response(resp)
       end
       synchronize do
         @receiver_thread_terminating = true
@@ -3594,6 +3557,61 @@ def get_response
     #############################
     # built-in response handlers
 
+    def handle_response(resp)
+      synchronize do
+        case resp
+        when TaggedResponse
+          handle_tagged_response(resp)
+        when UntaggedResponse
+          handle_untagged_response(resp)
+        when ContinuationRequest
+          @continuation_request_arrival.signal
+        end
+        run_response_handlers(resp)
+      end
+    rescue Exception => e
+      @exception = e
+      synchronize do
+        @tagged_response_arrival.broadcast
+        @continuation_request_arrival.broadcast
+      end
+    end
+
+    def handle_tagged_response(resp)
+      synchronize do
+        @tagged_responses[resp.tag] = resp
+        @tagged_response_arrival.broadcast
+        case resp.tag
+        when @logout_command_tag
+          state_logout!
+          return
+        when @continued_command_tag
+          @continuation_request_exception =
+            RESPONSE_ERRORS[resp.name].new(resp)
+          @continuation_request_arrival.signal
+        end
+      end
+    end
+
+    def handle_untagged_response(resp)
+      synchronize do
+        record_untagged_response(resp)
+        if resp.name == "BYE" && @logout_command_tag.nil?
+          state_logout!
+          @sock.close
+          @exception = ByeResponseError.new(resp)
+          @connection_closed = true
+        end
+        state_unselected! if resp in {data: {code: {name: "CLOSED"}}}
+      end
+    end
+
+    def run_response_handlers(resp)
+      @response_handlers.each do |handler|
+        handler.call(resp)
+      end
+    end
+
     # store name => [..., data]
     def record_untagged_response(resp)
       @responses[resp.name] << resp.data
@@ -3635,6 +3653,7 @@ def send_command(cmd, *args, &block)
           validate_data(i)
         end
         tag = generate_tag
+
         put_string(tag + " " + cmd)
         args.each do |i|
           put_string(" ")