Merge branch 'TR-89.88.56.47.55'

Conflicts:
	.gitignore

14 files changed, 478 insertions, 645 deletions

diff --git a/python/3.2/Pubnub.py b/python/3.2/Pubnub.py
deleted file mode 100644
index 79086cf..0000000
--- a/python/3.2/Pubnub.py
+++ /dev/null
@@ -1,345 +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.0 Real-time Push Cloud API
-## -----------------------------------
-
-try: import json
-except ImportError: import simplejson as json
-
-import time
-import hashlib
-import urllib2
-import uuid
-
-class Pubnub():
-    def __init__(
-        self,
-        publish_key,
-        subscribe_key,
-        secret_key = False,
-        ssl_on = False,
-        origin = 'pubsub.pubnub.com',
-        pres_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.ssl           = ssl_on
-
-        if self.ssl :
-            self.origin = 'https://' + self.origin
-        else :
-            self.origin = 'http://'  + self.origin
-        
-        self.uuid = pres_uuid or str(uuid.uuid4())
-        
-        if not isinstance(self.uuid, basestring):
-            raise AttributeError("pres_uuid must be a string")
-
-    def publish( self, args ) :
-        """
-        #**
-        #* Publish
-        #*
-        #* Send a message to a channel.
-        #*
-        #* @param array args with channel and message.
-        #* @return array success information.
-        #**
-
-        ## Publish Example
-        info = pubnub.publish({
-            'channel' : 'hello_world',
-            'message' : {
-                'some_text' : 'Hello my World'
-            }
-        })
-        print(info)
-
-        """
-        ## Fail if bad input.
-        if not (args['channel'] and args['message']) :
-            return [ 0, 'Missing Channel or Message' ]
-
-        ## Capture User Input
-        channel = str(args['channel'])
-        message = json.dumps(args['message'], separators=(',',':'))
-
-        ## Sign Message
-        if self.secret_key :
-            signature = hashlib.md5('/'.join([
-                self.publish_key,
-                self.subscribe_key,
-                self.secret_key,
-                channel,
-                message
-            ])).hexdigest()
-        else :
-            signature = '0'
-
-        ## Send Message
-        return self._request([
-            'publish',
-            self.publish_key,
-            self.subscribe_key,
-            signature,
-            channel,
-            '0',
-            message
-        ])
-
-
-    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
-    
-    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'])
-        
-        ## Fail if bad input.
-        if not channel :
-            raise Exception('Missing Channel')
-            return False
-        
-        ## Get Presence Here Now
-        return self._request([
-            'v2','presence',
-            'sub_key', self.subscribe_key,
-            'channel', channel
-        ]);
-        
-        
-    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
-
-        ## Get History
-        return self._request([
-            'history',
-            self.subscribe_key,
-            channel,
-            '0',
-            str(limit)
-        ]);
-
-
-    def time(self) :
-        """
-        #**
-        #* Time
-        #*
-        #* Timestamp from PubNub Cloud.
-        #*
-        #* @return int timestamp.
-        #*
-
-        ## PubNub Server Time Example
-        timestamp = pubnub.time()
-        print(timestamp)
-
-        """
-        return self._request([
-            'time',
-            '0'
-        ])[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 _request( self, request, origin = None, encode = True ) :
-        ## Build URL
-        url = (origin or self.origin) + '/' + "/".join(
-            encode and self._encode(request) or request
-        )
-
-        ## Send Request Expecting JSONP Response
-        try:
-            try: usock = urllib2.urlopen( url, None, 200 )
-            except TypeError: usock = urllib2.urlopen( url, None )
-            response = usock.read()
-            usock.close()
-            return json.loads( response )
-        except:
-            return None
-
diff --git a/python/3.2/history-example.py b/python/3.2/history-example.py
deleted file mode 100755
index cedf69e..0000000
--- a/python/3.2/history-example.py
+++ /dev/null
@@ -1,12 +0,0 @@
-from Pubnub import Pubnub
-
-## Initiat Class
-pubnub = Pubnub( 'demo', 'demo', None, False )
-
-## History Example
-history = pubnub.history({
-    'channel' : 'hello_world',
-    'limit'   : 1
-})
-print(history)
-
diff --git a/python/3.3/publish-example.py b/python/3.3/publish-example.py
deleted file mode 100755
index 725df0b..0000000
--- a/python/3.3/publish-example.py
+++ /dev/null
@@ -1,14 +0,0 @@
-from Pubnub import Pubnub
-
-## Initiate Class
-pubnub = Pubnub( 'demo', 'demo', None, False )
-
-## Publish Example
-info = pubnub.publish({
-    'channel' : 'hello_world',
-    'message' : {
-        'some_text' : 'Hello my World'
-    }
-})
-print(info)
-
diff --git a/python/3.3/subscribe-example.py b/python/3.3/subscribe-example.py
deleted file mode 100755
index e458e2b..0000000
--- a/python/3.3/subscribe-example.py
+++ /dev/null
@@ -1,64 +0,0 @@
-import sys
-import threading
-import time
-import random
-import string
-from Pubnub import Pubnub
-
-## Initiate Class
-pubnub = Pubnub( 'demo', 'demo', None, False )
-
-print("My UUID is: "+pubnub.uuid)
-
-channel = ''.join(random.choice(string.ascii_letters + string.digits) for x in range(20))
-
-## Subscribe Example
-def receive(message) :
-    print(message)
-    return False
-
-def pres_event(message):
-    print(message)
-    return False
-
-def subscribe():
-    print("Listening for messages on '%s' channel..." % channel)
-    pubnub.subscribe({
-        'channel'  : channel,
-        'callback' : receive 
-    })
-
-def presence():
-    print("Listening for presence events on '%s' channel..." % channel)
-    pubnub.presence({
-        'channel'  : channel,
-        'callback' : pres_event 
-    })
-
-def publish():
-    print("Publishing a test message on '%s' channel..." % channel)
-    pubnub.publish({
-        'channel'  : channel,
-        'message'  : { 'text':'foo bar' }
-    })
-
-pres_thread = threading.Thread(target=presence)
-pres_thread.daemon=True
-pres_thread.start()
-
-sub_thread = threading.Thread(target=subscribe)
-sub_thread.daemon=True
-sub_thread.start()
-
-time.sleep(3)
-
-publish()
-
-
-print("waiting for subscribes and presence")
-pres_thread.join()
-
-print pubnub.here_now({'channel':channel})
-
-sub_thread.join()
-
diff --git a/python/3.3/unit-test.py b/python/3.3/unit-test.py
deleted file mode 100755
index 88391a0..0000000
--- a/python/3.3/unit-test.py
+++ /dev/null
@@ -1,77 +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.0 Real-time Push Cloud API
-## -----------------------------------
-
-from Pubnub import Pubnub
-import sys
-
-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
-ssl_on        = len(sys.argv) > 4 and bool(sys.argv[4]) or False
-
-
-## -----------------------------------------------------------------------
-## Initiat Class
-## -----------------------------------------------------------------------
-
-pubnub = Pubnub( publish_key, subscribe_key, secret_key, ssl_on )
-crazy  = ' ~`!@#$%^&*(顶顅Ȓ)+=[]\\{}|;\':",./<>?abcd'
-
-## ---------------------------------------------------------------------------
-## Unit Test Function
-## ---------------------------------------------------------------------------
-def test( trial, name ) :
-    if trial :
-        print( 'PASS: ' + name )
-    else :
-        print( 'FAIL: ' + name )
-
-## -----------------------------------------------------------------------
-## Publish Example
-## -----------------------------------------------------------------------
-pubish_success = pubnub.publish({
-    'channel' : crazy,
-    'message' : crazy
-})
-test( pubish_success[0] == 1, 'Publish First Message Success' )
-
-## -----------------------------------------------------------------------
-## History Example
-## -----------------------------------------------------------------------
-history = pubnub.history({
-    'channel' : crazy,
-    'limit'   : 1
-})
-test(
-    history[0].encode('utf-8') == crazy,
-    'History Message: ' + history[0]
-)
-test( len(history) == 1, 'History Message Count' )
-
-## -----------------------------------------------------------------------
-## PubNub Server Time Example
-## -----------------------------------------------------------------------
-timestamp = pubnub.time()
-test( timestamp > 0, 'PubNub Server Time: ' + str(timestamp) )
-
-## -----------------------------------------------------------------------
-## Subscribe Example
-## -----------------------------------------------------------------------
-def receive(message) :
-    print(message)
-    return True
-
-pubnub.subscribe({
-    'channel'  : crazy,
-    'callback' : receive 
-})
-
-
diff --git a/python/Makefile b/python/Makefile
new file mode 100644
index 0000000..5eb9e2f
--- /dev/null
+++ b/python/Makefile
@@ -0,0 +1,29 @@
+include ../Makefile.inc
+
+
+.PHONY: all
+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/PubnubCore.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 tests/detailed-history-unit-test.py
+	python tests/unit-test.py
+
diff --git a/python/3.3/Pubnub.py b/python/Pubnub.py
index a3f4d6f..b1d1777 100644
--- a/python/3.3/Pubnub.py
+++ b/python/Pubnub.py
@@ -6,26 +6,111 @@
 ## http://www.pubnub.com/
 
 ## -----------------------------------
-## PubNub 3.0 Real-time Push Cloud API
+## PubNub 3.3.4 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))))
+
+
 try: import json
 except ImportError: import simplejson as json
 
 import time
 import hashlib
 import urllib2
-import uuid
+import uuid 
 
-class Pubnub():
+class PubnubBase(object):
     def __init__(
         self,
         publish_key,
         subscribe_key,
         secret_key = False,
+        cipher_key = False,
         ssl_on = False,
         origin = 'pubsub.pubnub.com',
-        pres_uuid = None
+        UUID = None
     ) :
         """
         #**
@@ -50,6 +135,7 @@ class Pubnub():
         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 :
@@ -57,11 +143,69 @@ class Pubnub():
         else :
             self.origin = 'http://'  + self.origin
         
-        self.uuid = pres_uuid or str(uuid.uuid4())
+        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 ) :
         """
         #**
@@ -89,22 +233,20 @@ class Pubnub():
 
         ## Capture User Input
         channel = str(args['channel'])
-        message = json.dumps(args['message'], separators=(',',':'))
 
-        ## Sign Message
-        if self.secret_key :
-            signature = hashlib.md5('/'.join([
-                self.publish_key,
-                self.subscribe_key,
-                self.secret_key,
-                channel,
-                message
-            ])).hexdigest()
+        ## Capture Callback
+        if args.has_key('callback') :
+            callback = args['callback']
         else :
-            signature = '0'
+            callback = None 
+
+        #message = json.dumps(args['message'], separators=(',',':'))
+        message = self.encrypt(args['message'])
+
+        signature = self.sign(channel, message)
 
         ## Send Message
-        return self._request([
+        return self._request({"urlcomponents": [
             'publish',
             self.publish_key,
             self.subscribe_key,
@@ -112,78 +254,7 @@ class Pubnub():
             channel,
             '0',
             message
-        ])
-
-
-    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
+        ]}, callback)
     
     def presence( self, args ) :
         """
@@ -246,6 +317,12 @@ class Pubnub():
 
         """
         channel = str(args['channel'])
+
+        ## Capture Callback
+        if args.has_key('callback') :
+            callback = args['callback']
+        else :
+            callback = None
         
         ## Fail if bad input.
         if not channel :
@@ -253,11 +330,11 @@ class Pubnub():
             return False
         
         ## Get Presence Here Now
-        return self._request([
+        return self._request({"urlcomponents": [
             'v2','presence',
             'sub_key', self.subscribe_key,
             'channel', channel
-        ]);
+        ]}, callback);
         
         
     def history( self, args ) :
@@ -288,14 +365,20 @@ class Pubnub():
             raise Exception('Missing Channel')
             return False
 
+        ## Capture Callback
+        if args.has_key('callback') :
+            callback = args['callback']
+        else :
+            callback = None
+
         ## Get History
-        return self._request([
+        return self._request({ "urlcomponents" : [
             'history',
             self.subscribe_key,
             channel,
             '0',
             str(limit)
-        ]);
+        ] }, callback);
 
     def detailedHistory(self, args) :
         """
@@ -319,39 +402,45 @@ class Pubnub():
         ## 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 :
             raise Exception('Missing Channel')
             return False
 
+        ## Capture Callback
+        if args.has_key('callback') :
+            callback = args['callback']
+        else :
+            callback = None 
+
         ## Get History
-        return self._request([
+        return self._request({ 'urlcomponents' : [
             'v2',
             'history',
             'sub-key',
             self.subscribe_key,
             'channel',
             channel,
-        ],params=params);
+        ],'urlparams' : params }, callback=callback);
 
-    def time(self) :
+    def time(self, args = None) :
         """
         #**
         #* Time
@@ -366,10 +455,17 @@ class Pubnub():
         print(timestamp)
 
         """
-        return self._request([
+        ## Capture Callback
+        if args and args.has_key('callback') :
+            callback = args['callback']
+        else :
+            callback = None 
+        time = self._request({'urlcomponents' : [
             'time',
             '0'
-        ])[0]
+        ]}, callback)
+        if time != None:
+            return time[0]
 
 
     def _encode( self, request ) :
@@ -378,24 +474,173 @@ class Pubnub():
                 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
+
+
+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
 
-    def _request( self, request, origin = None, encode = True, params = None ) :
+        ## 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
+
+
+
+class Pubnub(PubnubCore):
+    def __init__(
+        self,
+        publish_key,
+        subscribe_key,
+        secret_key = False,
+        cipher_key = False,
+        ssl_on = False,
+        origin = 'pubsub.pubnub.com',
+        pres_uuid = None
+    ) :
+        super(Pubnub, self).__init__(
+            publish_key = publish_key,
+            subscribe_key = subscribe_key,
+            secret_key = secret_key,
+            cipher_key = cipher_key,
+            ssl_on = ssl_on,
+            origin = origin,
+            uuid = pres_uuid
+        )        
+
+    def _request( self, request, callback = None ) :
         ## Build URL
-        url = (origin or self.origin) + '/' + "/".join(
-            encode and self._encode(request) or request
-        )
-        ## Add query params
-        if params is not None and len(params) > 0:
-            url = url + "?" + "&".join(params)
+        url = self.getUrl(request)
 
         ## Send Request Expecting JSONP Response
         try:
-            try: usock = urllib2.urlopen( url, None, 200 )
+            try: usock = urllib2.urlopen( url, None, 310 )
             except TypeError: usock = urllib2.urlopen( url, None )
             response = usock.read()
             usock.close()
-            return json.loads( response )
+            resp_json = json.loads(response)
         except:
             return None
-
+            
+        if (callback):
+            callback(resp_json)
+        else:
+            return resp_json
diff --git a/python/examples/here-now-example.py b/python/examples/here-now-example.py
new file mode 100644
index 0000000..d2ca9bd
--- /dev/null
+++ b/python/examples/here-now-example.py
@@ -0,0 +1,37 @@
+## 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('../')
+from twisted.internet import reactor
+from Pubnub import Pubnub
+
+publish_key   = len(sys.argv) > 1 and sys.argv[1] or 'demo'
+subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'demo'
+secret_key    = len(sys.argv) > 3 and sys.argv[3] or 'demo'
+cipher_key    = len(sys.argv) > 4 and sys.argv[4] or ''
+ssl_on        = len(sys.argv) > 5 and bool(sys.argv[5]) or False
+
+## -----------------------------------------------------------------------
+## Initiate Pubnub State
+## -----------------------------------------------------------------------
+pubnub = Pubnub( publish_key=publish_key, subscribe_key=subscribe_key,
+    secret_key=secret_key, cipher_key=cipher_key, ssl_on=ssl_on)
+crazy  = 'hello_world'
+
+def print_cb(message):
+	print message
+
+pubnub.here_now( {
+    'channel'  : crazy,
+    'callback' : print_cb
+})
+
diff --git a/python/3.3/history-example.py b/python/examples/history-example.py
index cedf69e..c7c9547 100755
--- a/python/3.3/history-example.py
+++ b/python/examples/history-example.py
@@ -1,3 +1,5 @@
+import sys
+sys.path.append('../')
 from Pubnub import Pubnub
 
 ## Initiat Class
diff --git a/python/3.2/publish-example.py b/python/examples/publish-example.py
index 725df0b..c97034b 100755
--- a/python/3.2/publish-example.py
+++ b/python/examples/publish-example.py
@@ -1,7 +1,7 @@
 from Pubnub import Pubnub
 
 ## Initiate Class
-pubnub = Pubnub( 'demo', 'demo', None, False )
+pubnub = Pubnub( publish_key='demo', subscribe_key='demo', ssl_on=False )
 
 ## Publish Example
 info = pubnub.publish({
diff --git a/python/3.2/subscribe-example.py b/python/examples/subscribe-example.py
index e458e2b..e458e2b 100755
--- a/python/3.2/subscribe-example.py
+++ b/python/examples/subscribe-example.py
diff --git a/python/3.3/detailed-history-unit-test.py b/python/tests/detailed-history-unit-test.py
index 2169e52..31bdef8 100755
--- a/python/3.3/detailed-history-unit-test.py
+++ b/python/tests/detailed-history-unit-test.py
@@ -9,9 +9,12 @@
 ## PubNub 3.0 Real-time Push Cloud API
 ## -----------------------------------
 
+import sys
+sys.path.append('.')
+sys.path.append('..')
+sys.path.append('../common')
 from Pubnub import Pubnub
 import unittest2 as unittest
-import sys
 
 
 publish_key = len(sys.argv) > 1 and sys.argv[1] or 'demo'
diff --git a/python/3.2/unit-test.py b/python/tests/unit-test.py
index 88391a0..1737ace 100755
--- a/python/3.2/unit-test.py
+++ b/python/tests/unit-test.py
@@ -9,8 +9,11 @@
 ## PubNub 3.0 Real-time Push Cloud API
 ## -----------------------------------
 
-from Pubnub import Pubnub
 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'
@@ -23,7 +26,7 @@ ssl_on        = len(sys.argv) > 4 and bool(sys.argv[4]) or False
 ## -----------------------------------------------------------------------
 
 pubnub = Pubnub( publish_key, subscribe_key, secret_key, ssl_on )
-crazy  = ' ~`!@#$%^&*(顶顅Ȓ)+=[]\\{}|;\':",./<>?abcd'
+crazy  = 'demo'
 
 ## ---------------------------------------------------------------------------
 ## Unit Test Function
@@ -37,11 +40,11 @@ def test( trial, name ) :
 ## -----------------------------------------------------------------------
 ## Publish Example
 ## -----------------------------------------------------------------------
-pubish_success = pubnub.publish({
+publish_success = pubnub.publish({
     'channel' : crazy,
     'message' : crazy
 })
-test( pubish_success[0] == 1, 'Publish First Message Success' )
+test( publish_success[0] == 1, 'Publish First Message Success' )
 
 ## -----------------------------------------------------------------------
 ## History Example
@@ -61,17 +64,3 @@ test( len(history) == 1, 'History Message Count' )
 ## -----------------------------------------------------------------------
 timestamp = pubnub.time()
 test( timestamp > 0, 'PubNub Server Time: ' + str(timestamp) )
-
-## -----------------------------------------------------------------------
-## Subscribe Example
-## -----------------------------------------------------------------------
-def receive(message) :
-    print(message)
-    return True
-
-pubnub.subscribe({
-    'channel'  : crazy,
-    'callback' : receive 
-})
-
-
diff --git a/python/unassembled/Platform.py b/python/unassembled/Platform.py
new file mode 100644
index 0000000..f598a98
--- /dev/null
+++ b/python/unassembled/Platform.py
@@ -0,0 +1,40 @@
+
+class Pubnub(PubnubCore):
+    def __init__(
+        self,
+        publish_key,
+        subscribe_key,
+        secret_key = False,
+        cipher_key = False,
+        ssl_on = False,
+        origin = 'pubsub.pubnub.com',
+        pres_uuid = None
+    ) :
+        super(Pubnub, self).__init__(
+            publish_key = publish_key,
+            subscribe_key = subscribe_key,
+            secret_key = secret_key,
+            cipher_key = cipher_key,
+            ssl_on = ssl_on,
+            origin = origin,
+            uuid = pres_uuid
+        )        
+
+    def _request( self, request, callback = None ) :
+        ## Build URL
+        url = self.getUrl(request)
+
+        ## Send Request Expecting JSONP Response
+        try:
+            try: usock = urllib2.urlopen( url, None, 310 )
+            except TypeError: usock = urllib2.urlopen( url, None )
+            response = usock.read()
+            usock.close()
+            resp_json = json.loads(response)
+        except:
+            return None
+            
+        if (callback):
+            callback(resp_json)
+        else:
+            return resp_json