refactoring

15 files changed, 704 insertions, 569 deletions

diff --git a/PubnubBase.py b/PubnubBase.py
new file mode 100644
index 0000000..074b891
--- /dev/null
+++ b/PubnubBase.py
@@ -0,0 +1,402 @@
+## www.pubnub.com - PubNub Real-time push service in the cloud. 
+# coding=utf8
+
+## PubNub Real-time Push APIs and Notifications Framework
+## Copyright (c) 2010 Stephen Blum
+## http://www.pubnub.com/
+
+## -----------------------------------
+## PubNub 3.0 Real-time Push Cloud API
+## -----------------------------------
+
+try: import json
+except ImportError: import simplejson as json
+
+import time
+import hashlib
+import urllib2
+import uuid 
+
+class PubnubBase(object):
+    def __init__(
+        self,
+        publish_key,
+        subscribe_key,
+        secret_key = False,
+        cipher_key = False,
+        ssl_on = False,
+        origin = 'pubsub.pubnub.com',
+        UUID = None
+    ) :
+        """
+        #**
+        #* Pubnub
+        #*
+        #* Init the Pubnub Client API
+        #*
+        #* @param string publish_key required key to send messages.
+        #* @param string subscribe_key required key to receive messages.
+        #* @param string secret_key optional key to sign messages.
+        #* @param boolean ssl required for 2048 bit encrypted messages.
+        #* @param string origin PUBNUB Server Origin.
+        #* @param string pres_uuid optional identifier for presence (auto-generated if not supplied)
+        #**
+
+        ## Initiat Class
+        pubnub = Pubnub( 'PUBLISH-KEY', 'SUBSCRIBE-KEY', 'SECRET-KEY', False )
+
+        """
+        self.origin        = origin
+        self.limit         = 1800
+        self.publish_key   = publish_key
+        self.subscribe_key = subscribe_key
+        self.secret_key    = secret_key
+        self.cipher_key    = cipher_key
+        self.ssl           = ssl_on
+
+        if self.ssl :
+            self.origin = 'https://' + self.origin
+        else :
+            self.origin = 'http://'  + self.origin
+        
+        self.uuid = UUID or str(uuid.uuid4())
+        
+        if not isinstance(self.uuid, basestring):
+            raise AttributeError("pres_uuid must be a string")
+
+    def sign(self, channel, message):
+        ## Sign Message
+        if self.secret_key:
+            signature = hashlib.md5('/'.join([
+                self.publish_key,
+                self.subscribe_key,
+                self.secret_key,
+                channel,
+                message
+            ])).hexdigest()
+        else:
+            signature = '0'
+        return signature
+
+    def encrypt(self, message):
+        if self.cipher_key:
+            pc = PubnubCrypto()
+            out = []
+            if type( message ) == type(list()):
+                for item in message:
+                    encryptItem = pc.encrypt(self.cipher_key, item ).rstrip()
+                    out.append(encryptItem)
+                message = json.dumps(out)
+            elif type( message ) == type(dict()):
+                outdict = {}
+                for k, item in message.iteritems():
+                    encryptItem = pc.encrypt(self.cipher_key, item ).rstrip()
+                    outdict[k] = encryptItem
+                    out.append(outdict)
+                message = json.dumps(out[0])
+            else:
+                message = json.dumps(pc.encrypt(self.cipher_key, message).replace('\n',''))
+        else :
+            message = json.dumps(message)
+
+        return message;
+
+    def decrypt(self, message):
+        if self.cipher_key:
+            if type( message ) == type(list()):
+                for item in message:
+                    encryptItem = pc.decrypt(self.cipher_key, item )
+                    out.append(encryptItem)
+                message = out
+            elif type( message ) == type(dict()):
+                outdict = {}
+                for k, item in message.iteritems():
+                    encryptItem = pc.decrypt(self.cipher_key, item )
+                    outdict[k] = encryptItem
+                    out.append(outdict)
+                message = out[0]
+            else:
+                message = pc.decrypt(self.cipher_key, message)
+
+        return message
+
+
+    def publish( self, args ) :
+        """
+        #**
+        #* Publish
+        #*
+        #* Send a message to a channel.
+        #*
+        #* @param array args with channel and message.
+        #* @return array success information.
+        #**
+
+        ## Publish Example
+        info = pubnub.publish({
+            'channel' : 'hello_world',
+            'message' : {
+                'some_text' : 'Hello my World'
+            }
+        })
+        print(info)
+
+        """
+        ## Fail if bad input.
+        if not (args['channel'] and args['message']) :
+            return [ 0, 'Missing Channel or Message' ]
+
+        ## Capture User Input
+        channel = str(args['channel'])
+
+        ## Capture Callback
+        if args.has_key('callback') :
+            callback = args['callback']
+        else :
+            callback = None 
+
+        #message = json.dumps(args['message'], separators=(',',':'))
+        message = self.encrypt(args['message'])
+
+        signature = self.sign(channel, message)
+
+        ## Send Message
+        return self._request({"urlcomponents": [
+            'publish',
+            self.publish_key,
+            self.subscribe_key,
+            signature,
+            channel,
+            '0',
+            message
+        ]}, callback)
+    
+    def presence( self, args ) :
+        """
+        #**
+        #* presence
+        #*
+        #* This is BLOCKING.
+        #* Listen for presence events on a channel.
+        #*
+        #* @param array args with channel and callback.
+        #* @return false on fail, array on success.
+        #**
+
+        ## Presence Example
+        def pres_event(message) :
+            print(message)
+            return True
+
+        pubnub.presence({
+            'channel'  : 'hello_world',
+            'callback' : receive 
+        })
+        """
+
+        ## Fail if missing channel
+        if not 'channel' in args :
+            raise Exception('Missing Channel.')
+            return False
+
+        ## Fail if missing callback
+        if not 'callback' in args :
+            raise Exception('Missing Callback.')
+            return False
+
+        ## Capture User Input
+        channel   = str(args['channel'])
+        callback  = args['callback']
+        subscribe_key = args.get('subscribe_key') or self.subscribe_key
+        
+        return self.subscribe({'channel': channel+'-pnpres', 'subscribe_key':subscribe_key, 'callback': callback})
+    
+    
+    def here_now( self, args ) :
+        """
+        #**
+        #* Here Now
+        #*
+        #* Load current occupancy from a channel.
+        #*
+        #* @param array args with 'channel'.
+        #* @return mixed false on fail, array on success.
+        #*
+
+        ## Presence Example
+        here_now = pubnub.here_now({
+            'channel' : 'hello_world',
+        })
+        print(here_now['occupancy'])
+        print(here_now['uuids'])
+
+        """
+        channel = str(args['channel'])
+
+        ## Capture Callback
+        if args.has_key('callback') :
+            callback = args['callback']
+        else :
+            callback = None
+        
+        ## Fail if bad input.
+        if not channel :
+            raise Exception('Missing Channel')
+            return False
+        
+        ## Get Presence Here Now
+        return self._request({"urlcomponents": [
+            'v2','presence',
+            'sub_key', self.subscribe_key,
+            'channel', channel
+        ]}, callback);
+        
+        
+    def history( self, args ) :
+        """
+        #**
+        #* History
+        #*
+        #* Load history from a channel.
+        #*
+        #* @param array args with 'channel' and 'limit'.
+        #* @return mixed false on fail, array on success.
+        #*
+
+        ## History Example
+        history = pubnub.history({
+            'channel' : 'hello_world',
+            'limit'   : 1
+        })
+        print(history)
+
+        """
+        ## Capture User Input
+        limit   = args.has_key('limit') and int(args['limit']) or 10
+        channel = str(args['channel'])
+
+        ## Fail if bad input.
+        if not channel :
+            raise Exception('Missing Channel')
+            return False
+
+        ## Capture Callback
+        if args.has_key('callback') :
+            callback = args['callback']
+        else :
+            callback = None
+
+        ## Get History
+        return self._request({ "urlcomponents" : [
+            'history',
+            self.subscribe_key,
+            channel,
+            '0',
+            str(limit)
+        ] }, callback);
+
+    def detailedHistory(self, args) :
+        """
+        #**
+        #* Detailed History
+        #*
+        #* Load Detailed history from a channel.
+        #*
+        #* @param array args with 'channel', optional: 'start', 'end', 'reverse', 'count'
+        #* @return mixed false on fail, array on success.
+        #*
+
+        ## History Example
+        history = pubnub.detailedHistory({
+            'channel' : 'hello_world',
+            'count'   : 5
+        })
+        print(history)
+
+        """
+        ## Capture User Input
+        channel = str(args['channel'])
+
+        params = [] 
+        count = 100    
+        
+        if args.has_key('count'):
+            count = int(args['count'])
+
+        params.append('count' + '=' + str(count))    
+        
+        if args.has_key('reverse'):
+            params.append('reverse' + '=' + str(args['reverse']).lower())
+
+        if args.has_key('start'):
+            params.append('start' + '=' + str(args['start']))
+
+        if args.has_key('end'):
+            params.append('end' + '=' + str(args['end']))
+
+        ## Fail if bad input.
+        if not channel :
+            raise Exception('Missing Channel')
+            return False
+
+        ## Capture Callback
+        if args.has_key('callback') :
+            callback = args['callback']
+        else :
+            callback = None 
+
+        ## Get History
+        return self._request([
+            'v2',
+            'history',
+            'sub-key',
+            self.subscribe_key,
+            'channel',
+            channel,
+        ],params=params , callback=callback);
+
+    def time(self, args = None) :
+        """
+        #**
+        #* Time
+        #*
+        #* Timestamp from PubNub Cloud.
+        #*
+        #* @return int timestamp.
+        #*
+
+        ## PubNub Server Time Example
+        timestamp = pubnub.time()
+        print(timestamp)
+
+        """
+        ## Capture Callback
+        if args and args.has_key('callback') :
+            callback = args['callback']
+        else :
+            callback = None 
+        time = self._request([
+            'time',
+            '0'
+        ], callback)
+        if time != None:
+            return time[0]
+
+
+    def _encode( self, request ) :
+        return [
+            "".join([ ' ~`!@#$%^&*()+=[]\\{}|;\':",./<>?'.find(ch) > -1 and
+                hex(ord(ch)).replace( '0x', '%' ).upper() or
+                ch for ch in list(bit)
+            ]) for bit in request]
+    
+    def getUrl(self,request):
+        ## Build URL
+        url = self.origin + '/' + "/".join([
+            "".join([ ' ~`!@#$%^&*()+=[]\\{}|;\':",./<>?'.find(ch) > -1 and
+                hex(ord(ch)).replace( '0x', '%' ).upper() or
+                ch for ch in list(bit)
+            ]) for bit in request["urlcomponents"]])
+        if (request.has_key("urlparams")):
+            url = url + '?' + "&".join([ x + "=" + y  for x,y in request["urlparams"].items()])
+        return url
diff --git a/PubnubCore.py b/PubnubCore.py
index 76e1cdd..4bf143b 100644
--- a/PubnubCore.py
+++ b/PubnubCore.py
@@ -16,16 +16,18 @@ import time
 import hashlib
 import urllib2
 import uuid
