adding pubnub sdk url parameter

pubnub · Apr 12, 2013 · 8bacc05 · 8bacc05
1 parent 02841bf
commit 8bacc05
Show file tree

Hide file tree

Showing 40 changed files with 3,900 additions and 164 deletions.
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-SUBDIRS = web socket.io nodejs modern titanium
+SUBDIRS = web socket.io nodejs modern titanium phonegap sencha webos
 
 .PHONY: all
 all:

diff --git a/Makefile.inc b/Makefile.inc
@@ -17,5 +17,3 @@ WEBSOCKET_JS=$(CORE_DIR)/websocket.js
 ENCRYPT_JS=$(CORE_DIR)/crypto/encrypt-pubnub.js
 PUBNUB_MIN_JS=pubnub.min.js
 
-.PHONY : test
-test :  #  empty
diff --git a/Makefile.post b/Makefile.post
@@ -0,0 +1,2 @@
+.PHONY: test
+test: #empty
diff --git a/core/pubnub-common.js b/core/pubnub-common.js
@@ -7,6 +7,8 @@ var NOW             = 1
 ,   DEF_SUB_TIMEOUT = 310    // SECONDS.
 ,   DEF_KEEPALIVE   = 60     // SECONDS.
 ,   SECOND          = 1000   // A THOUSAND MILLISECONDS.
+,   URLBIT          = '/'
+,   PARAMSBIT       = '&'
 ,   REPL            = /{([\w\-]+)}/g;
 
 /**
@@ -33,6 +35,26 @@ var nextorigin = (function() {
     }
 })();
 
+
+/**
+ * Build Url
+ * =======
+ * 
+ */
+function build_url(url_components, url_params) {
+    var url     = url_components.join(URLBIT);
+
+    if (url_params) {
+        var params = [];
+        url += "?";
+        for (var key in url_params) {
+             params.push(key+"="+url_params[key]);
+        }
+        url += params.join(PARAMSBIT);
+    }
+	return url;
+}
+
 /**
  * UPDATER
  * =======
@@ -206,7 +228,7 @@ function PN_API(setup) {
     // Announce Leave Event
     var SELF = {
         'LEAVE' : function( channel, blocking ) {
-            var data   = { 'uuid' : UUID }
+            var data   = { 'uuid' : UUID}
             ,   origin = nextorigin(ORIGIN)
             ,   jsonp  = jsonp_cb();
 
@@ -215,6 +237,7 @@ function PN_API(setup) {
 
             if (jsonp != '0') data['callback'] = jsonp;
 
+
             xdr({
                 blocking : blocking || SSL,
                 timeout  : 2000,

diff --git a/modern/Makefile b/modern/Makefile
@@ -1,5 +1,6 @@
 include ../Makefile.inc
 OUTPUT_FILES=$(PUBNUB_MIN_JS) $(PUBNUB_CRYPTO_MIN_JS)
+PLATFORM=Modern
 
 .PHONY	: all
 all: build
@@ -11,6 +12,8 @@ $(PUBNUB_MIN_JS) : $(PUBNUB_COMMON_JS) $(WEBSOCKET_JS) $(PUBNUB_PLATFORM_JS)
 	## Full Version
 	$(ECHO)  "// Version: $(VERSION)" > $(PUBNUB_JS)
 	cat $(PUBNUB_COMMON_JS) $(PUBNUB_PLATFORM_JS) $(WEBSOCKET_JS) >> $(PUBNUB_JS)
+	sed -i -e "s/VERSION/\'$(VERSION)\'/g" $(PUBNUB_JS)
+	sed -i -e "s/PLATFORM/\'$(PLATFORM)\'/g" $(PUBNUB_JS)
 	## Minfied Version
 	$(ECHO)  "// Version: $(VERSION)" > $(PUBNUB_MIN_JS)
 	$(ECHO) "(function(){" >> $(PUBNUB_MIN_JS)
@@ -26,3 +29,5 @@ $(PUBNUB_CRYPTO_MIN_JS) : $(GIBBERISH_JS) $(ENCRYPTO_JS)
 .PHONY	: clean
 clean:
 	rm -f $(OUTPUT_FILES)
+
+include ../Makefile.post
diff --git a/modern/pubnub.js b/modern/pubnub.js
@@ -8,6 +8,8 @@ var NOW             = 1
 ,   DEF_SUB_TIMEOUT = 310    // SECONDS.
 ,   DEF_KEEPALIVE   = 60     // SECONDS.
 ,   SECOND          = 1000   // A THOUSAND MILLISECONDS.
+,   URLBIT          = '/'
+,   PARAMSBIT       = '&'
 ,   REPL            = /{([\w\-]+)}/g;
 
 /**
@@ -34,6 +36,26 @@ var nextorigin = (function() {
     }
 })();
 
+
+/**
+ * Build Url
+ * =======
+ * 
+ */
+function build_url(url_components, url_params) {
+    var url     = url_components.join(URLBIT);
+
+    if (url_params) {
+        var params = [];
+        url += "?";
+        for (var key in url_params) {
+             params.push(key+"="+url_params[key]);
+        }
+        url += params.join(PARAMSBIT);
+    }
+	return url;
+}
+
 /**
  * UPDATER
  * =======
@@ -207,7 +229,7 @@ function PN_API(setup) {
     // Announce Leave Event
     var SELF = {
         'LEAVE' : function( channel, blocking ) {
-            var data   = { 'uuid' : UUID }
+            var data   = { 'uuid' : UUID}
             ,   origin = nextorigin(ORIGIN)
             ,   jsonp  = jsonp_cb();
 
@@ -216,6 +238,7 @@ function PN_API(setup) {
 
             if (jsonp != '0') data['callback'] = jsonp;
 
+
             xdr({
                 blocking : blocking || SSL,
                 timeout  : 2000,
@@ -701,8 +724,7 @@ THE SOFTWARE.
  * UTIL LOCALS
  */
 var NOW        = 1
-,   URLBIT     = '/'
+,	PNSDK      = encode('PubNub-JS-' + 'Modern' + '/' + '3.4.4')
-,   PARAMSBIT  = '&'
 ,   XHRTME     = 310000;
 
 
@@ -758,6 +780,7 @@ function xdr( setup ) {
     ,   complete = 0
     ,   loaded   = 0
     ,   timer    = timeout( function(){done(1)}, XHRTME )
+    ,   data     = setup.data || {}
     ,   fail     = setup.fail    || function(){}
     ,   success  = setup.success || function(){}
     ,   done     = function(failed) {
@@ -784,15 +807,8 @@ function xdr( setup ) {
         xhr.onerror = xhr.onabort   = function(){ done(1) };
         xhr.onload  = xhr.onloadend = finished;
         xhr.timeout = XHRTME;
-        url = setup.url.join(URLBIT);
+        data['pnsdk'] = PNSDK;
-        if (setup.data) {
+        url = build_url(setup.url, data);
-            var params = [];
-            url += "?";
-            for (key in setup.data) {
-                params.push(key+"="+setup.data[key]);
-            }
-            url += params.join(PARAMSBIT);
-        }
         xhr.open( 'GET', url, true );
         xhr.send();
     }