social_stream 0.11.8 → 0.12.0

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

@@ -1,9 +1,3 @@
-require 'xmpp4r'
-require 'xmpp4r/muc'
-require 'xmpp4r/roster'
-require 'xmpp4r/client'
-require 'xmpp4r/message'
-
 module SocialStream
   module Presence
     module Models
@@ -18,54 +12,33 @@ module SocialStream
           
           def save_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
-            #PASSWORD
-            password= SocialStream::Presence.password
-            #SS Username
-            ss_name = SocialStream::Presence.social_stream_presence_username
-            ss_sid = ss_name + "@" + domain
-              
             user_sid = self.sender.slug + "@" + domain
             user_name =  self.sender.name  
             buddy_sid = self.receiver.slug + "@" + domain
             buddy_name =  self.receiver.name
             
-            
-            begin
-              client = Jabber::Client.new(Jabber::JID.new(ss_sid))
-              client.connect
-              client.auth(password)
-   
-              #Check if is a positive and replied tie         
-              if self.bidirectional?
-                #SetRosterForBidirectionalTie[UserASID,UserBSID,UserAName,UserBName]
-                msg = Jabber::Message::new(ss_sid, "SetRosterForBidirectionalTie&" + user_sid + "&" + buddy_sid + "&" + buddy_name + "&" + user_name) 
-              elsif self.positive?
-                #Case: Possitive tie unidirectional
-                sType = "from"
-                #AddItemToRoster[UserSID,BuddySID,BuddyName,Subscription_type]
-                msg = Jabber::Message::new(ss_sid, "AddItemToRoster&" + user_sid + "&" + buddy_sid + "&" + buddy_name + "&" + sType)
-              else
-                return  
-              end
-
-              msg.type=:chat
-              client.send(msg)
-              client.close()
-
-            rescue Exception => e
-              case e
-                when Errno::ECONNREFUSED
-                  puts "Connection to XMPP Server refused"
-                else
-                  puts "Unknown exception: #{e.to_s}"
-              end
-            end   
+            #Check if is a positive and replied tie         
+            if self.bidirectional?
+              #Execute setRosterForBidirectionalTie(userASid,userBSid,userANick,userBNick,groupForA,groupForB)
+              SocialStream::Presence::XmppServerOrder::setRosterForBidirectionalTie(user_sid,buddy_sid,user_name,buddy_name,"SocialStream","SocialStream")
+            elsif self.positive?
+              #Case: Possitive tie unidirectional
+              #Execute addBuddyToRoster(userSID,buddySID,buddyNick,buddyGroup,subscription_type)
+              subscription_type = "to"
+              SocialStream::Presence::XmppServerOrder::addBuddyToRoster(user_sid,buddy_sid,buddy_name,"SocialStream",subscription_type)
+            else
+              return  
+            end
             
           end
           

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

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

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