+from PubnubBase import PubnubBase
 
-class PubnubCore(object):
+class PubnubCore(PubnubBase):
     def __init__(
         self,
         publish_key,
         subscribe_key,
         secret_key = False,
+        cipher_key = False,
         ssl_on = False,
         origin = 'pubsub.pubnub.com',
-        pres_uuid = None
+        uuid = None
     ) :
         """
         #**
@@ -45,81 +47,20 @@ class PubnubCore(object):
         pubnub = Pubnub( 'PUBLISH-KEY', 'SUBSCRIBE-KEY', 'SECRET-KEY', False )
 
         """
-        self.origin        = origin
-        self.limit         = 1800
-        self.publish_key   = publish_key
-        self.subscribe_key = subscribe_key
-        self.secret_key    = secret_key
-        self.ssl           = ssl_on
+        super(PubnubCore, self).__init__(
+            publish_key=publish_key,
+            subscribe_key=subscribe_key,
+            secret_key=secret_key,
+            cipher_key=cipher_key,
+            ssl_on=ssl_on,
+            origin=origin,
+            UUID=uuid
+        )        
 
-        if self.ssl :
-            self.origin = 'https://' + self.origin
-        else :
-            self.origin = 'http://'  + self.origin
-        
-        self.uuid = pres_uuid or str(uuid.uuid4())
-        
-        if not isinstance(self.uuid, basestring):
-            raise AttributeError("pres_uuid must be a string")
-
-    def publish( self, args ) :
-        """
-        #**
-        #* Publish
-        #*
-        #* Send a message to a channel.
-        #*
-        #* @param array args with channel and message.
-        #* @return array success information.
-        #**
-
-        ## Publish Example
-        info = pubnub.publish({
-            'channel' : 'hello_world',
-            'message' : {
-                'some_text' : 'Hello my World'
-            }
-        })
-        print(info)
-
-        """
-        ## Fail if bad input.
-        if not (args['channel'] and args['message']) :
-            return [ 0, 'Missing Channel or Message' ]
-
-        ## Capture User Input
-        channel = str(args['channel'])
-        message = json.dumps(args['message'], separators=(',',':'))
-
-
-        ## Capture Callback
-        if args.has_key('callback') :
-            callback = args['callback']
-        else :
-            callback = None 
-
-        ## Sign Message
-        if self.secret_key :
-            signature = hashlib.md5('/'.join([
-                self.publish_key,
-                self.subscribe_key,
-                self.secret_key,
-                channel,
-                message
-            ])).hexdigest()
-        else :
-            signature = '0'
-
-        ## Send Message
-        return self._request([
-            'publish',
-            self.publish_key,
-            self.subscribe_key,
-            signature,
-            channel,
-            '0',
-            message
-        ], callback)
+        self.subscriptions = {}
+        self.timetoken     = 0
+        self.version       = '3.4'
+        self.accept_encoding = 'gzip'
 
 
 
