social_stream 0.22.0 → 0.22.1

data/base/app/assets/javascripts/social_stream.search.js.erb

@@ -0,0 +1,27 @@
+SocialStream.Search = (function(SS, $, undefined){
+  function init(){
+    $.preloadImages ("<%= asset_path "mini-loading.gif" %>");
+
+    $('#search_form').submit(function() {
+      query = $('#global_search_input').val();
+      if((query=="")||(query.length < 2)||(query == I18n.t('search.write'))){
+        $('#too_short_error').show();
+        $('#global_search_input').removeClass("searching");
+        $('#global_search_input').blur();
+        $('#global_search_input').focus();
+        return false;
+      }else{
+        $('#global_search_input').addClass("searching");
+        $('#global_search_input').blur();
+      }
+      return true;
+    });
+
+    $("#global_search_input").Watermark(I18n.t('search.write'));
+  }
+
+  return {
+    init: init
+  }
+
+}) (SocialStream, jQuery);

data/base/app/assets/stylesheets/activities.css.scss

@@ -86,3 +86,5 @@
 .copy_new_comment{visibility: hidden; padding:6px; padding-bottom: 1.5em;font-size:inherit; line-height: 1.15em;
                   margin-bottom:7px;}
 .input_new_comments_container{min-height: 30px; position: relative;  }
+
+.activity_likes{ margin-bottom: 2px; }

data/base/app/controllers/search_controller.rb

@@ -26,8 +26,11 @@ class SearchController < ApplicationController
   private
 
   def search mode
-    models = SocialStream.extended_search_models
-    models = SocialStream.quick_search_models if mode.to_s.eql? "quick"
+    models = ( mode.to_s.eql?("quick") ?
+              SocialStream.extended_search_models :
+              SocialStream.quick_search_models
+             ).dup
+
     models.map! {|model_sym| model_sym.to_s.classify.constantize}
     result = ThinkingSphinx.search(get_search_query, :classes => models)
     result = authorization_filter result

data/base/app/helpers/activities_helper.rb

@@ -34,4 +34,23 @@ module ActivitiesHelper
     Post.new :author_id => Actor.normalize_id(current_subject),
              :owner_id  => Actor.normalize_id(receiver)
   end
+
+  def like_sentence(activity)
+    likers_shown = 3
+    likers_count = activity.likes.count
+    likers_other = likers_count - likers_shown
+
+    # TODO: select likers from current_subject's contacts
+    likers =
+      activity.likes.first(likers_shown).
+      map{ |a| a.sender_subject }.
+      map{ |l| link_to l.name, l }.
+      join(", ")
+
+    if likers_other > 0
+      t("activity.like_sentence.many", :likers => likers, :count => likers_other).html_safe
+    else
+      t("activity.like_sentence.few",  :likers => likers, :count => likers_count).html_safe
+    end
+  end
 end

data/base/app/helpers/search_helper.rb

@@ -1,10 +1,4 @@
 module SearchHelper  
-  
-  def focus_search_link text, search_class, query
-    search_class = search_class.to_s if search_class.is_a? Class or search_class.is_a? Symbol
-    link_to text, search_path(:focus => search_class.downcase.pluralize, :search_query => query ), :remote => true
-  end
-  
   def too_short_query?
     return true if params[:search_query].blank?
     bare_query = strip_tags(params[:search_query]) unless bare_query.html_safe?
@@ -35,4 +29,40 @@ module SearchHelper
     bare_query = strip_tags(params[:search_query]) unless bare_query.html_safe?
     return bare_query.strip.split
   end
-end
+
+  def search_class(type, model_sym)
+    case type
+    when :selected
+     params[:focus].present? &&
+      params[:focus].eql?(model_sym.to_s) &&
+      'selected' || ''
+    when :disabled
+      search_results?(model_sym) &&
+        '' || 'disabled'
+    else
+      raise "Unknown select search class type"
+   end
+  end
+
+  def search_results?(model_sym)
+    ThinkingSphinx.count(get_search_query,
+                         :classes => [model_sym.to_s.classify.constantize]) > 0
+  end
+
+  def search_tab(model_sym)
+    span_options = {}
+    span_options[:class] = "#{ search_class(:selected, model_sym) } #{ search_class(:disabled, model_sym) } #{ model_sym.to_s.pluralize.downcase }"
+
+    results = search_results?(model_sym)
+
+    unless results
+      span_options[:title] = t('search.no_subject_found', :subject => model_sym.to_s)
+    end
+
+    link_to_if results,
+               content_tag(:span, t("#{ model_sym }.title.other"), span_options),
+               search_path(:focus => model_sym,
+                           :search_query => params[:search_query]),
+               :remote => true
+  end
+end