@@ -0,0 +1,181 @@
+require 'xmpp4r'
+require 'xmpp4r/muc'
+require 'xmpp4r/roster'
+require 'xmpp4r/client'
+require 'xmpp4r/message'
+
+module SocialStream
+  module Presence
+    class XmppServerOrder
+      
+      class << self
+        
+          def setRosterForBidirectionalTie(userASid,userBSid,userANick,userBNick,groupForA,groupForB)
+            if SocialStream::Presence.remote_xmpp_server
+              puts "Not implemented setRosterForBidirectionalTie(userASid,userBSid,userANick,userBNick,groupForA,groupForB) for remote_xmpp_server"
+              return
+            else
+              #SocialStream::Presence.remote_xmpp_server=false
+              executeEmanagementLocalCommand("setBidireccionalBuddys",[userASid,userBSid,userANick,userBNick,groupForA,groupForB])
+            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])
+            end
+          end
+          
+          def synchronize_presence
+            if SocialStream::Presence.remote_xmpp_server  
+              
+              begin
+                client = openXmppClientForSocialStreamUser
+                if client
+                  sendXmppChatMessage(client,getSocialStreamUserSid,"Synchronize")
+                  client.close()
+                  return "Ok"
+                else
+                  reset_presence
+                  return "Reset Connected Users"
+                end
+              rescue
+                puts "Error in SocialStream::Presence::XmppServerOrder::synchronize_presence"
+              end
+              
+            else
+              #SocialStream::Presence.remote_xmpp_server=false
+              
+              #Get connected users locally
+              users = []
+              output = %x[ejabberdctl connected-users]
+              sessions = output.split("\n")
+  
+              sessions.each do |session|
+                users << session.split("@")[0]
+                puts session.split("@")[0]
+              end
+              
+              synchronize_presence_for_slugs(users)
+              
+            end
+          end
+          
+          
+          def remove_all_rosters
+            if SocialStream::Presence.remote_xmpp_server
+              puts "Not implemented SocialStream::Presence::XmppServerOrder::remove_all_rosters for remote_xmpp_server"
+              return
+            else
+            #SocialStream::Presence.remote_xmpp_server=false
+              executeEmanagementLocalCommand("removeAllRosters",[])
+            end
+          end
+          
+          def synchronize_rosters
+            puts "Removing all rosters"
+            remove_all_rosters
+            puts "Rosters removed"
+       
+            puts "Populate rosters"
+            users = User.all
+            checkedUsers = []
+          
+            users.each do |user|
+              checkedUsers << user.slug
+              contacts = user.contact_actors(:type=>:user)
+              contacts.each do |contact|
+                unless checkedUsers.include?(contact.slug)
+                  domain = SocialStream::Presence.domain
+                  user_sid = user.slug + "@" + domain
+                  contact_sid = contact.slug + "@" + domain  
+                  setRosterForBidirectionalTie(user_sid,contact_sid,user.name,contact.name,"SocialStream","SocialStream")
+                end
+              end
+            end
+          end
+          
+          
+          #Help methods
+          
+          def getSocialStreamUserSid
+            #XMPP DOMAIN
+            domain = SocialStream::Presence.domain
+            #SS Username
+            ss_name = SocialStream::Presence.social_stream_presence_username
+            return ss_name + "@" + domain
+          end
+          
+          def openXmppClientForSocialStreamUser
+            begin            
+              password= SocialStream::Presence.password
+              client = Jabber::Client.new(Jabber::JID.new(getSocialStreamUserSid))
+              client.connect
+              client.auth(password)
+              return client
+            rescue Exception => e
+              case e
+                when Errno::ECONNREFUSED
+                  puts "Connection to XMPP Server refused"
+                  return nil
+                else
+                  puts "Unknown exception: #{e.to_s}"
+                  return nil
+              end  
+            end
+          end
+          
+          def sendXmppChatMessage(client,dest_sid,body)
+                msg = Jabber::Message::new(dest_sid, body)
+                msg.type=:chat
+                client.send(msg)
+          end
+          
+          def synchronize_presence_for_slugs(user_slugs)
+            #Check connected users
+            users = User.find_all_by_connected(true)
+            
+            users.each do |user|
+              if user_slugs.include?(user.slug) == false
+                user.connected = false
+                user.save!
+              end
+            end
+            
+            user_slugs.each do |user_slug|
+              u = User.find_by_slug(user_slug)
+              if (u != nil && u.connected  == false)
+                u.connected = true
+                u.save!
+              end
+            end
+          end
+          
+          def reset_presence
+            users = User.find_all_by_connected(true)
+    
+            users.each do |user|
+              user.connected = false
+              user.save!
+            end
+          end
+          
+          def executeEmanagementLocalCommand(order,params)
+            command = SocialStream::Presence.scripts_path + "/emanagement " + order
+            params.each do |param|
+              command = command + " " + param.split(" ")[0]
+            end
+            puts "Executing " + command
+            system command
+            puts "Ok"
+          end
+        
+      end
+
+    end
+  end
+end

data/presence/lib/social_stream-presence.rb

@@ -3,16 +3,26 @@ require 'social_stream-base'
 module SocialStream
   module Presence   
 
+    autoload :XmppServerOrder, 'social_stream/presence/xmpp_server_order'
+
     module Models
       autoload :BuddyManager, 'social_stream/presence/models/buddy_manager'
     end
 
-    mattr_accessor :domain
     mattr_accessor :bosh_service
-    mattr_accessor :password
     mattr_accessor :xmpp_server_password
+    mattr_accessor :remote_xmpp_server
+    mattr_accessor :enable
+    
+    mattr_accessor :domain
     mattr_accessor :social_stream_presence_username