@@ -192,226 +133,3 @@ class PubnubCore(object):
                 time.sleep(1)
 
         return True
-    
-    def presence( self, args ) :
-        """
-        #**
-        #* presence
-        #*
-        #* This is BLOCKING.
-        #* Listen for presence events on a channel.
-        #*
-        #* @param array args with channel and callback.
-        #* @return false on fail, array on success.
-        #**
-
-        ## Presence Example
-        def pres_event(message) :
-            print(message)
-            return True
-
-        pubnub.presence({
-            'channel'  : 'hello_world',
-            'callback' : receive 
-        })
-        """
-
-        ## Fail if missing channel
-        if not 'channel' in args :
-            raise Exception('Missing Channel.')
-            return False
-
-        ## Fail if missing callback
-        if not 'callback' in args :
-            raise Exception('Missing Callback.')
-            return False
-
-        ## Capture User Input
-        channel   = str(args['channel'])
-        callback  = args['callback']
-        subscribe_key = args.get('subscribe_key') or self.subscribe_key
-        
-        return self.subscribe({'channel': channel+'-pnpres', 'subscribe_key':subscribe_key, 'callback': callback})
-    
-    
-    def here_now( self, args ) :
-        """
-        #**
-        #* Here Now
-        #*
-        #* Load current occupancy from a channel.
-        #*
-        #* @param array args with 'channel'.
-        #* @return mixed false on fail, array on success.
-        #*
-
-        ## Presence Example
-        here_now = pubnub.here_now({
-            'channel' : 'hello_world',
-        })
-        print(here_now['occupancy'])
-        print(here_now['uuids'])
-
-        """
-        channel = str(args['channel'])
-
-        ## Capture Callback
-        if args.has_key('callback') :
-            callback = args['callback']
-        else :
-            callback = None
-        
-        ## Fail if bad input.
-        if not channel :
-            raise Exception('Missing Channel')
-            return False
-        
-        ## Get Presence Here Now
-        return self._request([
-            'v2','presence',
-            'sub_key', self.subscribe_key,
-            'channel', channel
-        ], callback);
-        
-        
-    def history( self, args ) :
-        """
-        #**
-        #* History
-        #*
-        #* Load history from a channel.
-        #*
-        #* @param array args with 'channel' and 'limit'.
-        #* @return mixed false on fail, array on success.
-        #*
-
-        ## History Example
-        history = pubnub.history({
-            'channel' : 'hello_world',
-            'limit'   : 1
-        })
-        print(history)
-
-        """
-        ## Capture User Input
-        limit   = args.has_key('limit') and int(args['limit']) or 10
-        channel = str(args['channel'])
-
-        ## Fail if bad input.
-        if not channel :
-            raise Exception('Missing Channel')
-            return False
-
-        ## Capture Callback
-        if args.has_key('callback') :
-            callback = args['callback']
-        else :
-            callback = None
-
-        ## Get History
-        return self._request([
-            'history',
-            self.subscribe_key,
-            channel,
-            '0',
-            str(limit)
-        ] , callback);
-
-    def detailedHistory(self, args) :
-        """
-        #**
-        #* Detailed History
-        #*
-        #* Load Detailed history from a channel.
-        #*
-        #* @param array args with 'channel', optional: 'start', 'end', 'reverse', 'count'
-        #* @return mixed false on fail, array on success.
-        #*
-
-        ## History Example
-        history = pubnub.detailedHistory({
-            'channel' : 'hello_world',
-            'count'   : 5
-        })
-        print(history)
-
-        """
-        ## Capture User Input
-        channel = str(args['channel'])
-
-        params = [] 
-        count = 100    
-        
-        if args.has_key('count'):
-            count = int(args['count'])
-
-        params.append('count' + '=' + str(count))    
-        
-        if args.has_key('reverse'):
-            params.append('reverse' + '=' + str(args['reverse']).lower())
-
-        if args.has_key('start'):
-            params.append('start' + '=' + str(args['start']))
-
-        if args.has_key('end'):
-            params.append('end' + '=' + str(args['end']))
-
-        ## Fail if bad input.
-        if not channel :
-            raise Exception('Missing Channel')
-            return False
-
-        ## Capture Callback
-        if args.has_key('callback') :
-            callback = args['callback']
-        else :
-            callback = None 
-
-        ## Get History
-        return self._request([
-            'v2',
-            'history',
-            'sub-key',
-            self.subscribe_key,
-            'channel',
-            channel,
-        ],params=params , callback=callback);
-
-    def time(self, args = None) :
-        """
-        #**
-        #* Time
-        #*
-        #* Timestamp from PubNub Cloud.
-        #*
-        #* @return int timestamp.
-        #*
-
-        ## PubNub Server Time Example
-        timestamp = pubnub.time()
-        print(timestamp)
-
-        """
-        ## Capture Callback
-        if args and args.has_key('callback') :
-            callback = args['callback']
-        else :
-            callback = None 
-        time = self._request([
-            'time',
-            '0'
-        ], callback)
-        if time != None:
-            return time[0]
-
-
-    def _encode( self, request ) :
-        return [
-            "".join([ ' ~`!@#$%^&*()+=[]\\{}|;\':",./<>?'.find(ch) > -1 and
-                hex(ord(ch)).replace( '0x', '%' ).upper() or
-                ch for ch in list(bit)
-            ]) for bit in request]
-
-
-
-
diff --git a/PubnubCoreAsync.py b/PubnubCoreAsync.py
index b31fdfe..9c53c6e 100644
--- a/PubnubCoreAsync.py
+++ b/PubnubCoreAsync.py
@@ -22,8 +22,9 @@ except ImportError:
     sha256 = digestmod.new
 import hmac
 from PubnubCrypto import PubnubCrypto
