minor documentation and code fixes

engineio/middleware.py

@@ -17,7 +17,7 @@ class Middleware(object):
         from . import wsgi_app
 
         eio = engineio.Server()
-        app = engineio.EngineIOMiddleware(eio, wsgi_app)
+        app = engineio.Middleware(eio, wsgi_app)
         eventlet.wsgi.server(eventlet.listen(('', 8000)), app)
     """
     def __init__(self, engineio_app, wsgi_app=None, engineio_path='engine.io'):

engineio/server.py

@@ -37,7 +37,6 @@ class Server(object):
                              allowed in requests to this server.
     :param logger: To enable logging set to ``True`` or pass a logger object to
                    use. To disable logging set to ``False``.
-
     """
     compression_methods = ['gzip', 'deflate']
     event_names = ['connect', 'disconnect', 'message']
@@ -68,10 +67,6 @@ def __init__(self, ping_timeout=60, ping_interval=25,
             else:
                 self.logger.setLevel(logging.ERROR)
 
-    def generate_id(self):
-        """Generate a unique session id."""
-        return uuid.uuid4().hex
-
     def on(self, event, handler=None):
         """Register an event handler.
 
@@ -154,7 +149,7 @@ def handle_request(self, environ, start_response):
         :param environ: The WSGI environment.
         :param start_response: The WSGI ``start_response`` function.
 
-        Ths function returns the HTTP response body to deliver to the client
+        This function returns the HTTP response body to deliver to the client
         as a byte sequence.
         """
         method = environ['REQUEST_METHOD']
@@ -209,9 +204,13 @@ def handle_request(self, environ, start_response):
         start_response(r['status'], r['headers'] + cors_headers)
         return [r['response']]
 
+    def _generate_id(self):
+        """Generate a unique session id."""
+        return uuid.uuid4().hex
+
     def _handle_connect(self, environ):
         """Handle a client connection request."""
-        sid = self.generate_id()
+        sid = self._generate_id()
         s = socket.Socket(self, sid)
         self.clients[sid] = s
         pkt = packet.Packet(

tests/test_server.py

@@ -32,7 +32,7 @@ def test_create(self):
 
     def test_generate_id(self):
         s = server.Server()
-        self.assertNotEqual(s.generate_id(), s.generate_id())
+        self.assertNotEqual(s._generate_id(), s._generate_id())
 
     def test_on_event(self):
         s = server.Server()
@@ -161,7 +161,7 @@ def test_connect_cors_no_credentials(self):
 
     def test_connect_event(self):
         s = server.Server()
-        s.generate_id = mock.MagicMock(return_value='123')
+        s._generate_id = mock.MagicMock(return_value='123')
         mock_event = mock.MagicMock()
         s.on('connect')(mock_event)
         environ = {'REQUEST_METHOD': 'GET', 'QUERY_STRING': ''}
@@ -172,7 +172,7 @@ def test_connect_event(self):
 
     def test_connect_event_rejects(self):
         s = server.Server()
-        s.generate_id = mock.MagicMock(return_value='123')
+        s._generate_id = mock.MagicMock(return_value='123')
         mock_event = mock.MagicMock(return_value=False)
         s.on('connect')(mock_event)
         environ = {'REQUEST_METHOD': 'GET', 'QUERY_STRING': ''}
@@ -358,7 +358,7 @@ def test_compression_no_encoding(self):
 
     def test_cookie(self):
         s = server.Server(cookie='sid')
-        s.generate_id = mock.MagicMock(return_value='123')
+        s._generate_id = mock.MagicMock(return_value='123')
         environ = {'REQUEST_METHOD': 'GET', 'QUERY_STRING': ''}
         start_response = mock.MagicMock()
         s.handle_request(environ, start_response)
@@ -367,7 +367,7 @@ def test_cookie(self):
 
     def test_no_cookie(self):
         s = server.Server(cookie=None)
-        s.generate_id = mock.MagicMock(return_value='123')
+        s._generate_id = mock.MagicMock(return_value='123')
         environ = {'REQUEST_METHOD': 'GET', 'QUERY_STRING': ''}
         start_response = mock.MagicMock()
         s.handle_request(environ, start_response)