social_stream-presence 0.0.10 → 0.0.12

data/app/controllers/xmpp_controller.rb

@@ -1,9 +1,3 @@
-require 'xmpp4r'
-require 'xmpp4r/muc'
-require 'xmpp4r/roster'
-require 'xmpp4r/client'
-require 'xmpp4r/message'
-
 class XmppController < ApplicationController
   
   #Mapping XMPP Standar Status to Social Stream Chat Status
@@ -19,42 +13,6 @@ class XmppController < ApplicationController
    
    
   #API METHODS
-
-  def resetConnection
-    unless authorization
-      render :text => "Authorization error"
-      return
-    end
-    
-    users = User.find_all_by_connected(true)
-    
-    users.each do |user|
-      user.connected = false
-      user.save!
-    end
-    
-    render :text => "Ok" 
-  end
-
-
-  def unsetConecction
-    unless authorization
-      render :text => "Authorization error"
-      return
-    end
-    
-    user = User.find_by_slug(params[:name])
-    
-    if user && user.connected
-       user.connected = false
-       user.save!
-       render :text => "Ok"
-       return
-    end
-    
-    render :text => "User not connected"
-  end
-  
   
   def setConnection  
     unless authorization
@@ -76,34 +34,22 @@ class XmppController < ApplicationController
   end
   
   
-  def synchronizePresence  
+  def unsetConecction
     unless authorization
       render :text => "Authorization error"
       return
     end
-     
-    #Actual connected users
-    user_slugs = params[:name]
     
-    #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 = User.find_by_slug(params[:name])
     
-    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
+    if user && user.connected
+       user.connected = false
+       user.save!
+       render :text => "Ok"
+       return
     end
     
-    render :text => "ok"
+    render :text => "User not connected"
   end
   
   
@@ -146,6 +92,34 @@ class XmppController < ApplicationController
     
     render :text => "User not connected"
   end
+  
+  
+  def resetConnection
+    unless authorization
+      render :text => "Authorization error"
+      return
+    end
+    
+    SocialStream::Presence::XmppServerOrder::reset_presence
+    
+    render :text => "Ok" 
+  end
+  
+  
+  def synchronizePresence  
+    unless authorization
+      render :text => "Authorization error"
+      return
+    end 
+     
+    #Actual connected users
+    user_slugs = params[:name]  
+    
+    SocialStream::Presence::XmppServerOrder::synchronize_presence_for_slugs(user_slugs)
+    
+    render :text => "ok"
+  end
+ 
  
   def authorization
     return params[:password] == SocialStream::Presence.xmpp_server_password
@@ -160,8 +134,7 @@ class XmppController < ApplicationController
       render :partial => 'xmpp/chat_off'
     end 
   end
-  
-  
+    
 
  
   
@@ -176,7 +149,6 @@ class XmppController < ApplicationController
   end
   
   
-  
   private
   
   def setStatus(user,status)

data/ejabberd/ejabberd_scripts/authentication_script

@@ -45,8 +45,12 @@ def auth(username, password)
   #end
 
   #Social Stream password
-  if username == $sslogin and password == $sspass
-    return true
+  if username == $sslogin 
+    if password == $sspass
+      return true
+    else
+      return false
+    end
   end
 
   begin

data/ejabberd/ejabberd_scripts/emanagement

