From 90224d02e5f2400fb277217342ffa5cd4a7cb2c6 Mon Sep 17 00:00:00 2001
From: Devendra
Date: Sun, 24 Feb 2013 03:23:01 +0530
Subject: saving work

---
 python-twisted/Pubnub.py                   | 246 +++--------------------------
 python-twisted/Pubnub.pyc                  | Bin 12246 -> 7499 bytes
 python-twisted/PubnubCrypto.pyc            | Bin 2619 -> 2564 bytes
 python-twisted/examples/publish-example.py |   1 +
 4 files changed, 24 insertions(+), 223 deletions(-)

(limited to 'python-twisted')

diff --git a/python-twisted/Pubnub.py b/python-twisted/Pubnub.py
index 3c3f4b1..97895fd 100644
--- a/python-twisted/Pubnub.py
+++ b/python-twisted/Pubnub.py
@@ -14,6 +14,10 @@ import time
 import hashlib
 import urllib2
 import uuid
+sys.path.append('../')
+sys.path.append('../../')
+sys.path.append('../../../')
+from PubnubCoreAsync import PubnubCoreAsync
 try:
     from hashlib import sha256
     digestmod = sha256
@@ -21,6 +25,7 @@ except ImportError:
     import Crypto.Hash.SHA256 as digestmod
     sha256 = digestmod.new
 import hmac
+from twisted.web.client import getPage
 from twisted.internet import reactor
 from twisted.internet.defer import Deferred
 from twisted.internet.protocol import Protocol
@@ -35,7 +40,7 @@ pnconn_pool = HTTPConnectionPool(reactor)
 pnconn_pool.maxPersistentPerHost    = 100
 pnconn_pool.cachedConnectionTimeout = 310
 
-class Pubnub():
+class Pubnub(PubnubCoreAsync):
 
     def start(self): reactor.run()
     def stop(self):  reactor.stop()
@@ -51,124 +56,13 @@ class Pubnub():
         ssl_on = False,
         origin = 'pubsub.pubnub.com'
     ) :
-        """
-        #**
-        #* 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 )
-
-        """
-        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
-        self.subscriptions = {}
-
-        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([
-            'publish',
-            self.publish_key,
-            self.subscribe_key,
-            signature,
-            channel,
-            '0',
-            message
-        ], publish_response )
-
+        super(Pubnub, self).__init__(
+            publish_key,
+            subscribe_key,
+            secret_key,
+            ssl_on,
+            origin,
+        )        
 
     def subscribe( self, args ) :
         """
@@ -315,44 +209,6 @@ class Pubnub():
         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( [
-            'history',
-            self.subscribe_key,
-            channel,
-            '0',
-            str(limit)
-        ], args['callback'] )
-
     def time( self, args ) :
         """
         #**