+from PubnubBase import PubnubBase
 
-class PubnubCoreAsync(object):
+class PubnubCoreAsync(PubnubBase):
 
     def start(self): pass 
     def stop(self):  pass
@@ -57,112 +58,20 @@ class PubnubCoreAsync(object):
         pubnub = Pubnub( 'PUBLISH-KEY', 'SUBSCRIBE-KEY', 'SECRET-KEY', False )
 
         """
-        self.origin        = origin
-        self.publish_key   = publish_key
-        self.subscribe_key = subscribe_key
-        self.secret_key    = secret_key
-        self.cipher_key    = cipher_key
-        self.ssl           = ssl_on
+        super(PubnubCoreAsync, self).__init__(
+            publish_key=publish_key,
+            subscribe_key=subscribe_key,
+            secret_key=secret_key,
+            cipher_key=cipher_key,
+            ssl_on=ssl_on,
+            origin=origin,
+            UUID=uuid
+        )        
+
         self.subscriptions = {}
         self.timetoken     = 0
-        self.uuid          = uuid or str(self.uuid()) 
         self.version       = '3.4'
         self.accept_encoding = 'gzip'
-        print self.ssl
-        if self.ssl :
-            self.origin = 'https://' + self.origin
-        else :
-            self.origin = 'http://'  + self.origin
-
-
-    def publish( self, args ) :
-        """
-        #**
-        #* Publish
-        #*
-        #* Send a message to a channel.
-        #*
-        #* @param array args with channel and message.
-        #* @return array success information.
-        #**
-
-        ## Publish Example
-        def publish_complete(info):
-            print(info)
-
-        pubnub.publish({
-            'channel' : 'hello_world',
-            'message' : {
-                'some_text' : 'Hello my World'
-            },
-            'callback' : publish_complete
-        })
-
-        """
-        ## Capture Callback
-        if args.has_key('callback'): callback = args['callback']
-        else: callback = lambda x : x
-
-        ## Fail if bad input.
-        if not (args['channel'] and args['message']):
-            callback([ 0, 'Missing Channel or Message', 0 ])
-            return False
-
-        ## Capture User Input
-        channel = str(args['channel'])
-        message = args['message']
-
-        if self.cipher_key :
-            pc = PubnubCrypto()
-            out = []
-            if type( message ) == type(list()):
-                for item in message:
-                    encryptItem = pc.encrypt(self.cipher_key, item ).rstrip()
-                    out.append(encryptItem)
-                message = json.dumps(out)
-            elif type( message ) == type(dict()):
-                outdict = {}
-                for k, item in message.iteritems():
-                    encryptItem = pc.encrypt(self.cipher_key, item ).rstrip()
-                    outdict[k] = encryptItem
-                    out.append(outdict)
-                message = json.dumps(out[0])
-            else:
-                message = json.dumps(pc.encrypt(self.cipher_key, message).replace('\n',''))
-        else :
-            message = json.dumps(args['message'])
-
-        def publish_response(info):
-            callback(info or [0, 'Disconnected', 0]);
-
-        ## Sign Message
-        if self.secret_key :
-            hashObject = sha256()
-            hashObject.update(self.secret_key)
-            hashedSecret = hashObject.hexdigest()
-            hash = hmac.HMAC(hashedSecret, '/'.join([
-                    self.publish_key,
-                    self.subscribe_key,
-                    self.secret_key,
-                    channel,
-                    message
-                ]), digestmod=digestmod)
-            signature = hash.hexdigest()        
-        else :
-            signature = '0'
-
-        ## Send Message
-        return self._request({ "urlcomponents" : [
-            'publish',
-            self.publish_key,
-            self.subscribe_key,
-            signature,
-            channel,
-            '0',
-            message
-        ] }, publish_response )
-
-
 
     def subscribe( self, args ) :
         """
@@ -227,7 +136,7 @@ class PubnubCoreAsync(object):
 
         self.subscriptions[channel]['connected'] = 1
         ## SUBSCRIPTION RECURSION 
-        def substabizel():
+        def _subscribe():
             ## STOP CONNECTION?
             if not self.subscriptions[channel]['connected']:
                 return
@@ -248,43 +157,24 @@ class PubnubCoreAsync(object):
                 if not response:
                     def time_callback(_time):
                         if not _time:
-                            self.timeout( 1, substabizel )
+                            self.timeout( 1, _subscribe )
                             return errorback("Lost Network Connection")
                         else:
-                            self.timeout( 1, substabizel )
+                            self.timeout( 1, _subscribe)
 
                     ## ENSURE CONNECTED (Call Time Function)
                     return self.time({ 'callback' : time_callback })
 
                 self.timetoken = response[1]
-                substabizel()
+                _subscribe()
 
                 pc = PubnubCrypto()
                 out = []
                 for message in response[0]:
-                     print type(message)
-                     if self.cipher_key :
-                          if type( message ) == type(list()):
-                              for item in message:
-                                  encryptItem = pc.decrypt(self.cipher_key, item )
-                                  out.append(encryptItem)
-                              message = out
-                          elif type( message ) == type(dict()):
-                              outdict = {}
-                              for k, item in message.iteritems():
-                                  encryptItem = pc.decrypt(self.cipher_key, item )
-                                  outdict[k] = encryptItem
-                                  out.append(outdict)
-                              message = out[0]
-                          else:
-                              message = pc.decrypt(self.cipher_key, message )
-                     else :
-                          message
-
-                     callback(message)
+                     callback(self.decrypt(message))
 
             ## CONNECT TO PUBNUB SUBSCRIBE SERVERS
-            try :
+            try:
                 self._request( { "urlcomponents" : [
                     'subscribe',
                     self.subscribe_key,
@@ -293,113 +183,8 @@ class PubnubCoreAsync(object):
                     str(self.timetoken)
                 ], "urlparams" : {"uuid":self.uuid} }, sub_callback )
             except :
-                self.timeout( 1, substabizel )
+                self.timeout( 1, _subscribe)
                 return
 
         ## BEGIN SUBSCRIPTION (LISTEN FOR MESSAGES)
