social_stream 0.11.8 → 0.12.0

data/lib/social_stream/release.rb

@@ -5,19 +5,41 @@ module SocialStream
         # First of all, update gems
         system "bundle"
 
-        dependencies = Global::Release.new.dependencies
+        parse_args(args)
 
-        components = args.map do |a|
+        all.each(&:bump_version)
+
+        all.each(&:update_dependencies)
+
+        system("git commit #{ all.map(&:commit_files).join(" ") } -m #{ @global.version }") ||
+          raise(RuntimeError.new)
+
+        all.each(&:rake_release)
+      end
+
+      def dependencies
+        @dependencies ||=
+          Global::Release.new.dependencies
+      end
+
+      def parse_args args
+        @components = []
+
+        args.each do |a|
           name, version = a.split(":")
 
           if dependencies.include?(name)
-            Component::Release.new(name, version).release!
+            @components << Component::Release.new(name, version)
           else
             @target = name
           end
         end
 
-        Global::Release.new(@target).release!
+        @global = Global::Release.new(@target)
+      end
+
+      def all
+        @components + [ @global ]
       end
     end
   end

data/lib/social_stream/version.rb

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

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

@@ -241,12 +241,6 @@ function initAndPlaySound(sound){
 //Chat view jquery
 ////////////////////
 
-function initDelegates(){
-  $('.user_presence').delegate( '.user_presence a[title]', 'hover', function(){ 
-    e.preventDefault();
-  });
-}
-
 function setUserFunctions(){
 	
 	$("div.user_presence").click(function(event, ui){

data/presence/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,24 +13,27 @@ class XmppController < ApplicationController
    
    
   #API METHODS
-
-  def resetConnection
+  
+  def setConnection  
     unless authorization
       render :text => "Authorization error"
       return
     end
     
-    users = User.find_all_by_connected(true)
+    user = User.find_by_slug(params[:name])
     
-    users.each do |user|
-      user.connected = false
-      user.save!
+    if user && !user.connected
+       user.connected = true
+       user.status = "available"
+       user.save!
+       render :text => "Ok"
+       return
     end
     
-    render :text => "Ok" 
+    render :text => "Error"
   end
-
-
+  
+  
   def unsetConecction
     unless authorization
       render :text => "Authorization error"
@@ -52,87 +49,78 @@ class XmppController < ApplicationController
        return
     end
     
-    render :text => "Error"
+    render :text => "User not connected"
   end
   
   
-  def setConnection  
+  def setPresence  
     unless authorization
       render :text => "Authorization error"
       return
     end
     
     user = User.find_by_slug(params[:name])
+    status = params[:status]
     
-    if user && !user.connected
-       user.connected = true
-       user.status = "available"
-       user.save!
-       render :text => "Ok"
-       return
+    if setStatus(user,status)
+      if user && !user.connected
+        user.connected = true
+        user.save!
+      end
+      render :text => 'Status changed'
+    else
+      render :text => 'Status not changed'
     end
     
-    render :text => "Error"
   end
   
   
-  def synchronizePresence  
+  def unsetPresence  
     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
   
   
-  def setPresence  
+  def resetConnection
     unless authorization
       render :text => "Authorization error"
       return
     end
     
-    user = User.find_by_slug(params[:name])
-    status = params[:status]
-    
-    if setStatus(user,status)
-      render :text => 'Status changed'
-    else
-      render :text => 'Status not changed'
-    end
+    SocialStream::Presence::XmppServerOrder::reset_presence
     
+    render :text => "Ok" 
   end
   
   
-  def unsetPresence  
+  def synchronizePresence  
     unless authorization
       render :text => "Authorization error"
       return
-    end
-    render :text => "Ok"
+    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
   end
@@ -146,8 +134,7 @@ class XmppController < ApplicationController
       render :partial => 'xmpp/chat_off'
     end 
   end
-  
-  
+    
 
  
   
@@ -158,53 +145,10 @@ class XmppController < ApplicationController
   end
    
   def test
-    puts "TEST"
-      
-#    Thread.start{
-    
-#      #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)
-#     
-#      #Remove all rosters
-#      msg = Jabber::Message::new(ss_sid, "SynchronizeRosters")
-#      msg.type=:chat
-#      client.send(msg)
-#      
-# 
-#      #Write 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
-#
-#      client.close()
-#    }  
-
+    #puts "TEST"
   end
   
   
-  
   private
   
   def setStatus(user,status)

data/presence/app/views/xmpp/_chat.html.erb

@@ -14,7 +14,7 @@
 	<script type="text/javascript">
 			
 		//Global variables
-		var BOSH_SERVICE = '<%=SocialStream::Presence.bosh_service%>';
+		var BOSH_SERVICE = '<%= SocialStream::Presence.bosh_service || root_url + "http-bind/" %>';
 		var domain = '<%=SocialStream::Presence.domain%>';
     var user_name = '<%=current_user.name%>';
 		var user_slug = '<%=current_user.slug%>';
@@ -52,7 +52,6 @@
 			}
 			initialTimer = setTimeout("updateChatWindow()", 15000);
       initAudio();
-			initDelegates();
 		});
 		
 	</script>

data/presence/ejabberd/conf/{ejabberd.cfg → ejabberd_example.cfg}

@@ -88,7 +88,7 @@
 %% You can define one or several, for example:
 %% {hosts, ["example.net", "example.com", "example.org"]}.
 %%
-{hosts, ["localhost"]}.
+{hosts, ["example.com"]}.
 
 %%
 %% route_subdomains: Delegate subdomains to other XMPP servers.
@@ -115,8 +115,7 @@
 			%% certificate, specify the full path to the
 			%% file and uncomment this line:
 			%%
-			%%{certfile, "/path/to/ssl.pem"}, starttls,
-			{certfile, "/etc/ejabberd/server.pem"}, starttls,
+			%%{certfile, "/path/to/your_ssl_certificate.pem"}, starttls,
 
 			{access, c2s},
 			{shaper, c2s_shaper},
@@ -235,13 +234,10 @@
 %% Exauth Response Timeout is a extauth module constant and its value is 60 seconds.
 %%
 {auth_method, external}.
-{extauth_program, "/home/aldo/ejabberd-2.1.8_scripts/authentication_script"}.
+{extauth_program, "/scripts_path/authentication_script"}.
 {extauth_instances, 3}.
 
 
-%%{auth_method, external}.
-%%{extauth_program, "/home/aldo/ejabberd-2.1.8_scripts/authentication_script"}.
-
 %%
 %% Authentication using ODBC
 %% Remember to setup a database in the next section.

data/presence/ejabberd/conf/ssconfig_example.cfg

@@ -0,0 +1,32 @@
+#Social Stream Presence: ejabberd config
+
+#Ejabberd node server domain
+server_domain=domain.example.com
+
+#Scripts Path
+scripts_path=/my_scripts_path
+
+#Source path: uncomment to compile ejabberd social stream module
+#source_path=/.../ejabberd_source/src
+
+#It is also necessary to modify the file: /etc/ejabberd/ejabberd.cfg
+#%%{auth_method, external}.
+#%%{extauth_program, "scripts_path/authentication_script"}.
+
+#API REST
+auth_api=http://localhost/users/sign_in
+set_connection_api=http://localhost/xmpp/setConnection
+unset_connection_api=http://localhost/xmpp/unsetConnection
+reset_connection_api=http://localhost/xmpp/resetConnection
+synchronize_presence_api=http://localhost/xmpp/synchronizePresence
+set_presence_api=http://localhost/xmpp/setPresence
+unset_presence_api=http://localhost/xmpp/unsetPresence
+
+#Social Stream Login
+ss_login=social_stream-presence
+
+#Social Stream PASSWORD
+ss_password=password
+
+#Ejabberd Server Password
+ejabberd_password=password

data/presence/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
@@ -87,7 +91,7 @@ loop do
     
     when "auth"
       $logger.info "#{Process.pid}: Authenticating #{data[0]}@#{data[1]}"
-      $logger.info "#{Process.pid}: With password #{data[2]}"
+      #$logger.info "#{Process.pid}: With password #{data[2]}"
       #password = data[2]
       
       #Authorization condition for LOGIN

data/presence/ejabberd/ejabberd_scripts/{reset_logs.sh → development_scripts/reset_logs.sh}

@@ -3,14 +3,12 @@
 echo "Starting Reset logs"
 
 rm /var/log/ejabberd/auth.log
-rm /var/log/ejabberd/auth_error.log
 rm /var/log/ejabberd/ejabberd.log
 rm /var/log/ejabberd/erlang.log
 rm /var/log/ejabberd/scripts.log
 rm /var/log/ejabberd/erl_crash_*
 
 touch /var/log/ejabberd/auth.log
-touch /var/log/ejabberd/auth_error.log
 touch /var/log/ejabberd/ejabberd.log
 touch /var/log/ejabberd/erlang.log
 touch /var/log/ejabberd/scripts.log

data/presence/ejabberd/ejabberd_scripts/{show_config.sh → development_scripts/show_config.sh}

@@ -19,12 +19,15 @@ puts "############### Ejabberd Configuration ###############"
 puts "Config file for Social Stream Presence: /etc/ejabberd/ssconfig.cfg"
 puts "Scripts Path: #{getOption("scripts_path=")}"
 puts "mod_sspresence Path: #{getOption("source_path=")}"
+puts "Server domain: #{getOption("server_domain=")}"
 puts "API REST URLs"
 puts "Authentication: #{getOption("auth_api=")}"
 puts "onRegisterConnection: #{getOption("set_connection_api=")}"
 puts "onRemoveConnection: #{getOption("unset_connection_api=")}"
 puts "onPresence: #{getOption("set_presence_api=")}"
 puts "onUnsetPresence: #{getOption("unset_presence_api=")}"
+puts "ResetConnection: #{getOption("reset_connection_api=")}"
+puts "SynchronizePresence: #{getOption("synchronize_presence_api=")}"
 puts "Social Stream Presence logs in var/log/ejabberd/"
 puts "######################################################"
 puts ""

data/presence/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/presence/ejabberd/mod_sspresence/mod_sspresence.erl

@@ -13,8 +13,8 @@ start(Host, _Opts) ->
     ejabberd_hooks:add(set_presence_hook, 		Host, ?MODULE, on_presence, 50),
     ejabberd_hooks:add(unset_presence_hook, 		Host, ?MODULE, on_unset_presence, 50),
     ejabberd_hooks:add(user_send_packet, 		Host, ?MODULE, on_packet_send, 50),
-    %Uncomment to reset connected users directly when module sspresence starts.
-    %reset_connections(),
+    %Reset connected users when module sspresence starts.
+    reset_connections(),
     ok.
 
 stop(Host) ->
@@ -169,7 +169,11 @@ execute(Message) ->
 	%frank-williamson@trapo adds demo@trapo to its roster with subscription from, in the group SocialStream with the name Nickname
 %%
 addItemToRoster(UserSlug,UserDomain,BuddySlug,BuddyDomain,ContactName,Group,Subscription_type) ->
-	Command = lists:concat(["ejabberdctl add_rosteritem ", UserSlug , " ", UserDomain, " ", BuddySlug, " ", BuddyDomain , " \\'", ContactName , "\\' ", Group , " ", 					Subscription_type]),
+	%%Command = lists:concat(["ejabberdctl add_rosteritem ", UserSlug , " ", UserDomain, " ", BuddySlug, " ", BuddyDomain , " \\'", ContactName , "\\' ", Group , " ", 					Subscription_type]),
+	%%Command = lists:concat(["ejabberdctl add_rosteritem ", UserSlug , " ", UserDomain, " ", BuddySlug, " ", BuddyDomain , " \'", ContactName , "\' ", Group , " ", 					Subscription_type]),
+	
+	[UserName|_R] = string:tokens(ContactName, " "),
+	Command = lists:concat(["ejabberdctl add_rosteritem ", UserSlug , " ", UserDomain, " ", BuddySlug, " ", BuddyDomain , " ", UserName , " ", Group , " ", 					Subscription_type]),
 	os:cmd(Command),
 	?INFO_MSG("Execute command: ~p", [Command]),
 ok.
@@ -248,10 +252,10 @@ ok.
 
 
 %Reset all connections
-%reset_connections() ->
-%	Reset_path = string:concat(getOptionValue("scripts_path="), "/reset_connection_script "),
-%	os:cmd(Reset_path),
-%ok.
+reset_connections() ->
+	Reset_path = string:concat(getOptionValue("scripts_path="), "/reset_connection_script "),
+	os:cmd(Reset_path),
+ok.
 
 
 

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

@@ -2,11 +2,21 @@ SocialStream::Presence.setup do |config|
   #Configures XMPP Server Domain
   config.domain = "localhost"
   #Configures Bosh Service Path
-  config.bosh_service = "http://localhost:8080/http-bind"
-  #Configures Social Stream Rails App Password
-  config.password = "DnVCB8G|R$VGmZ@2?5=CYS8z)NrL@LuQ&LTCUh^9B(DF4gC&sQpfbCMbaNKEdNrGYkT4L5zxM0wNWs5q3?ww(b&0d5fK87z^BmgJMMF2SKXT9pEk^UEcch!GX!Avf5GT9)j@FpHe)4RH)BK7J98u!sUmJHUN(Je6aBmn!FtZ4Ab5h8$|nsvUt3Jkq?21HOH$r0sDyJZZvGOCgFS2EKw@0wXsJRHYVRPBe&Eb!1X55e55bQ^h2AW&^R70TK0m)Fu8"
+  #config.bosh_service = "http://xmpp-proxy/http-bind"
   #Configures XMPP Server Password
-  config.xmpp_server_password = "G&s6GBnO)anw2Ene%K12Cb=0quj@uDmA"
+  config.xmpp_server_password = "password"
+  #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/presence/lib/social_stream/migrations/presence.rb

@@ -2,7 +2,6 @@ require 'social_stream/migrations/components'
 
 module SocialStream
   module Migrations
-    # Migrate Documents
     class Presence < Components
     end
   end

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

@@ -1,9 +1,3 @@
-require 'xmpp4r'
-require 'xmpp4r/muc'
-require 'xmpp4r/roster'
-require 'xmpp4r/client'
-require 'xmpp4r/message'
-
 module SocialStream
   module Presence
     class Engine < Rails::Engine
@@ -15,48 +9,7 @@ module SocialStream
         end
         
       end 
-               
-      initializer "social_stream-presence.synchronize" do
-          #Synchronize User Presence
-          #Reset connected users when XMMP Server Down
-          Thread.start {
-            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
-                  begin
-                    users = User.find_all_by_connected(true)
-                    users.each do |user|
-                      user.connected = false
-                      user.save!
-                    end
-                    puts "Connection to XMPP Server refused: Reset Connected Users"
-                  rescue
-                  end
-                else
-                  puts "Unknown exception: #{e.to_s}"
-              end  
-            end           
-          }
-      end
-      
+ 
     end
   end
 end