social_stream 0.13.0 → 0.13.1

data/base/db/migrate/20111124100618_object_actors.rb

@@ -29,9 +29,11 @@ class ObjectActors < ActiveRecord::Migration
         a.author = author
         a.user_author = user_author
       else
+        next if a.post_activity.blank?
+
         a.author = a.post_activity.sender
         a.owner  = a.post_activity.receiver
-        a.user_author = (a.author.is_a?(User) ? a.author : a.author.sent_ties.order(:created_at).first.receiver)
+        a.user_author = (a.author.subject.is_a?(User) ? a.author : a.author.sent_ties.order(:created_at).first.receiver)
       end
 
       a.save!

data/base/lib/social_stream/base/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.10.0".freeze
+    VERSION = "0.10.1".freeze
   end
 end

data/lib/social_stream/version.rb

@@ -1,3 +1,3 @@
 module SocialStream
-  VERSION = "0.13.0".freeze
+  VERSION = "0.13.1".freeze
 end

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

@@ -188,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/presence/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,53 +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);
-	 if(userStatus!="offline"){
-	 	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;
-	 userStatus = "chat";
-   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(); 
@@ -166,18 +194,23 @@ 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";
-	connection.send($pres({type: "unavailable"}).tree()); 
-	connection.disconnect();
 	setStatusWidgetTitle("offline");
+	
+	if(isStropheConnected()){
+		connection.send($pres({type: "unavailable"}).tree()); 
+    connection.disconnect();
+	}	
 }
 
 ////////

data/presence/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: 

data/presence/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:

data/presence/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/presence/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"
 

data/social_stream.gemspec

@@ -3,15 +3,15 @@ require File.join(File.dirname(__FILE__), 'lib', 'social_stream', 'version')
 Gem::Specification.new do |s|
   s.name = "social_stream"
   s.version = SocialStream::VERSION.dup
-  s.summary = "Social networking features and activity streams for Ruby on Rails."
-  s.description = "Ruby on Rails engine supporting social networking features and activity streams."
+  s.summary = "A core for building social network websites"
+  s.description = "Social Stream is a Ruby on Rails engine for building social network websites. It supports contacts, posts, file uploads, private messages and many more."
   s.authors = [ "GING - DIT - UPM",
                 "CISE - ESPOL" ]
   s.homepage = "http://social-stream.dit.upm.es/"
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.10.0')
+  s.add_runtime_dependency('social_stream-base', '~> 0.10.1')
   s.add_runtime_dependency('social_stream-documents', '~> 0.5.0')
   s.add_runtime_dependency('social_stream-events', '~> 0.1.0')
  

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream
 version: !ruby/object:Gem::Version 
-  hash: 43
+  hash: 41
   prerelease: 
   segments: 
   - 0
   - 13
-  - 0
-  version: 0.13.0
+  - 1
+  version: 0.13.1
 platform: ruby
 authors: 
 - GING - DIT - UPM
@@ -27,12 +27,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 55
+        hash: 53
         segments: 
         - 0
         - 10
-        - 0
-        version: 0.10.0
+        - 1
+        version: 0.10.1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -177,7 +177,7 @@ dependencies:
         version: 1.6.4
   type: :development
   version_requirements: *id010
-description: Ruby on Rails engine supporting social networking features and activity streams.
+description: Social Stream is a Ruby on Rails engine for building social network websites. It supports contacts, posts, file uploads, private messages and many more.
 email: 
 executables: []
 
@@ -1443,6 +1443,6 @@ rubyforge_project:
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: Social networking features and activity streams for Ruby on Rails.
+summary: A core for building social network websites
 test_files: []