-        substabizel()
-
-
-    def unsubscribe( self, args ):
-        channel = str(args['channel'])
-        if not (channel in self.subscriptions):
-            return False
-
-        ## DISCONNECT
-        self.subscriptions[channel]['connected'] = 0
-        self.subscriptions[channel]['timetoken'] = 0
-        self.subscriptions[channel]['first']     = False
-
-
-    def history( self, args ) :
-        """
-        #**
-        #* History
-        #*
-        #* Load history from a channel.
-        #*
-        #* @param array args with 'channel' and 'limit'.
-        #* @return mixed false on fail, array on success.
-        #*
-
-        ## History Example
-        history = pubnub.history({
-            'channel' : 'hello_world',
-            'limit'   : 1
-        })
-        print(history)
-
-        """
-        ## Capture User Input
-        limit   = args.has_key('limit') and int(args['limit']) or 10
-        channel = str(args['channel'])
-
-        ## Fail if bad input.
-        if not channel :
-            return 'Missing Channel'
-
-        ## Get History
-        pc = PubnubCrypto()
-        return self._request( {"urlcomponents" : [
-            'history',
-            self.subscribe_key,
-            channel,
-            '0',
-            str(limit)
-        ]}, args['callback'] )
-
-    def time( self, args ) :
-        """
-        #**
-        #* Time
-        #*
-        #* Timestamp from PubNub Cloud.
-        #*
-        #* @return int timestamp.
-        #*
-
-        ## PubNub Server Time Example
-        def time_complete(timestamp):
-            print(timestamp)
-
-        pubnub.time(time_complete)
-
-        """
-        def complete(response) :
-            if not response: return 0
-            args['callback'](response[0])
-
-        self._request( { "urlcomponents" : [
-            'time',
-            '0'
-        ]}, complete )
-
-    def uuid(self) :
-        """
-        #**
-        #* uuid
-        #*
-        #* Generate a UUID
-        #*
-        #* @return  UUID.
-        #*
-
-        ## PubNub UUID Example
-        uuid = pubnub.uuid()
-        print(uuid)
-        """
-        return uuid.uuid1()
-
-    def getUrl(self,request):
-        ## Build URL
-        url = self.origin + '/' + "/".join([
-            "".join([ ' ~`!@#$%^&*()+=[]\\{}|;\':",./<>?'.find(ch) > -1 and
-                hex(ord(ch)).replace( '0x', '%' ).upper() or
-                ch for ch in list(bit)
-            ]) for bit in request["urlcomponents"]])
-        if (request.has_key("urlparams")):
-            url = url + '?' + "&".join([ x + "=" + y  for x,y in request["urlparams"].items()])
-        return url
-
-    def _request( self, request, callback, timeout=30 ) :
-        pass
+        _subscribe()
diff --git a/PubnubCrypto.py b/PubnubCrypto.py
new file mode 100644
index 0000000..744f2d3
--- /dev/null
+++ b/PubnubCrypto.py
@@ -0,0 +1,92 @@
+## www.pubnub.com - PubNub Real-time push service in the cloud. 
+# coding=utf8
+
+## PubNub Real-time Push APIs and Notifications Framework
+## Copyright (c) 2010 Stephen Blum
+## http://www.pubnub.com/
+
+## -----------------------------------
+## PubNub 3.1 Real-time Push Cloud API
+## -----------------------------------
+
+from Crypto.Cipher import AES
+from Crypto.Hash import MD5
+from base64 import encodestring, decodestring 
+import hashlib
+import hmac
+
+class PubnubCrypto() :
+    """
+    #**
+    #* PubnubCrypto
+    #*
+    #**
+
+    ## Initiate Class
+    pc = PubnubCrypto
+
+    """
+   
+    def pad( self, msg, block_size=16 ):
+        """
+        #**
+        #* pad
+        #*
+        #* pad the text to be encrypted
+        #* appends a padding character to the end of the String
+        #* until the string has block_size length
+        #* @return msg with padding.
+        #**
+        """
+        return msg + ((block_size - len(msg) % block_size) * chr(block_size - len(msg) % block_size))
+       
+    def depad( self, msg ):
+        """
+        #**
+        #* depad
+        #*
+        #* depad the decryptet message"
+        #* @return msg without padding.
+        #**
+        """
+        return msg[0:-ord(msg[-1])]
+
+    def getSecret( self, key ):
+        """
+        #**
+        #* getSecret
+        #*
+        #* hases the key to MD5
+        #* @return key in MD5 format
+        #**
+        """
+        return MD5.new(key).digest()
+
+    def encrypt( self, key, msg ):
+        """
+        #**
+        #* encrypt
+        #*
+        #* encrypts the message
+        #* @return message in encrypted format
+        #**
+        """
+        secret = self.getSecret(key)
+        Initial16bytes='0123456789012345'
+        cipher = AES.new(secret,AES.MODE_CBC,Initial16bytes)
+        return encodestring(cipher.encrypt(self.pad(msg)))
+    
+    def decrypt( self, key, msg ):
+        """
+        #**
+        #* decrypt
+        #*
+        #* decrypts the message
+        #* @return message in decryped format
+        #**
+        """
+        secret = self.getSecret(key)
+        Initial16bytes='0123456789012345'
+        cipher = AES.new(secret,AES.MODE_CBC,Initial16bytes)
+        return self.depad((cipher.decrypt(decodestring(msg))))
+    
diff --git a/python-tornado/examples/here-now-example.py b/python-tornado/examples/here-now-example.py
new file mode 100644
index 0000000..4105776
--- /dev/null
+++ b/python-tornado/examples/here-now-example.py
@@ -0,0 +1,43 @@
+## www.pubnub.com - PubNub Real-time push service in the cloud. 
+# coding=utf8
+
+## PubNub Real-time Push APIs and Notifications Framework
+## Copyright (c) 2010 Stephen Blum
+## http://www.pubnub.com/
+
+## -----------------------------------
+## PubNub 3.1 Real-time Push Cloud API
+## -----------------------------------
+
+import sys
+import tornado
+from Pubnub import Pubnub
+
+publish_key   = len(sys.argv) > 1 and sys.argv[1] or 'demo'
+subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'demo'
+secret_key    = len(sys.argv) > 3 and sys.argv[3] or 'demo'
+cipher_key    = len(sys.argv) > 4 and sys.argv[4] or ''
+ssl_on        = len(sys.argv) > 5 and bool(sys.argv[5]) or False
+
+## -----------------------------------------------------------------------
+## Initiate Pubnub State
+## -----------------------------------------------------------------------
+pubnub = Pubnub( publish_key, subscribe_key, secret_key, cipher_key, ssl_on )
+crazy  = 'hello_world'
+
+## -----------------------------------------------------------------------
+## History Example
+## -----------------------------------------------------------------------
+def here_now_complete(messages):
+    print(messages)
+    tornado.ioloop.IOLoop.instance().stop()
+
+pubnub.here_now( {
+    'channel'  : crazy,
+    'callback' : here_now_complete
+})
+
+## -----------------------------------------------------------------------
+## IO Event Loop
+## -----------------------------------------------------------------------
+tornado.ioloop.IOLoop.instance().start()
diff --git a/python-tornado/examples/history-example.py b/python-tornado/examples/history-example.py
index 5c6fb5b..c1619f4 100644
--- a/python-tornado/examples/history-example.py
+++ b/python-tornado/examples/history-example.py
@@ -11,7 +11,6 @@
 
 import sys
 import tornado
-sys.path.append('../')
 from Pubnub import Pubnub
 
 publish_key   = len(sys.argv) > 1 and sys.argv[1] or 'demo'
@@ -31,6 +30,7 @@ crazy  = 'hello_world'
 ## -----------------------------------------------------------------------
 def history_complete(messages):
     print(messages)
