social_stream 0.12.12 → 0.12.13

data/base/app/models/actor.rb

@@ -509,3 +509,5 @@ class Actor < ActiveRecord::Base
     sent_contacts.active.map(&:receiver_id)
   end
 end
+
+ActiveSupport.run_load_hooks(:actor, Actor)

data/base/app/models/tie.rb

@@ -150,3 +150,5 @@ class Tie < ActiveRecord::Base
       contact.sender_id == relation.actor_id
   end
 end
+
+ActiveSupport.run_load_hooks(:tie, Tie)

data/base/app/models/user.rb

@@ -139,3 +139,5 @@ class User < ActiveRecord::Base
     
   end
 end
+
+ActiveSupport.run_load_hooks(:user, User)

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

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.9.34".freeze
+    VERSION = "0.9.35".freeze
   end
 end

data/base/social_stream-base.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   # Activity and Relation hierarchies
   s.add_runtime_dependency('ancestry', '~> 1.2.3')
   # SQL foreign keys
-  s.add_runtime_dependency('foreigner', '~> 0.9.1')
+  s.add_runtime_dependency('foreigner', '~> 1.1.1')
   # Authentication
   s.add_runtime_dependency('devise', '~> 1.4.5')
   # CRUD controllers

data/documents/app/views/audios/index.html.erb

@@ -1 +1 @@
-<%=render(:partial => 'common/index') %>
+<%=render(:partial => 'common_documents/index') %>

data/documents/app/views/audios/show.html.erb

@@ -1,2 +1,2 @@
-<%= render :partial => 'common/show',
+<%= render :partial => 'common_documents/show',
            :locals  => { :document => @audio } %>

data/documents/app/views/{common → common_documents}/_document_info.html.erb

@@ -40,4 +40,4 @@
     <br class="clearfloat" />
   </div>
 </div>
-<%= render :partial => "common/edit_form", :locals => {:document => document} %> 
+<%= render :partial => "common_documents/edit_form", :locals => {:document => document} %> 

data/documents/app/views/{common → common_documents}/_index.html.erb

@@ -1,5 +1,5 @@
 <% unless params[:no_layout].present? %>
-  <%= render :partial => "common/headers" %>
+  <%= render :partial => "common_documents/headers" %>
   <div id="documents_grid">
 <% end %> 
 

data/documents/app/views/{common → common_documents}/_show.html.erb

@@ -28,7 +28,7 @@
 
 <%= show_view_for document %>
 
-<%= render :partial => "common/document_info", :locals => {:document => document} %>
+<%= render :partial => "common_documents/document_info", :locals => {:document => document} %>
 
 <div id="document_comments">
   <%= render :partial => 'activities/comments', :locals => { :activity => document.post_activity } %>

data/documents/app/views/documents/index.html.erb

@@ -1 +1 @@
-<%=render(:partial => 'common/index') %>
+<%=render(:partial => 'common_documents/index') %>

data/documents/app/views/documents/show.html.erb

@@ -1,2 +1,2 @@
-<%= render :partial => 'common/show',
+<%= render :partial => 'common_documents/show',
            :locals  => { :document => @document } %>

data/documents/app/views/pictures/index.html.erb

@@ -1 +1 @@
-<%=render(:partial => 'common/index') %>
+<%=render(:partial => 'common_documents/index') %>

data/documents/app/views/pictures/show.html.erb

@@ -1,2 +1,2 @@
-<%= render :partial => 'common/show',
+<%= render :partial => 'common_documents/show',
            :locals  => { :document => @picture } %>

data/documents/app/views/videos/index.html.erb

@@ -1 +1 @@
-<%=render(:partial => 'common/index') %>
+<%=render(:partial => 'common_documents/index') %>

data/documents/app/views/videos/show.html.erb

@@ -1,2 +1,2 @@
-<%= render :partial => 'common/show',
+<%= render :partial => 'common_documents/show',
            :locals  => { :document => @video } %>

data/documents/config/locales/en.yml

@@ -14,8 +14,8 @@ en:
       details: "Details"
       download: "Download"
       edit: "Edit"
-    all: "All documents"
-    confirm_delete: "Delete document?"
+    all: "All files"
+    confirm_delete: "Delete file?"
     form:
       title: "File"
     info:
@@ -28,8 +28,8 @@ en:
         title: "Upload"
       title:
         title: "Title"
-    mine: "My documents"
-    msg: "Uploaded a document:"
+    mine: "My files"
+    msg: "Uploaded a file:"
     name: "file"
     not_mine: "Documents"
     one: "a file"
@@ -52,7 +52,7 @@ en:
   resource:
     all: "All Resources"
     confirm_delete: "Delete resource?"
-    title: "Files"
+    title: "Resources"
     mine: "My resources"
     msg: "Uploaded a resource:"
     not_mine: "Resources"

