social_stream-presence 0.0.4 → 0.0.5

data/app/assets/javascripts/xmpp_client.js

@@ -241,6 +241,12 @@ 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){
@@ -254,7 +260,6 @@ function setUserFunctions(){
 	  };
 	});
 	
-	
 	//JQuery DropdwanStatus
 	
 	$(".dropdown dt a").click(function(event) {
@@ -326,7 +331,8 @@ function refreshChatWindow(){
 function updateChatWindow(){
 	timerCounter=0;
 	log("updateChatWindow()");
-  $.post("/chatWindow", { userConnected: userConnected }, function(data){ 
+  $.post("/chatWindow", { userConnected: userConnected }, function(data){
+			$(".tooltip").hide() //Prevent tooltips
       $("#chat_partial").html(data);
       if (userConnected) {
         $(".user_presence a[title]").tooltip();

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

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

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

@@ -28,7 +28,7 @@
 				  <%@contacts.each do |contact| %>
 							<div class="user_presence" name='<%=contact.name%>' slug='<%=contact.slug%>'>
 								<a title='<%=contact.name%>' class="presence_user_link" width="28">
-								  <%=image_tag(contact.logo.url, :alt => contact.name , :title => contact.name, :size => "28x28")%>
+								  <%=image_tag(contact.logo.url, :alt => contact.name , :size => "28x28")%>
 									<% if contact.user.status %>
 									<%=image_tag("status/" + contact.user.status + ".png", :class => "presence_status") %></a>
 									<% end %>

data/ejabberd/conf/ejabberd.cfg

@@ -88,7 +88,7 @@
 %% You can define one or several, for example:
 %% {hosts, ["example.net", "example.com", "example.org"]}.
 %%
-{hosts, ["trapo"]}.
+{hosts, ["localhost"]}.
 
 %%
 %% route_subdomains: Delegate subdomains to other XMPP servers.
@@ -376,7 +376,7 @@
 %%
 %%{acl, admin, {user, "aleksey", "localhost"}}.
 %%{acl, admin, {user, "ermine", "example.org"}}.
-{acl, admin, {user, "admin", "trapo"}}.
+{acl, admin, {user, "admin", "localhost"}}.
 
 %%
 %% Blocked users

data/ejabberd/conf/ssconfig.cfg

@@ -1,7 +1,7 @@
 #Social Stream Presence: ejabberd config
 
 #Ejabberd node server domain
-server_domain=trapo
+server_domain=localhost
 
 #Scripts Path
 scripts_path=/home/aldo/ejabberd-2.1.8_scripts

data/lib/generators/social_stream/presence/install_generator.rb

@@ -0,0 +1,28 @@
+class SocialStream::Presence::InstallGenerator < Rails::Generators::Base
+  include Rails::Generators::Migration
+  
+  source_root File.expand_path('../templates', __FILE__)
+
+  def create_initializer_file
+    copy_file 'initializer.rb', 'config/initializers/social_stream-presence.rb'
+  end
+
+  def create_migration_file
+    require 'rake'
+    Rails.application.load_tasks
+    Rake::Task['railties:install:migrations'].reenable
+    Rake::Task['social_stream_presence_engine:install:migrations'].invoke
+  end
+
+  def require_javascripts
+    inject_into_file 'app/assets/javascripts/application.js',
+                     "//= require social_stream-presence\n",
+                     :before => '//= require_tree .'
+  end
+
+  def require_stylesheets
+    inject_into_file 'app/assets/stylesheets/application.css',
+                     " *= require social_stream-presence\n",
+                     :before => ' *= require_tree .'
+  end
+end

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

@@ -0,0 +1,12 @@
+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"
+  #Configures XMPP Server Password
+  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"
+end

data/lib/social_stream/presence/version.rb

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

data/lib/tasks/presence/synchronize.rake

@@ -4,7 +4,6 @@ namespace :presence do
 
   namespace :synchronize do
 
-
     desc "Synchronize user presence."
     task :connections => :environment do
       puts "Starting presence:synchronize:connections"
@@ -26,6 +25,7 @@ namespace :presence do
         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"
         

metadata

@@ -2,7 +2,7 @@
 name: social_stream-presence
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Aldo Gordillo
@@ -92,7 +92,6 @@ files:
 - ejabberd/conf/ejabberd.cfg
 - ejabberd/conf/ejabberdctl.cfg
 - ejabberd/conf/inetrc
-- ejabberd/conf/server.pem
 - ejabberd/conf/ssconfig.cfg
 - ejabberd/ejabberd_scripts/authentication_script
 - ejabberd/ejabberd_scripts/authentication_script_org
@@ -113,6 +112,8 @@ files:
 - ejabberd/mod_admin_extra/mod_admin_extra.erl
 - ejabberd/mod_sspresence/mod_sspresence.beam
 - ejabberd/mod_sspresence/mod_sspresence.erl
+- lib/generators/social_stream/presence/install_generator.rb
+- lib/generators/social_stream/presence/templates/initializer.rb
 - lib/social_stream-presence.rb
 - lib/social_stream/migrations/presence.rb
 - lib/social_stream/presence/engine.rb

data/ejabberd/conf/server.pem

@@ -1,37 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDvDCCAyWgAwIBAgIJAOBE76dYOsdsMA0GCSqGSIb3DQEBBAUAMIGbMQswCQYD
-VQQGEwJGUjEMMAoGA1UECBMDSURGMQ4wDAYDVQQHEwVQYXJpczEXMBUGA1UEChMO
-VGVzdCBTZXJ2ZXIgUDExFDASBgNVBAsTC1Byb2Nlc3Mtb25lMRcwFQYDVQQDEw5N
-aWNrYWVsIFJlbW9uZDEmMCQGCSqGSIb3DQEJARYXY29udGFjdEBwcm9jZXNzLW9u
-ZS5uZXQwHhcNMDYwMzAzMTYwNjQ2WhcNMTYwMjI5MTYwNjQ2WjCBmzELMAkGA1UE
-BhMCRlIxDDAKBgNVBAgTA0lERjEOMAwGA1UEBxMFUGFyaXMxFzAVBgNVBAoTDlRl
-c3QgU2VydmVyIFAxMRQwEgYDVQQLEwtQcm9jZXNzLW9uZTEXMBUGA1UEAxMOTWlj
-a2FlbCBSZW1vbmQxJjAkBgkqhkiG9w0BCQEWF2NvbnRhY3RAcHJvY2Vzcy1vbmUu
-bmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC8sZ/Wb2GqYPL43OBzBNz0
-gFT1iDZMLLgpMYqBZElKul7GGCdLZElgqVYm8KRxPIiRd5BPbueNkhw/YhhcQAay
-4+Ef7Y6zdjXAsYGtYhdmms6icCk1RxIMa2TvJ6dZlraV2KJdNExxhMtSyj3NBVs4
-276RcZSukN2AR4/pziWysQIDAQABo4IBBDCCAQAwHQYDVR0OBBYEFMBW8llnB7AA
-hu9u+ivBndDdbmLTMIHQBgNVHSMEgcgwgcWAFMBW8llnB7AAhu9u+ivBndDdbmLT
-oYGhpIGeMIGbMQswCQYDVQQGEwJGUjEMMAoGA1UECBMDSURGMQ4wDAYDVQQHEwVQ
-YXJpczEXMBUGA1UEChMOVGVzdCBTZXJ2ZXIgUDExFDASBgNVBAsTC1Byb2Nlc3Mt
-b25lMRcwFQYDVQQDEw5NaWNrYWVsIFJlbW9uZDEmMCQGCSqGSIb3DQEJARYXY29u
-dGFjdEBwcm9jZXNzLW9uZS5uZXSCCQDgRO+nWDrHbDAMBgNVHRMEBTADAQH/MA0G
-CSqGSIb3DQEBBAUAA4GBAGtYeVL7BlksuXf79V/WfBPosKD4yVzs7P9GsgS/D10T
-HMIRbjIOma4IVy8Es/UBJ0Q4gPojVg4lPo3xv/PSgSDJfbcJyWjSbAh0eGvHtNc5
-4GnYVx5ox0o0MBR8Mt0ChbwA5QMSo6bqc5tRK6+B+ib4ELix7MCSq3wdh7HcuL9D
------END CERTIFICATE-----
------BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQC8sZ/Wb2GqYPL43OBzBNz0gFT1iDZMLLgpMYqBZElKul7GGCdL
-ZElgqVYm8KRxPIiRd5BPbueNkhw/YhhcQAay4+Ef7Y6zdjXAsYGtYhdmms6icCk1
-RxIMa2TvJ6dZlraV2KJdNExxhMtSyj3NBVs4276RcZSukN2AR4/pziWysQIDAQAB
-AoGADl1DOrK975dzx6gg2gCrxV0jmpFk+MWKu3APCCyXO74WSuQ50Y5v25Dogwxc
-qFYgW1qLvNBHhkpyJg0Up6kkGUalWNgdX/D63QMA/HeSLIpuUsoTGt/F3yu5wcaJ
-8y+WVZ5fcNK+rSYyNdnxv0+euazr2HUpfe5zqscGMdT5kDECQQDop9vLcop4aPkd
-h5e/AJt6irb/GQt7MBYZzxI+lof8SoASyL3EcMjZI002JCLXWirOX47eO7G7v/D1
-v7feRz3dAkEAz6CIqd9nHPT1QNmhb6QANC6Cy1PzQdAOjxz+0CRHzPBOy+bnHI00
-921RQdCiJ/KEp4olDrTVOMkjbKa928kM5QJBAJspuBDLZ0Y+3EWxdKbSBN+JO9qO
-HXYe795ul8BeLHs6RIhCkS09+vW18Xy2RPZTEFFqsaHNNg/9RvrezgXUhZECQQCp
-Tk3Cv9J0cWeALzcOM1ybMIYlSVqmgwMsPkem8L6/5gFLEgnJZXgYf0LweTGRg5ga
-inK3cEwilxnU4o8VJvflAkBcd/gsVklKfr0Z+vcfjoXsIAN5DoWQYozo7omUIudS
-5wjh6y5uYtkhazIJRxNUi9WMfKqhnrje0NfG+p+Sxs7J
------END RSA PRIVATE KEY-----