adding ver 1 of dev console

6 files changed, 193 insertions, 10 deletions

diff --git a/common/PubnubBase.py b/common/PubnubBase.py
index 98c68eb..075327d 100644
--- a/common/PubnubBase.py
+++ b/common/PubnubBase.py
@@ -120,7 +120,7 @@ class PubnubBase(object):
             params=params
         )
 
-        signature = self._pam_sign(sign_input)
+        query['signature'] = self._pam_sign(sign_input)
 
         '''
         url = ("https://pubsub.pubnub.com/v1/auth/{apitype}/sub-key/".format(apitype="audit" if (apicode) else "grant") +
@@ -133,7 +133,7 @@ class PubnubBase(object):
             'v1', 'auth', "audit" if (apicode) else "grant" , 
             'sub-key',
             self.subscribe_key
-        ], 'urlparams' : {'auth' : self.auth_key, 'signature' : signature}}, 
+        ], 'urlparams' : query}, 
         self._return_wrapped_callback(callback))
 
     def grant( self, channel, authkey=False, read=True, write=True, ttl=5, callback=None):
diff --git a/python-tornado/Pubnub.py b/python-tornado/Pubnub.py
index ccff021..757cdd7 100644
--- a/python-tornado/Pubnub.py
+++ b/python-tornado/Pubnub.py
@@ -291,7 +291,7 @@ class PubnubBase(object):
             params=params
         )
 
-        signature = self._pam_sign(sign_input)
+        query['signature'] = self._pam_sign(sign_input)
 
         '''
         url = ("https://pubsub.pubnub.com/v1/auth/{apitype}/sub-key/".format(apitype="audit" if (apicode) else "grant") +
@@ -304,7 +304,7 @@ class PubnubBase(object):
             'v1', 'auth', "audit" if (apicode) else "grant" , 
             'sub-key',
             self.subscribe_key
-        ], 'urlparams' : {'auth' : self.auth_key, 'signature' : signature}}, 
+        ], 'urlparams' : query}, 
         self._return_wrapped_callback(callback))
 
     def grant( self, channel, authkey=False, read=True, write=True, ttl=5, callback=None):
diff --git a/python-twisted/Pubnub.py b/python-twisted/Pubnub.py
index 383ee6d..b9e6b52 100644
--- a/python-twisted/Pubnub.py
+++ b/python-twisted/Pubnub.py
@@ -291,7 +291,7 @@ class PubnubBase(object):
             params=params
         )
 
-        signature = self._pam_sign(sign_input)
+        query['signature'] = self._pam_sign(sign_input)
 
         '''
         url = ("https://pubsub.pubnub.com/v1/auth/{apitype}/sub-key/".format(apitype="audit" if (apicode) else "grant") +
@@ -304,7 +304,7 @@ class PubnubBase(object):
             'v1', 'auth', "audit" if (apicode) else "grant" , 
             'sub-key',
             self.subscribe_key
-        ], 'urlparams' : {'auth' : self.auth_key, 'signature' : signature}}, 
+        ], 'urlparams' : query}, 
         self._return_wrapped_callback(callback))
 
     def grant( self, channel, authkey=False, read=True, write=True, ttl=5, callback=None):
diff --git a/python/Pubnub.py b/python/Pubnub.py
index 95eafd0..169bd54 100644
--- a/python/Pubnub.py
+++ b/python/Pubnub.py
@@ -291,7 +291,7 @@ class PubnubBase(object):
             params=params
         )
 
-        signature = self._pam_sign(sign_input)
+        query['signature'] = self._pam_sign(sign_input)
 
         '''
         url = ("https://pubsub.pubnub.com/v1/auth/{apitype}/sub-key/".format(apitype="audit" if (apicode) else "grant") +
@@ -304,7 +304,7 @@ class PubnubBase(object):
             'v1', 'auth', "audit" if (apicode) else "grant" , 
             'sub-key',
             self.subscribe_key
-        ], 'urlparams' : {'auth' : self.auth_key, 'signature' : signature}}, 
+        ], 'urlparams' : query}, 
         self._return_wrapped_callback(callback))
 
     def grant( self, channel, authkey=False, read=True, write=True, ttl=5, callback=None):