data/documents/config/locales/es.yml

@@ -14,8 +14,8 @@ es:
       details: "Detalles"
       download: "Descargar"
       edit: "Editar"
-    all: "Todos los documentos"
-    confirm_delete: "¿Borrar documento?"
+    all: "Todos los ficheros"
+    confirm_delete: "¿Borrar fichero?"
     form:
       title: "Fichero"
     info:
@@ -28,11 +28,11 @@ es:
         title: "Subir"
       title:
         title: "Título"
-    mine: "Mis documentos"
-    msg: "Subió un documento:"
-    name: "documento"
+    mine: "Mis ficheros"
+    msg: "Subió un fichero:"
+    name: "fichero"
     not_mine: "Documentos"
-    one: "un documento"
+    one: "un fichero"
     simple_all: "Todos"
     title: "Documentos"
   picture:
@@ -52,7 +52,7 @@ es:
   resource:
     all: "Todos los recursos"
     confirm_delete: "¿Borrar recursos?"
-    title: "Archivos"
+    title: "Recursos"
     mine: "Mis recursos"
     msg: "Subió un recurso:"
     not_mine: "Recursos"

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

@@ -1,5 +1,5 @@
 module SocialStream
   module Documents
-    VERSION = "0.4.6".freeze
+    VERSION = "0.4.7".freeze
   end
 end

data/documents/lib/social_stream/toolbar_config/documents.rb

@@ -5,10 +5,10 @@ module SocialStream
         items = super
 
         items << {
-          :key => :resources,
-          :name => image_tag("btn/btn_resource.png",:class =>"menu_icon")+t("resource.title"),
+          :key => :documents,
+          :name => image_tag("btn/btn_resource.png",:class =>"menu_icon")+t("document.title"),
           :url => polymorphic_path([subject, Document.new]),
-          :options => {:link => {:id => "resources_menu"}}
+          :options => {:link => {:id => "documents_menu"}}
         }
       end
       
@@ -16,10 +16,10 @@ module SocialStream
         items = super
 
         items << {
-          :key => :resources,
-          :name => image_tag("btn/btn_resource.png",:class =>"menu_icon")+t("resource.title"),
+          :key => :documents,
+          :name => image_tag("btn/btn_resource.png",:class =>"menu_icon")+t("document.title"),
           :url => polymorphic_path([current_subject, Document.new]),
-          :options => {:link => {:id => "resources_menu"}}
+          :options => {:link => {:id => "documents_menu"}}
         }
       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.9.34')
+  s.add_runtime_dependency('social_stream-base', '~> 0.9.35')
   s.add_runtime_dependency('paperclip-ffmpeg', '~> 0.7.0')
   s.add_runtime_dependency('paperclip','2.3.11')
   s.add_runtime_dependency('delayed_paperclip','>= 0.7.2')

data/lib/social_stream/version.rb

@@ -1,3 +1,3 @@
 module SocialStream
-  VERSION = "0.12.12".freeze
+  VERSION = "0.12.13".freeze
 end

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

@@ -194,4 +194,52 @@ function getAllConnectedSlugs(){
 	    }
 	});
   return connectedSlugs
+}
+
+
+////////////////////
+//Insert received message in chatbox
+////////////////////
+
+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)
+	
+	//Show message to chatBox.        
+	$("#" + from_slug).chatbox("option", "boxManager").addMsg(from_name, 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");
+	}
+	
 }

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

@@ -64,6 +64,132 @@ function blinkTitleOnMessage(username){
 }
 
 
