social_stream 0.19.2 → 0.19.3

data/base/spec/factories/activity.rb

@@ -35,7 +35,7 @@ Factory.define :self_activity, :parent => :activity do |a|
 end
 
 Factory.define :public_activity, :parent => :activity do |a|
-  a.relation_ids  { |b| Array(b.sender.relation_public.id) }
+  a.relation_ids  { |b| Array(Relation::Public.instance.id) }
 end
 
 Factory.define :like_activity, :class => 'Activity' do |a|

data/base/spec/factories/post.rb

@@ -7,5 +7,5 @@ end
 
 Factory.define :public_post, :parent => :post do |p|
   p.owner_id  { |q| q.author_id }
-  p._relation_ids { |q| Array(q.author.relation_public.id) }
+  p._relation_ids { |q| Array(Relation::Public.instance.id) }
 end

data/base/spec/factories/tie.rb

@@ -13,11 +13,11 @@ Factory.define :acquaintance, :parent => :tie do |t|
 end
 
 Factory.define :public, :parent => :tie do |t|
-  t.after_build { |u| u.relation = u.sender.relation_public }
+  t.after_build { |u| u.relation = Relation::Public.instance }
 end
 
 Factory.define :reject, :parent => :tie do |t|
-  t.after_build { |u| u.relation = u.sender.relation_reject }
+  t.after_build { |u| u.relation = Relation::Reject.instance }
 end
 
 # Group ties
@@ -38,6 +38,6 @@ Factory.define :partner, :parent => :g2g_tie do |t|
 end
 
 Factory.define :group_public, :parent => :g2g_tie do |t|
-  t.after_build { |u| u.relation = u.sender.relation_public }
+  t.after_build { |u| u.relation = Relation::Public.instance }
 end
 

data/base/spec/models/activity_authorization_spec.rb

@@ -89,7 +89,7 @@ describe Activity do
     context "with public activity" do
       before do
         contact = @user.contact_to!(@user)
-        create_activity(contact, @user.relation_public)
+        create_activity(contact, Relation::Public.instance)
       end
 
       describe "sender home" do
@@ -219,7 +219,7 @@ describe Activity do
     describe "belonging to user's public relation" do
 
       before do
-        create_activity(@user.contact_to!(@user), @user.relation_public)
+        create_activity(@user.contact_to!(@user), Relation::Public.instance)
       end
 
       describe "accessed by the sender" do
@@ -271,7 +271,7 @@ describe Activity do
 
       before do
         @tie = Factory(:public)
-        create_activity @tie.contact, @tie.sender.relation_public
+        create_activity @tie.contact, Relation::Public.instance
         create_ability_accessed_by @tie.receiver_subject
       end
       

data/base/spec/support/db.rb

@@ -1,6 +1,8 @@
 require 'social_stream/migrations/base'
 
-SocialStream::Migrations::Base.new.down
+ActiveRecord::Base.connection.tables.each do |t|
+  ActiveRecord::Base.connection.drop_table t
+end
 
 SocialStream::Migrations::Base.new.up
 

data/documents/lib/social_stream/documents/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Documents
-    VERSION = "0.9.0".freeze
+    VERSION = "0.9.1".freeze
   end
 end

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.14.0')
+  s.add_runtime_dependency('social_stream-base', '~> 0.14.3')
   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

@@ -9,7 +9,7 @@ end
 
 Factory.define :public_document, :parent => :document do |d|
   d.owner_id  { |q| q.author_id }
-  d._relation_ids { |q| Array(q.author.relation_public.id) }
+  d._relation_ids { |q| Array(Relation::Public.instance.id) }
 end
 
 Factory.define :private_document, :parent => :document do |d|

data/documents/spec/factories/picture.rb

@@ -9,7 +9,7 @@ end
 
 Factory.define :public_picture, :parent => :picture do |p|
   p.owner_id  { |q| q.author_id }
-  p._relation_ids { |q| Array(q.author.relation_public.id) }
+  p._relation_ids { |q| Array(Relation::Public.instance.id) }
 end
 
 Factory.define :private_picture, :parent => :picture do |p|

data/documents/spec/support/db.rb

@@ -1,8 +1,8 @@
 require 'social_stream/migrations/documents'
 
-
-SocialStream::Migrations::Documents.new.down
-SocialStream::Migrations::Base.new.down
+ActiveRecord::Base.connection.tables.each do |t|
+  ActiveRecord::Base.connection.drop_table t
+end
 
 SocialStream::Migrations::Base.new.up
 SocialStream::Migrations::Documents.new.up

