add abstract layer for websockets. issue #51

activity/views.py

@@ -8,9 +8,9 @@
 from django.views.generic import TemplateView, View
 from braces.views import LoginRequiredMixin, JSONResponseMixin, AjaxResponseMixin
 import misaka as m
-import pusher
 from activity.models import Event
 from datetime import datetime
+from emergent.websockets import Pusher
 
 
 __all__ = (
@@ -44,18 +44,13 @@ def get_ajax(self, request, *args, **kwargs):
 
 class ChatSendView(LoginRequiredMixin, JSONResponseMixin, AjaxResponseMixin, View):
     def post_ajax(self, request, *args, **kwargs):
-        p = pusher.Pusher(
-            app_id=settings.PUSHER_APPID,
-            key=settings.PUSHER_KEY,
-            secret=settings.PUSHER_SECRET
-        )
         msg = {
             'message': m.html(self.request.POST['message']),
             'user': self.request.user.username,
             'type': 'chat',
         }
         Event(timestamp=datetime.now(), user=self.request.user, type='chat', message=msg['message']).save()
-        p['activity'].trigger('my_event', msg)
+        Pusher.send("activity", 'my_event', msg)
         json_dict = {
             "success": True
         }

emergent/websockets.py

@@ -0,0 +1,18 @@
+import pusher
+from django.conf import settings
+
+
+class PusherWrapper(object):
+
+    def __init__(self):
+
+        self.p = pusher.Pusher(
+            app_id=settings.PUSHER_APPID,
+            key=settings.PUSHER_KEY,
+            secret=settings.PUSHER_SECRET
+        )
+
+    def send(self, channel, event, msg):
+        self.p[channel].trigger(event, msg)
+
+Pusher = PusherWrapper()

static/js/activity.js

@@ -13,14 +13,8 @@ $(function(){
          "</div>"
     );
 
-    var pusher = new Pusher('6bb5412badf09454aa87');
-        var channel = pusher.subscribe('activity');
-        channel.bind('my_event', function(data) {
-            console.log(data);
-            data.now = new Date().toLocaleTimeString();
-            $("#events").append(chat_message(data));
-        });
-
+    websocket_init()
+
     var editor = new EpicEditor({
         theme: {
             base: "http://"+location.host+'/static/epiceditor/themes/base/epiceditor.css',

static/js/websockets.js

@@ -0,0 +1,10 @@
+function websocket_init(){
+    var pusher = new Pusher('6bb5412badf09454aa87');
+        var channel = pusher.subscribe('activity');
+        channel.bind('my_event', function(data) {
+            console.log(data);
+            data.now = new Date().toLocaleTimeString();
+            $("#events").append(chat_message(data));
+        });
+
+}

templates/base.html

@@ -61,6 +61,7 @@
     <script type="text/javascript" src='{% static 'bootstrap/dist/js/bootstrap.js' %}'></script>
     <script type="text/javascript" src='{% static 'notify.js' %}'></script>
     <script type='text/javascript' src='http://js.pusher.com/2.1/pusher.min.js'></script>
+    <script type='text/javascript' src='{% static 'js/websockets.js' %}'></script>
     <script type="text/javascript" src='{% static 'underscore/underscore.js' %}'></script>
 
     <script type="text/javascript" src='{% static 'js/init.js' %}'></script>