+
+////////////////////
+//Antiflood
+////////////////////
+
+var lastMessageTimes = new Array();
+//lastMessageTimes['from_slug'] = ["timeOfLastMessage",["msgID1","msgID2"]];
+
+var timeBetweenMessages = 500; //mseconds
+
+//Return true when detects a text storm and control the text flood:
+//timeBetweenMessages is the minimum time that must elapse between the messages of the same contact.
+function antifloodControl(from_jid,from_slug,body,msgID) {
+	
+	if( from_slug in lastMessageTimes){
+
+  } else {
+    lastMessageTimes[from_slug] = [,[]];
+  }
+	
+	if (msgID==null){
+		msgID = generateMessageID();
+	}
+	
+	var lastMessageTime = lastMessageTimes[from_slug][0];
+	
+  var t = (new Date()).getTime();
+  if(t - lastMessageTime < timeBetweenMessages) {
+		        //Flood detected
+						return retryToShowMessage(from_jid,from_slug,body,msgID);
+  }
+	
+	//Check if is the first message of this user to be send.
+	//var messageQueue = lastMessageTimes[from_slug][1];
+	
+	if (lastMessageTimes[from_slug][1].length>0){
+		if((lastMessageTimes[from_slug][1])[0]==msgID){
+			//Message is the first on the queue: Show it and remove from the queue
+			lastMessageTimes[from_slug][1].splice(0,1);
+		} else {
+			//Message is not the first on the queue
+			return retryToShowMessage(from_jid,from_slug,body,msgID);
+		}
+	}
+	
+	//Message can be send
+  lastMessageTimes[from_slug][0] = t;	
+  return false;
+};
+
+
+var rootMessageID=1;
+function generateMessageID(){
+	return (++rootMessageID);
+}
+
+
+function retryToShowMessage(from_jid,from_slug,body,msgID){
+	//Enque the message if isn't in the queue
+  if (lastMessageTimes[from_slug][1].indexOf(msgID)==-1){
+    lastMessageTimes[from_slug][1].push(msgID);
+  }
+      
+  setTimeout(function(){putReceivedMessageOnChatWindow(from_jid,from_slug,body,msgID)}, timeBetweenMessages);
+  return true;
+}
+
+
+
+
+
+////////////////////
+//Controlflood
+////////////////////
+var timeBetweenOwnMessages = 500; //mseconds
+var lastMessageSentTime=null;
+
+function floodControl() {
+  var t = (new Date()).getTime();
+	
+	if(lastMessageSentTime==null){
+    lastMessageSentTime = t;
+    return true;
+  }
+	
+	if (t - lastMessageSentTime < timeBetweenOwnMessages) {
+    return false;
+  } else {
+    lastMessageSentTime = t;
+    return true;
+  } 
+};
+
+
+function initControlFlood(){
+	$(".ui-chatbox-input-box")
+}
+
+
+////////////////////
+//Bounce chatbox control
+////////////////////
+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 t = (new Date()).getTime();
+	
+	if(!(from_slug in lastBounceTimes)){
+    lastBounceTimes[from_slug] = t;
+		return true;
+  }
+	 
+  var lastBounceTime = lastBounceTimes[from_slug];
+	
+  if (t - lastBounceTime < timeBetweenBounces) {
+    return false;
+  } else {
+		lastBounceTimes[from_slug] = t;
+		return true;
+	} 
+	
+}
+
 ////////////////////
 //Next features...
 ////////////////////

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

@@ -52,7 +52,7 @@ function createChatBox(guest_slug,guest_name,guest_jid,user_name,user_jid){
 															},
 															
                               messageSent : function(id, user, msg) {
-																  rotatePriority(guest_slug);
+																	rotatePriority(guest_slug);
                                   $("#" + guest_slug).chatbox("option", "boxManager").addMsg(id, getParsedContent(msg,true));
                                   sendChatMessage(user_jid,guest_jid,msg);
                               }});

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

@@ -181,36 +181,11 @@ function onMessage(msg) {
     var elems = msg.getElementsByTagName('body');
 
     if (type == "chat" && elems.length > 0) {
-	
 			var body = elems[0];
 			var from_slug = from.split("@")[0];
-			var from_name = $("#" + from_slug).attr("name");
 			var from_jid = from_slug + "@" + domain;
 		
-		
-		  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');
-		  }
-			
-			if (createChatBox(from_slug,from_name,from_jid,user_name,user_jid)) {
-			} else {
-        window[getChatVariableFromSlug(from_slug)].chatbox("option", "boxManager").toggleBox(true);
-			}
-			
-			var content = getParsedContent(Strophe.getText(body),false)
-			//Send message to chatBox and post-message functions.					
-			$("#" + from_slug).chatbox("option", "boxManager").addMsg(from_name, content);
-			rotatePriority(from_slug);
-			blinkTitleOnMessage(from_name);
-			if (mustPlaySoundForChatWindow(window[getChatVariableFromSlug(from_slug)])){
-          playSound("onMessageAudio");
-      }
-			
+		  putReceivedMessageOnChatWindow(from_jid,from_slug,body,null)	
     }
 
     // we must return true to keep the handler alive.  

data/presence/lib/social_stream/presence/engine.rb

@@ -1,15 +1,11 @@
 module SocialStream
   module Presence
     class Engine < Rails::Engine
-      config.to_prepare do
-        
-        #Patching Tie
-        Tie.class_eval do
+      initializer "social_stream-presence.tie" do
+        ActiveSupport.on_load(:tie) do
           include SocialStream::Presence::Models::BuddyManager
         end
-        
       end
- 
     end
   end
 end

data/presence/vendor/assets/javascripts/jquery.ui.chatbox.js

@@ -54,11 +54,18 @@
 				//Get highlight color from css
 				var dummy_element = $("<p class=\"chatWindowhighlighted\"></div>");
         var options = {color: $(dummy_element).css("color")};
+				
 		    self.elem.uiChatboxTitlebar.effect("highlight", options, 300);
