social_stream-presence 0.4.0 → 0.5.0

data/app/assets/javascripts/chat_interface_manager.js.erb

@@ -24,7 +24,7 @@ function connectButtonTimerFunction(){
 		connectButtonTimerCounter++;
 		if (connectButtonTimerCounter > (periodBetweenAttempts-1)) {
 			clearTimeout(connectButtonTimer);
-			$("#chat_header_title").html('<%=I18n.t('chat.disconnected')%>')
+			$("#chat_header_title").html(I18n.t('chat.disconnected'))
 		}
 }
 
@@ -32,7 +32,7 @@ function requestConnectToChat(){
   if (connectButtonTimerCounter > (periodBetweenAttempts-1)) {
     connectButtonTimerCounter=0;
 		connectButtonTimer = setInterval("connectButtonTimerFunction()", 1000) 
-		$("#chat_header_title").html('<%=I18n.t('chat.connecting')%>')
+		$("#chat_header_title").html(I18n.t('chat.connecting'))
     return true
   } else {
     return false
@@ -108,7 +108,7 @@ function setStatusWidgetTitle(status){
 	}
 	
 	if(status=="default"){
-    var defaultTitle = '<%=I18n.t('chat.status.choose')%>'
+    var defaultTitle = I18n.t('chat.status.choose');
     $(".dropdown dt a span").html(defaultTitle);
 		return;
   }
@@ -324,11 +324,11 @@ function hideChatNotification(notification){
 
 function notifyWhenUsersDisconnect(){
 	var notification = $("div.ui-chatbox-notify");
-	var msg = '<%=I18n.t('chat.notify.offline')%>';
+	var msg = I18n.t('chat.notify.offline');
 	showChatNotification(notification,msg);
 }
 
 function hideAllNotifications(){
 	var notification = $("div.ui-chatbox-notify");
   hideChatNotification(notification);
-}
+}

data/app/assets/javascripts/xmpp_client_management.js.erb

@@ -187,7 +187,7 @@ function onReconnect(){
 		if (reconnectAttempts>0) {
 			reconnectAttempts--;
 			
-			$("#chat_header_title").html('<%=I18n.t('chat.reconnecting')%>')
+			$("#chat_header_title").html(I18n.t('chat.reconnecting'))
 			
 			if (authByCookie()){
         //Authentication by cookie
@@ -198,7 +198,7 @@ function onReconnect(){
       }
       reconnectTimer = setTimeout ("onReconnect()", 9000);
 		} else {
-			$("#chat_header_title").html('<%=I18n.t('chat.unableconnect')%>')
+			$("#chat_header_title").html(I18n.t('chat.unableconnect'))
 			//Notify issue to Rails App Server?
 		}
 		
@@ -323,4 +323,4 @@ function sendStatus(status){
        connection.send(pres.tree());
 			 setStatusWidgetTitle(status);
     }
-}
+}

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

@@ -9,57 +9,55 @@ module SocialStream
           after_destroy :remove_buddy
         end
         
-        module InstanceMethods
+        def save_buddy
           
-          def save_buddy
-            
-            unless SocialStream::Presence.enable
-              return
-            end
-            
-            unless self.receiver and self.sender
-              return
-            end
-            
-            unless self.receiver.subject_type == "User" and self.sender.subject_type == "User"
-              return
-            end
- 
-            #XMPP DOMAIN
-            domain = SocialStream::Presence.domain
-            user_sid = self.sender.slug + "@" + domain
-            user_name =  self.sender.name  
-            buddy_sid = self.receiver.slug + "@" + domain
-            buddy_name =  self.receiver.name
-            site_name = I18n.t('site.name').delete(' ')
+          unless SocialStream::Presence.enable
+            return
+          end
+          
+          unless self.receiver and self.sender
+            return
+          end
+          
+          unless self.receiver.subject_type == "User" and self.sender.subject_type == "User"
+            return
+          end
+
+          #XMPP DOMAIN
+          domain = SocialStream::Presence.domain
+          user_sid = self.sender.slug + "@" + domain
+          user_name =  self.sender.name  
+          buddy_sid = self.receiver.slug + "@" + domain
+          buddy_name =  self.receiver.name
+          site_name = I18n.t('site.name').delete(' ')
+          
+          #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,site_name,site_name)
+          elsif self.positive?
+            #Case: Possitive tie unidirectional
+            #Execute addBuddyToRoster(userSID,buddySID,buddyNick,buddyGroup,subscription_type)
+            subscription_type = "from"
+            SocialStream::Presence::XmppServerOrder::addBuddyToRoster(user_sid,buddy_sid,buddy_name,site_name,subscription_type)
+          else
+            #Negative Tie
             
-            #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,site_name,site_name)
-            elsif self.positive?
-              #Case: Possitive tie unidirectional
-              #Execute addBuddyToRoster(userSID,buddySID,buddyNick,buddyGroup,subscription_type)
-              subscription_type = "from"
-              SocialStream::Presence::XmppServerOrder::addBuddyToRoster(user_sid,buddy_sid,buddy_name,site_name,subscription_type)
+            if self.contact.positive_replied?
+              #Bidirectional contacts
+              #Execute unsetRosterForBidirectionalTie(user_sid,oldfriend_sid,oldfriendNick,oldfriendGroup)
+              SocialStream::Presence::XmppServerOrder::unsetRosterForBidirectionalTie(buddy_sid,user_sid,user_name,site_name)
             else
-              #Negative Tie
-              
-              if self.contact.positive_replied?
-                #Bidirectional contacts
-                #Execute unsetRosterForBidirectionalTie(user_sid,oldfriend_sid,oldfriendNick,oldfriendGroup)
-                SocialStream::Presence::XmppServerOrder::unsetRosterForBidirectionalTie(buddy_sid,user_sid,user_name,site_name)
-              else
-                SocialStream::Presence::XmppServerOrder::removeBuddyFromRoster(user_sid,buddy_sid)
-              end
-              
-              return  
+              SocialStream::Presence::XmppServerOrder::removeBuddyFromRoster(user_sid,buddy_sid)
             end
             
+            return  
           end
           
-          
-          def remove_buddy 
+        end
+        
+        
+        def remove_buddy 
 #            
 #            unless SocialStream::Presence.enable
 #              return
@@ -95,10 +93,8 @@ module SocialStream
 #              return  
 #            end
 #            
-          end
-          
         end
       end
     end
   end
-end
+end

data/lib/social_stream/presence/version.rb

@@ -1,5 +1,5 @@
 module Socialstream
   module Presence
-    VERSION = "0.4.0"
+    VERSION = "0.5.0"
   end
 end

data/social_stream-presence.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.13.0')
+  s.add_runtime_dependency('social_stream-base', '~> 0.14.0')
   
   s.add_runtime_dependency "xmpp4r"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_stream-presence
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-23 00:00:00.000000000Z
+date: 2012-01-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: social_stream-base
-  requirement: &73531950 !ruby/object:Gem::Requirement
+  requirement: &85041730 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.14.0
   type: :runtime
   prerelease: false
-  version_requirements: *73531950
+  version_requirements: *85041730
 - !ruby/object:Gem::Dependency
   name: xmpp4r
-  requirement: &73531310 !ruby/object:Gem::Requirement
+  requirement: &85041520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *73531310
+  version_requirements: *85041520
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &73530730 !ruby/object:Gem::Requirement
+  requirement: &85041290 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *73530730
+  version_requirements: *85041290
 - !ruby/object:Gem::Dependency
   name: net-sftp
-  requirement: &73530280 !ruby/object:Gem::Requirement
+  requirement: &85041080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *73530280
+  version_requirements: *85041080
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &73529900 !ruby/object:Gem::Requirement
+  requirement: &85040870 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *73529900
+  version_requirements: *85040870
 description: Social Stream is a Ruby on Rails engine providing your application with
   social networking features and activity streams.
 email: