Skip to content

Commit 89fcdb4

Browse files
committed
Merge pull request #15 from mshibata/feature/regex_url_dispatch
fixed examples/app
2 parents 8299a4d + 3e643de commit 89fcdb4

File tree

3 files changed

+9
-10
lines changed

3 files changed

+9
-10
lines changed

cats/base.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,13 @@ class WSGIHandler(object):
2424
def __init__(self, url_list=None, socketio_url_list=None):
2525
self.url_list = url_list
2626
self.socketio_url_list = socketio_url_list
27-
self.request = {'box': {}}
2827

2928
def __call__(self, environ, start_response):
3029
path = environ['PATH_INFO'].strip('/')
3130

3231
if self.socketio_url_list and path.startswith("socket.io"):
3332
request = Request(environ, charset='utf8')
34-
ns = self.create_namespace(environ)
33+
ns = self.create_namespace(path, environ)
3534
socketio_manage(environ=environ,
3635
namespaces=ns,
3736
request=request)

examples/chat/app.py

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,21 +29,19 @@ def get(self, request):
2929

3030

3131
class ViewTestSocketIO(BaseSocketIO):
32+
nicknames = []
3233
def on_nickname(self, nickname):
33-
if not self.request['box'].get('nicknames'):
34-
self.request['box']['nicknames'] = []
35-
36-
self.request['box']['nicknames'].append(nickname)
34+
self.nicknames.append(nickname)
3735
self.socket.session['nickname'] = nickname
3836
self.broadcast_event('announcement', '%s has connected' % nickname)
39-
self.broadcast_event('nicknames', self.request['box']['nicknames'])
37+
self.broadcast_event('nicknames', self.nicknames)
4038
self.join('main_room')
4139

4240
def recv_disconnect(self):
4341
nickname = self.socket.session['nickname']
44-
self.request['box']['nicknames'].remove(nickname)
42+
self.nicknames.remove(nickname)
4543
self.broadcast_event('announcement', '%s has disconnected' % nickname)
46-
self.broadcast_event('nicknames', self.request['box']['nicknames'])
44+
self.broadcast_event('nicknames', self.nicknames)
4745

4846
self.disconnect(silent=True)
4947

examples/chat/templates/index.jinja

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,9 @@
4848
});
4949
5050
function message (from, msg) {
51-
$('#lines').append($('<p>').append($('<b>').text(from), msg));
51+
if (msg != '') {
52+
$('#lines').append($('<p>').append($('<b>').text(from), msg));
53+
}
5254
}
5355
5456
// DOM manipulation

0 commit comments

Comments
 (0)