diff --git a/python/examples/dev-console.py b/python/examples/dev-console.py
new file mode 100755
index 0000000..372599a
--- /dev/null
+++ b/python/examples/dev-console.py
@@ -0,0 +1,182 @@
+## 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
+sys.path.append('../')
+sys.path.append('../../')
+from Pubnub import Pubnub
+
+from optparse import OptionParser
+
+
+parser = OptionParser()
+
+parser.add_option("--publish-key",
+                  dest="publish_key", default="demo",
+                  help="Publish Key ( default : 'demo' )")
+
+parser.add_option("--subscribe-key",
+                  dest="subscribe_key", default="demo",
+                  help="Subscribe Key ( default : 'demo' )")
+
+parser.add_option("--secret-key",
+                  dest="secret_key", default="demo",
+                  help="Secret Key ( default : 'demo' )")
+
+parser.add_option("--cipher-key",
+                  dest="cipher_key", default="",
+                  help="Cipher Key")
+
+parser.add_option("--auth-key",
+                  dest="auth_key", default=None,
+                  help="Auth Key")
+
+parser.add_option("--origin",
+                  dest="origin", default="pubsub.pubnub.com",
+                  help="Origin ( default: pubsub.pubnub.com )")
+
+parser.add_option("--ssl-on",
+                  action="store_false", dest="ssl", default=False,
+                  help="SSL")
+
+(options, args) = parser.parse_args()
+
+print options
+
+pubnub = Pubnub(options.publish_key, options.subscribe_key, options.secret_key, options.cipher_key, options.auth_key, options.ssl)
+
+
+class color:
+   PURPLE = '\033[95m'
+   CYAN = '\033[96m'
+   DARKCYAN = '\033[36m'
+   BLUE = '\033[94m'
+   GREEN = '\033[92m'
+   YELLOW = '\033[93m'
+   RED = '\033[91m'
+   BOLD = '\033[1m'
+   UNDERLINE = '\033[4m'
+   END = '\033[0m'
+
+
+def print_ok(msg):
+    print(color.GREEN + str(msg) + color.END)
+
+def print_error(msg):
+    print(color.RED + color.BOLD +  str(msg) + color.END)
+
+def get_input(message, t=None):
+    while True:
+        try:
+            command = raw_input(message)
+            if t is not None:
+                command = t(command)
+            else:
+                command = eval("'" + command + "'")
+            return command
+        except ValueError:
+            print_error("Invalid input : " + command)
+
+
+
+def _publish_command_handler():
+
+    channel = get_input("[PUBLISH] Enter Channel Name ", str)
+    while True:
+        message = get_input("[PUBLISH] Enter Message ( QUIT for exit from publish mode ) ")
+        if message == 'QUIT' or message == 'quit':
+            return  
+        def _callback(r):
+            print_ok(r)
+        def _error(r):
+            print_error(r)
+        pubnub.publish({
+            'channel' : channel,
+            'message' : message,
+            'callback' : _callback,
+            'error'   : _error
+        })
+
+
+def _subscribe_command_handler():
+    channel = get_input("[SUBSCRIBE] Enter Channel Name ", str)
+    def _callback(r):
+        print_ok(r)
+    def _error(r):
+        print_error(r)
+    pubnub.subscribe({
+        'channel' : channel,
+        'callback' : _callback,
+        'error'   : _error
+    })
+
+def _grant_command_handler():
+    pass
+
+def _revoke_command_handler():
+    pass
+
+def _audit_command_handler():
+    pass
+
+def _history_command_handler():
+    pass
+
+def _here_now_command_handler():
+    pass
+
+
+
+import threading
+
+def kill_all_threads():
+    for thread in threading.enumerate():
+        if thread.isAlive():
+            try:
+                thread._Thread__stop()
+            except:
+                print(str(thread.getName()) + ' could not be terminated')
+
+
+commands = []
+commands.append({"command" : "publish", "handler" : _publish_command_handler})
+commands.append({"command" : "subscribe", "handler" : _subscribe_command_handler})
+'''
+commands.append({"command" : "here_now", "handler" : _here_now_command_handler})
+commands.append({"command" : "history", "handler" : _history_command_handler})
+commands.append({"command" : "grant", "handler" : _grant_command_handler})
+commands.append({"command" : "revoke", "handler" : _revoke_command_handler})
+commands.append({"command" : "audit", "handler" : _audit_command_handler})
+'''
+# last command is quit. add new commands before this line
+commands.append({"command" : "QUIT"})
+
+def get_help():
+    help = ""
+    for i,v in enumerate(commands):
+        help += "Enter " + str(i) + " for " + v['command'] + "\n"
+    return help
+
+            
+while True:
+    command = get_input(color.BLUE + get_help(), int)
+
+    if command == len(commands) - 1:
+        kill_all_threads()
+        break
+    if command >= len(commands):
+        print_error("Invalid input " + str(command))
+        continue
+
+    commands[command]['handler']()
+
+#pubnub.start()
diff --git a/python/examples/publish-example.py b/python/examples/publish-example.py
index bb8b199..e632aef 100755
--- a/python/examples/publish-example.py
+++ b/python/examples/publish-example.py
@@ -19,12 +19,13 @@ 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
+auth_key    = len(sys.argv) > 5 and sys.argv[4] or 'abcd'     ##(Cipher key is Optional)
+ssl_on        = len(sys.argv) > 6 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, auth_key, ssl_on )
 crazy  = 'hello_world'
 
 ## -----------------------------------------------------------------------