+    mattr_accessor :password
+
+    mattr_accessor :scripts_path
 
+    @@enable = true
+    @@remote_xmpp_server = false
+    
     class << self
       def setup
         yield self

data/presence/lib/tasks/presence/synchronize.rake

@@ -1,63 +1,22 @@
 namespace :presence do
-  desc 'Synchronize the Xmpp Server database with the Social Stream database'
+  desc 'Synchronize Xmpp Server with Social Stream Rails Application'
   task :synchronize => [ 'presence:synchronize:connections', 'presence:synchronize:rosters' ]
 
   namespace :synchronize do
 
-    desc "Synchronize user presence."
+    desc "Synchronize user presence"
     task :connections => :environment do
       puts "Starting presence:synchronize:connections"
+      SocialStream::Presence::XmppServerOrder::synchronize_presence
       puts "Synchronization complete"
     end
 
+    desc "Synchronize Xmpp Server database with Social Stream Rails Application database"
     desc "Remove all rosters and populate rosters from Social Stream data."
     task :rosters => :environment do
         puts "Starting presence:synchronize:rosters"
-        
-        #XMPP DOMAIN
-        domain = SocialStream::Presence.domain
-        #PASSWORD
-        password= SocialStream::Presence.password
-        #SS Username
-        ss_name = SocialStream::Presence.social_stream_presence_username      
-        ss_sid = ss_name + "@" + domain 
-        
-        puts "Connecting to Xmpp Server"
-        client = Jabber::Client.new(Jabber::JID.new(ss_sid))
-        client.connect
-        puts "Authentication..."
-        client.auth(password)
-        puts "Connected to Xmpp Server"
-        
-        puts "Remove all rosters"
-        msg = Jabber::Message::new(ss_sid, "SynchronizeRosters")
-        msg.type=:chat
-        client.send(msg)
-        
-   
-        puts "Populate rosters"
-        users = User.all
-        checkedUsers = []
-      
-        users.each do |user|
-          checkedUsers << user.slug
-          contacts = user.contact_actors(:type=>:user)
-          contacts.each do |contact|
-            unless checkedUsers.include?(contact.slug)
-              user_sid = user.slug + "@" + domain
-              buddy_sid = contact.slug + "@" + domain  
-              msg = Jabber::Message::new(ss_sid, "SetRosterForBidirectionalTie&" + user_sid + "&" + buddy_sid + "&" + user.name + "&" + contact.name)
-              msg.type=:chat
-              client.send(msg)
-            end
-          end
-        end
-
-        puts "Synchronization complete"
-        puts "Closing connection"
-        client.close()  
-        puts "Connection closing"
-      
+        SocialStream::Presence::XmppServerOrder::synchronize_rosters
+        puts "Rosters Synchronization complete"
     end
   end
 end

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.22')
-  s.add_runtime_dependency('social_stream-documents', '~> 0.3.3')
+  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')
  
   # Development Gem dependencies

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream
 version: !ruby/object:Gem::Version 
-  hash: 35
+  hash: 47
   prerelease: 
   segments: 
   - 0
-  - 11
-  - 8
-  version: 0.11.8
+  - 12
+  - 0
+  version: 0.12.0
 platform: ruby
 authors: 
 - GING - DIT - UPM
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-19 00:00:00 +02:00
+date: 2011-10-28 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,12 +27,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 21
         segments: 
         - 0
         - 9
-        - 22
-        version: 0.9.22
+        - 23
+        version: 0.9.23
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -43,12 +43,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 15
         segments: 
         - 0
-        - 3
-        - 3
-        version: 0.3.3
+        - 4
+        - 0
+        version: 0.4.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -267,6 +267,7 @@ files:
 - base/app/assets/images/btn/close.png
 - base/app/assets/images/btn/date.png
 - base/app/assets/images/btn/delete.png
+- base/app/assets/images/btn/download.png
 - base/app/assets/images/btn/edit.png
 - base/app/assets/images/btn/error.png
 - base/app/assets/images/btn/facebook.png
@@ -682,7 +683,6 @@ files:
 - base/lib/social_stream/d3.rb
 - base/lib/social_stream/migrations/base.rb
 - base/lib/social_stream/migrations/components.rb
-- base/lib/social_stream/migrations/finder.rb
 - base/lib/social_stream/models/object.rb
 - base/lib/social_stream/models/subject.rb
 - base/lib/social_stream/models/supertype.rb
