social_stream-presence 0.1.1 → 0.1.2

data/app/assets/javascripts/chat_interface_manager.js.erb

@@ -80,7 +80,11 @@ function setUserFunctions(){
   $(".dropdown dd ul li a.option").click(function(event) { 
 	  event.preventDefault();
 		userStatus = $(this).find("span.value").html();
-    sendStatus(userStatus);
+		if(userStatus == "offline"){
+			disconnectStrophe();
+		} else {
+			sendStatus(userStatus);
+		}
 		$(".dropdown dd ul").hide();
   });
   
@@ -102,17 +106,21 @@ function setStatusWidgetTitle(status){
 		return;
 	}
 	
-  if (status in statusIcons) {
-		
-	  if ($("#" + statusIcons[status]).length == 0){
-      return;
-    }
-	  var text = $("#" + statusIcons[status]).html();
-    $(".dropdown dt a span").html(text);
-		
-  } else if(status=="default"){
+	if(status=="default"){
     var defaultTitle = '<%=I18n.t('chat.status.choose')%>'
     $(".dropdown dt a span").html(defaultTitle);
+		return;
+  }
+	
+	if(status=="offline"){
+		var text = $("#" + status).html();
+    $(".dropdown dt a span").html(text);
+		return;
+	}
+	
+  if ((status in statusIcons)&&($("#" + statusIcons[status]).length > 0)) {		
+	  var text = $("#" + statusIcons[status]).html();
+    $(".dropdown dt a span").html(text);
   }
 	 
 }
@@ -180,10 +188,11 @@ function refreshChatWindow(){
 function updateChatWindow(){
 	timerCounter=0;
 	log("updateChatWindow()");
-  $.post("/chatWindow", { userConnected: userConnected }, function(data){
+	var stropheConnectedAndOnlineStatus = ((isStropheConnected()) && (userStatus!="offline") && (!disconnectionFlag));
+  $.post("/chatWindow", { userConnected: stropheConnectedAndOnlineStatus }, function(data){
 			$(".tooltip").hide() //Prevent tooltips
       $("#chat_partial").html(data);
-      if (userConnected) {
+      if (isStropheConnected()) {
 				setStatusWidgetTitle(userStatus);
         $(".user_presence a[title]").tooltip();
         setUserFunctions();

data/app/assets/javascripts/xmpp_client_management.js.erb

@@ -14,7 +14,21 @@ statusMessage['dnd'] = "Busy";
 //Connect functions
 ////////////////////
 
+function isStropheConnected(){
+	if((connection!=null)&&(connection.connected)){
+      return true;
+    } else {
+			return false;
+		}
+}
+
+
 function connectToServerWithCookie(){
+	
+		if (isStropheConnected()){
+			log("connectToServerWithCookie() returns: Strophe already connected");
+		}	   
+	    log("connectToServerWithCookie() calls");
     try {
       connection = new Strophe.Connection(BOSH_SERVICE);
       connection.connect(user_jid, cookie, onConnect);
@@ -24,9 +38,14 @@ function connectToServerWithCookie(){
     }
 }
 
+
 //Password: Get from chatPassword param if exists, instead try to get from sessionStorage.
 function connectToServerWithPassword(chatPassword){
     
+		if (isStropheConnected()){
+      log("connectToServerWithPassword() returns: Strophe already connected");
+    }
+		
     //Get Password
     if ((chatPassword!=null)&&(chatPassword!="")){
       var password = chatPassword;
@@ -79,10 +98,11 @@ var awayTime = 300000;
 var awayCounter = 0;
 var timerCounter = 0;
 var connection = null;
-var userConnected = false;
 var reconnectAttempts = 3;
 var awayTimer;
 var timer;
+var reconnectTimer;
+var disconnectionFlag = true;
 var requestContacts=false;
 var cyclesToRefresh = (refreshMinTime/timerPeriod);
 
@@ -102,7 +122,7 @@ function onConnect(status) {
 	log('Strophe onConnect callback call with status ' + status);
 	
 	if (status == Strophe.Status.ATTACHED){
-		log('Strophe connection attached');
+	  log('Strophe connection attached');
 		return;
 	} 
 	
@@ -112,50 +132,61 @@ function onConnect(status) {
   }
 	
 	if (status == Strophe.Status.CONNECTING) {
-     log('Strophe is connecting.');
-		 return;
+    log('Strophe is connecting.');
+	  return;
+  } 
+	
+	if (status == Strophe.Status.DISCONNECTING) {
+    log('Strophe is disconnecting.');
+    return;
   } 
 		
 	clearTimeout(initialTimer);
 		
 	if (status == Strophe.Status.CONNFAIL) {
-   log('Strophe failed to connect.');
-   userConnected = false;
-   setTimeout ("onReconnect()", 3000);
+    log('Strophe failed to connect.');
+    reconnectTimer = setTimeout ("onReconnect()", 5000);
+		disconnectionFlag = true;
   } else if (status == Strophe.Status.AUTHFAIL) {
-   log('Strophe authentication fail.');
-	   if ((window.sessionStorage)&&(sessionStorage.getItem("ss_user_pass") != null)){
-	    sessionStorage.setItem("ss_user_pass",null);
-	   }
-   userConnected = false;
+    log('Strophe authentication fail.');
+	    if ((window.sessionStorage)&&(sessionStorage.getItem("ss_user_pass") != null)){
+	      sessionStorage.setItem("ss_user_pass",null);
+	    }
+			disconnectionFlag = true;
   } else if (status == Strophe.Status.ERROR) {
-   log('Strophe error.');
-   userConnected = false;
+    log('Strophe error.');
+		disconnectionFlag = true;
   } else if (status == Strophe.Status.DISCONNECTED) {
-   log('Strophe is disconnected.');
-   userConnected = false;
-	 clearTimeout(awayTimer);
-   setTimeout ("onReconnect()", 3000);
+    log('Strophe is disconnected.');
+		disconnectionFlag = true;
+	  clearTimeout(awayTimer);
+	  reconnectTimer = setTimeout ("onReconnect()", 5000);
   } else if (status == Strophe.Status.CONNECTED) {
-   log('Strophe is connected.');
-   log('Presenze stanza send for:' + connection.jid);
-   connection.addHandler(onMessage, null, 'message', null, null,  null);
-	 connection.addHandler(onPresence, null, 'presence', null, null,  null); 
-   //addHandler:(callback, namespace to match, stanza name, stanza type, stanza id , stanza from, options)
-   sendStatus(userStatus);
-   userConnected = true;
-   awayTimer = setInterval("awayTimerFunction()", awayTimerPeriod);
-	 timer = setInterval("timerFunction()", timerPeriod);
+    log('Strophe is connected.');
+    log('Presenze stanza send for:' + connection.jid);
+		clearTimeout(reconnectTimer);
+    connection.addHandler(onMessage, null, 'message', null, null,  null);
+	  connection.addHandler(onPresence, null, 'presence', null, null,  null); 
+    //addHandler:(callback, namespace to match, stanza name, stanza type, stanza id , stanza from, options)
+		disconnectionFlag = false;
+	  userStatus = "chat";
+	  sendStatus(userStatus);
+    awayTimer = setInterval("awayTimerFunction()", awayTimerPeriod);
+	  timer = setInterval("timerFunction()", timerPeriod);
   }
 	
 	updateChatWindow();
 }
 
 function onReconnect(){
-	if ((connection != null)&&(!userConnected)) {
+	log("onReconnect!")
+	if ((!isStropheConnected())&&(userStatus!="offline")) {
+		
 		if (reconnectAttempts>0) {
 			reconnectAttempts--;
 			
+			$("#chat_header_title").html('<%=I18n.t('chat.reconnecting')%>')
+			
 			if (authByCookie()){
         //Authentication by cookie
         connectToServerWithCookie(); 
@@ -163,13 +194,24 @@ function onReconnect(){
         //Authentication by password
         connectToServerWithPassword(null);
       }
-      setTimeout ("onReconnect()", 9000);
+      reconnectTimer = setTimeout ("onReconnect()", 9000);
 		} else {
+			$("#chat_header_title").html('<%=I18n.t('chat.unableconnect')%>')
 			//Notify issue to Rails App Server?
 		}
+		
 	}
 }
 
+function disconnectStrophe(){
+	userStatus = "offline";
+	setStatusWidgetTitle("offline");
+	
+	if(isStropheConnected()){
+		connection.send($pres({type: "unavailable"}).tree()); 
+    connection.disconnect();
+	}	
+}
 
 ////////
 //Manage Message stanzas
@@ -198,7 +240,7 @@ function onMessage(msg) {
 //Manage Presence stanzas
 ///////
 function onPresence(presence) {
-	 
+	  
 	  //Check presence stanza type
 		ptype = $(presence).attr('type');
 				

data/app/views/chat/_contacts.html.erb

@@ -1,4 +1,4 @@
-      <div>
+    <div>
       	
 			<div class="block">
 		    <div class="header">
@@ -15,6 +15,7 @@
 					      <li><a id="available" href="#" class="option"><img class="flag" src="assets/status/available.png" alt=""/> <%=t('chat.status.available')%> <span class="value">chat</span></a></li>
 					      <li><a id="away" href="#" class="option"><img class="flag" src="assets/status/away.png" alt=""/> <%=t('chat.status.away')%> <span class="value">away</span></a></li>
 					      <li><a id="dnd" href="#" class="option"><img class="flag" src="assets/status/dnd.png" alt=""/> <%=t('chat.status.dnd')%> <span class="value">dnd</span></a></li>
+								<li><a id="offline" href="#" class="option"><img class="flag" src="assets/status/offline.png" alt=""/> <%=t('chat.status.offline')%> <span class="value">offline</span></a></li>
 			        </ul>
 			    </dd>
         </div>
@@ -38,9 +39,9 @@
 				<% end %>
 			</div>
 			
-			</div>
+	  </div>
  	
-			<div id="chat_divs">	
-	      <div id="chat_div">
-	      </div>
-			</div>
+		<div id="chat_divs">	
+	    <div id="chat_div">
+	    </div>
+		</div>

data/config/locales/en.yml

@@ -1,7 +1,9 @@
 en:
   chat:
     connecting: "Chat Connecting"
+    reconnecting: "Chat Reconnecting"
     disconnected: "Chat Disconnected"
+    unableconnect: "Chat Disconnected"
     title: "Chat"
     password: "Password"
     status: 
@@ -9,6 +11,7 @@ en:
       available: "Available"
       away: "Away"
       dnd: "Busy"
+      offline: "Offline"
     settings:
       title: "Enable and configure Social Stream Chat"  
       checkbox: "Enable or disable Social Stream Chat"  

data/config/locales/es.yml

@@ -1,7 +1,9 @@
 es:
   chat:
     connecting: "Chat Conectando"
+    reconnecting: "Chat Reconectando"
     disconnected: "Chat Desconectado"
+    unableconnect: "Chat Desconectado"
     title: "Chat"
     password: "Contraseña"
     status:
@@ -9,6 +11,7 @@ es:
       available: "Disponible"
       away: "Ausente"
       dnd: "No molestar"
+      offline: "Desconectado"
     settings:
       title: "Activación y configuración del chat de Social Stream"
       checkbox: "Activar o desactivar chat"  

data/lib/social_stream/presence/version.rb

@@ -1,5 +1,5 @@
 module Socialstream
   module Presence
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

data/social_stream-presence.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base','~> 0.9.18')
+  s.add_runtime_dependency('social_stream-base','~> 0.10.0')
   
   s.add_runtime_dependency "xmpp4r"
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Aldo Gordillo
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-25 00:00:00 +01:00
+date: 2011-11-28 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,9 +27,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 9
-        - 18
-        version: 0.9.18
+        - 10
+        - 0
+        version: 0.10.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -100,6 +100,7 @@ files:
 - app/assets/images/status/available.png
 - app/assets/images/status/away.png
 - app/assets/images/status/dnd.png
+- app/assets/images/status/offline.png
 - app/assets/javascripts/chat_audio.js
 - app/assets/javascripts/chat_interface_manager.js.erb
 - app/assets/javascripts/chat_parser.js