social_stream 0.20.2 → 0.21.0

data/documents/social_stream-documents.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.15.2')
+  s.add_runtime_dependency('social_stream-base', '~> 0.16.0')
   s.add_runtime_dependency('paperclip-ffmpeg', '~> 0.7.0')
   s.add_runtime_dependency('paperclip','= 2.4.5')
   s.add_runtime_dependency('delayed_paperclip','2.4.5.1')

data/documents/spec/factories/document.rb

@@ -1,4 +1,5 @@
 Factory.define :document do |d|
+  d.sequence(:title)  { |n| "Document #{ n }" }
   d.file { Rack::Test::UploadedFile.new(File.join(File.dirname(__FILE__), 'files', 'small.pdf'),
                                        'application/pdf') }
 

data/documents/spec/factories/picture.rb

@@ -1,4 +1,5 @@
 Factory.define :picture do |p|
+  p.sequence(:title)  { |n| "Picture #{ n }" }
   p.file { Rack::Test::UploadedFile.new(File.join(File.dirname(__FILE__), 'files', 'rails.png'),
                                        'image/png') }
 

data/events/db/migrate/20120208143756_events_group_title_and_description_in_activity_object.rb

@@ -0,0 +1,26 @@
+class EventsGroupTitleAndDescriptionInActivityObject < ActiveRecord::Migration
+  def up
+    ao_ts = ActivityObject.record_timestamps
+    ActivityObject.record_timestamps = false
+
+    # Fix 'events' table
+    e_ts = Event.record_timestamps
+    Event.record_timestamps = false
+
+    Event.all.each do |e|
+      e.activity_object.title = e.read_attribute(:title)
+      e.save!
+    end
+    change_table :events do |t|
+      t.remove :title
+    end
+    Event.reset_column_information
+    Event.record_timestamps = e_ts
+
+    ActivityObject.record_timestamps = ao_ts
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration # Due to trans-gem oddities
+  end
+end

data/events/lib/social_stream/events/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Events
-    VERSION = "0.7.1".freeze
+    VERSION = "0.8.0".freeze
   end
 end

data/events/social_stream-events.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.15.2')
+  s.add_runtime_dependency('social_stream-base', '~> 0.16.0')
   s.add_runtime_dependency('rails-scheduler', '~> 0.0.6')
   s.add_runtime_dependency('coffee-rails', '>= 3.1.0')
 

data/lib/social_stream/version.rb

@@ -1,3 +1,3 @@
 module SocialStream
-  VERSION = "0.20.2".freeze
+  VERSION = "0.21.0".freeze
 end

data/linkser/app/views/links/create.js.erb

@@ -1,9 +1,7 @@
 //Display the new post
 $("#wall").prepend("<%= escape_javascript(render @link.post_activity) %>");
 
-setActivityPrivacyTooltips("<%= escape_javascript dom_id(@link.post_activity) %>");
-
-unblock_all_forms();
+SocialStream.Timeline.newActivity("<%= escape_javascript dom_id(@link.post_activity) %>");
 
 $("#link_preview").hide();
 $("#link_preview").html("");          

data/linkser/db/migrate/20120208143739_linkser_group_title_and_description_in_activity_object.rb

@@ -0,0 +1,30 @@
+class LinkserGroupTitleAndDescriptionInActivityObject < ActiveRecord::Migration
+  def up
+    ao_ts = ActivityObject.record_timestamps
+    ActivityObject.record_timestamps = false
+
+    # Fix 'links' table
+    l_ts = Link.record_timestamps
+    Link.record_timestamps = false
+
+    Link.all.each do |l|
+      l.activity_object.title = l.read_attribute(:title)
+      l.activity_object.description = l.read_attribute(:description)
+      l.save!
+    end
+
+    change_table :links do |t|
+      t.remove :title
+      t.remove :description
+    end
+
+    Link.reset_column_information
+    Link.record_timestamps = l_ts
+
+    ActivityObject.record_timestamps = ao_ts
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration # Due to trans-gem oddities
+  end
+end

data/linkser/lib/social_stream/linkser/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Linkser
-    VERSION = "0.5.0".freeze
+    VERSION = "0.6.0".freeze
   end
 end

data/linkser/social_stream-linkser.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.15.0')
+  s.add_runtime_dependency('social_stream-base', '~> 0.16.0')
   s.add_runtime_dependency('linkser', '~> 0.0.10')
   # Development Gem dependencies
   s.add_development_dependency('sqlite3-ruby')

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

@@ -1,3 +1,5 @@
+var global;
+
 ////////////////////
 //Reconnect button interface functions
 ////////////////////