+    tornado.ioloop.IOLoop.instance().stop()
 
 pubnub.history( {
    'channel'  : crazy,
diff --git a/python-tornado/examples/publish-example.py b/python-tornado/examples/publish-example.py
index 7f217d1..72f2586 100644
--- a/python-tornado/examples/publish-example.py
+++ b/python-tornado/examples/publish-example.py
@@ -6,7 +6,7 @@
 ## http://www.pubnub.com/
 
 ## -----------------------------------
-## PubNub 3.0 Real-time Push Cloud API
+## PubNub 3.1 Real-time Push Cloud API
 ## -----------------------------------
 
 import sys
@@ -18,27 +18,44 @@ from Pubnub import Pubnub
 publish_key   = len(sys.argv) > 1 and sys.argv[1] or 'demo'
 subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'demo'
 secret_key    = len(sys.argv) > 3 and sys.argv[3] or 'demo'
-cipher_key    = len(sys.argv) > 4 and sys.argv[4] or '' ##(Cipher key is Optional)
+cipher_key    = len(sys.argv) > 4 and sys.argv[4] or 'demo' ##(Cipher key is Optional)
 ssl_on        = len(sys.argv) > 5 and bool(sys.argv[5]) or False
 
 ## -----------------------------------------------------------------------
 ## Initiate Pubnub State
 ## -----------------------------------------------------------------------
-pubnub = Pubnub( publish_key, subscribe_key, secret_key,cipher_key, ssl_on )
+pubnub = Pubnub( publish_key=publish_key, subscribe_key=subscribe_key, secret_key=secret_key,cipher_key=cipher_key, ssl_on=ssl_on )
+#pubnub = Pubnub( publish_key, subscribe_key, secret_key, ssl_on )
 crazy  = 'hello_world'
 
-## -----------------------------------------------------------------------
-## History Example
-## -----------------------------------------------------------------------
-def history_complete(messages):
-    print(messages)
+def publish_complete(info):
+    print(info)
+
+## Publish string
+pubnub.publish({
+    'channel' : crazy,
+    'message' : 'Hello World!',
+    'callback' : publish_complete
+})
 
-pubnub.history( {
-   'channel'  : crazy,
-   'limit'    : 10,
-   'callback' : history_complete
+## Publish list
+li = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday']
+pubnub.publish({
+    'channel' : crazy,
+    'message' : li,
+    'callback' : publish_complete
 })
 
+def done_cb(info):
+    publish_complete(info)
+    tornado.ioloop.IOLoop.instance().stop()
+
+## Publish Dictionary Object
+pubnub.publish({
+    'channel' : crazy,
+    'message' : { 'some_key' : 'some_val' },
+    'callback' : done_cb
+})
 ## -----------------------------------------------------------------------
 ## IO Event Loop
 ## -----------------------------------------------------------------------
diff --git a/python-tornado/examples/subscribe-example.py b/python-tornado/examples/subscribe-example.py
index 1a2e03d..dfe8010 100644
--- a/python-tornado/examples/subscribe-example.py
+++ b/python-tornado/examples/subscribe-example.py
@@ -18,13 +18,14 @@ from Pubnub import Pubnub
 publish_key   = len(sys.argv) > 1 and sys.argv[1] or 'demo'
 subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'demo'
 secret_key    = len(sys.argv) > 3 and sys.argv[3] or 'demo'
-cipher_key    = len(sys.argv) > 4 and sys.argv[4] or '' ##(Cipher key is Optional)
+cipher_key    = len(sys.argv) > 4 and sys.argv[4] or 'demo' ##(Cipher key is Optional)
 ssl_on        = len(sys.argv) > 5 and bool(sys.argv[5]) or False
 
 ## -----------------------------------------------------------------------
 ## Initiate Pubnub State
 ## -----------------------------------------------------------------------
-pubnub = Pubnub( publish_key, subscribe_key, secret_key,cipher_key, ssl_on )
+pubnub = Pubnub( publish_key=publish_key, subscribe_key=subscribe_key, secret_key=secret_key,cipher_key=cipher_key, ssl_on=ssl_on )
+#pubnub = Pubnub( publish_key, subscribe_key, secret_key, ssl_on )
 crazy  = 'hello_world'
 
 def connect_cb():
@@ -41,6 +42,7 @@ pubnub.subscribe({
 ## -----------------------------------------------------------------------
 ## Publish Example
 ## -----------------------------------------------------------------------
+'''
 def publish_complete(info):
     print(info)
 
@@ -65,6 +67,7 @@ pubnub.publish({
     'message' : { 'some_key' : 'some_val' },
     'callback' : publish_complete
 })
+'''
 ## -----------------------------------------------------------------------
 ## IO Event Loop
 ## -----------------------------------------------------------------------
diff --git a/python-twisted/examples/here-now-example.py b/python-twisted/examples/here-now-example.py
new file mode 100644
index 0000000..b3c9dc0
--- /dev/null
+++ b/python-twisted/examples/here-now-example.py
@@ -0,0 +1,43 @@
+## www.pubnub.com - PubNub Real-time push service in the cloud. 
+# coding=utf8
+
+## PubNub Real-time Push APIs and Notifications Framework
+## Copyright (c) 2010 Stephen Blum
+## http://www.pubnub.com/
+
+## -----------------------------------
+## PubNub 3.1 Real-time Push Cloud API
+## -----------------------------------
+
+import sys
+from twisted.internet import reactor
+from Pubnub import Pubnub
+
+publish_key   = len(sys.argv) > 1 and sys.argv[1] or 'demo'
+subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'demo'
+secret_key    = len(sys.argv) > 3 and sys.argv[3] or 'demo'
+cipher_key    = len(sys.argv) > 4 and sys.argv[4] or ''
+ssl_on        = len(sys.argv) > 5 and bool(sys.argv[5]) or False
+
+## -----------------------------------------------------------------------
+## Initiate Pubnub State
+## -----------------------------------------------------------------------
+pubnub = Pubnub( publish_key, subscribe_key, secret_key, cipher_key, ssl_on )
+crazy  = 'hello_world'
+
+## -----------------------------------------------------------------------
+## History Example
+## -----------------------------------------------------------------------
+def here_now_complete(messages):
+    print(messages)
+    reactor.stop()
+
+pubnub.here_now( {
+    'channel'  : crazy,
+    'callback' : here_now_complete
+})
+
+## -----------------------------------------------------------------------
+## IO Event Loop
+## -----------------------------------------------------------------------
+reactor.run()
diff --git a/python-twisted/examples/history-example.py b/python-twisted/examples/history-example.py
index 31b8edb..5f352ef 100644
--- a/python-twisted/examples/history-example.py
+++ b/python-twisted/examples/history-example.py
@@ -31,6 +31,7 @@ crazy  = 'hello_world'
 ## -----------------------------------------------------------------------
 def history_complete(messages):
     print(messages)
+    reactor.stop()
 
 pubnub.history( {
     'channel'  : crazy,
diff --git a/python-twisted/examples/publish-example.py b/python-twisted/examples/publish-example.py
index 9c3be60..d09ad8d 100644
--- a/python-twisted/examples/publish-example.py
+++ b/python-twisted/examples/publish-example.py
@@ -48,11 +48,14 @@ pubnub.publish({
     'callback' : publish_complete
 })
 
+def done_cb(info):
+    publish_complete(info)
+    reactor.stop()
 ## Publish Dictionary Object
 pubnub.publish({
     'channel' : crazy,
     'message' : { 'some_key' : 'some_val' },
-    'callback' : publish_complete
+    'callback' : done_cb
 })
 
 ## -----------------------------------------------------------------------
diff --git a/python-twisted/examples/subscribe-example.py b/python-twisted/examples/subscribe-example.py
index 994e7e3..cf4a919 100644
--- a/python-twisted/examples/subscribe-example.py
+++ b/python-twisted/examples/subscribe-example.py
@@ -23,7 +23,8 @@ ssl_on        = len(sys.argv) > 5 and bool(sys.argv[5]) or False
 ## -----------------------------------------------------------------------
 ## Initiate Pubnub State
 ## -----------------------------------------------------------------------
-pubnub = Pubnub( publish_key, subscribe_key, secret_key, cipher_key, ssl_on )
+#pubnub = Pubnub( publish_key, subscribe_key, secret_key, cipher_key, ssl_on )
+pubnub = Pubnub( publish_key, subscribe_key, secret_key, ssl_on )
 crazy  = 'hello_world'
 
 ## -----------------------------------------------------------------------
@@ -33,10 +34,7 @@ def message_received(message):
     print(message)
 
 def connected() :
-    pubnub.publish({
-        'channel' : crazy,
-        'message' : { 'Info' : 'Connected!' }
-    })
+    print 'Connected'
 
 pubnub.subscribe({
     'channel'  : crazy,
diff --git a/python/3.3/Pubnub.py b/python/3.3/Pubnub.py
index e2b573f..5df77d5 100644
--- a/python/3.3/Pubnub.py
+++ b/python/3.3/Pubnub.py
@@ -25,27 +25,24 @@ class Pubnub(PubnubCore):
         publish_key,
         subscribe_key,
         secret_key = False,
+        cipher_key = False,
         ssl_on = False,
         origin = 'pubsub.pubnub.com',
         pres_uuid = None
     ) :
         super(Pubnub, self).__init__(
-            publish_key,
-            subscribe_key,
-            secret_key,
-            ssl_on,
-            origin,
-            pres_uuid
+            publish_key = publish_key,
+            subscribe_key = subscribe_key,
+            secret_key = secret_key,
+            cipher_key = cipher_key,
+            ssl_on = ssl_on,
+            origin = origin,
+            uuid = pres_uuid
         )        
 
-    def _request( self, request, origin = None, encode = True, params = None, callback = None ) :
+    def _request( self, request, callback = None ) :
         ## Build URL
-        url = (origin or self.origin) + '/' + "/".join(
-            encode and self._encode(request) or request
-        )
-        ## Add query params
-        if params is not None and len(params) > 0:
-            url = url + "?" + "&".join(params)
+        url = self.getUrl(request)
 
         ## Send Request Expecting JSONP Response
         try:
diff --git a/python/3.3/here-now-example.py b/python/3.3/here-now-example.py
new file mode 100644
index 0000000..261500a
--- /dev/null
+++ b/python/3.3/here-now-example.py
@@ -0,0 +1,33 @@
+## www.pubnub.com - PubNub Real-time push service in the cloud. 
+# coding=utf8
+
+## PubNub Real-time Push APIs and Notifications Framework
+## Copyright (c) 2010 Stephen Blum
+## http://www.pubnub.com/
+
+## -----------------------------------
+## PubNub 3.1 Real-time Push Cloud API
+## -----------------------------------
+
+import sys
+from twisted.internet import reactor
+from Pubnub import Pubnub
+
+publish_key   = len(sys.argv) > 1 and sys.argv[1] or 'demo'
+subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'demo'
+secret_key    = len(sys.argv) > 3 and sys.argv[3] or 'demo'
+cipher_key    = len(sys.argv) > 4 and sys.argv[4] or ''
+ssl_on        = len(sys.argv) > 5 and bool(sys.argv[5]) or False
+
+## -----------------------------------------------------------------------
+## Initiate Pubnub State
+## -----------------------------------------------------------------------
+pubnub = Pubnub( publish_key=publish_key, subscribe_key=subscribe_key,
+    secret_key=secret_key, cipher_key=cipher_key, ssl_on=ssl_on)
+crazy  = 'hello_world'
+
+
+print pubnub.here_now( {
+    'channel'  : crazy
+})
+
diff --git a/python/3.3/publish-example.py b/python/3.3/publish-example.py
index 725df0b..c97034b 100755
--- a/python/3.3/publish-example.py
+++ b/python/3.3/publish-example.py
@@ -1,7 +1,7 @@
 from Pubnub import Pubnub
 
 ## Initiate Class
-pubnub = Pubnub( 'demo', 'demo', None, False )
+pubnub = Pubnub( publish_key='demo', subscribe_key='demo', ssl_on=False )
 
 ## Publish Example
 info = pubnub.publish({