data/base/app/models/actor.rb

@@ -31,7 +31,8 @@ class Actor < ActiveRecord::Base
 
   has_many :avatars,
            :validate => true,
-           :autosave => true
+           :autosave => true,
+           :dependent => :destroy
   has_one  :avatar,
            :conditions => { :active => true }
   		  

data/base/app/models/group.rb

@@ -53,3 +53,5 @@ class Group < ActiveRecord::Base
     end
   end
 end
+
+ActiveSupport.run_load_hooks(:group, Group)

data/base/app/views/activities/_likes.html.erb

@@ -0,0 +1,5 @@
+<% if activity.likes.present? %>
+<div class="activity_likes subactivity " id="likes_<%= dom_id(activity) %>">
+  <%= like_sentence(activity) %>
+</div>
+<% end %>

data/base/app/views/activities/_root.html.erb

@@ -19,6 +19,9 @@
     <%= render :partial => 'activities/options',
                :locals => { :activity => activity } %>
 
+    <%= render :partial => 'activities/likes',
+               :locals => { :activity => activity } %>
+
     <%= render :partial => 'activities/comments',
                :locals => { :activity => activity } %>
 

data/base/app/views/cheesecake/_cheesecake.html.erb

@@ -77,7 +77,7 @@ $(function(){
     $("#sector_editor").data("prepare")(subsector.getCheesecake(),subsector);
   };
   $("#contacts_filter_input").keyup(function(){
-    cheese.searchEngine.filter($("#contacts_filter_input").val());
+    cheese.filter($("#contacts_filter_input").val());
     //TODO: Make users unfiltered visible again
   });
   cheese.onChange = function(cheesecake){

data/base/app/views/search/_form.html.erb

@@ -1,54 +1,33 @@
-  <form action="<%= search_path %>" method="get" data-remote="true" id="search_form">
-    <div class="block">
-    	<div class="error" id="too_short_error" <%= too_short_query? ? 'style=display:block;' : ''  %>><%= t('search.at_least') %></div>
-      <%= hidden_field_tag :focus, params[:focus] %>
-      <div class="form_row search_row">
-        <%= text_field_tag :search_query, params[:search_query].present? ? params[:search_query] : nil ,:autocomplete => :off, :id => :global_search_input %>
-      </div>
-      <div  id="focus_options" class="form_row search_row">
-        <ul class="menu_plain_list">
-          <li><%= link_to content_tag(:span,t('search.show_all'),:class => params[:focus].blank? ? 'global selected' : 'global'), search_path(:search_query => params[:search_query]), :remote => true %></li>
-          <% SocialStream.extended_search_models.each do |model_sym| %>
-            <% selected_class = (params[:focus].present? and params[:focus].pluralize.downcase.eql?(model_sym.to_s.pluralize.downcase)) ? 'selected' : ''%>
-            <% disabled = ThinkingSphinx.count(get_search_query, :classes => [model_sym.to_s.classify.constantize])==0 %>
-            <% disabled_class = (disabled ? 'disabled' : '') %>
-            <li>
-            <% unless disabled %>
-              <%= focus_search_link content_tag(:span, model_sym.to_s.pluralize.capitalize, 
-                                                    :class => selected_class + " " + disabled_class + " " + model_sym.to_s.pluralize.downcase), 
-                                        model_sym.to_s.classify.constantize, 
-                                        params[:search_query] %>
-            <% else %>
-               <%= content_tag(:span, model_sym.to_s.pluralize.capitalize, 
-                               :class => selected_class + " " + disabled_class + " " + model_sym.to_s.pluralize.downcase,
-                               :title => I18n.t('search.no_subject_found', :subject => model_sym.to_s)) %>
-            <% end %>
-            </li>
-          <% end %>
-        </ul>
-      </div>      
+<%= form_tag search_path, :method => :get,
+                          :remote => true,
+                          :id => "search_form" do %>
+  <%= hidden_field_tag :focus, params[:focus] %>
+  <div class="block">
+    <div class="error" id="too_short_error" <%= 'style=display:block;' if too_short_query? %>><%= t('search.at_least') %></div>
+
+    <div class="form_row search_row">
+      <%= text_field_tag :search_query, params[:search_query], :autocomplete => :off, :id => :global_search_input %>
     </div>
-  </form>
+
+    <div  id="focus_options" class="form_row search_row">
+      <ul class="menu_plain_list">
+        <li><%= link_to content_tag(:span,
+                                    t('search.show_all'),
+                                    :class => "global #{ params[:focus].blank? && 'selected' }"),
+                        search_path(:search_query => params[:search_query]),
+                                    :remote => true %></li>
+        <% SocialStream.extended_search_models.each do |model_sym| %>
+          <li>
+            <%= search_tab(model_sym) %>
+          </li>
+        <% end %>
+      </ul>
+    </div>      
+  </div>
+<% end %>
 
 <%= javascript_tag do %>
   $(function() {
-    $.preloadImages ("assets/mini-loading.gif");
-
-    $('#search_form').submit(function() {
-      query = $('#global_search_input').val();
-      if((query=="")||(query.length < 2)||(query=="<%= t('search.write') %>")){
-        $('#too_short_error').show();
-        $('#global_search_input').removeClass("searching");
-        $('#global_search_input').blur();
-        $('#global_search_input').focus();
-        return false;   
-      }else{        
-        $('#global_search_input').addClass("searching");
-        $('#global_search_input').blur();
-      }
-      return true;
-    });
-
-    $("#global_search_input").Watermark("<%= I18n.t('search.write') %>");
+    SocialStream.Search.init();
   });
 <% end %>

data/base/config/locales/en.yml

@@ -45,6 +45,13 @@ en:
     delete: "Delete"
     last: "Last Activities"
     like: "I like"
+    like_sentence:
+      few:
+        one: "%{likers} likes this"
+        other: "%{likers} like this"
+      many:
+        one: "%{likers} and %{count} more person like this"
+        other: "%{likers} and %{count} more people like this"
     one: "Activity"
     other: "Activities"
     privacy:
@@ -111,6 +118,9 @@ en:
     confirm_delete: "Delete comment?"
     name: "comment"
     one: "a comment"
+    title:
+      one: "Comment"
+      other: "Comments"
     view_all: "View all comments"
   contact:
     addressbook: "Addressbook"
@@ -226,6 +236,9 @@ en:
       followed: "Most followed"
       liked: "Most liked"
     tags: "Tags"
+    title:
+      one: "Group"
+      other: "Groups"
   help: "Help"
   helpers:
     submit:
@@ -337,7 +350,9 @@ en:
     input: "What are you doing?"
     name: "post"
     one: "a post"
-    title: "Posts"
+    title:
+      one: "Post"
+      other: "Posts"
   preposition:
     and: "and"
     on: "on"
@@ -496,11 +511,14 @@ en:
     ago: "%{time} ago"
   unknown: "Unknown"
   user:
+    all: "All users"
+    all_n: "All users (%{count})"
     by: "By Users"
     one: "User"
     other: "Users"
-    all: "All users"
-    all_n: "All users (%{count})"
+    title:
+      one: "User"
+      other: "Users"
   welcome: "Welcome to %{site}!"
   lang:
     browser: "Auto-detect browser language"

data/base/config/locales/es.yml

@@ -112,6 +112,9 @@ es:
     name: "comentario"
     one: "un comentario"
     view_all: "Ver todos los comentarios"
+    title:
+      one: "Comentario"
+      other: "Comentarios"
   contact:
     addressbook: "Libreta de direcciones"
     all_n: "Todos los contactos (%{count})"
@@ -226,6 +229,9 @@ es:
       followed: "Más seguidos"
       liked: "Más populares"
     tags: "Etiquetas"
+    title:
+      one: "Grupo"
+      other: "Grupos"
   help: "Ayuda"
   helpers:
     submit:
@@ -337,7 +343,9 @@ es:
     input: "¿Qué quieres compartir?"
     name: "publicación"
     one: "una publicación"
-    title: "Textos"
+    title:
+      one: "Texto"
+      other: "Textos"
   preposition:
     and: "y"
   profile:
@@ -514,11 +522,14 @@ es:
     ago: "hace %{time}"
   unknown: "Desconocido"
   user:
+    all: "Todos los usuarios"
+    all_n: "Todos los usuarios (%{count})"
     by: "Por usuarios"
     one: "Usuario"
     other: "Usuarios"
-    all: "Todos los usuarios"
-    all_n: "Todos los usuarios (%{count})"
+    title:
+      one: "Usuario"
+      other: "Usuarios"
   welcome: "¡Bienvenid@ a %{site}!"
   lang:
     browser: "Autodetectar el idioma del navegador"

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

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.16.3".freeze
+    VERSION = "0.16.4".freeze
   end
 end

data/documents/config/locales/en.yml

@@ -12,6 +12,9 @@ en:
     not_mine: "Audios"
     one: "an audio"
     processing: "Processing audio clip. Please wait..."
+    title:
+      one: "Audio"
+      other: "Audios"
   document:
     actions:
       delete: "Delete"
@@ -38,15 +41,19 @@ en:
     not_mine: "Files"
     one: "a file"
     simple_all: "All"  
-    title: "Files"
+    title:
+      one: "File"
+      other: "Files"
   picture:
     confirm_delete: "Delete picture?"
-    title: "Pictures"
     mine: "My pictures"  
     msg: "See details..."
     name: "picture"
     not_mine: "Pictures"
     one: "a picture"
+    title:
+      one: "Picture"
+      other: "Pictures"
   repository:
     title: "Files"
     order:
@@ -62,10 +69,12 @@ en:
     not_mine: "Resources"
   video:
     confirm_delete: "Delete video?"
-    title: "Videos"
     mine: "My videos"  
     msg: "Uploaded a video:"
     name: "video" 
     not_mine: "Videos"
     one: "a video"
     processing: "Processing video. Please, wait..."
+    title:
+      one: "Video"
+      other: "Videos"

data/documents/config/locales/es.yml

@@ -5,13 +5,15 @@ es:
         title: "Título"
   audio:
     confirm_delete: "¿Borrar audios?"
-    title: "Audios"
     mine: "Mis audios"
     msg: "Subió un audio:"
     name: "archivo de audio"
     not_mine: "Audios"
     one: "un archivo de audio"
     processing: "Procesando fichero de audio. Espere, por favor..."
+    title:
+      one: "Audio"
+      other: "Audios"
   document:
     actions:
       delete: "Borrar"
@@ -38,15 +40,19 @@ es:
     not_mine: "Ficheros"
     one: "un fichero"
     simple_all: "Todos"
-    title: "Ficheros"
+    title:
+      one: "Fichero"
+      other: "Ficheros"
   picture:
     confirm_delete: "¿Borrar imagen?"
-    title: "Imágenes"
     mine: "Mis imágenes"
     msg: "Ver detalles..."
     name: "imagen"
     not_mine: "Imágenes"
     one: "una imagen"
+    title:
+      one: "Imagen"
+      other: "Imágenes"
   repository:
     title: "Ficheros"
     order:
@@ -62,10 +68,12 @@ es:
     not_mine: "Recursos"
   video:
     confirm_delete: "¿Borrar vídeo?"
-    title: "Vídeos"
     mine: "Mis vídeos"  
     msg: "Subió un vídeo:"
     name: "vídeo"
     not_mine: "Vídeos"
     one: "un vídeo"
     processing: "Procesando vídeo. Espere, por favor..."
+    title:
+      one: "Vídeo"
+      other: "Vídeos"

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

@@ -1,5 +1,5 @@
 module SocialStream
   module Documents
-    VERSION = "0.11.1".freeze
+    VERSION = "0.11.2".freeze
   end
 end

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

@@ -6,7 +6,7 @@ module SocialStream
 
         items << {
           :key => :documents,
-          :name => image_tag("btn/btn_resource.png",:class =>"menu_icon")+t("document.title"),
+          :name => image_tag("btn/btn_resource.png",:class =>"menu_icon")+t("document.title.other"),
           :url => polymorphic_path([subject, Document.new]),
           :options => {:link => {:id => "documents_menu"}}
         }
@@ -17,7 +17,7 @@ module SocialStream
 
         items << {
           :key => :documents,
-          :name => image_tag("btn/btn_resource.png",:class =>"menu_icon")+t("document.title"),
+          :name => image_tag("btn/btn_resource.png",:class =>"menu_icon")+t("document.title.other"),
           :url => polymorphic_path([current_subject, Document.new]),
           :options => {:link => {:id => "documents_menu"}}
         }

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.16.2')
+  s.add_runtime_dependency('social_stream-base', '~> 0.16.4')
   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/events/app/views/events/index.html.erb

@@ -6,12 +6,12 @@
 <% end %>
 
 <% content_for :title do %>
-  <%= profile_subject.name + ": " + t('event.title') %>
+  <%= profile_subject.name + ": " + t('event.calendar') %>
 <% end %>
 
 <%= location(
   link_to(profile_subject.name, polymorphic_path(profile_subject)),
-  link_to(t('event.title'), polymorphic_path([profile_subject, Event.new]))
+  link_to(t('event.calendar'), polymorphic_path([profile_subject, Event.new]))
   ) %>
 
 <% toolbar :profile => profile_subject %>

data/events/config/locales/en.yml

@@ -19,11 +19,14 @@ en:
   boxy:
     close_text: "[close]"
   event:
+    calendar: "Calendar"
     confirm_delete: "Delete event?"
     new:
       title: "New event"
     one: "an event"
-    title: "Calendar"
+    title:
+      one: "Event"
+      other: "Events"
     wall_post: "Published an event: %{title}"
   room:
     confirm_delete: "Delete room?"

data/events/config/locales/es.yml

@@ -19,11 +19,14 @@ es:
   boxy:
     close_text: "[cerrar]"
   event:
+    calendar: "Calendario"
     confirm_delete: "¿Borrar evento?"
     new:
       title: "Nuevo evento"
     one: "un evento"
-    title: "Calendario"
+    title:
+      one: "Evento"
+      other: "Eventos"
     wall_post: "Publicó un evento: %{title}"
   room:
     confirm_delete: "¿Borrar espacio?"

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

@@ -1,5 +1,5 @@
 module SocialStream
   module Events
-    VERSION = "0.8.1".freeze
+    VERSION = "0.8.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.16.2')
+  s.add_runtime_dependency('social_stream-base', '~> 0.16.4')
   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.22.0".freeze
+  VERSION = "0.22.1".freeze
 end

data/presence/app/assets/javascripts/social_stream-presence.js

@@ -1,5 +1,6 @@
 //= require jquery
 //= require strophe
+//= require strophe.muc
 //= require jquery.tools.tooltip
 //= require jquery.ui.chatbox.sstreampresence
 //= require jquery.flexselect.sstreampresence

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

@@ -441,7 +441,7 @@ function handleGetIQStanza(iq,jid,slug){
 		return true;
 	}
 	
-  //Case: Default behaviour
+  //Case 3: Default behaviour
   sendIQEmpty(jid,iqID);
 
   return true;
@@ -466,7 +466,7 @@ function handleGetVideochatIQStanza(jid,iqID,iq,slug){
     }
   }
 	
-	//Send error stanza
+	//Send empty stanza
 	sendIQEmpty(jid,iqID);
 }
 
@@ -671,3 +671,15 @@ function sendStatus(status){
        setStatusWidgetTitle(status);
     }
 }
+
+
+
+////////
+//MUC management
+///////
+
+function joinRoom(roomName){
+  //domain
+	//stropne_connection.muc.init(stropne_connection)
+	//stropne_connection.muc.join(room, user_name, onMessage, onPresence, null, null)
+}

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

@@ -6,6 +6,12 @@ module SocialStream
           include SocialStream::Presence::Models::BuddyManager
         end
       end
+      
+      initializer "social_stream-presence.group" do
+        ActiveSupport.on_load(:group) do
+          include SocialStream::Presence::Models::GroupManager
+        end
+      end
 
       initializer "social_stream-presence.views.settings" do
         SocialStream::Views::Settings.module_eval do