social_stream 0.21.4 → 0.22.0

data/base/social_stream-base.gemspec

@@ -58,7 +58,7 @@ Gem::Specification.new do |s|
   # Autolink text blocks
   s.add_runtime_dependency('rails_autolink', '~> 1.0.4')
   # SocialCheesecake
-  s.add_runtime_dependency('social_cheesecake','~> 0.3.0')
+  s.add_runtime_dependency('social_cheesecake','~> 0.4.0')
   # I18n-js
   s.add_runtime_dependency('i18n-js','~>2.1.2')
 

data/base/spec/controllers/posts_controller_spec.rb

@@ -25,6 +25,7 @@ describe PostsController do
         end
 
         it_should_behave_like "Allow Creating"
+        it_should_behave_like "Allow Reading"
         it_should_behave_like "Allow Destroying"
 
         it "should destroy with js" do
@@ -49,6 +50,7 @@ describe PostsController do
         end
 
         it_should_behave_like "Allow Creating"
+        it_should_behave_like "Allow Reading"
         it_should_behave_like "Allow Destroying"
       end
 
@@ -63,6 +65,7 @@ describe PostsController do
         end
 
         it_should_behave_like "Allow Creating"
+        it_should_behave_like "Allow Reading"
         it_should_behave_like "Allow Destroying"
       end
     end
@@ -72,9 +75,13 @@ describe PostsController do
         friend = Factory(:friend, :contact => Factory(:contact, :receiver => @user.actor)).sender
 
         model_assigned_to @user.contact_to!(friend), friend.relation_custom('friend')
+        @current_model = Factory(:post, :author_id => @user.actor_id,
+                                        :owner_id  => friend.id,
+                                        :user_author_id => @user.actor_id)
       end
 
       it_should_behave_like "Allow Creating"
+      it_should_behave_like "Allow Reading"
     end
 
     describe "post to acquaintance" do
@@ -87,6 +94,14 @@ describe PostsController do
       it_should_behave_like "Deny Creating"
     end
 
+    describe "post from other user" do
+      before do
+        @current_model = Factory(:post)
+      end
+
+      it_should_behave_like "Deny Reading"
+    end
+
     describe "posts represented group" do
       before do
         @group = Factory(:member, :contact => Factory(:group_contact, :receiver => @user.actor)).sender_subject
@@ -105,6 +120,7 @@ describe PostsController do
         end
 
         it_should_behave_like "Allow Creating"
+        it_should_behave_like "Allow Reading"
         it_should_behave_like "Allow Destroying"
       end
 
@@ -125,6 +141,7 @@ describe PostsController do
           end
 
           it_should_behave_like "Allow Creating"
+          it_should_behave_like "Allow Reading"
           it_should_behave_like "Allow Destroying"
         end
 
@@ -140,6 +157,7 @@ describe PostsController do
           end
 
           it_should_behave_like "Allow Creating"
+          it_should_behave_like "Allow Reading"
           it_should_behave_like "Allow Destroying"
         end
 
@@ -155,11 +173,11 @@ describe PostsController do
           end
 
           it_should_behave_like "Allow Creating"
+          it_should_behave_like "Allow Reading"
           it_should_behave_like "Allow Destroying"
         end
       end
     end
-
   end
 
   context "creating post in group's wall" do

data/lib/social_stream/version.rb

@@ -1,3 +1,3 @@
 module SocialStream
-  VERSION = "0.21.4".freeze
+  VERSION = "0.22.0".freeze
 end

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

@@ -91,7 +91,7 @@ function settingChatBoxFunctions(){
     
     if (createChatBox(guest_slug, guest_name, guest_jid, user_name, user_jid)) {
     } else {
-      window[getChatVariableFromSlug(guest_slug)].chatbox("option", "boxManager").toggleBox(true);
+      getChatBoxForSlug(guest_slug).chatbox("option", "boxManager").toggleBox(true);
     };
   });
   