-		    self.elem.uiChatbox.effect("bounce", {times:3}, 300, function(){
-			     self.highlightLock = false;
-			     self._scrollToBottom();
-		    });
+				
+				
+				if (((typeof mustBounceBoxForChatWindow == 'function')&&(mustBounceBoxForChatWindow(self)))||((typeof mustBounceBoxForChatWindow != 'function'))) {
+					 self.elem.uiChatbox.effect("bounce", {times:3}, 300, function(){
+           self.highlightLock = false;
+           self._scrollToBottom();
+          });
+				} else {
+					 self.highlightLock = false;
+				}
 		},
 		toggleBox: function(show) {
 		    this.elem.uiChatbox.toggle(show);
@@ -187,15 +194,17 @@
 			 )
 		.appendTo(uiChatboxInput)
 	        .keydown(function(event) {
-		    if(event.keyCode && event.keyCode == $.ui.keyCode.ENTER) {
-			msg = $.trim($(this).val());
-			if(msg.length > 0) {
-			    self.options.messageSent(self.options.id, self.options.user, msg);
-			}
-			$(this).val('');
-			return false;
-		    }
-		})
+				    if(event.keyCode && event.keyCode == $.ui.keyCode.ENTER) {
+							if (((typeof floodControl == 'function')&&(floodControl()))||((typeof floodControl != 'function'))) {
+						  	msg = $.trim($(this).val());
+						  	if (msg.length > 0) {
+						  		self.options.messageSent(self.options.id, self.options.user, msg);
+						  	}
+						  	$(this).val('');
+						  }
+							return false;
+				    }
+		      })
 		.focusin(function() {
 		    uiChatboxInputBox.addClass('ui-chatbox-input-focus');
 		    var box = $(this).parent().prev();

data/social_stream.gemspec

@@ -11,8 +11,8 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.9.34')
-  s.add_runtime_dependency('social_stream-documents', '~> 0.4.6')
+  s.add_runtime_dependency('social_stream-base', '~> 0.9.35')
+  s.add_runtime_dependency('social_stream-documents', '~> 0.4.7')
   s.add_runtime_dependency('social_stream-events', '~> 0.0.20')
  
   # Development Gem dependencies
@@ -29,8 +29,10 @@ Gem::Specification.new do |s|
     s.add_development_dependency('sqlite3')
   end
   # Debugging
-  if RUBY_VERSION < '1.9'
-    s.add_development_dependency('ruby-debug', '~> 0.10.3')
+  unless ENV["CI"]
+    if RUBY_VERSION < '1.9'
+      s.add_development_dependency('ruby-debug', '~> 0.10.3')
+    end
   end
   # Specs
   s.add_development_dependency('rspec-rails', '~> 2.5.0')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 53
   prerelease: 
   segments: 
   - 0
   - 12
-  - 12
-  version: 0.12.12
+  - 13
+  version: 0.12.13
 platform: ruby
 authors: 
 - GING - DIT - UPM
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-18 00:00:00 +01:00
+date: 2011-11-20 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,12 +27,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 127
+        hash: 125
         segments: 
         - 0
         - 9
-        - 34
-        version: 0.9.34
+        - 35
+        version: 0.9.35
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -43,12 +43,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 1
         segments: 
         - 0
         - 4
-        - 6
-        version: 0.4.6
+        - 7
+        version: 0.4.7
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -876,17 +876,16 @@ files:
 - documents/app/views/audios/index.html.erb
 - documents/app/views/audios/index.js.erb
 - documents/app/views/audios/show.html.erb
-- documents/app/views/common/_document_info.html.erb
-- documents/app/views/common/_edit_form.html.erb
-- documents/app/views/common/_headers.html.erb
-- documents/app/views/common/_index.html.erb
-- documents/app/views/common/_show.html.erb
+- documents/app/views/common_documents/_document_info.html.erb
+- documents/app/views/common_documents/_edit_form.html.erb
+- documents/app/views/common_documents/_headers.html.erb
+- documents/app/views/common_documents/_index.html.erb
+- documents/app/views/common_documents/_show.html.erb
 - documents/app/views/documents/_document.html.erb
 - documents/app/views/documents/_document_focus_search.html.erb
 - documents/app/views/documents/_document_global_search.html.erb
 - documents/app/views/documents/_document_show.html.erb
 - documents/app/views/documents/_document_with_details.html.erb
-- documents/app/views/documents/_header.html.erb
 - documents/app/views/documents/_new_activity.html.erb
 - documents/app/views/documents/_new_activity_fields.html.erb
 - documents/app/views/documents/destroy.js.erb

data/documents/app/views/documents/_header.html.erb

@@ -1,5 +0,0 @@
-<% content_for :headers do %>
-        <%= stylesheet_link_tag "documents" %>
-<% end %>
-
-<%= image_tag("btn/document.png", :class => "size_19px") %> <%=t('resource.title')%>