Refactors Client class

Break the method in other so separeted the logic

Author: Jefferson Stachelski

Diff for: gpg_group_chat/client/client.py

@@ -1,7 +1,6 @@
 import select
 import socket
 import sys
-import threading
 
 
 class Client():
@@ -23,27 +22,33 @@ def start(self, server_port, server_ip):
         self._handle_messages()
 
     def _handle_messages(self):
-        socket_list = [sys.stdin, self._socket]
+        input_list = [sys.stdin, self._socket]
         self._prompt()
         while self._working:
-            ready_to_read, _, _ = select.select(socket_list, [], [])
-            for sock in ready_to_read:
-                if sock == self._socket:
-                    # incoming message from remote server
-                    data = sock.recv(4096)
-                    if not data:
-                        print('\nDisconnected from chat server')
-                        sys.exit(0)
-                    else:
-                        # print data
-                        sys.stdout.write(data.decode('utf-8'))
-                        self._prompt()
-                else:
-                    # user entered a message
-                    msg = '[*] %s' % sys.stdin.readline()
-                    self._socket.send(msg.encode('utf-8'))
-                    self._prompt()
+            ready_to_read, _, _ = select.select(input_list, [], [])
+            self._handle_input_channel(ready_to_read)
+
+    def _handle_input_channel(self, ready_to_read):
+        for input_channel in ready_to_read:
+            if input_channel is self._socket:
+                self._receive_data_from_server()
+            else:
+                self._send_message_to_server()
+
+    def _receive_data_from_server(self):
+        data = self._socket.recv(4096)
+        if not data:
+            print('\nDisconnected from chat server')
+            sys.exit(0)
+        else:
+            print(data.decode('utf-8'))
+            self._prompt()
+
+    def _send_message_to_server(self):
+        msg = '[*] %s' % input()
+        self._socket.send(msg.encode('utf-8'))
+        self._prompt()
 
     def _prompt(self):
-        sys.stdout.write('[Me] ')
+        print('[Me] ', end='')
         sys.stdout.flush()

Diff for: test/client/client_test.py

@@ -1,8 +1,8 @@
 from gpg_group_chat.client.client import Client
+from socket import socket as SocketType
 from unittest import TestCase
-from unittest.mock import patch
 from unittest.mock import Mock
-from socket import socket as SocketType
+from unittest.mock import patch
 import sys
 
 
@@ -79,3 +79,10 @@ def side_effect(size):
 
         self.print_stdout.assert_any_call('\nDisconnected from chat server')
         self.exit.assert_called_once_with(0)
+
+    def test_the_prompt_meyhod_does_not_print_with_break_line_char(self):
+        def side_effect(txt):
+            assert not txt.endswith('\n')
+
+        self.print_stdout.side_effect = side_effect
+        self.client._prompt()