Working on python moderator.

A moderator object is created for each session, but otherwise it does
nothing at this point.

servers/python/coweb/__init__.py

@@ -2,6 +2,6 @@
 Copyright (c) The Dojo Foundation 2011. All Rights Reserved.
 Copyright (c) IBM Corporation 2008, 2011. All Rights Reserved.
 '''
-VERSION = '0.8.3'
+VERSION = '0.8.4-SNAPSHOT'
 from runner import run_server
 from container import AppContainer

servers/python/coweb/admin.py

@@ -57,11 +57,15 @@ def post(self):
         access = self._container.access
         sessionInfo = access.on_admin_request(username, key, collab)
 
+        config = {}
+        config['sessionModerator'] = None
+
         if sessionId is None:
             # create a new session if not started yet
             # if we made it here, user has permission to do so
             sess = session.create_session(
                 collab,
+                config,
                 key=key,
                 cacheState=cacheState,
                 container=self._container,

servers/python/coweb/cowebpyoe/OperationEngine.py

@@ -33,7 +33,7 @@ def __init__(self, siteId):
         self.hb = HistoryBuffer()
         self.siteCount = 1
 
-    VERSION = "0.8.3"
+    VERSION = "0.8.4-SNAPSHOT"
 
     """
     Gets the state of this engine instance to seed a new instance.

servers/python/coweb/session/__init__.py

@@ -7,7 +7,7 @@
 from session import Session
 from collab import CollabSession
 
-def create_session(collab, *args, **kwargs):
+def create_session(collab, config, *args, **kwargs):
     '''Builds a cooperative or non-cooperative session.'''
     cls = CollabSession if collab else Session
-    return cls(*args, **kwargs)
+    return cls(config, *args, **kwargs)

servers/python/coweb/session/collab.py

@@ -15,6 +15,7 @@
 # coweb
 import session
 from .. import OEHandler
+from .. import session_moderator
 
 OEHandler = OEHandler.OEHandler
 session_sync_regex = re.compile("/session/([A-z0-9]+)/sync(.*)");
@@ -25,8 +26,8 @@ class CollabSession(session.Session):
     '''
     Manages a session instance that supports services and cooperative events.
     '''
-    def __init__(self, *args, **kwargs):
-        super(CollabSession, self).__init__(*args, **kwargs)
+    def __init__(self, config, *args, **kwargs):
+        super(CollabSession, self).__init__(config, *args, **kwargs)
         self.collab = True
         self._connectionClass = CollabSessionConnection
 
@@ -50,6 +51,9 @@ def __init__(self, *args, **kwargs):
 
         # TODO make this optional
         self._opengine = OEHandler(self, 0)
+
+        # Moderator? TODO
+        self._moderator = session_moderator.get_instance(self.config['sessionModerator'], self.key)
 
     def get_order(self):
         '''Gets the next operation order sequence number.'''

servers/python/coweb/session/session.py

@@ -24,9 +24,10 @@ class Session(bayeux.BayeuxManager):
     Manages a session instance that supports services but no user cooperative 
     events.
     '''
-    def __init__(self, container, key, cacheState, *args, **kwargs):
+    def __init__(self, config, container, key, cacheState, *args, **kwargs):
         super(Session, self).__init__(*args, **kwargs)
         self.collab = False
+        self.config = config
         # produce unique session ID
         self.sessionId = uuid.uuid4().hex
         self.key = key
@@ -202,4 +203,4 @@ def on_publish(self, cl, req, res):
             res['error'] = '402:%s:not-allowed' % client.clientId
             res['successful'] = False
             return
-        super(SessionConnection, self).on_publish(cl, req, res)
+        super(SessionConnection, self).on_publish(cl, req, res)

servers/python/coweb/session_moderator.py

@@ -0,0 +1,74 @@
+
+_moderators = {}
+
+# Adopted from hasen j's answer to
+# http://stackoverflow.com/questions/452969/does-python-have-an-equivalent-to-java-class-forname
+def _get_class( kls ):
+    try:
+        parts = kls.split('.')
+        module = ".".join(parts[:-1])
+        m = __import__( module )
+        for comp in parts[1:]:
+            m = getattr(m, comp)            
+        return m
+    except Exception:
+        return None
+
+def get_instance(class_name, key):
+    moderator = _moderators.get(key, None)
+    if moderator is not None:
+        return moderator
+
+    # Must create a new moderator for the given cowebkey.
+    if not class_name:
+        class_name = 'coweb.session_moderator.session_moderator'
+
+    clss = _get_class(class_name)
+    if clss is None:
+        clss = session_moderator
+
+    moderator = clss(key)
+    _moderators[key] = moderator
+    return moderator
+
+class session_moderator:
+
+    def __init__(self, key):
+        self.key = key
+
+    def canClientJoinState(self, client):
+        pass
+
+    def canClientMakeServiceRequest(self, client):
+        pass
+
+    def canClientSubscribeService(self, client):
+        pass
+
+    def getLateJoinState(self):
+        pass
+
+    def getLocalSession(self):
+        pass
+
+    def getServerSession(self):
+        pass
+
+    def onClientJoinSession(self, client):
+        pass
+
+    def onClientLeaveSession(self, client):
+        pass
+
+    def onServiceResponse(self, botResponse):
+        pass
+
+    def onSessionEnd(self):
+        pass
+
+    def onSync(self, data):
+        pass
+
+    def setSessionAttribute(self, key, value):
+        pass
+

servers/python/setup.py

@@ -11,7 +11,7 @@
 import shutil
 import subprocess
 
-VERSION = '0.8.3'
+VERSION = '0.8.4-SNAPSHOT'
 
 isSDist = len(sys.argv) > 1 and sys.argv[1] == 'sdist'
 srcDir = os.path.join(os.environ['PWD'], '../../js/release/coweb-%s' % VERSION)
@@ -61,7 +61,7 @@
         'coweb.service.manager',
         'coweb.session',
         'coweb.updater',
-        'cowebpyoe'
+        'coweb.cowebpyoe'
     ],
     data_files = cowebJSFiles,
     package_data={