From e5f767f964b651698812f19d33f5223b9a2ed508 Mon Sep 17 00:00:00 2001
From: Devendra
Date: Fri, 5 Jul 2013 22:14:19 +0530
Subject: dir structure reorg

---
 common/PubnubBase.py      | 404 ++++++++++++++++++++++++++++++++++++++++++++++
 common/PubnubCore.py      | 135 ++++++++++++++++
 common/PubnubCoreAsync.py | 190 ++++++++++++++++++++++
 common/PubnubCrypto.py    |  93 +++++++++++
 4 files changed, 822 insertions(+)
 create mode 100644 common/PubnubBase.py
 create mode 100644 common/PubnubCore.py
 create mode 100644 common/PubnubCoreAsync.py
 create mode 100644 common/PubnubCrypto.py

(limited to 'common')

diff --git a/common/PubnubBase.py b/common/PubnubBase.py
new file mode 100644
index 0000000..07dd27f
--- /dev/null
+++ b/common/PubnubBase.py
@@ -0,0 +1,404 @@
+## 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 
+from PubnubCrypto import PubnubCrypto
+
+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, json.dumps(message)).replace('\n',''))
+        else :
+            message = json.dumps(message)
+
+        return message;
+
+    def decrypt(self, message):
+        if self.cipher_key:
+            pc = PubnubCrypto()
+            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/common/PubnubCore.py b/common/PubnubCore.py
new file mode 100644
index 0000000..4bf143b
--- /dev/null
+++ b/common/PubnubCore.py
@@ -0,0 +1,135 @@
+## 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
+from PubnubBase import PubnubBase
+
+class PubnubCore(PubnubBase):
+    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 )
+
+        """
+        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
+        )        
+
+        self.subscriptions = {}
+        self.timetoken     = 0
+        self.version       = '3.4'
+        self.accept_encoding = 'gzip'
+
+
+
+    def subscribe( self, args ) :
+        """
+        #**
+        #* Subscribe
+        #*
+        #* This is BLOCKING.
+        #* Listen for a message on a channel.
+        #*
+        #* @param array args with channel and callback.
+        #* @return false on fail, array on success.
+        #**
+
+        ## Subscribe Example
+        def receive(message) :
+            print(message)
+            return True
+
+        pubnub.subscribe({
+            '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
+
+        ## Begin Subscribe
+        while True :
+
+            timetoken = 'timetoken' in args and args['timetoken'] or 0
+            try :
+                ## Wait for Message
+                response = self._request(self._encode([
+                    'subscribe',
+                    subscribe_key,
+                    channel,
+                    '0',
+                    str(timetoken)
+                ])+['?uuid='+self.uuid], encode=False)
+
+                messages          = response[0]
+                args['timetoken'] = response[1]
+
+                ## If it was a timeout
+                if not len(messages) :
+                    continue
+
+                ## Run user Callback and Reconnect if user permits.
+                for message in messages :
+                    if not callback(message) :
+                        return
+
+            except Exception:
+                time.sleep(1)
+
+        return True
diff --git a/common/PubnubCoreAsync.py b/common/PubnubCoreAsync.py
new file mode 100644
index 0000000..9c53c6e
--- /dev/null
+++ b/common/PubnubCoreAsync.py
@@ -0,0 +1,190 @@
+## 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 json
+import time
+import hashlib
+import urllib2
+import uuid
+try:
+    from hashlib import sha256
+    digestmod = sha256
+except ImportError:
+    import Crypto.Hash.SHA256 as digestmod
+    sha256 = digestmod.new
+import hmac
+from PubnubCrypto import PubnubCrypto
+from PubnubBase import PubnubBase
+
+class PubnubCoreAsync(PubnubBase):
+
+    def start(self): pass 
+    def stop(self):  pass
+    def timeout( self, delay, callback ):
+        pass
+
+    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 required key to sign messages.
+        #* @param boolean ssl required for 2048 bit encrypted messages.
+        #* @param string origin PUBNUB Server Origin.
+        #**
+
+        ## Initiat Class
+        pubnub = Pubnub( 'PUBLISH-KEY', 'SUBSCRIBE-KEY', 'SECRET-KEY', False )
+
+        """
+        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.version       = '3.4'
+        self.accept_encoding = 'gzip'
+
+    def subscribe( self, args ) :
+        """
+        #**
+        #* Subscribe
+        #*
+        #* This is NON-BLOCKING.
+        #* Listen for a message on a channel.
+        #*
+        #* @param array args with channel and message.
+        #* @return false on fail, array on success.
+        #**
+
+        ## Subscribe Example
+        def receive(message) :
+            print(message)
+            return True
+
+        ## On Connect Callback
+        def connected() :
+            pubnub.publish({
+                'channel' : 'hello_world',
+                'message' : { 'some_var' : 'text' }
+            })
+
+        ## Subscribe
+        pubnub.subscribe({
+            'channel'  : 'hello_world',
+            'connect'  : connected,
+            'callback' : receive
+        })
+
+        """
+        ## Fail if missing channel
+        if not 'channel' in args :
+            return 'Missing Channel.'
+
+        ## Fail if missing callback
+        if not 'callback' in args :
+            return 'Missing Callback.'
+
+        ## Capture User Input
+        channel   = str(args['channel'])
+        callback  = args['callback']
+        connectcb = args['connect']
+
+        if 'errorback' in args:
+            errorback = args['errorback']
+        else:
+            errorback = lambda x: x
+
+        ## New Channel?
+        if not (channel in self.subscriptions) :
+            self.subscriptions[channel] = {
+                'first'     : False,
+                'connected' : False,
+            }
+
+        ## Ensure Single Connection
+        if self.subscriptions[channel]['connected'] :
+            return "Already Connected"
+
+        self.subscriptions[channel]['connected'] = 1
+        ## SUBSCRIPTION RECURSION 
+        def _subscribe():
+            ## STOP CONNECTION?
+            if not self.subscriptions[channel]['connected']:
+                return
+          
+            def sub_callback(response):
+                print response
+                response = json.loads(response)
+                ## STOP CONNECTION?
+                if not self.subscriptions[channel]['connected']:
+                    return
+
+                ## CONNECTED CALLBACK
+                if not self.subscriptions[channel]['first'] :
+                    self.subscriptions[channel]['first'] = True
+                    connectcb()
+
+                ## PROBLEM?
+                if not response:
+                    def time_callback(_time):
+                        if not _time:
+                            self.timeout( 1, _subscribe )
+                            return errorback("Lost Network Connection")
+                        else:
+                            self.timeout( 1, _subscribe)
+
+                    ## ENSURE CONNECTED (Call Time Function)
+                    return self.time({ 'callback' : time_callback })
+
+                self.timetoken = response[1]
+                _subscribe()
+
+                pc = PubnubCrypto()
+                out = []
+                for message in response[0]:
+                     callback(self.decrypt(message))
+
+            ## CONNECT TO PUBNUB SUBSCRIBE SERVERS
+            try:
+                self._request( { "urlcomponents" : [
+                    'subscribe',
+                    self.subscribe_key,
+                    channel,
+                    '0',
+                    str(self.timetoken)
+                ], "urlparams" : {"uuid":self.uuid} }, sub_callback )
+            except :
+                self.timeout( 1, _subscribe)
+                return
+
+        ## BEGIN SUBSCRIPTION (LISTEN FOR MESSAGES)
+        _subscribe()
diff --git a/common/PubnubCrypto.py b/common/PubnubCrypto.py
new file mode 100644
index 0000000..b7a57a1
--- /dev/null
+++ b/common/PubnubCrypto.py
@@ -0,0 +1,93 @@
+## 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.
+        #**
+        """
+        padding = block_size - (len(msg) % block_size)
+        return msg + chr(padding)*padding
+       
+    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 hashlib.sha256(key).hexdigest()
+
+    def encrypt( self, key, msg ):
+        """
+        #**
+        #* encrypt
+        #*
+        #* encrypts the message
+        #* @return message in encrypted format
+        #**
+        """
+        secret = self.getSecret(key)
+        Initial16bytes='0123456789012345'
+        cipher = AES.new(secret[0:32],AES.MODE_CBC,Initial16bytes)
+        enc = encodestring(cipher.encrypt(self.pad(msg)))
+        return enc
+    def decrypt( self, key, msg ):
+        """
+        #**
+        #* decrypt
+        #*
+        #* decrypts the message
+        #* @return message in decryped format
+        #**
+        """
+        secret = self.getSecret(key)
+        Initial16bytes='0123456789012345'
+        cipher = AES.new(secret[0:32],AES.MODE_CBC,Initial16bytes)
+        return self.depad((cipher.decrypt(decodestring(msg))))
+    
-- 
cgit v1.2.3


From a7f8ca862adfc012ca7c593f1305101de8e73d3c Mon Sep 17 00:00:00 2001
From: Devendra
Date: Fri, 5 Jul 2013 22:27:05 +0530
Subject: changed version in python files

---
 common/PubnubBase.py      | 2 +-
 common/PubnubCore.py      | 2 +-
 common/PubnubCoreAsync.py | 2 +-
 common/PubnubCrypto.py    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'common')

diff --git a/common/PubnubBase.py b/common/PubnubBase.py
index 07dd27f..0691a87 100644
--- a/common/PubnubBase.py
+++ b/common/PubnubBase.py
@@ -6,7 +6,7 @@
 ## http://www.pubnub.com/
 
 ## -----------------------------------
-## PubNub 3.0 Real-time Push Cloud API
+## PubNub 3.3.2 Real-time Push Cloud API
 ## -----------------------------------
 
 try: import json
diff --git a/common/PubnubCore.py b/common/PubnubCore.py
index 4bf143b..9b32de7 100644
--- a/common/PubnubCore.py
+++ b/common/PubnubCore.py
@@ -6,7 +6,7 @@
 ## http://www.pubnub.com/
 
 ## -----------------------------------
-## PubNub 3.0 Real-time Push Cloud API
+## PubNub 3.3.2 Real-time Push Cloud API
 ## -----------------------------------
 
 try: import json
diff --git a/common/PubnubCoreAsync.py b/common/PubnubCoreAsync.py
index 9c53c6e..9dcad4b 100644
--- a/common/PubnubCoreAsync.py
+++ b/common/PubnubCoreAsync.py
@@ -6,7 +6,7 @@
 ## http://www.pubnub.com/
 
 ## -----------------------------------
-## PubNub 3.1 Real-time Push Cloud API
+## PubNub 3.3.2 Real-time Push Cloud API
 ## -----------------------------------
 import sys
 import json
diff --git a/common/PubnubCrypto.py b/common/PubnubCrypto.py
index b7a57a1..b452765 100644
--- a/common/PubnubCrypto.py
+++ b/common/PubnubCrypto.py
@@ -6,7 +6,7 @@
 ## http://www.pubnub.com/
 
 ## -----------------------------------
-## PubNub 3.1 Real-time Push Cloud API
+## PubNub 3.3.2 Real-time Push Cloud API
 ## -----------------------------------
 
 from Crypto.Cipher import AES
-- 
cgit v1.2.3


From e65cc45e333cc33d19b97b5f93e69121ca2beffa Mon Sep 17 00:00:00 2001
From: Devendra
Date: Wed, 10 Jul 2013 10:39:58 +0530
Subject: adding makefiles for version updates

---
 common/Makefile           | 16 ++++++++++++++++
 common/PubnubBase.py      | 20 ++++++++++----------
 common/PubnubCoreAsync.py |  9 +++++++++
 3 files changed, 35 insertions(+), 10 deletions(-)
 create mode 100644 common/Makefile

(limited to 'common')

diff --git a/common/Makefile b/common/Makefile
new file mode 100644
index 0000000..1be6f8c
--- /dev/null
+++ b/common/Makefile
@@ -0,0 +1,16 @@
+include ../Makefile.inc
+
+
+.PHONY: all
+all: build
+
+.PHONY: build
+build:
+	find -name "Pubnub*py" | xargs sed -i "s/PubNub\ [0-9]\.[0-9]\.[0-9]/PubNub\ $(VERSION)/g"
+
+
+.PHONY: clean
+clean:
+
+.PHONY: test
+test:
diff --git a/common/PubnubBase.py b/common/PubnubBase.py
index 0691a87..b5da9fa 100644
--- a/common/PubnubBase.py
+++ b/common/PubnubBase.py
@@ -319,22 +319,22 @@ class PubnubBase(object):
         ## Capture User Input
         channel = str(args['channel'])
 
-        params = [] 
+        params = dict() 
         count = 100    
         
         if args.has_key('count'):
             count = int(args['count'])
 
-        params.append('count' + '=' + str(count))    
+        params['count'] = str(count)    
         
         if args.has_key('reverse'):
-            params.append('reverse' + '=' + str(args['reverse']).lower())
+            params['reverse'] = str(args['reverse']).lower()
 
         if args.has_key('start'):
-            params.append('start' + '=' + str(args['start']))
+            params['start'] = str(args['start'])
 
         if args.has_key('end'):
-            params.append('end' + '=' + str(args['end']))
+            params['end'] = str(args['end'])
 
         ## Fail if bad input.
         if not channel :
@@ -348,14 +348,14 @@ class PubnubBase(object):
             callback = None 
 
         ## Get History
-        return self._request([
+        return self._request({ 'urlcomponents' : [
             'v2',
             'history',
             'sub-key',
             self.subscribe_key,
             'channel',
             channel,
-        ],params=params , callback=callback);
+        ],'urlparams' : params }, callback=callback);
 
     def time(self, args = None) :
         """
@@ -377,10 +377,10 @@ class PubnubBase(object):
             callback = args['callback']
         else :
             callback = None 
-        time = self._request([
+        time = self._request({'urlcomponents' : [
             'time',
             '0'
-        ], callback)
+        ]}, callback)
         if time != None:
             return time[0]
 
@@ -400,5 +400,5 @@ class PubnubBase(object):
                 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()])
+            url = url + '?' + "&".join([ x + "=" + y  for x,y in request["urlparams"].iteritems()])
         return url
diff --git a/common/PubnubCoreAsync.py b/common/PubnubCoreAsync.py
index 9dcad4b..5b8d130 100644
--- a/common/PubnubCoreAsync.py
+++ b/common/PubnubCoreAsync.py
@@ -188,3 +188,12 @@ class PubnubCoreAsync(PubnubBase):
 
         ## BEGIN SUBSCRIPTION (LISTEN FOR MESSAGES)
         _subscribe()
+    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
-- 
cgit v1.2.3


From 523802043bf1ce3616d3bac382f166e34984d5bf Mon Sep 17 00:00:00 2001
From: Devendra
Date: Fri, 12 Jul 2013 10:11:07 +0530
Subject: adding common test from tornado and twisted

---
 common/unit-test-async.py | 143 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 143 insertions(+)
 create mode 100644 common/unit-test-async.py

(limited to 'common')

diff --git a/common/unit-test-async.py b/common/unit-test-async.py
new file mode 100644
index 0000000..258bf6a
--- /dev/null
+++ b/common/unit-test-async.py
@@ -0,0 +1,143 @@
+## 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 time
+sys.path.append('../')
+sys.path.append('./')
+sys.path.append('../common/')
+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 None 
+cipher_key    = len(sys.argv) > 4 and sys.argv[4] or None
+ssl_on        = len(sys.argv) > 5 and bool(sys.argv[5]) or False
+
+## -----------------------------------------------------------------------
+## Initiat Class
+## -----------------------------------------------------------------------
+pubnub = Pubnub( publish_key, subscribe_key, secret_key, cipher_key, ssl_on )
+crazy  = 'python-async-test-channel'
+expect = 0
+done = 0
+failures = 0
+passes = 0
+
+def stop():
+    global done
+    global count
+    pubnub.stop()
+    print "============================"
+    print 'Total\t:\t' , failures + passes
+    print 'PASS\t:\t' , passes
+    print 'FAIL\t:\t', failures
+    print "============================"
+
+## ---------------------------------------------------------------------------
+## Unit Test Function
+## ---------------------------------------------------------------------------
+def test( trial, name ) :
+    global failures
+    global passes
+    global done
+    done += 1
+    #print trial
+    if trial == False:
+        print 'FAIL : ', name
+        failures += 1
+    else:
+        print 'PASS : ', name
+        passes += 1
+    if done == expect:
+        stop()
+
+def test_publish():
+    def publish_cb(messages):
+        test(messages[0] == 1, "Publish Test")
+
+    pubnub.publish({
+        'channel' : crazy,
+        'message' :  {'one': 'Hello World! --> ɂ顶@#$%^&*()!', 'two': 'hello2'},
+        'callback' : publish_cb
+    }) 
+
+
+def test_history():
+    def history_cb(messages):
+        test(len(messages) <= 1, "History Test")    
+    pubnub.history({
+        'channel' : crazy,
+        'limit' :  1,
+        'callback' : history_cb 
+    })
+
+
+
+def test_subscribe():
+    message = "Testing Subscribe"
+    def subscribe_connect_cb():
+        def publish_cb(response):
+            test(response[0] == 1, 'Publish Test in subscribe Connect Callback')
+        pubnub.publish({
+            'channel' : crazy,
+            'message' :  message,
+            'callback' : publish_cb
+        })
+    def subscribe_cb(response):
+        print response
+        test(response == message , 'Subscribe Receive Test in subscribe Callback')
+    pubnub.subscribe({
+        'channel' : crazy,
+        'connect' : subscribe_connect_cb,
+        'callback': subscribe_cb
+    }) 
+    
+
+def test_here_now():
+    channel = crazy + '-here-now'
+    message = "Testing Subscribe"
+    def subscribe_connect_cb():
+        def here_now_cb(response):
+            test(response["occupancy"] > 0, 'Here Now Test')
+            def publish_cb(response):
+                test(response[0] == 1, 'Here Now Test: Publish Test in subscribe Connect Callback')
+            pubnub.publish({
+                'channel' : channel,
+                'message' :  message,
+                'callback' : publish_cb
+            })
+        time.sleep(5)
+        pubnub.here_now({
+            'channel' : channel,
+            'callback' : here_now_cb
+        })
+
+
+    def subscribe_cb(response):
+        test(response == message , 'Here Now Test: Subscribe Receive Test in subscribe Callback')
+    pubnub.subscribe({
+        'channel' : channel,
+        'connect' : subscribe_connect_cb,
+        'callback': subscribe_cb
+    }) 
+
+expect = 7
+test_publish()
+test_history()
+test_subscribe()
+test_here_now()
+
+
+
+pubnub.start()
+if failures > 0:
+    raise Exception('Fail', failures)
-- 
cgit v1.2.3


From 6616acbec40ac039b7bdabf7e8b3581e68c0b2cb Mon Sep 17 00:00:00 2001
From: Devendra
Date: Fri, 12 Jul 2013 10:14:21 +0530
Subject: adding common test from tornado and twisted

---
 common/PubnubBase.py      |  2 +-
 common/PubnubCore.py      |  2 +-
 common/PubnubCoreAsync.py | 13 ++++++-------
 common/PubnubCrypto.py    |  2 +-
 common/unit-test-async.py |  1 -
 5 files changed, 9 insertions(+), 11 deletions(-)

(limited to 'common')

diff --git a/common/PubnubBase.py b/common/PubnubBase.py
index b5da9fa..0c4efef 100644
--- a/common/PubnubBase.py
+++ b/common/PubnubBase.py
@@ -6,7 +6,7 @@
 ## http://www.pubnub.com/
 
 ## -----------------------------------
-## PubNub 3.3.2 Real-time Push Cloud API
+## PubNub 3.3.4 Real-time Push Cloud API
 ## -----------------------------------
 
 try: import json
diff --git a/common/PubnubCore.py b/common/PubnubCore.py
index 9b32de7..5965740 100644
--- a/common/PubnubCore.py
+++ b/common/PubnubCore.py
@@ -6,7 +6,7 @@
 ## http://www.pubnub.com/
 
 ## -----------------------------------
-## PubNub 3.3.2 Real-time Push Cloud API
+## PubNub 3.3.4 Real-time Push Cloud API
 ## -----------------------------------
 
 try: import json
diff --git a/common/PubnubCoreAsync.py b/common/PubnubCoreAsync.py
index 5b8d130..8150bde 100644
--- a/common/PubnubCoreAsync.py
+++ b/common/PubnubCoreAsync.py
@@ -6,7 +6,7 @@
 ## http://www.pubnub.com/
 
 ## -----------------------------------
-## PubNub 3.3.2 Real-time Push Cloud API
+## PubNub 3.3.4 Real-time Push Cloud API
 ## -----------------------------------
 import sys
 import json
@@ -142,16 +142,15 @@ class PubnubCoreAsync(PubnubBase):
                 return
           
             def sub_callback(response):
-                print response
-                response = json.loads(response)
+                if not self.subscriptions[channel]['first'] :
+                    self.subscriptions[channel]['first'] = True
+                    connectcb()
+
                 ## STOP CONNECTION?
                 if not self.subscriptions[channel]['connected']:
                     return
 
-                ## CONNECTED CALLBACK
-                if not self.subscriptions[channel]['first'] :
-                    self.subscriptions[channel]['first'] = True
-                    connectcb()
+
 
                 ## PROBLEM?
                 if not response:
diff --git a/common/PubnubCrypto.py b/common/PubnubCrypto.py
index b452765..b91e2d9 100644
--- a/common/PubnubCrypto.py
+++ b/common/PubnubCrypto.py
@@ -6,7 +6,7 @@
 ## http://www.pubnub.com/
 
 ## -----------------------------------
-## PubNub 3.3.2 Real-time Push Cloud API
+## PubNub 3.3.4 Real-time Push Cloud API
 ## -----------------------------------
 
 from Crypto.Cipher import AES
diff --git a/common/unit-test-async.py b/common/unit-test-async.py
index 258bf6a..89a828e 100644
--- a/common/unit-test-async.py
+++ b/common/unit-test-async.py
@@ -93,7 +93,6 @@ def test_subscribe():
             'callback' : publish_cb
         })
     def subscribe_cb(response):
-        print response
         test(response == message , 'Subscribe Receive Test in subscribe Callback')
     pubnub.subscribe({
         'channel' : crazy,
-- 
cgit v1.2.3


From 2c77bdb1d0725d7203ce7ce94ec675de750974b0 Mon Sep 17 00:00:00 2001
From: Devendra
Date: Fri, 12 Jul 2013 16:56:21 +0530
Subject: changing async unit tests to use separate channel for each test

---
 common/unit-test-async.py | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

(limited to 'common')

diff --git a/common/unit-test-async.py b/common/unit-test-async.py
index 89a828e..f95c759 100644
--- a/common/unit-test-async.py
+++ b/common/unit-test-async.py
@@ -11,6 +11,7 @@
 
 import sys
 import time
+import random
 sys.path.append('../')
 sys.path.append('./')
 sys.path.append('../common/')
@@ -26,7 +27,7 @@ ssl_on        = len(sys.argv) > 5 and bool(sys.argv[5]) or False
 ## Initiat Class
 ## -----------------------------------------------------------------------
 pubnub = Pubnub( publish_key, subscribe_key, secret_key, cipher_key, ssl_on )
-crazy  = 'python-async-test-channel'
+ch = 'python-async-test-channel-'
 expect = 0
 done = 0
 failures = 0
@@ -61,21 +62,23 @@ def test( trial, name ) :
         stop()
 
 def test_publish():
+    channel = ch + str(random.random())
     def publish_cb(messages):
         test(messages[0] == 1, "Publish Test")
 
     pubnub.publish({
-        'channel' : crazy,
+        'channel' : channel,
         'message' :  {'one': 'Hello World! --> ɂ顶@#$%^&*()!', 'two': 'hello2'},
         'callback' : publish_cb
     }) 
 
 
 def test_history():
+    channel = ch + str(random.random())
     def history_cb(messages):
         test(len(messages) <= 1, "History Test")    
     pubnub.history({
-        'channel' : crazy,
+        'channel' : channel,
         'limit' :  1,
         'callback' : history_cb 
     })
@@ -83,26 +86,27 @@ def test_history():
 
 
 def test_subscribe():
-    message = "Testing Subscribe"
+    message = "Testing Subscribe " + str(random.random())
+    channel = ch + str(random.random())
     def subscribe_connect_cb():
         def publish_cb(response):
             test(response[0] == 1, 'Publish Test in subscribe Connect Callback')
         pubnub.publish({
-            'channel' : crazy,
-            'message' :  message,
+            'channel'  :  channel,
+            'message'  :  message,
             'callback' : publish_cb
         })
     def subscribe_cb(response):
         test(response == message , 'Subscribe Receive Test in subscribe Callback')
     pubnub.subscribe({
-        'channel' : crazy,
+        'channel' : channel,
         'connect' : subscribe_connect_cb,
         'callback': subscribe_cb
     }) 
     
 
 def test_here_now():
-    channel = crazy + '-here-now'
+    channel = ch + str(random.random()) 
     message = "Testing Subscribe"
     def subscribe_connect_cb():
         def here_now_cb(response):
@@ -110,8 +114,8 @@ def test_here_now():
             def publish_cb(response):
                 test(response[0] == 1, 'Here Now Test: Publish Test in subscribe Connect Callback')
             pubnub.publish({
-                'channel' : channel,
-                'message' :  message,
+                'channel'  : channel,
+                'message'  : message,
                 'callback' : publish_cb
             })
         time.sleep(5)
-- 
cgit v1.2.3


From 09d6ea1fa20f87dc648740ffb2a70f67e7e4efa9 Mon Sep 17 00:00:00 2001
From: Devendra
Date: Wed, 25 Sep 2013 13:51:19 +0530
Subject: combining into Pubnub.py, added common async unit test method

---
 common/LICENSE_HEADER     | 10 ++++++++++
 common/PubnubBase.py      | 12 ------------
 common/PubnubCore.py      | 20 --------------------
 common/PubnubCoreAsync.py | 18 ------------------
 common/PubnubCrypto.py    | 12 ------------
 common/PubnubUnitTest.py  | 36 ++++++++++++++++++++++++++++++++++++
 6 files changed, 46 insertions(+), 62 deletions(-)
 create mode 100644 common/LICENSE_HEADER
 create mode 100644 common/PubnubUnitTest.py

(limited to 'common')

diff --git a/common/LICENSE_HEADER b/common/LICENSE_HEADER
new file mode 100644
index 0000000..a83793d
--- /dev/null
+++ b/common/LICENSE_HEADER
@@ -0,0 +1,10 @@
+## 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.3.4 Real-time Push Cloud API
+## -----------------------------------
diff --git a/common/PubnubBase.py b/common/PubnubBase.py
index 0c4efef..64d43ed 100644
--- a/common/PubnubBase.py
+++ b/common/PubnubBase.py
@@ -1,14 +1,3 @@
-## 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.3.4 Real-time Push Cloud API
-## -----------------------------------
-
 try: import json
 except ImportError: import simplejson as json
 
@@ -16,7 +5,6 @@ import time
 import hashlib
 import urllib2
 import uuid 
-from PubnubCrypto import PubnubCrypto
 
 class PubnubBase(object):
     def __init__(
diff --git a/common/PubnubCore.py b/common/PubnubCore.py
index 5965740..9f79dc8 100644
--- a/common/PubnubCore.py
+++ b/common/PubnubCore.py
@@ -1,23 +1,3 @@
-## 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.3.4 Real-time Push Cloud API
-## -----------------------------------
-
-try: import json
-except ImportError: import simplejson as json
-
-import time
-import hashlib
-import urllib2
-import uuid
-from PubnubBase import PubnubBase
-
 class PubnubCore(PubnubBase):
     def __init__(
         self,
diff --git a/common/PubnubCoreAsync.py b/common/PubnubCoreAsync.py
index 8150bde..e844b96 100644
--- a/common/PubnubCoreAsync.py
+++ b/common/PubnubCoreAsync.py
@@ -1,19 +1,3 @@
-## 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.3.4 Real-time Push Cloud API
-## -----------------------------------
-import sys
-import json
-import time
-import hashlib
-import urllib2
-import uuid
 try:
     from hashlib import sha256
     digestmod = sha256
@@ -21,8 +5,6 @@ except ImportError:
     import Crypto.Hash.SHA256 as digestmod
     sha256 = digestmod.new
 import hmac
-from PubnubCrypto import PubnubCrypto
-from PubnubBase import PubnubBase
 
 class PubnubCoreAsync(PubnubBase):
 
diff --git a/common/PubnubCrypto.py b/common/PubnubCrypto.py
index b91e2d9..df7cb8d 100644
--- a/common/PubnubCrypto.py
+++ b/common/PubnubCrypto.py
@@ -1,14 +1,3 @@
-## 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.3.4 Real-time Push Cloud API
-## -----------------------------------
-
 from Crypto.Cipher import AES
 from Crypto.Hash import MD5
 from base64 import encodestring, decodestring 
@@ -90,4 +79,3 @@ class PubnubCrypto() :
         Initial16bytes='0123456789012345'
         cipher = AES.new(secret[0:32],AES.MODE_CBC,Initial16bytes)
         return self.depad((cipher.decrypt(decodestring(msg))))
-    
diff --git a/common/PubnubUnitTest.py b/common/PubnubUnitTest.py
new file mode 100644
index 0000000..2f9d28c
--- /dev/null
+++ b/common/PubnubUnitTest.py
@@ -0,0 +1,36 @@
+
+import time
+
+class Suite():
+	def __init__(self, pubnub, expected):
+		self.pubnub = pubnub
+		self.total = expected
+		self.passed = 0
+		self.failed = 0
+		self.started = False
+
+	def test(self, condition , name, message = None, response = None):
+
+		if condition:
+			self.passed += 1
+			msg = "PASS : " + name
+			if message:
+				msg += ", " + message
+			if response:
+				msg += ", " + response
+			print msg
+		else:
+			self.failed += 1
+			msg = "FAIL : " + name
+			if message:
+				msg += ", " + message
+			if response:
+				msg += ", " + response
+			print msg
+
+		if self.total == self.failed + self.passed:
+			print "\n======== RESULT ========"
+			print "Total\t:\t", self.total
+			print "Passed\t:\t", self.passed
+			print "Failed\t:\t", self.failed
+			self.pubnub.stop()
-- 
cgit v1.2.3


From 7ec3bbe414abe58072fda63f4f9c801f77b292e1 Mon Sep 17 00:00:00 2001
From: Devendra
Date: Sun, 6 Oct 2013 14:39:59 +0530
Subject: changing timeout from 200 to 310 s, changed exception handling to not
 silently eat execeptions in callback

---
 common/PubnubCoreAsync.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'common')

diff --git a/common/PubnubCoreAsync.py b/common/PubnubCoreAsync.py
index e844b96..a7fbb7d 100644
--- a/common/PubnubCoreAsync.py
+++ b/common/PubnubCoreAsync.py
@@ -52,7 +52,7 @@ class PubnubCoreAsync(PubnubBase):
 
         self.subscriptions = {}
         self.timetoken     = 0
-        self.version       = '3.4'
+        self.version       = '3.3.4'
         self.accept_encoding = 'gzip'
 
     def subscribe( self, args ) :
-- 
cgit v1.2.3