@@ -395,7 +251,7 @@ class Pubnub():
         """
         return uuid.uuid1()
 
-    def _request( self, request, callback ) :
+    def _request( self, request, callback, timeout=30 ) :
         global pnconn_pool
 
         ## Build URL
@@ -409,74 +265,18 @@ class Pubnub():
         agent       = Agent(
             reactor,
             self.ssl and None or pnconn_pool,
-            connectTimeout=30
+            connectTimeout=timeout
         )
-        request     = agent.request( 'GET', url, Headers({
-            'V'               : ['3.1'],
+        print url
+        gp  = getPage( url, headers={
+            'V'               : ['3.4'],
             'User-Agent'      : ['Python-Twisted'],
             'Accept-Encoding' : ['gzip']
-        }), None )
-
-        self.resulting_is = str()
-        def received(response):
-            headerlist = list(response.headers.getAllRawHeaders())
-            for item in headerlist:
-                if( item[0] == "Content-Encoding"):
-                    if type(item[1]) == type(list()):
-                        for subitem in item[1]:
-                            self.resulting_is = subitem
-                    elif type(item[1]) == type(str()):
-                        self.resulting_is = item[1]
-
-            finished = Deferred()
-            response.deliverBody(PubNubResponse(finished))
-            return finished
-
-        def complete(data):
-            if ( type(data) == type(str()) ):
-                if self.resulting_is:
-                    d = zlib.decompressobj(16+zlib.MAX_WBITS)
-
-            try     :   data = d.decompress(data) # try/catch here, pass through if except
-            except  :   data = data
-
-            try    : obj = json.loads(data)
-            except : obj = None
-
-            pc = PubnubCrypto()
-            out = []
-            if self.cipher_key :
-                if requestType == "history" :
-                    if type(obj) == type(list()):
-                        for item in obj:
-                            if type(item) == type(list()):
-                                for subitem in item:
-                                    encryptItem = pc.decrypt(self.cipher_key, subitem )
-                                    out.append(encryptItem)
-                            elif type(item) == type(dict()):
-                                outdict = {}
-                                for k, subitem in item.iteritems():
-                                    encryptItem = pc.decrypt(self.cipher_key, subitem )
-                                    outdict[k] = encryptItem
-                                    out.append(outdict)
-                            else :
-                                encryptItem = pc.decrypt(self.cipher_key, item )
-                                out.append(encryptItem)
-                        callback(out)
-                    elif type( obj ) == type(dict()):
-                        for k, item in obj.iteritems():
-                            encryptItem = pc.decrypt(self.cipher_key, item )
-                            out.append(encryptItem)
-                        callback(out)
-                else :
-                    callback(obj)
-            else :
-                callback(obj)
-
-        request.addCallback(received)
-        request.addBoth(complete)
-
-
+        } );
+        
+        gp.addCallback(callback)
+        gp.addErrback(callback)
+	   
 
 class PubNubResponse(Protocol):
     def __init__( self, finished ):
diff --git a/python-twisted/Pubnub.pyc b/python-twisted/Pubnub.pyc
index 94d6ecc..4f3fab5 100644
Binary files a/python-twisted/Pubnub.pyc and b/python-twisted/Pubnub.pyc differ
diff --git a/python-twisted/PubnubCrypto.pyc b/python-twisted/PubnubCrypto.pyc
index a349424..d338aee 100644
Binary files a/python-twisted/PubnubCrypto.pyc and b/python-twisted/PubnubCrypto.pyc differ
diff --git a/python-twisted/examples/publish-example.py b/python-twisted/examples/publish-example.py
index 4a5baf6..9c3be60 100644
--- a/python-twisted/examples/publish-example.py
+++ b/python-twisted/examples/publish-example.py
@@ -12,6 +12,7 @@
 import sys
 from twisted.internet import reactor
 sys.path.append('../')
+sys.path.append('../../')
 from Pubnub import Pubnub
 
 publish_key   = len(sys.argv) > 1 and sys.argv[1] or 'demo'
-- 
cgit v1.2.3


From 08c75762c1fd19b90f646a04072cb9bef60f5478 Mon Sep 17 00:00:00 2001
From: Devendra
Date: Sun, 24 Feb 2013 03:24:17 +0530
Subject: removing .pyc files and adding .gitignore

---
 python-twisted/Pubnub.pyc       | Bin 7499 -> 0 bytes
 python-twisted/PubnubCrypto.pyc | Bin 2564 -> 0 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 python-twisted/Pubnub.pyc
 delete mode 100644 python-twisted/PubnubCrypto.pyc

(limited to 'python-twisted')

diff --git a/python-twisted/Pubnub.pyc b/python-twisted/Pubnub.pyc
deleted file mode 100644
index 4f3fab5..0000000
Binary files a/python-twisted/Pubnub.pyc and /dev/null differ
diff --git a/python-twisted/PubnubCrypto.pyc b/python-twisted/PubnubCrypto.pyc
deleted file mode 100644
index d338aee..0000000
Binary files a/python-twisted/PubnubCrypto.pyc and /dev/null differ
-- 
cgit v1.2.3


From 51b1dec8b04258f7bff59fb5bb4f69cbab52260c Mon Sep 17 00:00:00 2001
From: Devendra
Date: Sun, 24 Feb 2013 04:56:45 +0530
Subject: saving working version

---
 python-twisted/Pubnub.py | 201 ++---------------------------------------------
 1 file changed, 7 insertions(+), 194 deletions(-)

(limited to 'python-twisted')

diff --git a/python-twisted/Pubnub.py b/python-twisted/Pubnub.py
index 97895fd..f7d5c52 100644
--- a/python-twisted/Pubnub.py
+++ b/python-twisted/Pubnub.py
@@ -44,7 +44,7 @@ class Pubnub(PubnubCoreAsync):
 
     def start(self): reactor.run()
     def stop(self):  reactor.stop()
-    def timeout( self, callback, delay ):
+    def timeout( self, delay, callback ):
         reactor.callLater( delay, callback )
 
     def __init__(
@@ -64,193 +64,6 @@ class Pubnub(PubnubCoreAsync):
             origin,
         )        
 
-    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' : 0,
-                'timetoken' : '0'
-            }
-
-        ## Ensure Single Connection
-        if self.subscriptions[channel]['connected'] :
-            return "Already Connected"
-
-        self.subscriptions[channel]['connected'] = 1
-
-        ## SUBSCRIPTION RECURSION 
-        def substabizel():
-            ## STOP CONNECTION?
-            if not self.subscriptions[channel]['connected']:
-                return
-
-            def sub_callback(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:
-                            reactor.callLater( 1, substabizel )
-                            return errorback("Lost Network Connection")
-                        else:
-                            reactor.callLater( 1, substabizel )
-
-                    ## ENSURE CONNECTED (Call Time Function)
-                    return self.time({ 'callback' : time_callback })
-
-                self.subscriptions[channel]['timetoken'] = response[1]
-                substabizel()
-
-                pc = PubnubCrypto()
-                out = []
-                for message in response[0]:
-                     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)
-
-            ## CONNECT TO PUBNUB SUBSCRIBE SERVERS
-            try :
-                self._request( [
-                    'subscribe',
-                    self.subscribe_key,
-                    channel,
-                    '0',
-                    str(self.subscriptions[channel]['timetoken'])
-                ], sub_callback )
-            except :
-                reactor.callLater( 1, substabizel )
-                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 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( [
-            'time',
-            '0'
-        ], complete )
-
-    def uuid(self) :
-        """
-        #**
-        #* uuid
-        #*
-        #* Generate a UUID
-        #*
-        #* @return  UUID.
-        #*
-
-        ## PubNub UUID Example
-        uuid = pubnub.uuid()
-        print(uuid)
-        """
-        return uuid.uuid1()
-
     def _request( self, request, callback, timeout=30 ) :
         global pnconn_pool
 
@@ -278,10 +91,10 @@ class Pubnub(PubnubCoreAsync):
         gp.addErrback(callback)
 	   
 
-class PubNubResponse(Protocol):
-    def __init__( self, finished ):
-        self.finished = finished
-
-    def dataReceived( self, bytes ):
-            self.finished.callback(bytes)
+#class PubNubResponse(Protocol):
+#    def __init__( self, finished ):
+#        self.finished = finished
+#
+#    def dataReceived( self, bytes ):
+#            self.finished.callback(bytes)
 
-- 
cgit v1.2.3


From 8b1a2eb372f2206f24029cc7e4694ae472599d95 Mon Sep 17 00:00:00 2001
From: Devendra
Date: Sun, 24 Feb 2013 23:57:51 +0530
Subject: saving work on async clients consolidation

---
 python-twisted/Pubnub.py | 61 ++++++++++++++++++++++++++++++++----------------
 1 file changed, 41 insertions(+), 20 deletions(-)

(limited to 'python-twisted')

diff --git a/python-twisted/Pubnub.py b/python-twisted/Pubnub.py
index f7d5c52..10875dd 100644
--- a/python-twisted/Pubnub.py
+++ b/python-twisted/Pubnub.py
@@ -29,12 +29,13 @@ from twisted.web.client import getPage
 from twisted.internet import reactor
 from twisted.internet.defer import Deferred
 from twisted.internet.protocol import Protocol
-from twisted.web.client import Agent
+from twisted.web.client import Agent, ContentDecoderAgent, RedirectAgent, GzipDecoder
 from twisted.web.client import HTTPConnectionPool
 from twisted.web.http_headers import Headers
 from PubnubCrypto import PubnubCrypto
 import gzip
 import zlib
+from twisted.internet.ssl import ClientContextFactory
 
 pnconn_pool = HTTPConnectionPool(reactor)
 pnconn_pool.maxPersistentPerHost    = 100
@@ -64,37 +65,57 @@ class Pubnub(PubnubCoreAsync):
             origin,
         )        
 
-    def _request( self, request, callback, timeout=30 ) :
+    def _request( self, request, callback ) :
         global pnconn_pool
 
         ## 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])
-
-        requestType = request[0]
-        agent       = Agent(
+        '''
+        url = self.getUrl(request)
+        cf = WebClientContextFactory()
+        agent       = ContentDecoderAgent(RedirectAgent(Agent(
             reactor,
-            self.ssl and None or pnconn_pool,
-            connectTimeout=timeout
-        )
+            contextFactory = cf,
+            pool = self.ssl and None or pnconn_pool
+        )), [('gzip', GzipDecoder)])
         print url
-        gp  = getPage( url, headers={
-            'V'               : ['3.4'],
+        request     = agent.request( 'GET', url, Headers({
+            'V'               : ['3.1'],
             'User-Agent'      : ['Python-Twisted'],
             'Accept-Encoding' : ['gzip']
-        } );
-        
-        gp.addCallback(callback)
-        gp.addErrback(callback)
+        }), None )
+
+        def received(response):
+            #print response
+            finished = Deferred()
+            response.deliverBody(PubNubResponse(finished))
+            return finished
+
+        def complete(data):
+            #print data
+            #try    : obj = json.loads(data)
+            #except : obj = None
+
+            #print obj
+            callback(data)
+
+        request.addCallback(received)
+        request.addBoth(complete)
+
+class WebClientContextFactory(ClientContextFactory):
+    def getContext(self, hostname, port):
+        return ClientContextFactory.getContext(self)
 	   
+class PubNubResponse(Protocol):
+    def __init__( self, finished ):
+        self.finished = finished
 
-#class PubNubResponse(Protocol):
-#    def __init__( self, finished ):
-#        self.finished = finished
-#
-#    def dataReceived( self, bytes ):
-#            self.finished.callback(bytes)
+    def dataReceived( self, bytes ):
+            #print bytes
+            self.finished.callback(bytes)
 
-- 
cgit v1.2.3


From 2ea3826d516fdf10a889e98ffab04a8f1d790650 Mon Sep 17 00:00:00 2001
From: Devendra
Date: Mon, 25 Feb 2013 15:19:20 +0530
Subject: saving python async consolidation work

---
 python-twisted/Pubnub.py | 31 ++++++++++++-------------------
 1 file changed, 12 insertions(+), 19 deletions(-)

(limited to 'python-twisted')

diff --git a/python-twisted/Pubnub.py b/python-twisted/Pubnub.py
index 10875dd..c52bf6d 100644
--- a/python-twisted/Pubnub.py
+++ b/python-twisted/Pubnub.py
@@ -37,7 +37,7 @@ import gzip
 import zlib
 from twisted.internet.ssl import ClientContextFactory
 
-pnconn_pool = HTTPConnectionPool(reactor)
+pnconn_pool = HTTPConnectionPool(reactor, persistent=True)
 pnconn_pool.maxPersistentPerHost    = 100
 pnconn_pool.cachedConnectionTimeout = 310
 
@@ -58,12 +58,16 @@ class Pubnub(PubnubCoreAsync):
         origin = 'pubsub.pubnub.com'
     ) :
         super(Pubnub, self).__init__(
-            publish_key,
-            subscribe_key,
-            secret_key,
-            ssl_on,
-            origin,
+            publish_key=publish_key,
+            subscribe_key=subscribe_key,
+            secret_key=secret_key,
+            ssl_on=ssl_on,
+            origin=origin,
         )        
+        self.headers = {}
+        self.headers['User-Agent'] = ['Python-Twisted']
+        #self.headers['Accept-Encoding'] = [self.accept_encoding]
+        self.headers['V'] = [self.version]
 
     def _request( self, request, callback ) :
         global pnconn_pool
@@ -77,18 +81,13 @@ class Pubnub(PubnubCoreAsync):
             ]) for bit in request])
         '''
         url = self.getUrl(request)
-        cf = WebClientContextFactory()
         agent       = ContentDecoderAgent(RedirectAgent(Agent(
             reactor,
-            contextFactory = cf,
+            contextFactory = WebClientContextFactory(),
             pool = self.ssl and None or pnconn_pool
         )), [('gzip', GzipDecoder)])
         print url
-        request     = agent.request( 'GET', url, Headers({
-            'V'               : ['3.1'],
-            'User-Agent'      : ['Python-Twisted'],
-            'Accept-Encoding' : ['gzip']
-        }), None )
+        request     = agent.request( 'GET', url, Headers(self.headers), None )
 
         def received(response):
             #print response
@@ -97,11 +96,6 @@ class Pubnub(PubnubCoreAsync):
             return finished
 
         def complete(data):
-            #print data
-            #try    : obj = json.loads(data)
-            #except : obj = None
-
-            #print obj
             callback(data)
 
         request.addCallback(received)
@@ -116,6 +110,5 @@ class PubNubResponse(Protocol):
         self.finished = finished
 
     def dataReceived( self, bytes ):
-            #print bytes
             self.finished.callback(bytes)
 
-- 
cgit v1.2.3


From 2238067fbbe3fa6154150095f8a3b4b317a7c7dd Mon Sep 17 00:00:00 2001
From: Devendra
Date: Mon, 25 Feb 2013 21:58:57 +0530
Subject: refactoring

---
 python-twisted/examples/here-now-example.py  | 43 ++++++++++++++++++++++++++++
 python-twisted/examples/history-example.py   |  1 +
 python-twisted/examples/publish-example.py   |  5 +++-
 python-twisted/examples/subscribe-example.py |  8 ++----
 4 files changed, 51 insertions(+), 6 deletions(-)
 create mode 100644 python-twisted/examples/here-now-example.py

(limited to 'python-twisted')

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,
-- 
cgit v1.2.3


From b4258b8b05544cb1a730550cbc1d87c6ef12eea6 Mon Sep 17 00:00:00 2001
From: Devendra
Date: Mon, 25 Feb 2013 22:13:08 +0530
Subject: PubnubCrypto moved to top level dir

---
 python-twisted/PubnubCrypto.py | 92 ------------------------------------------
 1 file changed, 92 deletions(-)
 delete mode 100644 python-twisted/PubnubCrypto.py

(limited to 'python-twisted')

diff --git a/python-twisted/PubnubCrypto.py b/python-twisted/PubnubCrypto.py
deleted file mode 100644
index 744f2d3..0000000
--- a/python-twisted/PubnubCrypto.py
+++ /dev/null
@@ -1,92 +0,0 @@
-## 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))))
-    
-- 
cgit v1.2.3


From 12aee359893dcdfee2c958ef4c8c98b493b267e6 Mon Sep 17 00:00:00 2001
From: Devendra
Date: Mon, 25 Feb 2013 22:18:51 +0530
Subject: removing path append, need to use PYTHONPATH when running examples or
 tests from command line

---
 python-twisted/Pubnub.py | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'python-twisted')

diff --git a/python-twisted/Pubnub.py b/python-twisted/Pubnub.py
index c52bf6d..b0541c9 100644
--- a/python-twisted/Pubnub.py
+++ b/python-twisted/Pubnub.py
@@ -14,9 +14,6 @@ import time
 import hashlib
 import urllib2
 import uuid
-sys.path.append('../')
-sys.path.append('../../')
-sys.path.append('../../../')
 from PubnubCoreAsync import PubnubCoreAsync
 try:
     from hashlib import sha256
@@ -33,8 +30,6 @@ from twisted.web.client import Agent, ContentDecoderAgent, RedirectAgent, GzipDe
 from twisted.web.client import HTTPConnectionPool
 from twisted.web.http_headers import Headers
 from PubnubCrypto import PubnubCrypto
-import gzip
-import zlib
 from twisted.internet.ssl import ClientContextFactory
 
 pnconn_pool = HTTPConnectionPool(reactor, persistent=True)
-- 
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

---
 python-twisted/Pubnub.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'python-twisted')

diff --git a/python-twisted/Pubnub.py b/python-twisted/Pubnub.py
index b0541c9..247c4ff 100644
--- a/python-twisted/Pubnub.py
+++ b/python-twisted/Pubnub.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
-- 
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

---
 python-twisted/Makefile                | 18 ++++++++++++++++++
 python-twisted/Pubnub.py               |  1 -
 python-twisted/tests/unit-test-full.py |  2 ++
 python-twisted/tests/unit-test.py      | 15 ++++++++++++---
 4 files changed, 32 insertions(+), 4 deletions(-)
 create mode 100644 python-twisted/Makefile

(limited to 'python-twisted')

diff --git a/python-twisted/Makefile b/python-twisted/Makefile
new file mode 100644
index 0000000..4cd9305
--- /dev/null
+++ b/python-twisted/Makefile
@@ -0,0 +1,18 @@
+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:
+	python tests/unit-test.py
+
diff --git a/python-twisted/Pubnub.py b/python-twisted/Pubnub.py
index 247c4ff..e317a9c 100644
--- a/python-twisted/Pubnub.py
+++ b/python-twisted/Pubnub.py
@@ -81,7 +81,6 @@ class Pubnub(PubnubCoreAsync):
             contextFactory = WebClientContextFactory(),
             pool = self.ssl and None or pnconn_pool
         )), [('gzip', GzipDecoder)])
-        print url
         request     = agent.request( 'GET', url, Headers(self.headers), None )
 
         def received(response):
diff --git a/python-twisted/tests/unit-test-full.py b/python-twisted/tests/unit-test-full.py
index f593d11..c5940af 100644
--- a/python-twisted/tests/unit-test-full.py
+++ b/python-twisted/tests/unit-test-full.py
@@ -19,6 +19,8 @@
 
 import sys
 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'
diff --git a/python-twisted/tests/unit-test.py b/python-twisted/tests/unit-test.py
index 843f939..ed7fcd5 100644
--- a/python-twisted/tests/unit-test.py
+++ b/python-twisted/tests/unit-test.py
@@ -11,6 +11,8 @@
 
 import sys
 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'
@@ -23,7 +25,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  = ' ~`!@#$%^&*( 顶顅 Ȓ)+=[]\\{}|;\':",./<>?abcd'
+crazy  = 'python-twisted-test-channel'
 
 ## ---------------------------------------------------------------------------
 ## Unit Test Function
@@ -90,10 +92,17 @@ def message_received(message):
         'callback' : dumpster
     })
 
+
 def connected() :
+    ch = crazy
+    def dump_message( msg):
+        print ch, msg
+        pubnub.unsubscribe({'channel':ch})
+        pubnub.stop()
     pubnub.publish({
-        'channel' : crazy,
-        'message' : { 'Info' : 'Connected!' }
+        'channel' : ch,
+        'message' : { 'Info' : 'Connected!' },
+        'callback' : dump_message
     })
 
 pubnub.subscribe({
-- 
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

---
 python-twisted/tests/unit-test.py | 116 --------------------------------------
 1 file changed, 116 deletions(-)
 delete mode 100644 python-twisted/tests/unit-test.py

(limited to 'python-twisted')

diff --git a/python-twisted/tests/unit-test.py b/python-twisted/tests/unit-test.py
deleted file mode 100644
index ed7fcd5..0000000
--- a/python-twisted/tests/unit-test.py
+++ /dev/null
@@ -1,116 +0,0 @@
-## 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
-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 'demo'
-cipher_key    = len(sys.argv) > 4 and sys.argv[4] or ''      ##(Cipher key is Optional)
-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-twisted-test-channel'
-
-## ---------------------------------------------------------------------------
-## Unit Test Function
-## ---------------------------------------------------------------------------
-def test( trial, name ) :
-    if trial :
-        print( 'PASS: ' + name )
-    else :
-        print( 'FAIL: ' + name )
-
-## -----------------------------------------------------------------------
-## Time Example
-## -----------------------------------------------------------------------
-def time_complete(timestamp):
-    print(timestamp)
-
-pubnub.time({ 'callback' : time_complete })
-
-## -----------------------------------------------------------------------
-## History Example
-## -----------------------------------------------------------------------
-def history_complete(messages):
-    print(messages)
-
-pubnub.history( {
-    'channel'  : crazy,
-    'limit'    : 10,
-    'callback' : history_complete
-})
-
-## -----------------------------------------------------------------------
-## Publish Example
-## -----------------------------------------------------------------------
-def publish_complete(info):
-    print(info)
-
-pubnub.publish({
-    'channel' : crazy,
-    'message' :  {'one': 'Hello World! --> ɂ顶@#$%^&*()!', 'two': 'hello2'},
-    'callback' : publish_complete
-})
-
-## -----------------------------------------------------------------------
-## Subscribe Example
-## -----------------------------------------------------------------------
-def message_received(message):
-    print(message)
-    print('Disconnecting...')
-    pubnub.unsubscribe({ 'channel' : crazy })
-
-    def done() :
-        print('final connection, done :)')
-        pubnub.unsubscribe({ 'channel' : crazy })
-        pubnub.stop()
-
-    def dumpster(message) :
-        print('never see this')
-        print(message)
-
-    print('reconnecting...')
-    pubnub.subscribe({
-        'channel'  : crazy,
-        'connect'  : done,
-        'callback' : dumpster
-    })
-
-
-def connected() :
-    ch = crazy
-    def dump_message( msg):
-        print ch, msg
-        pubnub.unsubscribe({'channel':ch})
-        pubnub.stop()
-    pubnub.publish({
-        'channel' : ch,
-        'message' : { 'Info' : 'Connected!' },
-        'callback' : dump_message
-    })
-
-pubnub.subscribe({
-    'channel'  : crazy,
-    'connect'  : connected,
-    'callback' : message_received
-})
-## -----------------------------------------------------------------------
-## IO Event Loop
-## -----------------------------------------------------------------------
-pubnub.start()
-- 
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

---
 python-twisted/Makefile  | 2 +-
 python-twisted/Pubnub.py | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'python-twisted')

diff --git a/python-twisted/Makefile b/python-twisted/Makefile
index 4cd9305..13a5e5a 100644
--- a/python-twisted/Makefile
+++ b/python-twisted/Makefile
@@ -14,5 +14,5 @@ clean:
 
 .PHONY: test
 test:
-	python tests/unit-test.py
+	python ../common/unit-test-async.py
 
diff --git a/python-twisted/Pubnub.py b/python-twisted/Pubnub.py
index e317a9c..8b29236 100644
--- a/python-twisted/Pubnub.py
+++ b/python-twisted/Pubnub.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
@@ -84,13 +84,12 @@ class Pubnub(PubnubCoreAsync):
         request     = agent.request( 'GET', url, Headers(self.headers), None )
 
         def received(response):
-            #print response
             finished = Deferred()
             response.deliverBody(PubNubResponse(finished))
             return finished
 
         def complete(data):
-            callback(data)
+            callback(eval(data))
 
         request.addCallback(received)
         request.addBoth(complete)
-- 
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

---
 python-twisted/Makefile                |  12 +-
 python-twisted/Pubnub.py               | 657 ++++++++++++++++++++++++++++++++-
 python-twisted/tests/unit-tests.py     | 107 ++++++
 python-twisted/unassembled/Platform.py |  83 +++++
 4 files changed, 853 insertions(+), 6 deletions(-)
 create mode 100644 python-twisted/tests/unit-tests.py
 create mode 100644 python-twisted/unassembled/Platform.py

(limited to 'python-twisted')

diff --git a/python-twisted/Makefile b/python-twisted/Makefile
index 13a5e5a..bf23137 100644
--- a/python-twisted/Makefile
+++ b/python-twisted/Makefile
@@ -6,13 +6,23 @@ all: build
 
 .PHONY: build
 build:
+	cat ../common/LICENSE_HEADER > ./Pubnub.py
+	echo "\n" >> ./Pubnub.py
+	cat ../common/PubnubCrypto.py >> ./Pubnub.py
+	echo "\n" >> ./Pubnub.py
+	cat ../common/PubnubBase.py >> ./Pubnub.py
+	echo "\n" >> ./Pubnub.py
+	cat ../common/PubnubCoreAsync.py >> ./Pubnub.py
+	echo "\n" >> ./Pubnub.py
+	cat ./unassembled/Platform.py >> ./Pubnub.py
 	find -name "Pubnub*py" | xargs sed -i "s/PubNub\ [0-9]\.[0-9]\.[0-9]/PubNub\ $(VERSION)/g"
 
 
 .PHONY: clean
 clean:
+	rm -f Pubnub.py*
 
 .PHONY: test
 test:
-	python ../common/unit-test-async.py
+	python tests/unit-tests.py
 
diff --git a/python-twisted/Pubnub.py b/python-twisted/Pubnub.py
index 8b29236..9a89aee 100644
--- a/python-twisted/Pubnub.py
+++ b/python-twisted/Pubnub.py
@@ -8,13 +8,485 @@
 ## -----------------------------------
 ## PubNub 3.3.4 Real-time Push Cloud API
 ## -----------------------------------
-import sys
-import json
+
+
+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))))
+
+
+try: import json
+except ImportError: import simplejson as json
+
 import time
 import hashlib
 import urllib2
-import uuid
-from PubnubCoreAsync import PubnubCoreAsync
+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, 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 = dict() 
+        count = 100    
+        
+        if args.has_key('count'):
+            count = int(args['count'])
+
+        params['count'] = str(count)    
+        
+        if args.has_key('reverse'):
+            params['reverse'] = str(args['reverse']).lower()
+
+        if args.has_key('start'):
+            params['start'] = str(args['start'])
+
+        if args.has_key('end'):
+            params['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({ 'urlcomponents' : [
+            'v2',
+            'history',
+            'sub-key',
+            self.subscribe_key,
+            'channel',
+            channel,
+        ],'urlparams' : 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({'urlcomponents' : [
+            '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"].iteritems()])
+        return url
+
+
 try:
     from hashlib import sha256
     digestmod = sha256
@@ -22,6 +494,181 @@ except ImportError:
     import Crypto.Hash.SHA256 as digestmod
     sha256 = digestmod.new
 import hmac
+
+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):
+                if not self.subscriptions[channel]['first'] :
+                    self.subscriptions[channel]['first'] = True
+                    connectcb()
+
+                ## STOP CONNECTION?
+                if not self.subscriptions[channel]['connected']:
+                    return
+
+
+
+                ## 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()
+    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
+
+
 from twisted.web.client import getPage
 from twisted.internet import reactor
 from twisted.internet.defer import Deferred
@@ -29,8 +676,8 @@ from twisted.internet.protocol import Protocol
 from twisted.web.client import Agent, ContentDecoderAgent, RedirectAgent, GzipDecoder
 from twisted.web.client import HTTPConnectionPool
 from twisted.web.http_headers import Headers
-from PubnubCrypto import PubnubCrypto
 from twisted.internet.ssl import ClientContextFactory
+from twisted.internet.task import LoopingCall
 
 pnconn_pool = HTTPConnectionPool(reactor, persistent=True)
 pnconn_pool.maxPersistentPerHost    = 100
diff --git a/python-twisted/tests/unit-tests.py b/python-twisted/tests/unit-tests.py
new file mode 100644
index 0000000..f143a3a
--- /dev/null
+++ b/python-twisted/tests/unit-tests.py
@@ -0,0 +1,107 @@
+
+import sys
+import time
+
+sys.path.append('../../common')
+sys.path.append('../common')
+sys.path.append('..')
+sys.path.append('.')
+
+from PubnubUnitTest import Suite
+from Pubnub import Pubnub
+
+pubnub = Pubnub("demo","demo")
+
+tests_count = 1 + 2 + 1
+test_suite = Suite(pubnub,tests_count)
+
+tests = []
+
+
+
+def test_publish():
+	channel =  "hello" + str(time.time())
+	name = "Publish Test"
+	def success(r):
+		test_suite.test(r[0] == 1, name)
+
+	def fail(e):
+		test_suite.test(False, msg , e)
+
+
+	pubnub.publish({
+		'channel' : 'hello',
+		'message' : 'hi',
+		'callback' : success,
+		'error' : fail
+	})
+tests.append(test_publish)
+
+#"""
+def test_subscribe_publish():
+	channel = "hello" + str(time.time())
+	name = "Subscribe Publish Test"
+	publish_msg = "This is Pubnub Python-Twisted"
+	def connect():
+		#print 'connect'
+		def success(r):
+			test_suite.test(r[0] == 1, name, "publish success")
+
+		def fail(e):
+			test_suite.test(False, name , "Publish Failed", e)
+
+		pubnub.publish({
+			'channel' : channel,
+			'message' : publish_msg,
+			'callback' : success,
+			'error' : fail
+		})
+
+	def callback(r):
+		test_suite.test(r == publish_msg, name, "message received")
+
+	pubnub.subscribe({
+		'channel' : channel,
+		'callback' : callback,
+		'connect' : connect
+	})
+tests.append(test_subscribe_publish)
+#"""
+
+def test_here_now():
+	channel = "hello12" #+ str(time.time())
+	name = "Here Now Test"
+
+	def connect():
+		print 'connect'
+		def call_here_now():
+			print 'call_here_now'
+			def success(r):
+				test_suite.test(r['occupancy'] == 1, name, "Here Now success")
+
+			def fail(e):
+				test_suite.test(False, name , "Here Now Failed", e)
+
+			pubnub.here_now({
+				'channel' : channel,
+				'callback' : success,
+				'error' : fail
+			})
+		pubnub.timeout(5, call_here_now)
+
+	def callback(r):
+		pass
+	print 'Subscribe'
+	pubnub.subscribe({
+		'channel' : channel,
+		'callback' : callback,
+		'connect' : connect
+	})
+tests.append(test_here_now)
+
+
+
+
+for t in tests: t()
+
+pubnub.start()
diff --git a/python-twisted/unassembled/Platform.py b/python-twisted/unassembled/Platform.py
new file mode 100644
index 0000000..e4ae680
--- /dev/null
+++ b/python-twisted/unassembled/Platform.py
@@ -0,0 +1,83 @@
+from twisted.web.client import getPage
+from twisted.internet import reactor
+from twisted.internet.defer import Deferred
+from twisted.internet.protocol import Protocol
+from twisted.web.client import Agent, ContentDecoderAgent, RedirectAgent, GzipDecoder
+from twisted.web.client import HTTPConnectionPool
+from twisted.web.http_headers import Headers
+from twisted.internet.ssl import ClientContextFactory
+from twisted.internet.task import LoopingCall
+
+pnconn_pool = HTTPConnectionPool(reactor, persistent=True)
+pnconn_pool.maxPersistentPerHost    = 100
+pnconn_pool.cachedConnectionTimeout = 310
+
+class Pubnub(PubnubCoreAsync):
+
+    def start(self): reactor.run()
+    def stop(self):  reactor.stop()
+    def timeout( self, delay, callback ):
+        reactor.callLater( delay, callback )
+
+    def __init__(
+        self,
+        publish_key,
+        subscribe_key,
+        secret_key = False,
+        cipher_key = False,
+        ssl_on = False,
+        origin = 'pubsub.pubnub.com'
+    ) :
+        super(Pubnub, self).__init__(
+            publish_key=publish_key,
+            subscribe_key=subscribe_key,
+            secret_key=secret_key,
+            ssl_on=ssl_on,
+            origin=origin,
+        )        
+        self.headers = {}
+        self.headers['User-Agent'] = ['Python-Twisted']
+        #self.headers['Accept-Encoding'] = [self.accept_encoding]
+        self.headers['V'] = [self.version]
+
+    def _request( self, request, callback ) :
+        global pnconn_pool
+
+        ## 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])
+        '''
+        url = self.getUrl(request)
+        agent       = ContentDecoderAgent(RedirectAgent(Agent(
+            reactor,
+            contextFactory = WebClientContextFactory(),
+            pool = self.ssl and None or pnconn_pool
+        )), [('gzip', GzipDecoder)])
+        request     = agent.request( 'GET', url, Headers(self.headers), None )
+
+        def received(response):
+            finished = Deferred()
+            response.deliverBody(PubNubResponse(finished))
+            return finished
+
+        def complete(data):
+            callback(eval(data))
+
+        request.addCallback(received)
+        request.addBoth(complete)
+
+class WebClientContextFactory(ClientContextFactory):
+    def getContext(self, hostname, port):
+        return ClientContextFactory.getContext(self)
+	   
+class PubNubResponse(Protocol):
+    def __init__( self, finished ):
+        self.finished = finished
+
+    def dataReceived( self, bytes ):
+            self.finished.callback(bytes)
+
-- 
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

---
 python-twisted/Pubnub.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'python-twisted')

diff --git a/python-twisted/Pubnub.py b/python-twisted/Pubnub.py
index 9a89aee..283e121 100644
--- a/python-twisted/Pubnub.py
+++ b/python-twisted/Pubnub.py
@@ -541,7 +541,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