@@ -30,8 +32,15 @@ function requestConnectToChat(){
 //Chat interface: Connection boxes
 ////////////////////
 
+var focusSearchContactsFlag=false;
+
 function setUserFunctions(){
-  
+
+	settingTooltips();
+	
+	///////////////////////
+	//Open chatbox function
+	///////////////////////
   $("div.user_presence").click(function(event, ui){
     var guest_name = $(this).attr("name");
     var guest_slug = $(this).attr("slug");
@@ -43,10 +52,21 @@ function setUserFunctions(){
     };
   });
   
+	
+	//Hide tooltips on mouseleave
+	$("div.user_presence").mouseleave(function(e){
+		var div = $(this);
+		$.each($(".tooltip:visible"), function(index, value) {
+			if ( $($(".tooltip:visible")[0]).html() == $(div).attr("name") ){
+				$($(".tooltip:visible")[index]).hide();
+			}
+		});
+  });
   
-////////////////////
-//Chat interface: Status selector
-////////////////////
+	
+	////////////////////
+	//Chat interface: Status selector
+	////////////////////
 
   //JQuery DropdwanStatus
   
@@ -78,15 +98,105 @@ function setUserFunctions(){
   
   $(document).bind('click', function(e) {
     var $clicked = $(e.target);
+		
     if (! $clicked.parents().hasClass("dropdown")){
       //Click outside the select...
         $(".dropdown dd ul").hide();
         setStatusWidgetTitle(userStatus);
     }
   });
+	
+	///////////////
+	//Search contacts enabling
+	///////////////
+	$("select.flexselect").flexselect({
+    allowMismatch: true
+  });
+	
+	//Select contact function
+	//callback in changeSelectContactValue()
+
+  
+  $("#search_chat_contact_flexselect").focus(function(e) {
+		changeContactListVisibility(true);
+	});
+	
+	$("#search_chat_contact_flexselect").blur(function(e) {
+    changeContactListVisibility(false);
+  });
+
+}
+
+
+function changeSelectContactValue(name,value){
+	$("#search_chat_contact_flexselect").blur();
+	
+	if(value == "ZERO_CONTACTS"){
+		return;
+	}
+	
+  var guest_slug = value;
+  var guest_name = name;
+  var guest_jid = guest_slug + "@" + domain;
+  if (createChatBox(guest_slug, guest_name, guest_jid, user_name, user_jid)) {
+  } else {
+    window[getChatVariableFromSlug(guest_slug)].chatbox("option", "boxManager").toggleBox(true);
+  };
+  
+  //Check for online status and show notification
+  if (getAllConnectedSlugs().indexOf(guest_slug)==-1) {
+		showOfflineChatNotificationForSlug(guest_slug);
+  }
   
+	changeContactListVisibility(false);
 }
 
+
+function settingTooltips(){
+  if (mainChatBox == null) {
+    //Enabling default tooltips
+      $(".user_presence a[title]").tooltip();
+  } else {
+    //Enabling tooltips with center left position
+    
+    //Changing Tooltip CSS class by JQuery
+    var ss = document.styleSheets;
+    for (var i=0; i<ss.length; i++) {
+        var rules = ss[i].cssRules || ss[i].rules;
+        for (var j=0; j<rules.length; j++) {
+            if (rules[j].selectorText === ".tooltip") {
+                rules[j].style.background = 'url("black_arrow9.png") repeat scroll 0% 0% transparent'
+            }
+        }
+    } 
+    $(".user_presence a[title]").tooltip({
+      opacity: 0.95,
+      relative: false,
+      position: 'top left',
+      offset: [0,37]
+    });
+  }
+}
+
+
+function changeContactListVisibility(visible){
+  var nItems = $("#search_chat_contact_flexselect_dropdown ul li").length-1;
+	if (visible){
+		  focusSearchContactsFlag=true;
+		  if(nItems > 9){
+				changeMainChatBoxHeight(mainChatBoxHeightWhileSearchContacts);
+			} else {
+				var mainChatBoxMinRequiredHeight= mainChatBoxaddonsHeight + 20 + nItems * 19;
+				changeMainChatBoxHeight(mainChatBoxMinRequiredHeight);
+			}
+			$(".users_connected").hide();
+  } else {
+      changeMainChatBoxHeight(getChatBoxHeightRequiredForConnectionBoxes());
+			$(".users_connected").show();
+  }
+}
+
+
 function setStatusWidgetTitle(status){
   
 	if((status in sstreamChatStatus)){
@@ -179,14 +289,18 @@ function updateChatWindow(){
   $.post("/chatWindow", { userConnected: stropheConnectedAndOnlineStatus }, function(data){
       $(".tooltip").hide() //Prevent tooltips
       $("#chat_partial").html(modifyChatPartialIfMainBox(data));
+			updateConnectedUsersOfMainChatBox();
       if (isStropheConnected()) {
         setStatusWidgetTitle(userStatus);
-        $(".user_presence a[title]").tooltip();
-        setUserFunctions();
-				updateConnectedUsersOfMainChatBox();
+				setUserFunctions();
         if (afterNewConnectionFlag){
           afterNewConnectionFlag = false;
-          restoreChatData();
+					if(afterFirstConnectionFlag){
+						restoreChatData();
+						afterFirstConnectionFlag = false;
+					} else {
+						updateAllNotifications();
+					}
         }
       }
   });
@@ -201,11 +315,23 @@ function getConnectionBoxFromSlug(slug){
 }
 
 var cacheConnectedUsers = [];
+
 function hideConnectionBoxFromSlug(slug){
   if ($('div.user_presence[slug=' + slug + ']').length > 0){
     $('div.user_presence[slug=' + slug + ']').hide();
     if(cacheConnectedUsers.indexOf(slug)==-1){
       cacheConnectedUsers.push(slug);
+    }
+		updateMainChatBoxAfterUserDisconnect();
+		
+		//Last user disconnected?
+		if (getAllConnectedSlugs().length ==0){
+			if($(".users_connected p.zero_users_connected").length > 0){
+				$(".users_connected p.zero_users_connected").show();
+			} else {
+				var msg = '<%=I18n.t('chat.zerousers')%>';
+        $(".users_connected").append('<p class="zero_users_connected">' + msg + '</p>')
+			}
     }
   }
 }
@@ -214,6 +340,7 @@ function showConnectionBoxFromSlug(slug){
   if ($('div.user_presence[slug=' + slug + ']').length > 0){
     if (!($('div.user_presence[slug=' + slug + ']').is(":visible"))){
        $('div.user_presence[slug=' + slug + ']').show();
+			 $(".users_connected p.zero_users_connected").hide();
     }
   }
 }
@@ -229,17 +356,29 @@ function setUserIconStatus(slug, status){
 }
 
 function getAllConnectedSlugs(){
-  connectedSlugs=[];
+  return getAllSlugsByChatConnectedState()[0];
+}
+
+function getAllDisconnectedSlugs(){
+  return getAllSlugsByChatConnectedState()[1];
+}
+
+function getAllSlugsByChatConnectedState(){
+  var onlineSlugs=[];
+	var offlineSlugs=[];
+	var allSlugs=[];
   connectionBoxes = $('div.user_presence[slug]');
   $.each(connectionBoxes, function(index, value) {
-		if($(value).css("display")!="none"){
-          connectedSlugs.push($(value).attr("slug"))
-      }
+    if($(value).css("display")!="none"){
+        onlineSlugs.push($(value).attr("slug"))
+    } else {
+				offlineSlugs.push($(value).attr("slug"))
+		}
+		allSlugs.push($(value).attr("slug"))
   });
-  return connectedSlugs
+  return [onlineSlugs,offlineSlugs,allSlugs]
 }
 
-
 ////////////////////
 //Insert received message in chatbox
 ////////////////////
@@ -293,20 +432,24 @@ function putReceivedMessageOnChatWindow(from_jid,from_slug,body,msgID){
 //Notifications on chat Window
 ////////////////////
 
-function showChatNotificationForSlug(slug,msg){
-  var notification = $("#" + slug).parent().find("div.ui-chatbox-notify");
-  showChatNotification(notification,msg);
-}
-
 function showChatNotification(notification,msg){
   notification.html("<p class==\"ui-chatbox-notify-text\">" + msg + "</p>");
   notification.css("visibility","visible");
   notification.fadeIn();
 }
 
-function hideChatNotificationForSlug(slug){
+function showChatNotificationForSlug(slug,msg){
   var notification = $("#" + slug).parent().find("div.ui-chatbox-notify");
-  hideChatNotification(notification);
+  showChatNotification(notification,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')%>';
+    showChatNotificationForSlug(slug,msg);
+	}
 }
 
 function hideChatNotification(notification){
@@ -314,6 +457,11 @@ function hideChatNotification(notification){
   notification.css("visibility","hidden");
 }
 
+function hideChatNotificationForSlug(slug){
+  var notification = $("#" + slug).parent().find("div.ui-chatbox-notify");
+  hideChatNotification(notification);
+}
+
 function notifyWhenUsersDisconnect(){
   var notification = $("div.ui-chatbox-notify");
   var msg = '<%=I18n.t('chat.notify.offline')%>';
@@ -325,6 +473,17 @@ function hideAllNotifications(){
   hideChatNotification(notification);
 }
 
+function updateAllNotifications(){
+	hideAllNotifications();
+	if(disconnectionFlag){
+		notifyWhenUsersDisconnect();
+	} else {
+		//Notification for offline contacts
+		$.each(getAllDisconnectedSlugsWithChatBoxes(), function(index, value) {
+			showOfflineChatNotificationForSlug(value)
+    }); 
+	}
+}
 
 
 ////////////////////
@@ -332,6 +491,15 @@ function hideAllNotifications(){
 ////////////////////
 
 function updateConnectedUsersOfMainChatBox(){
-	var connectedUsers = getAllConnectedSlugs().length;
-	changeMainChatBoxHeaderTitle( '<%=I18n.t('chat.title')%>' + " (" + connectedUsers + ")");
+  if(mainChatBox!=null){
+    var connectedUsers = getAllConnectedSlugs().length;
+    changeMainChatBoxHeaderTitle( '<%=I18n.t('chat.title')%>' + " (" + connectedUsers + ")");
+    changeMainChatBoxHeight(getChatBoxHeightRequiredForConnectionBoxes());
+  }
 }
+
+
+function updateMainChatBoxAfterUserDisconnect(){
+  changeMainChatBoxHeight(getChatBoxHeightRequiredForConnectionBoxes());
+  updateConnectedUsersOfMainChatBox();
+}