@@ -856,7 +856,8 @@ files:
 - documents/app/assets/images/btn/document.png
 - documents/app/assets/javascripts/documents.js.erb
 - documents/app/assets/javascripts/social_stream-documents.js
-- documents/app/assets/stylesheets/documents.css
+- documents/app/assets/stylesheets/documents.css.scss
+- 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
@@ -873,6 +874,7 @@ files:
 - documents/app/views/audios/_audio_global_search.html.erb
 - documents/app/views/audios/_audio_processed.html.erb
 - documents/app/views/audios/_audio_processing.html.erb
+- documents/app/views/audios/_audio_show.html.erb
 - documents/app/views/audios/_audio_with_details.html.erb
 - documents/app/views/audios/_mediapreviews.html.erb
 - documents/app/views/audios/_new.html.erb
@@ -880,10 +882,13 @@ 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/_index.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/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
@@ -897,18 +902,19 @@ files:
 - documents/app/views/pictures/_picture.html.erb
 - documents/app/views/pictures/_picture_focus_search.html.erb
 - documents/app/views/pictures/_picture_global_search.html.erb
+- documents/app/views/pictures/_picture_show.html.erb
 - documents/app/views/pictures/_picture_with_details.html.erb
 - documents/app/views/pictures/destroy.js.erb
 - documents/app/views/pictures/index.html.erb
 - documents/app/views/pictures/index.js.erb
 - documents/app/views/pictures/show.html.erb
-- documents/app/views/toolbar/_uploads_menu.html.erb
 - documents/app/views/videos/_new.html.erb
 - documents/app/views/videos/_video.html.erb
 - documents/app/views/videos/_video_focus_search.html.erb
 - documents/app/views/videos/_video_global_search.html.erb
 - documents/app/views/videos/_video_processed.html.erb
 - documents/app/views/videos/_video_processing.html.erb
+- documents/app/views/videos/_video_show.html.erb
 - documents/app/views/videos/_video_with_details.html.erb
 - documents/app/views/videos/destroy.js.erb
 - documents/app/views/videos/index.html.erb
@@ -1143,23 +1149,20 @@ files:
 - presence/config/routes.rb
 - presence/db/migrate/20110711111408_add_connected_column_to_user.rb
 - presence/db/migrate/20110928135031_add_status_column_to_user.rb
-- presence/ejabberd/conf/ejabberd.cfg
-- presence/ejabberd/conf/ejabberdctl.cfg
-- presence/ejabberd/conf/inetrc
-- presence/ejabberd/conf/ssconfig.cfg
+- presence/ejabberd/conf/ejabberd_example.cfg
+- presence/ejabberd/conf/ssconfig_example.cfg
 - presence/ejabberd/ejabberd_scripts/authentication_script
-- presence/ejabberd/ejabberd_scripts/authentication_script_org
-- presence/ejabberd/ejabberd_scripts/compile_module
+- presence/ejabberd/ejabberd_scripts/development_scripts/compile_module
+- presence/ejabberd/ejabberd_scripts/development_scripts/generate_random_password
+- presence/ejabberd/ejabberd_scripts/development_scripts/kill_authentication_script.sh
+- presence/ejabberd/ejabberd_scripts/development_scripts/reset_logs.sh
+- presence/ejabberd/ejabberd_scripts/development_scripts/show_config.sh
+- presence/ejabberd/ejabberd_scripts/development_scripts/start_ejabberd.sh
+- presence/ejabberd/ejabberd_scripts/development_scripts/stop_ejabberd.sh
 - presence/ejabberd/ejabberd_scripts/emanagement
-- presence/ejabberd/ejabberd_scripts/generate_random_password
-- presence/ejabberd/ejabberd_scripts/kill_authentication_script.sh
 - presence/ejabberd/ejabberd_scripts/reset_connection_script
-- presence/ejabberd/ejabberd_scripts/reset_logs.sh
 - presence/ejabberd/ejabberd_scripts/set_connection_script
 - presence/ejabberd/ejabberd_scripts/set_presence_script