data/events/app/views/events/_sidebar_calendar.html.erb

@@ -3,7 +3,7 @@
 <div class="block">
   <div class="content">
 
-    <% bow = (Time.now - 1.days).beginning_of_week %>
+    <% bow = (Time.now - 6.days).beginning_of_week %>
 
     <%= render :partial => 'events/calendar_month',
                :locals  => {
@@ -17,8 +17,8 @@
       <% day = bow + i.days %>
 
       <%= raw cycle(*(Array.wrap("<tr>") + 6.times.map{""}) + Array.wrap(:name => "tr_start")) %>
-      <td id="sidebar_day_<%= day.day %>_<%= day.month %>_<%= day.year %>" class="sidebar_day">
-        <%= link_to day.day, polymorphic_path([profile_or_current_subject, Event.new], :date => day.to_i, :view => "agendaDay") %>
+      <td id="sidebar_day_<%= day.day %>_<%= day.month %>_<%= day.year %>">
+        <%= link_to day.day, polymorphic_path([profile_or_current_subject, Event.new], :date => day.to_i, :view => "agendaWeek") %>
       </td>
 
       <%= raw cycle(*(6.times.map{""} + Array.wrap('</tr>') + Array.wrap(:name => "tr_end"))) %>
@@ -29,12 +29,12 @@
     var now = new Date();
     $('#sidebar_day_' + now.getDate() + '_' + (now.getMonth()+1) + '_' + now.getFullYear()).addClass('today');
     var re = new RegExp('sidebar_day_(..?)_(..?)_(..?.?.?)');
-    $('.sidebar_day').each(function(index, domEl){
+    $('#sidebar_calendar td').each(function(index, domEl){
       var m = re.exec(domEl.id);
       if(m == null) return;
       var d = new Date(m[3], (m[2]-1), m[1], 23, 59, 59);
       if(d < now) $(domEl).addClass('past');
-      if(m[2] != (now.getMonth()+1)) $(domEl).addClass('next_month');
+      if(m[2] != (now.getMonth()+1) && d > now) $(domEl).addClass('next_month');
     });
     $.ajax({
       dataType: 'json',

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

@@ -1,5 +1,5 @@
 module SocialStream
   module Events
-    VERSION = "0.6.1".freeze
+    VERSION = "0.6.2".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.14.1')
+  s.add_runtime_dependency('social_stream-base', '~> 0.14.3')
   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.19.2".freeze
+  VERSION = "0.19.3".freeze
 end

data/linkser/db/migrate/20120202104549_add_links_foreign_key.rb

@@ -0,0 +1,9 @@
+class AddLinksForeignKey < ActiveRecord::Migration
+  def up
+    add_foreign_key "links", "activity_objects", :name => "links_on_activity_object_id"
+  end
+
+  def down
+    remove_foreign_key "links", :name => "links_on_activity_object_id"
+  end
+end

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

@@ -1,17 +1,3 @@
-////////////////////
-//Hash table
-////////////////////
-
-//Keys: Xmpp status
-//Value: Social Stream Status
-var statusIcons = new Array();
-statusIcons[''] = "available";
-statusIcons['chat'] = "available";
-statusIcons['away'] = "away";
-statusIcons['xa'] = "away";
-statusIcons['dnd'] = "dnd";
-
-
 ////////////////////
 //Reconnect button interface functions
 ////////////////////
@@ -21,18 +7,18 @@ var periodBetweenAttempts=15; //(seg)
 var connectButtonTimerCounter=periodBetweenAttempts+1;
 
 function connectButtonTimerFunction(){
-		connectButtonTimerCounter++;
-		if (connectButtonTimerCounter > (periodBetweenAttempts-1)) {
-			clearTimeout(connectButtonTimer);
-			$("#chat_header_title").html(I18n.t('chat.disconnected'))
-		}
+    connectButtonTimerCounter++;
+    if (connectButtonTimerCounter > (periodBetweenAttempts-1)) {
+      clearTimeout(connectButtonTimer);
+      $("#chat_header_title").html('<%=I18n.t('chat.disconnected')%>')
+    }
 }
 
 function requestConnectToChat(){
   if (connectButtonTimerCounter > (periodBetweenAttempts-1)) {
     connectButtonTimerCounter=0;
-		connectButtonTimer = setInterval("connectButtonTimerFunction()", 1000) 
-		$("#chat_header_title").html(I18n.t('chat.connecting'))
+    connectButtonTimer = setInterval("connectButtonTimerFunction()", 1000) 
+    $("#chat_header_title").html('<%=I18n.t('chat.connecting')%>')
     return true
   } else {
     return false
@@ -45,48 +31,48 @@ function requestConnectToChat(){
 ////////////////////
 
 function setUserFunctions(){
-	
-	$("div.user_presence").click(function(event, ui){
-	  var guest_name = $(this).attr("name");
-	  var guest_slug = $(this).attr("slug");
-	  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);
-	  };
-	});
-	
-	
+  
+  $("div.user_presence").click(function(event, ui){
+    var guest_name = $(this).attr("name");
+    var guest_slug = $(this).attr("slug");
+    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);
+    };
+  });
+  
+  
 ////////////////////
 //Chat interface: Status selector
 ////////////////////
 
-	//JQuery DropdwanStatus
-	
-	$(".dropdown dt a").click(function(event) {
-	 	event.preventDefault();
+  //JQuery DropdwanStatus
+  
+  $(".dropdown dt a").click(function(event) {
+    event.preventDefault();
     $(".dropdown dd ul").toggle();
-		
-		if($(".dropdown dd ul").is(":visible")){
-			setStatusWidgetTitle("default");
-		} else {
-			setStatusWidgetTitle(userStatus);
-		}
-		
-		restartAwayTimer(false);
-		
+    
+    if($(".dropdown dd ul").is(":visible")){
+      setStatusWidgetTitle("default");
+    } else {
+      setStatusWidgetTitle(userStatus);
+    }
+    
+    restartAwayTimer();
+    
   });
           
   $(".dropdown dd ul li a.option").click(function(event) { 
-	  event.preventDefault();
-		userStatus = $(this).find("span.value").html();
-		if(userStatus == "offline"){
-			disconnectStrophe();
-		} else {
-			sendStatus(userStatus);
-		}
-		$(".dropdown dd ul").hide();
+    event.preventDefault();
+    userStatus = $(this).find("span.value").html();
+    if(userStatus == "offline"){
+      disconnectStrophe();
+    } else {
+      sendStatus(userStatus);
+    }
+    $(".dropdown dd ul").hide();
   });
   
   
@@ -95,35 +81,40 @@ function setUserFunctions(){
     if (! $clicked.parents().hasClass("dropdown")){
       //Click outside the select...
         $(".dropdown dd ul").hide();
-				setStatusWidgetTitle(userStatus);
+        setStatusWidgetTitle(userStatus);
     }
   });
-	
+  
 }
 
 function setStatusWidgetTitle(status){
-	
-	if ($(".dropdown dt a span").length == 0){
-		return;
+  
+	if((status in sstreamChatStatus)){
+		status = sstreamChatStatus[status];
 	}
 	
-	if(status=="default"){
-    var defaultTitle = I18n.t('chat.status.choose');
+	
+  if ($(".dropdown dt a span").length == 0){
+    return;
+  }
+  
+  if(status=="default"){
+    var defaultTitle = '<%=I18n.t('chat.status.choose')%>'
     $(".dropdown dt a span").html(defaultTitle);
-		return;
+    return;
   }
-	
-	if(status=="offline"){
-		var text = $("#" + status).html();
+  
+  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();
+    return;
+  }
+  
+  if ((status in statusIcons)&&($("#" + statusIcons[status]).length > 0)) {   
+    var text = $("#" + statusIcons[status]).html();
     $(".dropdown dt a span").html(text);
   }
-	 
+   
 }
 
 
@@ -132,34 +123,29 @@ function setStatusWidgetTitle(status){
 ////////////////////
 
 function awayTimerFunction(){
-	  awayCounter++;
-	  if (awayCounter > (awayTime/awayTimerPeriod)){
-			if (userStatus != "dnd") {
-	  	  userStatus = "away";
-	  	  sendStatus(userStatus);
-	    }
-			clearTimeout(awayTimer);
-	  }
+    awayCounter++;
+    if (awayCounter > (awayTime/awayTimerPeriod)){
+      if ((userStatus != "dnd")&&(userStatus != "away")) {
+        userStatus = "autoaway";
+        sendStatus(userStatus);
+      }
+      clearTimeout(awayTimer);
+    }
 }
 
-function autochangeStatusOnUserAway(){
-	  if (userStatus == "away"){
-      userStatus = "chat";
+function autochangeStatusIfAutoAway(){
+    if (userStatus == "autoaway"){
+      userStatus = "available";
       sendStatus(userStatus);
     }
 }
 
-function restartAwayTimer(autochangeStatus){
-		
-		if (awayCounter > (awayTime/awayTimerPeriod)){
-			awayTimer = setInterval("awayTimerFunction()", awayTimerPeriod);
-			
-			if(autochangeStatus){
-        autochangeStatusOnUserAway();
-      }
-		}
-		
-		awayCounter = 0;		
+function restartAwayTimer(){   
+    if (awayCounter > (awayTime/awayTimerPeriod)){
+      awayTimer = setInterval("awayTimerFunction()", awayTimerPeriod);
+      autochangeStatusIfAutoAway();
+    }  
+    awayCounter = 0;    
 }
 
 
@@ -168,82 +154,86 @@ function restartAwayTimer(autochangeStatus){
 ////////////////////
 
 function timerFunction(){
-    timerCounter++;	
-		
+    timerCounter++; 
+    
     if((timerCounter > cyclesToRefresh)&&(requestContacts)) {
         requestContacts = false;
         updateChatWindow();
-	  }
+    }
 }
 
 
 function refreshChatWindow(){  
-		if(timerCounter > cyclesToRefresh){
-			updateChatWindow();
-		} else {
-			requestContacts = true;
-		}
+    if(timerCounter > cyclesToRefresh){
+      updateChatWindow();
+    } else {
+      requestContacts = true;
+    }
 }
 
 
 function updateChatWindow(){
-	timerCounter=0;
-	log("updateChatWindow()");
-	var stropheConnectedAndOnlineStatus = ((isStropheConnected()) && (userStatus!="offline") && (!disconnectionFlag));
+  timerCounter=0;
+  log("updateChatWindow()");
+  var stropheConnectedAndOnlineStatus = ((isStropheConnected()) && (userStatus!="offline") && (!disconnectionFlag));
   $.post("/chatWindow", { userConnected: stropheConnectedAndOnlineStatus }, function(data){
-			$(".tooltip").hide() //Prevent tooltips
+      $(".tooltip").hide() //Prevent tooltips
       $("#chat_partial").html(data);
       if (isStropheConnected()) {
-				setStatusWidgetTitle(userStatus);
+        setStatusWidgetTitle(userStatus);
         $(".user_presence a[title]").tooltip();
         setUserFunctions();
+        if (afterNewConnectionFlag){
+          afterNewConnectionFlag = false;
+          restoreChatData();
+        }
       }
   });
 }
 
 function getConnectionBoxFromSlug(slug){
-	if ($('div.user_presence[slug=' + slug + ']').length > 0){
-		return ($('div.user_presence[slug=' + slug + ']'))[0];
-	}  else {
-		return null;
-	}
+  if ($('div.user_presence[slug=' + slug + ']').length > 0){
+    return ($('div.user_presence[slug=' + slug + ']'))[0];
+  }  else {
+    return null;
+  }
 }
 
 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);
-		}
+    if(cacheConnectedUsers.indexOf(slug)==-1){
+      cacheConnectedUsers.push(slug);
+    }
   }
 }
 
 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();
-		}
+    if (!($('div.user_presence[slug=' + slug + ']').is(":visible"))){
+       $('div.user_presence[slug=' + slug + ']').show();
+    }
   }
 }
 
 function setUserIconStatus(slug, status){
-	 if (status in statusIcons) {
-   	 iconName = statusIcons[status];
-		 var $img_status = $('img.presence_status');
-		 connectionBox = getConnectionBoxFromSlug(slug);
+   if (status in statusIcons) {
+     iconName = statusIcons[status];
+     var $img_status = $('img.presence_status');
+     connectionBox = getConnectionBoxFromSlug(slug);
      $(connectionBox).find($img_status).attr("src", "/assets/status/" + iconName + ".png")
    }
 }
 
 function getAllConnectedSlugs(){
-	connectedSlugs=[];
+  connectedSlugs=[];
   connectionBoxes = $('div.user_presence[slug]');
-	$.each(connectionBoxes, function(index, value) {
-	    if($(value).is(":visible")){
-	        connectedSlugs.push($(value).attr("slug"))
-	    }
-	});
+  $.each(connectionBoxes, function(index, value) {
+      if($(value).is(":visible")){
+          connectedSlugs.push($(value).attr("slug"))
+      }
+  });
   return connectedSlugs
 }
 
@@ -253,47 +243,47 @@ function getAllConnectedSlugs(){
 ////////////////////
 
 function putReceivedMessageOnChatWindow(from_jid,from_slug,body,msgID){
-	
-	//Antiflood control
-	 if (antifloodControl(from_jid,from_slug,body,msgID)){
-	 	return;
-	 }
-	
-	//Check for from_slug name and connectionBox visibility
-	if (typeof($('div.user_presence[slug=' + from_slug + ']').attr('name')) == 'undefined') {
-		//No connectionBox for this user!
-		var from_name = from_slug;
-		refreshChatWindow();
-	}	else {
-		showConnectionBoxFromSlug(from_slug);
-		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 {
-		window[getChatVariableFromSlug(from_slug)].chatbox("option", "boxManager").toggleBox(true);
-	}
-	
-	//Parse content before show it.
-	var content = getParsedContent(Strophe.getText(body), false)
-	var headerMessage = getParsedName(from_name,false);
-	
-	//Show message to chatBox.        
-	$("#" + from_slug).chatbox("option", "boxManager").addMsg(headerMessage, content);
-	
-	//Rotate chatBoxes priority.
-	rotatePriority(from_slug);
-	
-	//Check for start blinkTitle.
-	blinkTitleOnMessage(from_name);
-	
-	//Check for play sound
-	if (mustPlaySoundForChatWindow(window[getChatVariableFromSlug(from_slug)])) {
-		playSound("onMessageAudio");
-	}
-	
+  
+  //Antiflood control
+   if (antifloodControl(from_jid,from_slug,body,msgID)){
+    return;
+   }
+  
+  //Check for from_slug name and connectionBox visibility
+  if (typeof($('div.user_presence[slug=' + from_slug + ']').attr('name')) == 'undefined') {
+    //No connectionBox for this user!
+    var from_name = from_slug;
+    refreshChatWindow();
+  } else {
+    showConnectionBoxFromSlug(from_slug);
+    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 {
+    window[getChatVariableFromSlug(from_slug)].chatbox("option", "boxManager").toggleBox(true);
+  }
+  
+  //Parse content before show it.
+  var content = getParsedContent(Strophe.getText(body), false)
+  var headerMessage = getParsedName(from_name,false);
+  
+  //Show message to chatBox.        
+  $("#" + from_slug).chatbox("option", "boxManager").addMsg(headerMessage, content);
+  
+  //Rotate chatBoxes priority.
+  rotatePriority(from_slug);
+  
+  //Check for start blinkTitle.
+  blinkTitleOnMessage(from_name);
+  
+  //Check for play sound
+  if (mustPlaySoundForChatWindow(window[getChatVariableFromSlug(from_slug)])) {
+    playSound("onMessageAudio");
+  }
+  
 }
 
 
@@ -302,8 +292,8 @@ function putReceivedMessageOnChatWindow(from_jid,from_slug,body,msgID){
 ////////////////////
 
 function showChatNotificationForSlug(slug,msg){
-	var notification = $("#" + slug).parent().find("div.ui-chatbox-notify");
-	showChatNotification(notification,msg);
+  var notification = $("#" + slug).parent().find("div.ui-chatbox-notify");
+  showChatNotification(notification,msg);
 }
 
 function showChatNotification(notification,msg){
@@ -314,7 +304,7 @@ function showChatNotification(notification,msg){
 
 function hideChatNotificationForSlug(slug){
   var notification = $("#" + slug).parent().find("div.ui-chatbox-notify");
-	hideChatNotification(notification);
+  hideChatNotification(notification);
 }
 
 function hideChatNotification(notification){
@@ -323,12 +313,12 @@ function hideChatNotification(notification){
 }
 
 function notifyWhenUsersDisconnect(){
-	var notification = $("div.ui-chatbox-notify");
-	var msg = I18n.t('chat.notify.offline');
-	showChatNotification(notification,msg);
+  var notification = $("div.ui-chatbox-notify");
+  var msg = '<%=I18n.t('chat.notify.offline')%>';
+  showChatNotification(notification,msg);
 }
 
 function hideAllNotifications(){
-	var notification = $("div.ui-chatbox-notify");
+  var notification = $("div.ui-chatbox-notify");
   hideChatNotification(notification);
-}
+}