social_stream 0.12.0 → 0.12.1

data/base/app/views/groups/index.html.erb

@@ -39,7 +39,7 @@
       <div class="row">
         <div class="center">
           <% for g in Group.distinct_initials %>
-            <%= link_to g.initial,{:letter => g.initial,:page => 1},:class => "user_letter_link" %>
+            <%= link_to g.initial.capitalize,{:letter => g.initial,:page => 1},:class => "user_letter_link" %>
           <% end %>
         </div>
       </div>

data/base/app/views/users/index.html.erb

@@ -25,7 +25,7 @@
       <div class="center">
         <%= link_to t('user.all_n', :count => User.count), users_path %> -
         <% for u in User.distinct_initials %>
-          <%= link_to u.initial,{:letter => u.initial,:page => 1},:class => "user_letter_link" %>
+          <%= link_to u.initial.capitalize,{:letter => u.initial,:page => 1},:class => "user_letter_link" %>
         <% end %>
       </div>
     </div>

data/base/app/views/users/show.xml.builder

@@ -1,28 +1,15 @@
 xml.instruct!
-	xml.user do
-		xml.uid @user.id
-		xml.name @user.name
-		xml.slug @user.slug
-		xml.email @user.email
-		xml.userSince @user.created_at
-		xml.birthday @user.profile.birthday
-		xml.organization @user.profile.organization
-		xml.city @user.profile.city
-		xml.country @user.profile.country
-		xml.website @user.profile.website
-		xml.ties do
-			@user.actors(:subject_type => 'user', :direction => :senders).each do |u|
-				xml.contact do
-					xml.uid u.id
-					xml.slug u.slug
-				end
-			end
-			
-			@user.actors(:subject_type => 'group', :direction => :senders).each do |g|
-				xml.group do
-					xml.gid g.id
-					xml.slug g.slug
-				end
-			end
-		end
+xml.user do
+  xml.uid @user.id
+  xml.name @user.name
+  xml.slug @user.slug
+  if user_signed_in?
+    xml.email @user.email
+  end
+  xml.userSince @user.created_at
+  xml.birthday @user.profile.birthday
+  xml.organization @user.profile.organization
+  xml.city @user.profile.city
+  xml.country @user.profile.country
+  xml.website @user.profile.website
 end

data/base/config/routes.rb

@@ -82,8 +82,9 @@ Rails.application.routes.draw do
   match 'api/user/:id' => 'api#users', :as => :api_user
   match 'api/me' => 'api#users', :as => :api_me
   match 'api/me/home/' => 'api#activity_atom_feed', :format => 'atom', :as => :api_my_home
+  match 'api/user/:id/public' => 'api#activity_atom_feed', :format => 'atom', :as => :api_user_activities
+
   match 'api/me/contacts' => 'contacts#index', :format => 'json', :as => :api_contacts
   match 'api/subjects/:s/contacts' => 'contacts#index', :format => 'json', :as => :api_subject_contacts
-  match 'api/user/:id/public' => 'api#activity_atom_feed', :format => 'atom', :as => :api_user_activities
   ##/API##
 end

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

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.9.23".freeze
+    VERSION = "0.9.24".freeze
   end
 end

data/documents/app/assets/javascripts/documents.js.erb

@@ -48,3 +48,14 @@ showAllDocumentComments = function(id){
   //and hide the hide_show_comments
   $("#"+id).children(".hide_show_comments").hide();
 };
+
+toggleDocumentEdit = function(){
+  if($("#document_edit").css("display")=="none"){
+    $("#document_edit").show("slow");
+    $("#document_edit_action").addClass("selected");
+    
+  }else{
+    $("#document_edit").hide("slow");
+    $("#document_edit_action").removeClass("selected");
+  }
+}

data/documents/app/assets/stylesheets/show.css.scss

@@ -45,13 +45,42 @@
   margin-left: 30px; 
 }
 #document_info #actions .action{
-  margin-right: 10px; 
+  margin-right: 10px;
+  padding: 5px;
+}
+#document_info #actions .action.selected{
+  border: thin solid $separation-color;
+  background: $secondary-color;
 }
 #document_info #actions .action img{
   width: 16px;
   height: 16px;
 }
 
+#document_edit {
+  margin: 5px 5px 0px 5px;
+  border: thin solid $separation-color;
+  background: $secondary-color;
+  
+}
+#document_edit textarea{
+  resize: none;
+  height: 75px;
+}
+#document_edit .form_row {
+  padding: 5px 10px;
+}
+#document_edit .form_label {
+  width: 100px;
+}
+#document_edit .form_field {
+  width: 415px;
+  padding: 0;
+}
+#document_edit .form_tag {
+  width: 100%;
+}
+
 #document_comments {
   margin-top: 20px;
   padding-top: 10px;