@@ -268,33 +268,13 @@ function restartAwayTimer(){
 //Update chatWindow Management
 ////////////////////
 
-function timerFunction(){
-    timerCounter++; 
-    
-    if((timerCounter > cyclesToRefresh)&&(requestContacts)) {
-        requestContacts = false;
-        updateChatWindow();
-    }
-}
-
-
-function refreshChatWindow(){  
-    if(timerCounter > cyclesToRefresh){
-      updateChatWindow();
-    } else {
-      requestContacts = true;
-    }
-}
-
-
-function updateChatWindow(){	
-	var stropheConnectedAndOnlineStatus = ((isStropheConnected()) && (userStatus!="offline") && (!disconnectionFlag));
+function updateChatWindow(){
 	timerCounter=0;
 	
 	log("updateChatWindow()");
-	log("Connected " + stropheConnectedAndOnlineStatus);
+	log("Connected " + isUserConnected());
 	
-	if(! stropheConnectedAndOnlineStatus){
+	if(! isUserConnected()){
 		loadDisconnectionDiv();
 		updateConnectedUsersOfMainChatBox();
 		return;
@@ -307,6 +287,7 @@ function updateChatWindow(){
 			hideConnectionBoxesFromDisconnectedSlugs();
 			setAllUserFunctions();
 			updateConnectedUsersOfMainChatBox();
+			checkForZeroUsersConnected();
       if (isStropheConnected()) {
         if (afterNewConnectionFlag){
           afterNewConnectionFlag = false;
@@ -403,6 +384,7 @@ function updateInterfaceAfterPresenceStanza(slug,available){
 	} else {
 		hideConnectionBoxFromSlug(slug);
 		showOfflineChatNotificationForSlug(slug);
+		closeVideoSession(slug);
 	}
   updateMainChatBoxAfterConnectionBoxChanges();
 	checkForZeroUsersConnected();
@@ -510,20 +492,17 @@ function putReceivedMessageOnChatWindow(from_jid,from_slug,body,msgID){
     return;
    }
   
-  //Check slug connection and slugs connectionBox
-  if (existsSlugChatBox(from_slug)) {
+  //Check slugs connectionBox
+  if (!existsSlugChatBox(from_slug)) {
     //No connectionBox for this user!
     var from_name = getNameFromSlug(from_slug);
 		if(! isAdminSlug(from_slug)){
-			refreshChatWindow();
-		}
+      updateChatWindow();
+    }
   } else {
-		if(! isSlugChatConnected(from_slug)){
-			updateInterfaceAfterPresenceStanza(from_slug,"true");
-		}
-    var from_name = $('div.user_presence[slug=' + from_slug + ']').attr('name');
-  }
-  
+		var from_name = $('div.user_presence[slug=' + from_slug + ']').attr('name');
+	}
+
   //Create or toggle from_slug's chatBox.
   if (createChatBox(from_slug, from_name, from_jid, user_name, user_jid)) {
   } else {
@@ -564,16 +543,28 @@ function showChatNotification(notification,type,msg){
 
 function showChatNotificationForSlug(slug,type,msg){
   var notification = $("#" + slug).parent().find("div.ui-chatbox-notify");
-  showChatNotification(notification,type,msg);
+	if(notification.length==1){
+		showChatNotification(notification,type,msg);
+	}
 }
 
 function showOfflineChatNotificationForSlug(slug){
-	var slug_chat_box = getChatBoxForSlug(slug);
-	if(slug_chat_box!=null){
-		var name = slug_chat_box.attr("name")
-    var msg =  name + ' ' + I18n.t('chat.notify.guestOffline');
+		var msg = I18n.t("chat.notify.guestOffline", {name: getNameFromSlug(slug)});
     showChatNotificationForSlug(slug,"guestOffline",msg);
-	}
+}
+
+function showVideoChatNotificationForSlug(slug,msg){
+  showChatNotificationForSlug(slug,"videochat",msg);
+}
+
+function showVideoChatNotificationForSlugClientIssue(slug){
+	var msg = I18n.t("chat.notify.videochat.clientIssue", {name: getNameFromSlug(slug)});
+  showVideoChatNotificationForSlug(slug,msg);
+}
+
+function showVideoChatNotificationForSlugClientOffline(slug){
+  var msg = I18n.t("chat.notify.videochat.offline", {name: getNameFromSlug(slug)});
+  showVideoChatNotificationForSlug(slug,msg);
 }
 
 function hideChatNotification(notification){
@@ -587,8 +578,15 @@ function hideChatNotificationForSlug(slug){
   hideChatNotification(notification);
 }
 
-function notifyWhenUsersDisconnect(){
-  var notification = $("div.ui-chatbox-notify");
+function updateInterfaceAfterUsersDisconnect(){
+  updateNotificationsAfterUserDisconnect();
+	$.each(getAllSlugsWithVisibleVideoBoxes(), function(index, value) {
+    closeVideoSession(value);
+  });
+}
+
+function updateNotificationsAfterUserDisconnect(){
+	var notification = $("div.ui-chatbox-notify");
   var msg = I18n.t('chat.notify.offline');
   showChatNotification(notification,"userOffline",msg);
 }
@@ -601,7 +599,7 @@ function hideAllNotifications(){
 function updateAllNotifications(){
 	hideAllNotifications();
 	if(disconnectionFlag){
-		notifyWhenUsersDisconnect();
+		updateNotificationsAfterUserDisconnect();
 	} else {
 		//Notification for offline contacts
 		$.each(getAllDisconnectedSlugsWithChatBoxes(), function(index, value) {
@@ -617,8 +615,7 @@ function updateAllNotifications(){
 
 function updateConnectedUsersOfMainChatBox(){
   if(mainChatBox!=null){
-		var stropheConnectedAndOnlineStatus = ((isStropheConnected()) && (userStatus!="offline") && (!disconnectionFlag));
-		if(stropheConnectedAndOnlineStatus){
+		if(isUserConnected()){
 			var connectedUsers = getConnectedSlugsLength();
       changeMainChatBoxHeaderTitle( I18n.t('chat.title') + " (" + connectedUsers + ")");
       changeMainChatBoxHeight(getChatBoxHeightRequiredForConnectionBoxes());

data/presence/app/assets/javascripts/chat_parser.js

@@ -46,7 +46,7 @@ function parseContent(content){
     return "<pre>" + content + "</pre>"
   }
   
-  words = content.split(" ");
+  var words = content.split(" ");
   for(i=0; i<words.length; i++){
     words[i] = parseWord(words[i]);
   }
@@ -131,18 +131,18 @@ function parseWord(word){
 }
 
 function splitFirst(word,key){
-    split=[]  
-    cut = word.split(key);   
+    var split=[]  
+    var cut = word.split(key);   
     split[0]=cut[0]
     cut.shift()
-    paste = cut.join(key)
+    var paste = cut.join(key)
     split[1]=paste
     return split
 }
 
 function buildIconImage(icon){
   if (icon in chatIcons){
-    image_file = chatIcons[icon]
+    var image_file = chatIcons[icon]
     return "<img class=\"chatEmoticon\" src=\"/assets/emoticons/" + image_file + "\"/>";
   }
   return icon

data/presence/app/assets/javascripts/chat_persistence.js

@@ -10,11 +10,20 @@ function storeChatData(){
     return
   }
 	
+	storeChatStatus();
 	storeUserChatStatus();
-  storeChatConnectionParametres();
 	storeConversations();
 }
 
+function storeChatStatus(){
+	//Status of the mainChatBoxWindow
+  if(mainChatBox!=null){
+    sessionStorage.setItem("chat_mainChatBox_status", $(mainChatBox).is(":visible"));
+  } else {
+    sessionStorage.setItem("chat_mainChatBox_status", null);
+  } 
+}
+
 function storeConversations() {
 
   var chatboxes = getAllChatBoxes();
@@ -23,8 +32,6 @@ function storeConversations() {
 	var visibleMaxSlugs = [];
 	var visibleMinSlugs = [];
 	
-	//window[getChatVariableFromSlug("eric-white")].is(":visible")
-	
 	//Stored all conversations
 	for (var i=0;i<chatboxes.length;i++){
 	  var slug = chatboxes[i].id
@@ -62,35 +69,13 @@ function storeConversations() {
   }
 }
 
-
-function storeChatConnectionParametres() {
-	if ((sessionStorage.getItem("cookie") == null)||(sessionStorage.getItem("chat_user_name") == null)){
-		if ((typeof cookie != 'undefined')&&(cookie!=null)){
-			sessionStorage.setItem("cookie", cookie);
-		}
-    if ((typeof user_name != 'undefined') && (user_name != null)) {
-			sessionStorage.setItem("chat_user_name", user_name);
-	  }
-		if ((typeof user_slug != 'undefined') && (user_slug != null)) {
-			sessionStorage.setItem("chat_user_slug", user_slug);
-	  }
-		if ((typeof user_jid != 'undefined') && (user_jid != null)) {
-			sessionStorage.setItem("chat_user_jid", user_jid);
-	  }
-	}	
-}
-
 function storeUserChatStatus(){
 	sessionStorage.setItem("chat_user_status", userStatus);
 }
 
 function removeAllDataStored(){
-	sessionStorage.removeItem("cookie");
-  sessionStorage.removeItem("chat_user_name");
-  sessionStorage.removeItem("chat_user_slug");
-  sessionStorage.removeItem("chat_user_jid");
-	
 	sessionStorage.removeItem("chat_user_status");
+	sessionStorage.removeItem("chat_mainChatBox_status");
 	
 	sessionStorage.removeItem("slugs_with_stored_log");
 	sessionStorage.removeItem("slugs_with_visible_max_chatbox");
@@ -117,9 +102,23 @@ function restoreChatData(){
   if (! window.sessionStorage){
     return
   }
+	
   restoreConversations();
 }
 
+
+function getRestoreMainChatBoxStatus(){
+	if (!window.sessionStorage) {
+    return false;
+  } else {
+		if(sessionStorage.getItem("chat_mainChatBox_status") == "true"){
+			return true;
+		} else {
+			return false;
+		}
+	}
+}
+
 function restoreConversations() {
 	
 	  //Get Stored slugs

data/presence/app/assets/javascripts/chat_utilities.js

@@ -93,7 +93,7 @@ function userChatDataInputControl(){
 ////////////////////
 
 var lastMessageTimes = new Array();
-//lastMessageTimes['from_slug'] = ["timeOfLastMessage",["msgID1","msgID2"]];
+//lastMessageTimes['slug'] = ["timeOfLastMessage",["msgID1","msgID2"]];
 
 var timeBetweenMessages = 500; //mseconds
 
@@ -181,11 +181,6 @@ function floodControl() {
 };
 
 
-function initControlFlood(){
-	$(".ui-chatbox-input-box")
-}
-
-
 ////////////////////
 //Bounce chatbox control
 ////////////////////
@@ -193,21 +188,30 @@ var lastBounceTimes = new Array();
 var timeBetweenBounces = 5000; //mseconds
 
 function mustBounceBoxForChatWindow(jqueryUIChatbox){
-	var from_slug = $($(jqueryUIChatbox.elem.uiChatbox).find(".ui-chatbox-content").children()[0]).attr("id")
 	
+	var slug = jqueryUIChatbox.elem.uiChatbox.find(".ui-chatbox-content").find(".ui-chatbox-log").attr("id")
+	
+	if (typeof slug == 'undefined') {
+		return false;
+	}
+	
+	if((slug in contactsInfo)&&(contactsInfo[slug].videoChatStatus!="disconnected")){
+      return false;
+	}
+
   var t = (new Date()).getTime();
 	
-	if(!(from_slug in lastBounceTimes)){
-    lastBounceTimes[from_slug] = t;
+	if(!(slug in lastBounceTimes)){
+    lastBounceTimes[slug] = t;
 		return true;
   }
 	 
-  var lastBounceTime = lastBounceTimes[from_slug];
+  var lastBounceTime = lastBounceTimes[slug];
 	
   if (t - lastBounceTime < timeBetweenBounces) {
     return false;
   } else {
-		lastBounceTimes[from_slug] = t;
+		lastBounceTimes[slug] = t;
 		return true;
 	} 
 	

data/presence/app/assets/javascripts/chat_window_manager.js

@@ -5,8 +5,8 @@
 var nBox = 0;
 var maxBox = 5;
 var chatBoxWidth = 230;
-var chatBoxHeight = 170;
-var videoBoxHeight = 150;
+var chatBoxHeight = 180;
+var videoBoxHeight = 145;
 var visibleChatBoxes = new Array();
 var offsetForFlowBox = 0;
 var chatBoxSeparation = chatBoxWidth+12;
@@ -150,13 +150,66 @@ function getChatBoxForSlug(slug){
 	}
 }
 
+function getChatBoxHeaderForSlug(slug){
+  var chatBox = getChatBoxForSlug(slug);
+  if(chatBox!=null){
+    return chatBox.parent().parent().find(".ui-chatbox-titlebar")
+  } else {
+		return null;
+	}
+}
 
-function getAllSlugsWithChatBoxes(){
-	var slugsWithChatBox = [];
-	$.each(getAllChatBoxes(), function(index, value) {
+function getChatBoxButtonsForSlug(slug){
+	var chatBoxHeader = getChatBoxHeaderForSlug(slug);
+	if(chatBoxHeader!=null){
+		return chatBoxHeader.find(".ui-chatbox-icon");
+	} else {
+		return null;
+	}
+}
+
+function getChatBoxButtonForSlug(slug,button){
+	var chatBoxButtons = getChatBoxButtonsForSlug(slug);
+	if(chatBoxButtons!=null){
+		switch (button){
+			case "close":
+			return chatBoxButtons[0];
+			break;
+			case "min":
+			return chatBoxButtons[1];
+			break;
+			case "video":
+      return chatBoxButtons[2];
+      break;
+			case "videoChange":
+      return chatBoxButtons[3];
+      break;
+			default : return null;
+		}
+	} else {
+		return null;
+	}
+}
+
+
+function getAllSlugsWithChatOrVideoBoxes(){
+  var slugsWithChatBox = [];
+	var slugsWithVideoBox = [];
+  $.each(getAllChatBoxes(), function(index, value) {
+		if($(value).parent().find(".ui-videobox").is(":visible")){
+      slugsWithVideoBox.push($(value).attr("id"))
+    }
     slugsWithChatBox.push($(value).attr("id"))
   });
-	return  slugsWithChatBox;
+  return  [slugsWithChatBox,slugsWithVideoBox];
+}
+
+function getAllSlugsWithChatBoxes(){
+	return getAllSlugsWithChatOrVideoBoxes()[0];
+}
+
+function getAllSlugsWithVisibleVideoBoxes(){
+  return getAllSlugsWithChatOrVideoBoxes()[1];
 }
 
 function getAllDisconnectedSlugsWithChatBoxes(){
@@ -209,41 +262,88 @@ function rotatePriority(guest_slug){
 //Video Window Manager functions
 ////////////////////
 
-function getVideoBoxFromSlug(slug){
-	return $("#" + slug).parent().find("div.ui-videobox")
+function getVideoBoxForSlug(slug){
+	var videoBox = $("#" + slug).parent().find("div.ui-videobox");
+	if(videoBox.length == 1){
+		return videoBox;
+	} else {
+		return null;
+	}
+}
+
+function getPublisherVideoBoxForSlug(slug){
+	var pubDiv = $("#stream_publish_videochat_" + slug);
+	if (pubDiv.length > 0) {
+		return pubDiv
+	} else {
+		return null;
+	}
+}
+
+function setVideoBoxContent(slug,embed){
+  var videoBox = getVideoBoxForSlug(slug);
+  if(videoBox!=null){
+    videoBox.html(embed);
+  }
 }
 
-function showVideoBox(slug,embed){
-	var chatBox = window[getChatVariableFromSlug(slug)]
-	getVideoBoxFromSlug(slug).html(embed);
-  chatBox.chatbox("option", "video",videoBoxHeight);
+function addVideoBoxContent(slug,embed){
+  var videoBox = getVideoBoxForSlug(slug);
+  if(videoBox!=null){
+    videoBox.append(embed);
+  }
 }
 
+function showVideoBox(chatBox){
+		chatBox.chatbox("option", "video",videoBoxHeight);
+}
 
-function hideVideoBox(slug){
-	  var chatBox = window[getChatVariableFromSlug(slug)]
-    chatBox.chatbox("option", "video", 0);
+function hideVideoBox(chatBox){
+  chatBox.chatbox("option", "video", 0);
 }
 
 
 //Function called from JQuery UI Plugin
-function toogleVideoBox(uiElement){
-	  var slug = $(uiElement.element).attr("id");
-    toogleVideoBoxForSlug(slug)
+function toggleVideoBox(uiElement){
+	var slug = $(uiElement.element).attr("id");
+	clickVideoChatButton(slug);
 }
 
-function toogleVideoBoxForSlug(slug){
-	var chatBox = window[getChatVariableFromSlug(slug)]
-	if (chatBox.chatbox("option", "video")==0){
-		showVideoBox(slug,getVideoEmbedForSlug(slug))
+//Function called from JQuery UI Plugin
+function toggleVideoBoxChange(uiElement){
+  var slug = $(uiElement.element).attr("id");
+  clickVideoChangeChatButton(slug);
+}
+
+function toggleVideoBoxForSlug(slug,force){
+	var aux;
+	var chatBox = getChatBoxForSlug(slug);
+	
+	if(chatBox==null) {
+		return null;
+  }
+	
+	if(typeof force != 'undefined'){
+		aux = force;
 	} else {
-		hideVideoBox(slug);
+		if (chatBox.chatbox("option", "video")==0){
+	    aux=true;
+	  } else {
+	    aux=false;
+	  }
 	}
+	
+  if (aux){
+		//Show
+    showVideoBox(chatBox);
+    return true;
+  } else {
+		//Hide
+    hideVideoBox(chatBox);
+    return false;
+  }
 }
 
-function getVideoEmbedForSlug(slug){
-	return "<img src=\"http://www.batiburrillo.net/wp-content/uploads/2011/03/Freemake.jpg?cda6c1\" width=\"" + (chatBoxWidth-20) + "\"/>"
-}
 
 
 
@@ -304,6 +404,9 @@ function createMainChatBox(){
 			$(mainChatBox).css('overflow-x','hidden')
       $(mainChatBox).css('overflow-y','hidden')
 			
+			//Minimize
+			mainChatBox.parent().toggle(getRestoreMainChatBoxStatus());
+			
 			//Header title
 			updateConnectedUsersOfMainChatBox();
 		}