@@ -39,7 +39,7 @@ PARAMS_FOR_COMMANDS = {
 'addBuddyToRoster' => 5,
 'removeRoster' => 1,
 'getBuddysFromRoster' => 1,
-'setBidireccionalBuddys' => 4,
+'setBidireccionalBuddys' => 6,
 'help' => 0,
 'getUserResource' => 1,
 'sendMessageToUser' => 3,
@@ -52,10 +52,10 @@ PARAMS_FOR_COMMANDS = {
 SYNTAX_FOR_COMMANDS = {
 'getRoster' => "getRoster username",
 'removeBuddyFromRoster' => "removeBuddyFromRoster username buddy",
-'addBuddyToRoster' => "addBuddyToRoster username buddy buddyNick buddyGroup subscription_type",
+'addBuddyToRoster' => "addBuddyToRoster userSid buddySid buddyNick buddyGroup subscription_type",
 'removeRoster' => "removeRoster username",
 'getBuddysFromRoster' => "getBuddysFromRoster roster",
-'setBidireccionalBuddys' => "setBidireccionalBuddys usernameA usernameB nickA nickB",
+'setBidireccionalBuddys' => "setBidireccionalBuddys userASid userBSid userANick userBNick groupForA groupForB",
 'getUserResource' => "getUserResource username",
 'sendMessageToUser' => "sendMessageToUser from_name to_name msg",
 'sendPresence' => 'sendPresence username show',
@@ -88,11 +88,6 @@ def removeBuddyFromRoster(username,buddy)
 	%x[#{command}];
 end
 
-def addBuddyToRoster(username,buddy,buddyNick,buddyGroup,subscription_type)
-	command = "ejabberdctl add-rosteritem " + username + " " + $domain + " " + buddy + " " + $domain + " \\'" + buddyNick + "\\' " + buddyGroup + " " + subscription_type
-	%x[#{command}];
-end
-
 def removeRoster(username)
 	user_roster = getRoster(username);
 	user_buddys = getBuddysFromRoster(user_roster);
@@ -117,15 +112,22 @@ def getBuddysFromRoster(roster)
 	buddys
 end
 
-def setBidireccionalBuddys(usernameA,usernameB,nickA,nickB)
-	#addBuddyToRoster(username,buddy,buddyNick,buddyGroup,subscription_type)
-	addBuddyToRoster(usernameA,usernameB,nickB,"SocialStream","both")
-	addBuddyToRoster(usernameB,usernameA,nickA,"SocialStream","both")
-	#sendPresence(usernameA,"chat")
-	#sendPresence(usernameB,"chat")
+def setBidireccionalBuddys(userASid,userBSid,userANick,userBNick,groupForA,groupForB)
+	addBuddyToRoster(userASid,userBSid,userBNick,groupForB,"both")
+	addBuddyToRoster(userBSid,userASid,userANick,groupForA,"both")
 	return "Done"
 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
+	%x[#{command}];
+end
+
 def sendStanzaUserMessage(username,msg)
 	resource = getUserResource(username);
 	stanza = "\\<\\'message\\'\\>\\<\\'body\\'\\>\\'" + msg + "\\'\\<\\'/body\\'\\>\\<\\'/message\\'\\>"
@@ -226,6 +228,8 @@ begin
 			  puts send(ARGV[0],ARGV[1],ARGV[2],ARGV[3],ARGV[4])
 			when 6
 			  puts send(ARGV[0],ARGV[1],ARGV[2],ARGV[3],ARGV[4],ARGV[5])
+			when 7
+			  puts send(ARGV[0],ARGV[1],ARGV[2],ARGV[3],ARGV[4],ARGV[5],ARGV[6])
 			else
 			  puts send(ARGV[0],ARGV)
 			end

data/lib/generators/social_stream/presence/templates/initializer.rb

@@ -3,16 +3,20 @@ SocialStream::Presence.setup do |config|
   config.domain = "localhost"
   #Configures Bosh Service Path
   #config.bosh_service = "http://xmpp-proxy/http-bind"
-  #Configures Social Stream Rails App Password
-  config.password = "password"
   #Configures XMPP Server Password
   config.xmpp_server_password = "password"
-  #Username of the Social Stream Admin sid
-  config.social_stream_presence_username = "social_stream-presence"
-  #Scripts path, only to execute local ejabberd commands
-  config.scripts_path = "/scripts_path"
   #Remote or local mode
   config.remote_xmpp_server = false
   #False to disable Social Stream Presence
   #config.enable = false
+  
+  #Parameters for remote mode
+  #Username of the the Social Stream Admin sid
+  config.social_stream_presence_username = "social_stream-presence"
+  #Configures Social Stream Rails App Password
+  config.password = "password"
+  
+  #Parameters for local mode  
+  #Scripts path to execute local ejabberd commands
+  config.scripts_path = "/scripts_path"
 end

data/lib/social_stream-presence.rb

@@ -3,20 +3,23 @@ require 'social_stream-base'
 module SocialStream
   module Presence   
 
-    autoload :XmppServerComunication, 'social_stream/presence/xmpp_server_comunication'
+    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 :scripts_path
-    mattr_accessor :social_stream_presence_username
     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
     

data/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
@@ -25,51 +19,26 @@ module SocialStream
             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/lib/social_stream/presence/version.rb

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

data/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/lib/tasks/presence/synchronize.rake

@@ -4,126 +4,19 @@ namespace :presence do
 
   namespace :synchronize do
 
-    desc "Synchronize user presence."
+    desc "Synchronize user presence"
     task :connections => :environment do
       puts "Starting presence:synchronize:connections"
-      
-      begin
-        #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
-        client = Jabber::Client.new(Jabber::JID.new(ss_sid))
-        client.connect
-        client.auth(password)
- 
-        msg = Jabber::Message::new(ss_sid, "Synchronize")
-        msg.type=:chat
-        client.send(msg)
-        client.close()
-      
-      rescue Exception => e
-        case e
-          when Errno::ECONNREFUSED
-            desc "Reset connected users when XMMP Server Down"
-            puts "Connection to XMPP Server refused: Reset Connected Users"
-            users = User.find_all_by_connected(true)
-            users.each do |user|
-              user.connected = false
-              user.save!
-            end
-          else
-            puts "Unknown exception: #{e.to_s}"
-            return
-        end  
-      end              
-    
-    puts "Synchronization complete"
+      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"
-        
-               
-        if SocialStream::Presence.remote_xmpp_server
-        
-          #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"
-        
-        else
-        #SocialStream::Presence.remote_xmpp_server=false
-        
-          puts "Removing all rosters"
-          system SocialStream::Presence.scripts_path + "/emanagement removeAllRosters"
-          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)
-                user_nick = user.name.split(" ")[0]
-                buddy_nick = contact.name.split(" ")[0]
-                command = SocialStream::Presence.scripts_path + "/emanagement setBidireccionalBuddys " + user.slug + " " + contact.slug + " " + user_nick + " " + buddy_nick
-                puts command
-                system command
-              end
-            end
-          end
-        
-      end
-      
+        SocialStream::Presence::XmppServerOrder::synchronize_rosters
+        puts "Rosters Synchronization complete"
     end
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: social_stream-presence
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.10
+  version: 0.0.12
 platform: ruby
 authors: 
 - Aldo Gordillo
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-25 00:00:00 +02:00
+date: 2011-10-26 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -116,6 +116,7 @@ files:
 - lib/social_stream/presence/engine.rb
 - lib/social_stream/presence/models/buddy_manager.rb
 - lib/social_stream/presence/version.rb
+- lib/social_stream/presence/xmpp_server_order.rb
 - lib/tasks/presence/synchronize.rake
 - social_stream-presence.gemspec
 - spec/demo/.gitignore