social_stream-presence 0.0.5 → 0.0.6

data/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/app/controllers/xmpp_controller.rb

@@ -52,7 +52,7 @@ class XmppController < ApplicationController
        return
     end
     
-    render :text => "Error"
+    render :text => "User not connected"
   end
   
   
@@ -117,6 +117,10 @@ class XmppController < ApplicationController
     status = params[:status]
     
     if setStatus(user,status)
+      if user && !user.connected
+        user.connected = true
+        user.save!
+      end
       render :text => 'Status changed'
     else
       render :text => 'Status not changed'
@@ -130,7 +134,17 @@ class XmppController < ApplicationController
       render :text => "Authorization error"
       return
     end
-    render :text => "Ok"
+    
+    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 authorization
@@ -158,49 +172,7 @@ 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
   
   

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

@@ -52,7 +52,6 @@
 			}
 			initialTimer = setTimeout("updateChatWindow()", 15000);
       initAudio();
-			initDelegates();
 		});
 		
 	</script>

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

@@ -9,4 +9,6 @@ SocialStream::Presence.setup do |config|
   config.xmpp_server_password = "G&s6GBnO)anw2Ene%K12Cb=0quj@uDmA"
   #Username of the the Social Stream Admin sid
   config.social_stream_presence_username = "social_stream-presence"
+  #True to enable Social Stream Presence
+  config.enable = true
 end

data/lib/social_stream-presence.rb

@@ -12,6 +12,7 @@ module SocialStream
     mattr_accessor :password
     mattr_accessor :xmpp_server_password
     mattr_accessor :social_stream_presence_username
+    mattr_accessor :enable
 
     class << self
       def setup

data/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/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

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

@@ -18,6 +18,10 @@ 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

data/lib/social_stream/presence/version.rb

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

data/lib/tasks/presence/synchronize.rake

@@ -7,7 +7,42 @@ namespace :presence do
     desc "Synchronize user presence."
     task :connections => :environment do
       puts "Starting presence:synchronize:connections"
-      puts "Synchronization complete"
+      
+      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"
     end
 
     desc "Remove all rosters and populate rosters from Social Stream data."

metadata

@@ -2,7 +2,7 @@
 name: social_stream-presence
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - Aldo Gordillo
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-17 00:00:00 +02:00
+date: 2011-10-24 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency