social_stream 0.11.5 → 0.11.6

data/events/vendor/assets/stylesheets/jquery.ad-gallery.css

@@ -168,4 +168,4 @@
   position: absolute;
   left: -9000px;
   top: -9000px;
-}
+}

data/lib/social_stream/version.rb

@@ -1,3 +1,3 @@
 module SocialStream
-  VERSION = "0.11.5".freeze
+  VERSION = "0.11.6".freeze
 end

data/presence/app/assets/stylesheets/chat.css

@@ -108,14 +108,22 @@ input.chat_password{
 	margin-bottom: 5px;
 }
 
+
 input.connectChatButton{
 	text-align: center;
+	width: 150px;
+	background-color: #1F4A75;
+  border: 0 none;
+  cursor: pointer;
+	color: white;
+	font-family: Helvetica;
+  font-size: 11px;
+	padding: 2px 0 2px 0px;
 }
 
 
 
 
-
 /* Tooltip */
 
 .tooltip {

data/presence/app/controllers/xmpp_controller.rb

@@ -134,12 +134,12 @@ class XmppController < ApplicationController
   end
  
   def authorization
-    return params[:password] == Socialstream::Presence::XMPP_SERVER_PASSWORD
+    return params[:password] == SocialStream::Presence.xmpp_server_password
   end
   
   
   def chatWindow
-    if (current_user.connected) and (current_user.status != 'disable') and (params[:userConnected]=="true")
+    if (current_user) and (current_user.connected) and (current_user.status != 'disable') and (params[:userConnected]=="true")
       render :partial => 'xmpp/chat_contacts'
     else
       #User not connected or chat desactivated
@@ -159,15 +159,24 @@ class XmppController < ApplicationController
    
   def test
     puts "TEST"
-    client = Jabber::Client.new(Jabber::JID.new('social_stream-presence@trapo'))
-              client.connect
-              password = Socialstream::Presence::PASSWORD
-              client.auth(password)
+      
+    #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)
    
-              #Sending a message
-              msg = Jabber::Message::new('social_stream-presence@trapo', "Message&order")
-              msg.type=:chat
-              client.send(msg) 
+    #Sending a message
+    msg = Jabber::Message::new(ss_sid, "Message&order")
+    msg.type=:chat
+    client.send(msg) 
+    client.close()
   end
   
   

data/presence/app/helpers/xmpp_helper.rb

@@ -1,33 +1,20 @@
 module XmppHelper
+  
   def getChatContacts 
      connected_users = []   
-     contacts = getBidirectionalContacts
+     
+     #Get bidirectional contacts
+     contacts = current_user.contact_actors(:type=>:user)
+     
+     #Apply filters
+     
      contacts.each do |contact|
-       if current_user.name != contact.receiver.name && contact.receiver.subject_type == "User" && contact.receiver.user.connected
-         connected_users << contact.receiver
+       if contact.user.connected
+         connected_users << contact.user
        end
      end
-     
+
     return connected_users  
   end
-  
-  def getBidirectionalContacts
-    #Code for new SS Version
-#    return current_user.contact_actors(:direction => :both)
-    
-    contacts = []
-    csenders = current_user.sent_contacts
-    creceivers = current_user.received_contacts
-    
-    csenders.each do |csender|
-      creceivers.each do |creceiver|
-        if ((csender.sender.name == creceiver.receiver.name) && (csender.receiver.name == creceiver.sender.name))
-            contacts << csender
-          break
-        end
-      end
-    end
-    return contacts
-  end
 
 end

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

@@ -1,4 +1,6 @@
-  <% content_for :headers do %>
+<% if current_subject.subject_type=="User" %>
+	
+	<% content_for :headers do %>
 	  <%= stylesheet_link_tag "chat.css", :media => "screen, projection" %>
 	  <%= javascript_include_tag 'jquery-ui-1.8.14.custom.min'%>
 	  <%= javascript_include_tag 'jquery.ui.chatbox'%>
@@ -12,8 +14,8 @@
 	<script type="text/javascript">
 			
 		//Global variables
-		var BOSH_SERVICE = '<%=Socialstream::Presence::BOSH_SERVICE%>';
-		var domain = '<%=Socialstream::Presence::DOMAIN%>';
+		var BOSH_SERVICE = '<%=SocialStream::Presence.bosh_service%>';
+		var domain = '<%=SocialStream::Presence.domain%>';
     var user_name = '<%=current_user.name%>';
 		var user_slug = '<%=current_user.slug%>';
     var user_jid = '<%=current_user.slug%>'+"@"+domain;
@@ -53,7 +55,7 @@
 	</script>
 			
 	<div id="chat_partial">		
-	<%= render :partial => 'xmpp/chat_connecting' %>
-    <!-- <%= render :partial => 'xmpp/chat_connecting' %> -->
-		<!-- <%= render :partial => 'xmpp/chat_contacts' %> -->
-	</div>
+	  <%= render :partial => 'xmpp/chat_connecting' %>
+	</div>
+	
+<% end %>

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

@@ -31,5 +31,5 @@
       	  <label for="user_password" class="chatPasswordTitle">Password</label>
           <input id="user_password" class="chat_password" type="password"></input>
 				</div>
-				<input class="other_blue connectChatButton storePass" value="Connect">
+				<input class="connectChatButton storePass" value="Connect">
       </div>

data/presence/lib/social_stream-presence.rb

@@ -7,6 +7,18 @@ module SocialStream
       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 :social_stream_presence_username
+
+    class << self
+      def setup
+        yield self
+      end
+    end
+
   end
 end
 

data/presence/lib/social_stream/presence/config.rb

@@ -1,9 +1,5 @@
 module Socialstream
   module Presence
-    DOMAIN = "trapo"
-    BOSH_SERVICE = "http://localhost:8080/http-bind"
-    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"
-    XMPP_SERVER_PASSWORD = "G&s6GBnO)anw2Ene%K12Cb=0quj@uDmA"
     VERSION = "0.0.3"
   end
 end

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

@@ -18,29 +18,42 @@ module SocialStream
                
       initializer "social_stream-presence.synchronize" do
           #Synchronize User Presence
-          #Implement case XMMP Server Down
+          #Reset connected users when XMMP Server Down
           Thread.start {
             begin
-              client = Jabber::Client.new(Jabber::JID.new('social_stream-presence@trapo'))
+              #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
-              password = Socialstream::Presence::PASSWORD
               client.auth(password)
        
-              msg = Jabber::Message::new("social_stream-presence@trapo", "Synchronize")
+              msg = Jabber::Message::new(ss_sid, "Synchronize")
               msg.type=:chat
               client.send(msg)
               client.close()
             
-            rescue Errno::ECONNREFUSED
-              #XMPP Server Down
-              #Reset Connected Users
-              users = User.find_all_by_connected(true)
-              users.each do |user|
-                user.connected = false
-                user.save!
-              end
-              
-            end
+            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
       

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

@@ -1,4 +1,3 @@
-require "social_stream/presence/config"
 require 'xmpp4r'
 require 'xmpp4r/muc'
 require 'xmpp4r/roster'
@@ -18,16 +17,18 @@ module SocialStream
         module InstanceMethods
           
           def save_buddy
-
+            
             unless self.receiver.subject_type == "User" and self.sender.subject_type == "User"
               return
             end
 
             #XMPP DOMAIN
-            domain = Socialstream::Presence::DOMAIN
+            domain = SocialStream::Presence.domain
             #PASSWORD
-            password= Socialstream::Presence::PASSWORD
-            
+            password= SocialStream::Presence.password
+            #SS Username
+            ss_name = SocialStream::Presence.social_stream_presence_username
+              
             user_sid = self.sender.slug + "@" + domain
             buddy_sid = self.receiver.slug + "@" + domain
             buddy_name =  self.receiver.name
@@ -40,19 +41,26 @@ module SocialStream
             end 
             
             begin
-              client = Jabber::Client.new(Jabber::JID.new('social_stream-presence@trapo'))
+              ss_sid = ss_name + "@" + domain
+              client = Jabber::Client.new(Jabber::JID.new(ss_sid))
               client.connect
-              password = Socialstream::Presence::PASSWORD
               client.auth(password)
    
               #Sending a message
               #AddItemToRoster[UserSID,BuddySID,BuddyName,Subscription_type]
-              msg = Jabber::Message::new('social_stream-presence@trapo', "AddItemToRoster&" + user_sid + "&" + buddy_sid + "&" + buddy_name + "&" + sType)
+              msg = Jabber::Message::new(ss_sid, "AddItemToRoster&" + user_sid + "&" + buddy_sid + "&" + buddy_name + "&" + sType)
               msg.type=:chat
-              client.send(msg) 
-            rescue Errno::ECONNREFUSED
-              #Rescue...
-            end
+              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   
             
           end
           

data/social_stream.gemspec

@@ -11,8 +11,8 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.9.19')
-  s.add_runtime_dependency('social_stream-documents', '~> 0.3.1')
+  s.add_runtime_dependency('social_stream-base', '~> 0.9.20')
+  s.add_runtime_dependency('social_stream-documents', '~> 0.3.2')
   s.add_runtime_dependency('social_stream-events', '~> 0.0.12')
  
   # Development Gem dependencies

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream
 version: !ruby/object:Gem::Version 
-  hash: 57
+  hash: 63
   prerelease: 
   segments: 
   - 0
   - 11
-  - 5
-  version: 0.11.5
+  - 6
+  version: 0.11.6
 platform: ruby
 authors: 
 - GING - DIT - UPM
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-13 00:00:00 +02:00
+date: 2011-10-14 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,12 +27,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 29
+        hash: 19
         segments: 
         - 0
         - 9
-        - 19
-        version: 0.9.19
+        - 20
+        version: 0.9.20
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -43,12 +43,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 17
+        hash: 23
         segments: 
         - 0
         - 3
-        - 1
-        version: 0.3.1
+        - 2
+        version: 0.3.2
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -347,7 +347,6 @@ files:
 - base/app/assets/images/mini-loading.gif
 - base/app/assets/images/right.png
 - base/app/assets/images/tipsy.gif
-- base/app/assets/images/title_background.png
 - base/app/assets/javascripts/activities.js.erb
 - base/app/assets/javascripts/contacts.js
 - base/app/assets/javascripts/conversations.js
@@ -512,6 +511,8 @@ files:
 - base/app/views/conversations/show.js.erb
 - base/app/views/devise/passwords/edit.html.erb
 - base/app/views/devise/passwords/new.html.erb
+- base/app/views/devise/registrations/_delete_account.html.erb
+- base/app/views/devise/registrations/_edit_user.html.erb
 - base/app/views/devise/registrations/edit.html.erb
 - base/app/views/devise/registrations/new.html.erb
 - base/app/views/devise/sessions/new.html.erb
@@ -781,7 +782,6 @@ files:
 - base/vendor/assets/javascripts/jquery.watermarkinput.js
 - base/vendor/assets/javascripts/menu.js
 - base/vendor/assets/javascripts/superfish.js
-- base/vendor/assets/javascripts/ui.checkbox.js
 - base/vendor/assets/stylesheets/carousel.css
 - base/vendor/assets/stylesheets/chosen-sprite.png
 - base/vendor/assets/stylesheets/chosen.css
@@ -978,7 +978,7 @@ files:
 - documents/spec/support/devise.rb
 - documents/spec/support/mock.rb
 - documents/vendor/assets/javascripts/jquery.jplayer.js
-- documents/vendor/assets/javascripts/jquery.lightbox.min.js
+- documents/vendor/assets/javascripts/jquery.lightbox-with-resize-plugin.js
 - documents/vendor/assets/stylesheets/jplayer.blue.monday.css
 - documents/vendor/assets/stylesheets/jplayer.blue.monday.jpg
 - documents/vendor/assets/stylesheets/jplayer.blue.monday.video.play.hover.png
@@ -1114,7 +1114,6 @@ files:
 - presence/Rakefile
 - presence/app/assets/audio/chat/onMessageAudio.mp3
 - presence/app/assets/audio/chat/onMessageAudio.wav
-- presence/app/assets/images/arrow.png
 - presence/app/assets/images/black_arrow3.png
 - presence/app/assets/images/status/available.png
 - presence/app/assets/images/status/away.png

data/base/vendor/assets/javascripts/ui.checkbox.js

@@ -1,309 +0,0 @@
-/**
- * @author alexander.farkas
- * @version 1.4.1
- */
-$(document).ready(function() {
-
-	var baseClasses = /ui-checkbox|ui-radio/;
-    $.widget('ui.checkBox', {
-		options: {
-	        hideInput: true,
-			addVisualElement: true,
-			addLabel: true,
-			_delegated: false
-	    },
-        _create: function(){
-            var that = this, 
-				opts = this.options
-			;
-			
-			if(!this.element.is(':radio,:checkbox')){
-				if($.nodeName(this.element[0], 'input')){return false;}
-				this._addDelegate();
-				this.updateContainer();
-				return false;
-			}
-            this.labels = $([]);
-			
-            this.checkedStatus = false;
-			this.disabledStatus = false;
-			this.hoverStatus = false;
-            
-            this.radio = (this.element.is(':radio'));
-					
-            this.visualElement = $([]);
-            if (opts.hideInput) {
-				this.element
-					.addClass('ui-helper-hidden-accessible')
-				;
-				if(opts.addVisualElement){
-					this.visualElement = $('<span />')
-						.addClass(this.radio ? 'ui-radio' : 'ui-checkbox')
-					;
-					this.element.after(this.visualElement[0]);
-				}
-            }
-			
-			if(opts.addLabel){
-				this.labels = $('label[for=' + this.element.attr('id') + ']')
-					.addClass(this.radio ? 'ui-radio' : 'ui-checkbox')
-				;
-			}
-			if(!opts._delegated){
-				this._addEvents();
-			}
-			this.initialized = true;
-            this.reflectUI({type: 'initialReflect'});
-			return undefined;
-        },
-		updateContainer: function(){
-			if(!this.element.is(':radio,:checkbox') && !$.nodeName(this.element[0], 'input')){
-				$('input', this.element[0])
-					.filter(function(){
-						return !($.data(this, 'checkBox'));
-					})
-					.checkBox($.extend({}, this.options, {_delegated: true}))
-				;
-			}
-		},
-		_addDelegate: function(){
-			var opts 		= this.options,
-					
-				toggleHover = function(e, that){
-					if(!that){return;}
-					that.hover = !!(e.type == 'focus' || e.type == 'mouseenter' || e.type == 'focusin' || e.type == 'mouseover');
-					that._changeStateClassChain.call(that);
-					return undefined;
-				}
-			;
-			
-			
-			this.element
-				.bind('click', function(e){
-					if(!$.nodeName(e.target, 'input')){return;}
-					var inst = ($.data(e.target) || {}).checkBox;
-					if(!inst){return;}
-					inst.reflectUI.call(inst, e.target, e);
-				})
-				.bind('focusin.checkBox focusout.checkBox', function(e){
-					if(!$.nodeName(e.target, 'input')){return;}
-					var inst = ($.data(e.target) || {}).checkBox;
-					toggleHover(e, inst);
-				})
-			;
-			
-			if (opts.hideInput){
-				this.element
-					.bind('usermode', function(e){
-						if(!e.enabled){return;}
-						$('input', this).each(function(){
-		                    var inst = ($.data(this) || {}).checkBox;
-							(inst && inst.destroy.call(inst, true));
-						});
-	                })
-				;
-            }
-			
-			if(opts.addVisualElement){
-				this.element
-					.bind('mouseover.checkBox mouseout.checkBox', function(e){
-						if(!$.nodeName(e.target, 'span')){return;}
-						var inst = ( $.data($(e.target).prev()[0]) || {} ).checkBox;
-						toggleHover(e, inst);
-					})
-					.bind('click.checkBox', function(e){
-						if(!$.nodeName(e.target, 'span') || !baseClasses.test( e.target.className || '' )){return;}
-						$(e.target).prev()[0].click();
-						return false;
-					})
-				;
-			}
-			if(opts.addLabel){
-				this.element
-					.delegate('label.ui-radio, label.ui-checkbox', 'mouseenter.checkBox mouseleave.checkBox', function(e){
-						var inst = ( $.data(document.getElementById( $(this).attr('for') )) || {} ).checkBox;
-						toggleHover( e, inst );
-					});
-			}
-			
-		},
-		_addEvents: function(){
-			var that 		= this, 
-			
-				opts 		= this.options,
-					
-				toggleHover = function(e){
-					if(that.disabledStatus){
-						return false;
-					}
-					that.hover = (e.type == 'focus' || e.type == 'mouseenter');
-					that._changeStateClassChain();
-					return undefined;
-				}
-			;
-			
-			this.element
-				.bind('click.checkBox', $.proxy(this, 'reflectUI'))
-				.bind('focus.checkBox blur.checkBox', toggleHover)
-			;
-			if (opts.hideInput){
-				this.element
-					.bind('usermode', function(e){
-	                    (e.enabled &&
-	                        that.destroy.call(that, true));
-	                })
-				;
-            }
-			if(opts.addVisualElement){
-					this.visualElement
-						.bind('mouseenter.checkBox mouseleave.checkBox', toggleHover)
-						.bind('click.checkBox', function(e){
-							that.element[0].click();
-							return false;
-						})
-					;
-				}
-			if(opts.addLabel){
-				this.labels.bind('mouseenter.checkBox mouseleave.checkBox', toggleHover);
-			}
-		},
-		_changeStateClassChain: function(){
-			var allElements = this.labels.add(this.visualElement),
-				stateClass 	= '',
-				baseClass 	= 'ui-'+((this.radio) ? 'radio' : 'checkbox')
-			;
-				
-			if(this.checkedStatus){
-				stateClass += '-checked'; 
-				allElements.addClass(baseClass+'-checked');
-			} else {
-				allElements.removeClass(baseClass+'-checked');
-			}
-			
-			if(this.disabledStatus){
-				stateClass += '-disabled'; 
-				allElements.addClass(baseClass+'-disabled');
-			} else {
-				allElements.removeClass(baseClass+'-disabled');
-			}
-			if(this.hover){
-				stateClass += '-hover'; 
-				allElements.addClass(baseClass+'-hover');
-			} else {
-				allElements.removeClass(baseClass+'-hover');
-			}
-			
-			baseClass += '-state';
-			if(stateClass){
-				stateClass = baseClass + stateClass;
-			}
-			
-			function switchStateClass(){
-				var classes = this.className.split(' '),
-					found = false;
-				$.each(classes, function(i, classN){
-					if(classN.indexOf(baseClass) === 0){
-						found = true;
-						classes[i] = stateClass;
-						return false;
-					}
-					return undefined;
-				});
-				if(!found){
-					classes.push(stateClass);
-				}
-				this.className = classes.join(' ');
-			}
-			
-			this.labels.each(switchStateClass);
-			this.visualElement.each(switchStateClass);
-		},
-        destroy: function(onlyCss){
-            this.element.removeClass('ui-helper-hidden-accessible');
-						if(this.visualElement){
-							this.visualElement.addClass('ui-helper-hidden');
-						}
-            if (!onlyCss) {
-                var o = this.options;
-                this.element.unbind('.checkBox');
-								if(this.visualElement){
-                  this.visualElement.remove();
-                }
-								if(this.labels){
-									this.labels.unbind('.checkBox').removeClass('ui-state-hover ui-state-checked ui-state-disabled');
-								}
-            }
-        },
-		
-        disable: function(){
-            this.element[0].disabled = true;
-            this.reflectUI({type: 'manuallyDisabled'});
-        },
-		
-        enable: function(){
-            this.element[0].disabled = false;
-            this.reflectUI({type: 'manuallyenabled'});
-        },
-		
-        toggle: function(e){
-            this.changeCheckStatus((this.element.is(':checked')) ? false : true, e);
-        },
-		
-        changeCheckStatus: function(status, e){
-            if(e && e.type == 'click' && this.element[0].disabled){
-				return false;
-			}
-			this.element.attr({'checked': status});
-            this.reflectUI(e || {
-                type: 'changeCheckStatus'
-            });
-			return undefined;
-        },
-		
-        propagate: function(n, e, _noGroupReflect){
-			if(!e || e.type != 'initialReflect'){
-				if (this.radio && !_noGroupReflect) {
-					//dynamic
-	                $(document.getElementsByName(this.element.attr('name')))
-						.checkBox('reflectUI', e, true);
-	            }
-	            return this._trigger(n, e, {
-	                options: this.options,
-	                checked: this.checkedStatus,
-	                labels: this.labels,
-					disabled: this.disabledStatus
-	            });
-			}
-			return undefined;
-        },
-		
-      reflectUI: function(e){
-      
-				var oldChecked 		= this.checkedStatus, 
-				oldDisabledStatus 	= this.disabledStatus;
-	            					
-				this.disabledStatus = this.element.is(':disabled');
-				this.checkedStatus = this.element.is(':checked');
-				
-				if (this.disabledStatus != oldDisabledStatus || this.checkedStatus !== oldChecked) {
-	
-					//Change status callback
-	
-					if (this.checkedStatus==true){
-						var id = this.element[0].id;
-						checkBoxEnable(id);
-					} else if (this.checkedStatus==false){
-						var id = this.element[0].id;
-						checkBoxDisable(id);
-					}
-	
-					this._changeStateClassChain();
-					
-					(this.disabledStatus != oldDisabledStatus && this.propagate('disabledChange', e));
-					
-					(this.checkedStatus !== oldChecked && this.propagate('change', e));
-				}
-            
-      }
-    });
-});