-- presence/ejabberd/ejabberd_scripts/show_config.sh
-- presence/ejabberd/ejabberd_scripts/start_ejabberd.sh
-- presence/ejabberd/ejabberd_scripts/stop_ejabberd.sh
 - presence/ejabberd/ejabberd_scripts/synchronize_presence_script
 - presence/ejabberd/ejabberd_scripts/unset_connection_script
 - presence/ejabberd/mod_admin_extra/mod_admin_extra.beam
@@ -1173,6 +1176,7 @@ files:
 - presence/lib/social_stream/presence/engine.rb
 - presence/lib/social_stream/presence/models/buddy_manager.rb
 - presence/lib/social_stream/presence/version.rb
+- presence/lib/social_stream/presence/xmpp_server_order.rb
 - presence/lib/tasks/presence/synchronize.rake
 - presence/social_stream-presence.gemspec
 - presence/spec/demo/.gitignore

data/base/lib/social_stream/migrations/finder.rb

@@ -1,20 +0,0 @@
-module SocialStream
-  module Migrations
-    # Searches for migrations in a gem and requires them.
-    # Example:
-    #
-    #   MigrationFinder.new 'acts-as-taggable-on',
-    #                       ["generators", "acts_as_taggable_on", "migration", "templates", "active_record", "migration"]
-    #   ActsAsTaggableOnMigration.up
-    class Finder
-      def initialize gem, path
-        finder = Gem::GemPathSearcher.new
-        taggable_spec = finder.find(gem)
-        taggable_migration = finder.matching_files(taggable_spec,
-                                                   File.join(*path)).first
-
-        require taggable_migration
-      end
-    end
-  end
-end

data/documents/app/views/common-documents/_index.html.erb

@@ -1,45 +0,0 @@
-<% content_for :title do %>
-  <%= profile_subject.name %> 
-<% end %>
-
-<% content_for :sidebar do %>
-  <%= render :partial => 'home/sidebar' %>
-<% end %>
-
-<%if profile_subject_is_current?%>
-  <%= location(
-    link_to(t(controller.controller_name.singularize + '.title'), polymorphic_path(controller.controller_name),:remote => true)
-    ) %>
-  <% toolbar %>
-<%else%>
-  <%= location(
-    link_to(profile_subject.name, polymorphic_path(profile_subject),:remote => true),
-    link_to(t(controller.controller_name.singularize + '.title'), polymorphic_path([profile_subject, controller.controller_name]),:remote => true)
-    ) %>
-  <% toolbar :profile => profile_subject %>
-<%end%>
-
-
-<div class="attachment_section_header">
-	<h3><%= profile_subject_is_current? ? t(controller.controller_name.singularize + '.mine') : t(controller.controller_name.singularize + '.not_mine') %></h3>
-</div>
-<% @activities.each do |a| %>
-	<% document = a.activity_objects.first.document %>
-	<div class="attachment_tile">
-		<div class="attachment_tile_thumb">
-    		<%= link_to thumb_for(document,48), 
-                {:controller => "documents", :action => "download", :id => document}, 
- 				:type => document.type, 
-				:title => document.file_file_name,
-				:path => document_path(document) %>
-  		</div>
-
-  		<div class="attachment_tile_text">
-  			<%= link_to document.file_file_name,
-                {:controller => "documents", :action => "download", :id => document},
- 				:alt => document.file_file_name,
- 				:type => document.type,
- 				:path => document_path(document) %>
-  		</div>
-	</div>
-<% end %>

data/documents/app/views/toolbar/_uploads_menu.html.erb

@@ -1,21 +0,0 @@
-<li>
-  <%= link_to( image_tag("btn/btn_resource.png",:class =>"menu_icon")+t('resource.title'),"#") %>
-	<ul>
-    <li>
-      <%= link_to( image_tag("btn/btn_document.png",
-      :class => "menu_icon")+t('document.title'), documents_path) %>
-    </li>
-    <li>
-      <%= link_to( image_tag("btn/btn_gallery.png",
-            :class => "menu_icon")+t('picture.title'), pictures_path) %>
-    </li>
-		<li>
-			<%= link_to( image_tag("btn/btn_video.png", 
-			    :class => "menu_icon")+t('video.title'), videos_path) %>
-		</li>
-		<li>
-			<%= link_to( image_tag("btn/btn_audio.png",
-			:class => "menu_icon")+t('audio.title'), audios_path) %>
-		</li>
-	</ul>
-</li>