data/documents/app/controllers/audios_controller.rb

@@ -1,2 +1,2 @@
-class AudiosController < CommonDocumentsController
+class AudiosController < DocumentsController
 end

data/documents/app/controllers/documents_controller.rb

@@ -1,19 +1,44 @@
-class DocumentsController < CommonDocumentsController
+class DocumentsController < InheritedResources::Base
   respond_to :html, :js
-  
-  SEND_FILE_METHOD = :default
 
+  belongs_to_subjects :optional => true
+
+  before_filter :profile_subject!, :only => :index
+
+  load_and_authorize_resource :except => :index
+
+  SEND_FILE_METHOD = :default
   def create
     super do |format|
       format.all {redirect_to request.referer || home_path}
     end
   end
-  
+
+  def update
+    update! do |success, failure|
+      failure.html { render :action => :show }
+      success.html { render :action => :show }
+    end
+  end
+
+  def show
+    respond_to do |format|
+      format.html {render :action => :show}
+      format.all {
+        path = resource.file.path(params[:style] || params[:format])
+
+        send_file path,
+        :filename => resource.file_file_name,
+        :disposition => "inline"
+      }
+    end
+  end
+
   #TODO: we have to add the mimetype as in videos_controller
   def download
     path = @document.file.path(params[:style])
 
-    head(:bad_request) and return unless File.exist?(path) 
+    head(:bad_request) and return unless File.exist?(path)
 
     send_file_options = {
       :filename => @document.file_file_name,
@@ -22,13 +47,29 @@ class DocumentsController < CommonDocumentsController
 
     # Ask Victor about the rationale of this:
     case SEND_FILE_METHOD
-      when :apache then send_file_options[:x_sendfile] = true
-      when :nginx then head(:x_accel_redirect => path.gsub(Rails.root, ''))
+    when :apache then send_file_options[:x_sendfile] = true
+    when :nginx then head(:x_accel_redirect => path.gsub(Rails.root, ''))
     end
 
     send_file(path, send_file_options)
   end
 
+  def destroy
+    @post_activity = resource.post_activity
+
+    destroy!
+  end
+
+  private
+
+  def collection
+    @activities = profile_subject.wall(:profile,
+    :for => current_subject,
+    :object_type => Array(self.class.index_object_type)).
+    page(params[:page]).
+    per(params[:per])
+  end
+
   class << self
     def index_object_type
       [ :Audio, :Video, :Picture, :Document ]

data/documents/app/controllers/pictures_controller.rb

@@ -1,2 +1,2 @@
-class PicturesController < CommonDocumentsController
+class PicturesController < DocumentsController
 end  

data/documents/app/controllers/videos_controller.rb

@@ -1,2 +1,2 @@
-class VideosController < CommonDocumentsController
+class VideosController < DocumentsController
 end

data/documents/app/models/document.rb

@@ -8,8 +8,11 @@ class Document < ActiveRecord::Base
                     :path => ':rails_root/documents/:class/:id_partition/:style/:filename.:extension'
   
   validates_attachment_presence :file
+  validates_presence_of :title
   
-  before_create :set_title_and_description
+  before_validation(:on => :create) do
+    set_title_and_description
+  end
   
   define_index do
     indexes title

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

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

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

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

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

@@ -24,11 +24,12 @@
   </div>
   <br class="clearfloat" />
   <div id="actions">
-    <%= link_to image_tag("btn/download.png") + t('document.actions.download'), download_document_path(document), :class => :action %>
-    <%= link_to image_tag("btn/edit.png") + t('document.actions.edit'), "javascript:toggleEdit();", :class => :action %>
+    <%= link_to content_tag(:span,image_tag("btn/download.png") + t('document.actions.download'), :class => :action), download_document_path(document) %>
+    <%= link_to content_tag(:span,image_tag("btn/edit.png") + t('document.actions.edit'), :class => :action, :id => :document_edit_action), "javascript:toggleDocumentEdit();" %>
     <% if document.post_activity.delete_object_by?(current_subject) %>
-      <%= link_to image_tag("btn/error.png") + t('document.actions.delete'), document.post_activity.direct_object , :confirm => t('confirm_delete',
+      <%= link_to content_tag(:span,image_tag("btn/error.png") + t('document.actions.delete'), :class => :action), document.post_activity.direct_object , :confirm => t('confirm_delete',
         :scope => document.post_activity.direct_object.class.to_s.underscore), :method => :delete %>
     <% end %>
   </div>
 </div>
+<%= render :partial => "common/edit_form", :locals => {:document => document} %>

data/documents/app/views/common/_edit_form.html.erb

@@ -0,0 +1,49 @@
+<div class="block" id="document_edit" style="display:none;">
+  <%= form_for(document, :html => { :method => :put }) do |f| %>
+  <% if document and document.errors.any? %>
+  <%= javascript_tag do %>
+    $(document).ready(function(){
+      toggleDocumentEdit();
+    });
+  <% end %>
+  <div class="error">
+    <ul>
+      <% document.errors.full_messages.each do |msg| %>
+      <li>
+        <%= msg %>
+      </li>
+      <% end %>
+    </ul>
+  </div>
+  <% end %>
+  <div class="form_row">
+    <div class="form_label">
+      <%= f.label t('document.info.title.title') %>
+    </div>
+    <div class="form_field">
+      <%= f.text_field :title, :class => "form_tag" %>
+    </div>
+  </div>
+  <div class="form_row">
+    <div class="form_label">
+      <%= f.label t('document.info.description.title') %>
+    </div>
+    <div class="form_field">
+      <%= f.text_area :description, :class => "form_tag" %>
+    </div>
+  </div>
+  <!-- 
+  <div class="form_row">
+    <div class="form_label">
+      <%#= f.label t('document.info.file.title') %>
+    </div>
+    <div class="form_field">
+      <%#= f.file_field :file, :class => "form_tag" %>
+    </div>
+  </div>  
+  -->
+  <div class="actions center">
+    <%= f.submit t('document.actions.edit'), :class => "button" %>
+  </div>
+  <% end %>
+</div>

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

@@ -28,7 +28,7 @@
 
 <%= show_view_for document %>
 
-<%= render :partial => "document_info", :locals => {:document => document} %>
+<%= render :partial => "common/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_documents/index') %>
+<%=render(:partial => 'common/index') %>

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

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

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

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

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

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

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

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

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

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

data/documents/config/locales/en.yml

@@ -21,6 +21,8 @@ en:
         updated_at: "Updated at"
       description:
         title: "Description"
+      file:
+        title: "Upload"
       title:
         title: "Title"
     mine: "My documents"
@@ -43,7 +45,7 @@ en:
   resource:
     all: "All Resources"
     confirm_delete: "Delete resource?"
-    title: "Resources"
+    title: "Repository"
     mine: "My resources"
     msg: "Uploaded a resource:"
     not_mine: "Resources"

data/documents/config/locales/es.yml

@@ -21,6 +21,8 @@ es:
         updated_at: "Última modificación"
       description:
         title: "Descripción"
+      file:
+        title: "Subir"
       title:
         title: "Título"
     mine: "Mis documentos"
@@ -43,7 +45,7 @@ es:
   resource:
     all: "Todos los recursos"
     confirm_delete: "¿Borrar recursos?"
-    title: "Recursos"
+    title: "Repositorio"
     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.0".freeze
+    VERSION = "0.4.1".freeze
   end
 end

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

@@ -6,17 +6,22 @@ module SocialStream
 
         items << {
           :key => :resources,
-          :name => image_tag("btn/btn_resource.png",:class =>"menu_icon")+t("resource.#{ subject == current_subject ? 'mine' : 'title' }"),
-          :url => "#",
-          :options => {:link => {:id => "resources_menu"}},
-          :items => [
-            {:key => :resources_documents,:name => image_tag("btn/btn_document.png")+t('document.title'),:url => polymorphic_path([subject, Document.new])},
-            {:key => :resources_pictures,:name => image_tag("btn/btn_gallery.png")+t('picture.title'),:url => polymorphic_path([subject, Picture.new])},
-            {:key => :resources_videos,:name => image_tag("btn/btn_video.png")+t('video.title'),:url => polymorphic_path([subject, Video.new])},
-            {:key => :resources_audios,:name => image_tag("btn/btn_audio.png")+t('audio.title'),:url => polymorphic_path([subject, Audio.new])}
-            ]
+          :name => image_tag("btn/btn_resource.png",:class =>"menu_icon")+t("resource.title"),
+          :url => polymorphic_path([subject, Document.new]),
+          :options => {:link => {:id => "resources_menu"}}
         }
       end
+      
+      def home_toolbar_items
+        items = super
+
+        items << {
+          :key => :resources,
+          :name => image_tag("btn/btn_resource.png",:class =>"menu_icon")+t("resource.title"),
+          :url => polymorphic_path([current_subject, Document.new]),
+          :options => {:link => {:id => "resources_menu"}}
+        }
+      end      
     end
   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.23')
+  s.add_runtime_dependency('social_stream-base', '~> 0.9.24')
   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/events/Rakefile

@@ -1,33 +1,23 @@
 # encoding: UTF-8
-require 'rubygems'
-begin
-  require 'bundler/setup'
-rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
-end
+require 'bundler/gem_tasks'
 
-require 'rake'
-require 'rake/rdoctask'
+require 'rdoc/task'
 
 require 'rspec/core'
 require 'rspec/core/rake_task'
 
-require 'bundler'
-
 RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec
 
 Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'Socialstream-events'
+  rdoc.title    = 'Socialstream Events'
   rdoc.options << '--line-numbers' << '--inline-source'
   rdoc.rdoc_files.include('README.rdoc')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-Bundler::GemHelper.install_tasks
-
 # Modify this gem's tags
 class Bundler::GemHelper
   def version_tag

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

@@ -1,5 +1,5 @@
 module SocialStream
   module Events
-    VERSION = "0.0.15".freeze
+    VERSION = "0.0.16".freeze
   end
 end

data/events/lib/social_stream/toolbar_config/events.rb

@@ -4,12 +4,6 @@ module SocialStream
       def profile_toolbar_items(subject = current_subject)
         items = super
 
-        items.find{ |i| i[:key] == :resources }[:items].unshift({
-          :key => :resources_events,
-          :name => image_tag("btn/btn_event.png")+t('conference.title'),
-          :url => polymorphic_path([subject, Event.new])
-        })
-
         if SocialStream.activity_forms.include?(:event) &&
            subject.is_a?(Event) &&
            subject.agenda.present?

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.9.22')
+  s.add_runtime_dependency('social_stream-base', '~> 0.9.24')
   s.add_runtime_dependency('conference_manager-ruby', '~> 0.0.3')
 
   # Development Gem dependencies

data/lib/social_stream/version.rb

@@ -1,3 +1,3 @@
 module SocialStream
-  VERSION = "0.12.0".freeze
+  VERSION = "0.12.1".freeze
 end

data/presence/ejabberd/ejabberd_scripts/emanagement

@@ -34,36 +34,56 @@ end
 $domain = getOption("server_domain=")
 
 PARAMS_FOR_COMMANDS = {
-'getRoster' => 1,
-'removeBuddyFromRoster' => 2,
-'addBuddyToRoster' => 5,
-'removeRoster' => 1,
-'getBuddysFromRoster' => 1,
-'setBidireccionalBuddys' => 6,
-'help' => 0,
-'getUserResource' => 1,
-'sendMessageToUser' => 3,
-'sendPresence' => 2,
-'unsetPresence' => 1,
-'setPresence' => 1,
-'removeAllRosters' => 0,
+	'addBuddyToRoster' => 5,
+	'removeBuddyFromRoster' => 2,
+	'setBidireccionalBuddys' => 6,
+	'unsetBidireccionalBuddys' => 4,
+	'getRoster' => 1,
+	'removeRoster' => 1,
+	'removeAllRosters' => 0,
+	'getBuddysFromRoster' => 1,
+	'getAllUsersWithRoster' => 0,
+	'getAllRosters' => 0,
+	'printAllRosters' => 0,
+	'printAllBidirecctionalBuddys' => 0,
+	'checkUser' => 1,
+	'checkBidirecctionalBuddys' => 2,
+	'sendPresence' => 2,
+	'setPresence' => 1,
+	'unsetPresence' => 1,
+	'sendMessageToUser' => 3,
+	'getUserResource' => 1,
+	'isEjabberdNodeStarted' => 0,
+	'help' => 0,
 }
 
 SYNTAX_FOR_COMMANDS = {
-'getRoster' => "getRoster username",
-'removeBuddyFromRoster' => "removeBuddyFromRoster username buddy",
-'addBuddyToRoster' => "addBuddyToRoster userSid buddySid buddyNick buddyGroup subscription_type",
-'removeRoster' => "removeRoster username",
-'getBuddysFromRoster' => "getBuddysFromRoster roster",
-'setBidireccionalBuddys' => "setBidireccionalBuddys userASid userBSid userANick userBNick groupForA groupForB",
-'getUserResource' => "getUserResource username",
-'sendMessageToUser' => "sendMessageToUser from_name to_name msg",
-'sendPresence' => 'sendPresence username show',
-'unsetPresence' => 'unsetPresence username',
-'setPresence' => 'setPresence username',
-'removeAllRosters' => 'removeAllRosters'
+	'addBuddyToRoster' => 'addBuddyToRoster userSid buddySid buddyNick buddyGroup subscription_type',
+	'removeBuddyFromRoster' => 'removeBuddyFromRoster userSid buddySid',
+	'setBidireccionalBuddys' => 'setBidireccionalBuddys userASid userBSid userANick userBNick groupForA groupForB',
+	'unsetBidireccionalBuddys' => 'unsetBidireccionalBuddys userSid oldFriendSid oldFriendNick groupForOldFriend',
+	'getRoster' => 'getRoster username',
+	'removeRoster' => 'removeRoster username',
+	'removeAllRosters' => 'removeAllRosters',
+	'getBuddysFromRoster' => 'getBuddysFromRoster roster',
+	'getAllUsersWithRoster' => 'getAllUsersWithRoster',
+	'getAllRosters' => 'getAllRosters',
+	'printAllRosters' => 'printAllRosters',
+	'printAllBidirecctionalBuddys' => 'printAllBidirecctionalBuddys',
+	'checkUser' => 'checkUser user',
+	'checkBidirecctionalBuddys' => 'checkBidirecctionalBuddys userASid userBSid',
+	'sendPresence' => 'sendPresence username show',
+	'setPresence' => 'setPresence username',
+	'unsetPresence' => 'unsetPresence username',
+	'sendMessageToUser' => 'sendMessageToUser from_name to_name msg',
+	'getUserResource' => 'getUserResource username',
+	'isEjabberdNodeStarted' => 'isEjabberdNodeStarted',
+	'help' => 'help',
 }
 
+
+
+#Debug methods
 def log(msg)
 	logWithTitle(msg,nil)
 end
@@ -78,29 +98,60 @@ def logWithTitle(msg,title)
 end
 
 
-def getRoster(username)
-	command = "ejabberdctl get_roster " + username  + " " + $domain
-	%x[#{command}];
+
+#Methods to manage rosters from Social Stream Rails App
+
+def setBidireccionalBuddys(userASid,userBSid,userANick,userBNick,groupForA,groupForB)
+	addBuddyToRoster(userASid,userBSid,userBNick,groupForB,"both")
+	addBuddyToRoster(userBSid,userASid,userANick,groupForA,"both")
+	return "Done"
+end
+
+def unsetBidireccionalBuddys(userSid,oldFriendSid,oldFriendNick,groupForOldFriend)
+	if checkBidirecctionalBuddys(userSid,oldFriendSid)
+		removeBuddyFromRoster(userSid,oldFriendSid)
+		removeBuddyFromRoster(oldFriendSid,userSid)
+		addBuddyToRoster(userSid,oldFriendSid,oldFriendNick,groupForOldFriend,"to")
+		return "Done"
+	else
+		return userSid + " and " + oldFriendSid + " aren't bidireccional buddys"
+	end
 end
 
-def removeBuddyFromRoster(username,buddy)
-	command = "ejabberdctl delete_rosteritem " + username + " " + $domain + " " + buddy + " " + $domain
+def addBuddyToRoster(userSid,buddySid,buddyNick,buddyGroup,subscription_type)
+	user = userSid.split("@")[0]
+	buddy = buddySid.split("@")[0]
+	userDomain = userSid.split("@")[1]
+	buddyDomain = buddySid.split("@")[1]
+	command = "ejabberdctl add-rosteritem " + user + " " + userDomain + " " + buddy + " " + buddyDomain + " " + buddyNick + " " + buddyGroup + " " + subscription_type
 	%x[#{command}];
+	return "Done"
 end
 
-def removeRoster(username)
-	user_roster = getRoster(username);
-	user_buddys = getBuddysFromRoster(user_roster);
-	user_buddys.each do |buddy|
-		removeBuddyFromRoster(username,buddy)
+def removeBuddyFromRoster(userSid,buddySid)
+	user = userSid.split("@")[0]
+	buddy = buddySid.split("@")[0]
+	userDomain = userSid.split("@")[1]
+	buddyDomain = buddySid.split("@")[1]
+	if checkUserInRoster(buddy,getRoster(user))
+		command = "ejabberdctl delete_rosteritem " + user + " " + userDomain + " " + buddy + " " + buddyDomain
+		%x[#{command}];
+		return "Done"
+	else
+		return "User " + buddy + " not found in " + user + " roster."
 	end
-	return "Done"
 end
 
-def removeAllRosters()
-	command = "ejabberdctl process_rosteritems delete any any any any"
-	%x[#{command}];
-	return "Done";
+
+#Roster Utilities
+
+def getRoster(username)
+	if checkUser(username)
+		command = "ejabberdctl get_roster " + username  + " " + $domain
+		%x[#{command}];
+	else
+		return "User " + username + " not found"
+	end
 end
 
 def getBuddysFromRoster(roster)
@@ -112,22 +163,126 @@ def getBuddysFromRoster(roster)
 	buddys
 end
 
-def setBidireccionalBuddys(userASid,userBSid,userANick,userBNick,groupForA,groupForB)
-	addBuddyToRoster(userASid,userBSid,userBNick,groupForB,"both")
-	addBuddyToRoster(userBSid,userASid,userANick,groupForA,"both")
-	return "Done"
+def removeRoster(username)
+	if checkUser(username)
+		user_sid = username + "@" + $domain
+		user_roster = getRoster(username);
+		user_buddys = getBuddysFromRoster(user_roster);
+		user_buddys.each do |buddy|
+			buddy_sid = buddy + "@" + $domain
+			removeBuddyFromRoster(user_sid,buddy_sid)
+		end
+		return "Done"	
+	else
+		return "User " + username + " not found"
+	end
 end
 
-def addBuddyToRoster(userSid,buddySid,buddyNick,buddyGroup,subscription_type)
-	user = userSid.split("@")[0]
-	buddy = buddySid.split("@")[0]
-	userDomain = userSid.split("@")[1]
-	buddyDomain = buddySid.split("@")[1]
-	command = "ejabberdctl add-rosteritem " + user + " " + userDomain + " " + buddy + " " + buddyDomain + " " + buddyNick + " " + buddyGroup + " " + subscription_type
-	puts command
+def removeAllRosters()
+	command = "ejabberdctl process_rosteritems delete any any any any"
 	%x[#{command}];
+	return "Done";
 end
 
+def getAllUsersWithRoster()
+	command = "ejabberdctl process_rosteritems list any any any any"
+	output = %x[#{command}];
+
+	i = 0
+	users = []
+
+	lines = output.split("\n");
+	items = lines[0].split(" ")[2]
+
+	#test if items string contains a correct number
+	if items.to_i.to_s == items
+		if items.to_i > 0
+			lines.each do |line|
+				if i%2==1
+					user = line.split(" ")[1].split("@")[0]
+					#puts i.to_s() + " :" + line
+					unless users.include?(user)
+						users << user
+					end	
+				end
+				i=i+1
+			end
+		end
+	end
+	
+	return users;
+end
+
+def getAllRosters()
+	rosterList = { }
+
+	users = getAllUsersWithRoster()
+
+	users.each do |user|
+		roster = getRoster(user)
+		rosterList.store(user,roster)
+	end
+	return rosterList
+end
+
+def printAllRosters()
+	rosterList = getAllRosters()
+	rosterList.keys.each do |user|
+		puts "\n"
+		puts "-------------------------------------"
+		puts user + " Roster"
+		puts "-------------------------------------"
+		puts rosterList[user]
+		puts "-------------------------------------"
+		puts "\n"
+	end
+	return "Done"
+end
+
+def getAllBidirecctionalBuddys()
+	b_buddys = []
+	users = getAllUsersWithRoster()
+	nonCheckedUsers = users
+	users.each do |user|
+		nonCheckedUsers.delete(user)
+		nonCheckedUsers.each do |checkUser|
+			if checkBidirecctionalBuddys(user + "@" + $domain,checkUser + "@" + $domain)
+				b_buddys << [user,checkUser]
+			end
+		end
+	end
+	return b_buddys
+end
+
+def printAllBidirecctionalBuddys()
+	puts "This may take a while..."
+	b_buddys = getAllBidirecctionalBuddys
+	b_buddys.each do |contact|
+		puts "[" + contact[0] + "," + contact[1] + "]"
+	end
+	return "Done"
+end
+
+#Check if the user have a roster
+def checkUser(user)
+	return getAllUsersWithRoster().include?(user)
+end
+
+def checkUserInRoster(user,roster)
+	return getBuddysFromRoster(roster).include?(user)
+end
+
+def checkBidirecctionalBuddys(userASid,userBSid)
+	userA = userASid.split("@")[0]
+	userB = userBSid.split("@")[0]
+	rosterA = getRoster(userA)
+	rosterB = getRoster(userB)
+	return (checkUserInRoster(userA,rosterB) and checkUserInRoster(userB,rosterA))
+end
+
+
+#Manage stanzas Utilities
+
 def sendStanzaUserMessage(username,msg)
 	resource = getUserResource(username);
 	stanza = "\\<\\'message\\'\\>\\<\\'body\\'\\>\\'" + msg + "\\'\\<\\'/body\\'\\>\\<\\'/message\\'\\>"
@@ -137,17 +292,16 @@ def sendStanzaUserMessage(username,msg)
 	return "Done"
 end
 
-
-def sendPresence(username,show)
-	sendPresenceWithShow(username,username,show)
+def setPresence(username)
+	sendPresenceStanzaWithType(username,username,"available")
 end
 
 def unsetPresence(username)
 	sendPresenceStanzaWithType(username,username,"unavailable")
 end
 
-def setPresence(username)
-	sendPresenceStanzaWithType(username,username,"available")
+def sendPresence(username,show)
+	sendPresenceWithShow(username,username,show)
 end
 
 def sendPresenceWithShow(from_name,to_name,show)
@@ -198,6 +352,22 @@ def getUserResource(username)
 	return username + " no have any active session"
 end
 
+
+#More utilities
+
+def isEjabberdNodeStarted
+	command = "ejabberdctl status"
+	output = %x[#{command}]
+	if firstLine = output.split("\n")[0]
+	  return ((firstLine.split(":")[1]).strip()=="started")
+	end
+	return false
+end
+
+
+
+#Help & Support methods
+
 def help
 	log("Command list")
 	SYNTAX_FOR_COMMANDS.values.each do |command|
@@ -206,6 +376,10 @@ def help
 	puts ""
 end
 
+
+
+#Main thread
+
 log("Init Ejabberd Maintenance script")
 
 begin
@@ -235,15 +409,16 @@ begin
 			end
 			puts ""
 		else 
-			log("Error: Params required for command " + (ARGV[0]).to_s() + ": " + (PARAMS_FOR_COMMANDS[ARGV[0]]).to_s())
-			log("Use 'help' to get information about command syntax")
+			puts "Error: Params required for command " + (ARGV[0]).to_s() + ": " + (PARAMS_FOR_COMMANDS[ARGV[0]]).to_s()
+			puts "Syntax for command " + (ARGV[0]).to_s() + "\n" + (SYNTAX_FOR_COMMANDS[ARGV[0]]).to_s()
+			puts "Use 'help' to get information about command syntax"
 		end
 	else
-		
-		log("Error: Command not recognized")
-		log("Use 'help' to get information about command syntax")
+		puts "Error: Command not recognized"
+		puts "Use 'help' to get information about command syntax"
 	end
 rescue
-	puts "Parametros incorrectos"
+	puts "Syntax error"
+	puts "Use 'help' to get information about command syntax"
 end
 

data/presence/lib/social_stream/presence/models/buddy_manager.rb

@@ -6,6 +6,7 @@ module SocialStream
         
         included do
           after_create :save_buddy
+          after_destroy :remove_buddy
         end
         
         module InstanceMethods
@@ -42,6 +43,38 @@ module SocialStream
             
           end
           
+          
+          def remove_buddy
+            
+            unless SocialStream::Presence.enable
+              return
+            end
+            
+            unless self.receiver.subject_type == "User" and self.sender.subject_type == "User"
+              return
+            end
+ 
+            #XMPP DOMAIN
+            domain = SocialStream::Presence.domain
+            user_sid = self.sender.slug + "@" + domain
+            user_name =  self.sender.name  
+            buddy_sid = self.receiver.slug + "@" + domain
+            buddy_name =  self.receiver.name
+            
+            #Check if is a positive and replied tie         
+            if self.bidirectional?
+              #Execute unsetRosterForBidirectionalTie(user_sid,oldfriend_sid,oldfriendNick,oldfriendGroup)
+              SocialStream::Presence::XmppServerOrder::unsetRosterForBidirectionalTie(user_sid,buddy_sid,buddy_name,"SocialStream")
+            elsif self.positive?
+              #Case: Possitive tie unidirectional
+              #Execute removeBuddyFromRoster(user_sid,buddy_sid)
+              SocialStream::Presence::XmppServerOrder::removeBuddyFromRoster(user_sid,buddy_sid)
+            else
+              return  
+            end
+            
+          end
+          
         end
       end
     end

data/presence/lib/social_stream/presence/version.rb

@@ -1,5 +1,5 @@
 module Socialstream
   module Presence
-    VERSION = "0.0.12"
+    VERSION = "0.0.13"
   end
 end

data/presence/lib/social_stream/presence/xmpp_server_order.rb

@@ -20,13 +20,33 @@ module SocialStream
             end
           end 
           
-          def addBuddyToRoster(userSID,buddySID,buddyNick,buddyGroup,subscription_type)
+          def unsetRosterForBidirectionalTie(userSid,oldfriendSid,oldfriendNick,oldfriendGroup)
+            if SocialStream::Presence.remote_xmpp_server
+              puts "Not implemented unsetRosterForBidirectionalTie(user_sid,oldfriend_sid,oldfriendNick,oldfriendGroup) for remote_xmpp_server"
+              return
+            else
+              #SocialStream::Presence.remote_xmpp_server=false
+              executeEmanagementLocalCommand("unsetBidireccionalBuddys",[userSid,oldfriendSid,oldfriendNick,oldfriendGroup])
+            end
+          end
+          
+          def addBuddyToRoster(userSid,buddySid,buddyNick,buddyGroup,subscription_type)
             if SocialStream::Presence.remote_xmpp_server
               puts "Not implemented addBuddyToRoster(userSID,buddySID,buddyNick,buddyGroup,subscription_type) for remote_xmpp_server"
               return
             else
               #SocialStream::Presence.remote_xmpp_server=false
-              executeEmanagementLocalCommand("addBuddyToRoster",[userSID,buddySID,buddyNick,buddyGroup,subscription_type])
+              executeEmanagementLocalCommand("addBuddyToRoster",[userSid,buddySid,buddyNick,buddyGroup,subscription_type])
+            end
+          end
+          
+          def removeBuddyFromRoster(userSid,buddySid)
+            if SocialStream::Presence.remote_xmpp_server
+              puts "Not implemented removeBuddyFromRoster(userSid,buddySid) for remote_xmpp_server"
+              return
+            else
+              #SocialStream::Presence.remote_xmpp_server=false
+              executeEmanagementLocalCommand("removeBuddyFromRoster",[userSid,buddySid])
             end
           end
           
@@ -50,18 +70,27 @@ module SocialStream
             else
               #SocialStream::Presence.remote_xmpp_server=false
               
-              #Get connected users locally
-              users = []
-              output = %x[ejabberdctl connected-users]
-              sessions = output.split("\n")
+              #Get connected users locally 
+              output = executeEmanagementLocalCommand("isEjabberdNodeStarted",[])
+              nodeUp = output.split("\n")[3]
+              
+              if nodeUp and nodeUp.strip() == "true"
+                users = []
+                output = %x[ejabberdctl connected-users]
+                sessions = output.split("\n")
   
-              sessions.each do |session|
-                users << session.split("@")[0]
-                puts session.split("@")[0]
+                sessions.each do |session|
+                  users << session.split("@")[0]
+                  puts session.split("@")[0]
+                end
+                
+                synchronize_presence_for_slugs(users)  
+                
+              else
+                reset_presence
+                return "Xmpp Server Down: Reset Connected Users"
               end
               
-              synchronize_presence_for_slugs(users)
-              
             end
           end
           
@@ -170,8 +199,8 @@ module SocialStream
               command = command + " " + param.split(" ")[0]
             end
             puts "Executing " + command
-            system command
-            puts "Ok"
+            output = %x[#{command}];
+            return output
           end
         
       end

data/social_stream.gemspec

@@ -11,9 +11,9 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.9.23')
-  s.add_runtime_dependency('social_stream-documents', '~> 0.4.0')
-  s.add_runtime_dependency('social_stream-events', '~> 0.0.15')
+  s.add_runtime_dependency('social_stream-base', '~> 0.9.24')
+  s.add_runtime_dependency('social_stream-documents', '~> 0.4.1')
+  s.add_runtime_dependency('social_stream-events', '~> 0.0.16')
  
   # Development Gem dependencies
   #

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream
 version: !ruby/object:Gem::Version 
-  hash: 47
+  hash: 45
   prerelease: 
   segments: 
   - 0
   - 12
-  - 0
-  version: 0.12.0
+  - 1
+  version: 0.12.1
 platform: ruby
 authors: 
 - GING - DIT - UPM
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-28 00:00:00 +02:00
+date: 2011-10-31 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,12 +27,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 11
         segments: 
         - 0
         - 9
-        - 23
-        version: 0.9.23
+        - 24
+        version: 0.9.24
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -43,12 +43,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 13
         segments: 
         - 0
         - 4
-        - 0
-        version: 0.4.0
+        - 1
+        version: 0.4.1
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -59,12 +59,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 63
         segments: 
         - 0
         - 0
-        - 15
-        version: 0.0.15
+        - 16
+        version: 0.0.16
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -860,7 +860,6 @@ files:
 - documents/app/assets/stylesheets/show.css.scss
 - documents/app/assets/stylesheets/social_stream-documents.css
 - documents/app/controllers/audios_controller.rb
-- documents/app/controllers/common_documents_controller.rb
 - documents/app/controllers/documents_controller.rb
 - documents/app/controllers/pictures_controller.rb
 - documents/app/controllers/videos_controller.rb
@@ -882,9 +881,10 @@ 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_documents/_document_info.html.erb
-- documents/app/views/common_documents/_index.html.erb
-- documents/app/views/common_documents/_show.html.erb
+- documents/app/views/common/_document_info.html.erb
+- documents/app/views/common/_edit_form.html.erb
+- documents/app/views/common/_index.html.erb
+- documents/app/views/common/_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

data/documents/app/controllers/common_documents_controller.rb

@@ -1,45 +0,0 @@
-class CommonDocumentsController < InheritedResources::Base
-  respond_to :html, :js
-
-  belongs_to_subjects :optional => true
-
-  before_filter :profile_subject!, :only => :index
-
-  load_and_authorize_resource :except => :index
-
-
-  def show
-    respond_to do |format|
-      format.html {render :action => :show}
-      format.all {
-        path = resource.file.path(params[:style] || params[:format])
-
-        send_file path, 
-                  :filename => resource.file_file_name,
-                  :disposition => "inline"
-      }
-    end
-  end
-  
-  def destroy
-    @post_activity = resource.post_activity
-    
-    destroy!
-  end
-
-  private
-
-  def collection
-    @activities = profile_subject.wall(:profile,
-                                       :for => current_subject,
-                                       :object_type => Array(self.class.index_object_type)).
-                                  page(params[:page]).
-                                  per(params[:per])
-  end
-
-  class << self
-    def index_object_type
-      controller_name.classify
-    end
-  end
-end