social_stream 0.11.6 → 0.11.7

data/base/app/models/activity.rb

@@ -275,9 +275,9 @@ class Activity < ActiveRecord::Base
           relations.select{ |r| r.actor_id == Actor.normalize_id(subject)}
 
         if visible_relations.present?
-          [ :visible, visible_relations.map(&:name).join(", ") ]
+          [ :visible, visible_relations.map(&:name).uniq.join(", ") ]
         else
-          [ :hidden, relations.map(&:actor).map(&:name).join(", ") ]
+          [ :hidden, relations.map(&:actor).map(&:name).uniq.join(", ") ]
         end
       end
 

data/base/app/models/contact.rb

@@ -107,6 +107,11 @@ class Contact < ActiveRecord::Base
       inverse.ties_count > 0
   end
 
+  def positive_replied?
+    inverse_id.present? &&
+      self.class.positive.where(:id => inverse.id).any?
+  end
+
   # The {ActivityVerb} corresponding to this {Contact}. If this contact is pending,
   # the other one was establised already, so this is going to "make-friend".
   # If it is not pending, the contact in the other way was not established, so this

data/base/app/models/relation.rb

@@ -135,6 +135,11 @@ class Relation < ActiveRecord::Base
     Relation.mode(sender_type, receiver_type)
   end
 
+  # Is this {Relation} a Positive one?
+  def positive?
+    self.class.positive_names.include?(self.class.to_s)
+  end
+
   private
 
   # Before create callback

data/base/app/models/tie.rb

@@ -82,6 +82,21 @@ class Tie < ActiveRecord::Base
     receiver.subject
   end
 
+  # The {Tie} is positive if its {Relation} is
+  def positive?
+    relation.positive?
+  end
+
+  # Does this {Tie} have positive {Tie ties} in the other way?
+  def positive_replied?
+    contact.positive_replied?
+  end
+
+  # This {Tie} is {#positive? positive} and {#positive_replied? positive replied}
+  def bidirectional?
+    positive? && positive_replied?
+  end
+
   private
 
   # before_create callback

data/base/app/views/devise/registrations/new.html.erb

@@ -36,7 +36,7 @@
       <%= render :partial => "devise/shared/links" %>
     </div>
     <div class="form_row center">
-      <div class="btn_login"><%= f.submit t('action.accept').capitalize,:class=>"button"  %></div>
+      <div class="btn_login"><%= f.submit t('action.accept').capitalize,:class=>"button storePass"%></div>
     </div>
   <% end %>
 </div>

data/base/app/views/devise/sessions/new.html.erb

@@ -27,7 +27,7 @@
       </div>
 
       <div class="btn_login">
-        <%= f.submit t('action.send'), :class =>"button" %>
+        <%= f.submit t('action.send'), :class =>"button storePass" %>
       </div>
     <% end %>
   </div>

data/base/app/views/layouts/_header_dropdown_menu_sessions.html.erb

@@ -1,7 +1,7 @@
 <% representations = current_user.represented.unshift(current_user) - [current_subject] %>
 <% unless representations.empty? %>
 <li>
-  <%= link_to "Switch session", "javascript:;", :class=>"session_change" %>
+  <%= link_to t('representation.switch'), "javascript:;", :class=>"session_change" %>
   <ul>
     <% representations.each do |representation| %>
     <li>
@@ -10,4 +10,4 @@
     <% end %>
   </ul>
 </li>
-<% end %> 
+<% end %> 

data/base/app/views/layouts/_header_signed_out.erb

@@ -17,7 +17,7 @@
         </div>
         
         <div class="login_data_block">
-        <%= f.submit t(:sign_in), :class => 'other_blue'%>
+          <%= f.submit t(:sign_in), :class => 'other_blue storePass'%>
         </div>
       </div>
       <div class="options">

data/base/app/views/subjects/_contacts.html.erb

@@ -10,7 +10,7 @@
   <div class ="content">
       <div class="contact space_center">
         <% cs.each do |contact| %>
-            <%= link_to(image_tag(contact.logo.url(:contact), :alt => contact.name , :size => "28x28"), contact) %>
+          <%= link_to(image_tag(contact.logo.url(:contact), :alt => contact.name, :title => contact.name, :size => "28x28"), contact) %>
         <% end %>
       </div>
   </div>

data/base/config/locales/en.yml

@@ -371,6 +371,8 @@ en:
     title: "Privacy & context"
   relation_public:
     name: "Public"
+  representation:
+    switch: "Switch session"
   required: "(*) These fields are required"
   search:
     all_results: "Search all %{subject} (%{count})"

data/base/config/locales/es.yml

@@ -48,7 +48,7 @@ es:
       myself:
         contacts:
           group: "Todos los integrantes"
-          user: "Tus contacts"
+          user: "Tus contactos"
       outside:
         contacts:
           group: "Integrantes de %{receiver}"
@@ -137,7 +137,7 @@ es:
     confirm: "¿Borrar %{element}}?"
   devise:
     links:
-      sign_in: "Entrar"
+      sign_in: "Ingresar"
       sign_up: "Registrarse"
       forgot_password: "¿Olvidaste tu contraseña?"
       confirmation_instructions: "¿No recibiste instrucciones de confirmación?"
@@ -366,6 +366,8 @@ es:
     title: "Privacidad y contexto"
   relation_public:
     name: "Público"
+  representation:
+    switch: "Cambiar sessión"
   required: "(*) Estos campos son obligatorios"
   search:
     all_subject_results: "Ver todos %{subject} (%{count})"
@@ -414,7 +416,7 @@ es:
       briefing: "Cambia tu contraseña"
     success: "Ajustes guardados con éxito"
   share: "Compartir"
-  sign_in: "Entrar"
+  sign_in: "Ingresar"
   sign_out: "Salir"
   sign_up: "Registrarse"
   site:

data/base/lib/social_stream/base/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.9.20".freeze
+    VERSION = "0.9.21".freeze
   end
 end

data/base/spec/models/tie_spec.rb

@@ -59,6 +59,10 @@ describe Tie do
   end
 
   describe "with public relation" do
+    before do
+      @tie = Factory(:public)
+    end
+
     it "should create activity" do
       count = Activity.count
 
@@ -66,9 +70,55 @@ describe Tie do
 
       Activity.count.should eq(count + 1)
     end
+
+    it "should be positive" do
+      @tie.should be_positive
+    end
+
+    it "should not be positive replied" do
+      @tie.should_not be_positive_replied
+    end
+
+    context "with public reply" do
+      before do
+        Factory(:public, :contact => @tie.contact.inverse!)
+
+        # It should reload tie.contact again, as its inverse is now set
+        @tie.reload
+      end
+
+      it "should be positive replied" do
+        @tie.should be_positive_replied
+      end
+
+      it "should be bidirectional" do
+        @tie.should be_bidirectional
+      end
+    end
+
+    context "with reject reply" do
+      before do
+       Factory(:reject, :contact => @tie.contact.inverse!)
+
+        # It should reload tie.contact again, as its inverse is now set
+        @tie.reload
+      end
+
+      it "should not be positive replied" do
+        @tie.should_not be_positive_replied
+      end
+
+      it "should not be bidirectional" do
+        @tie.should_not be_bidirectional
+      end
+    end
   end
 
   describe "with reject relation" do
+    before do
+      @tie = Factory(:reject)
+    end
+
     it "should not create activity" do
       count = Activity.count
 
@@ -76,7 +126,44 @@ describe Tie do
 
       Activity.count.should eq(count)
     end
-  end
 
+    it "should not be positive" do
+      @tie.should_not be_positive
+    end
+
+    context "with public reply" do
+      before do
+        Factory(:public, :contact => @tie.contact.inverse!)
+
+        # It should reload tie.contact again, as its inverse is now set
+        @tie.reload
+      end
+
+      it "should be positive replied" do
+        @tie.should be_positive_replied
+      end
+
+      it "should not be bidirectional" do
+        @tie.should_not be_bidirectional
+      end
+    end
+
+    context "with reject reply" do
+      before do
+       Factory(:reject, :contact => @tie.contact.inverse!)
+
+        # It should reload tie.contact again, as its inverse is now set
+        @tie.reload
+      end
+
+      it "should not be positive replied" do
+        @tie.should_not be_positive_replied
+      end
+
+      it "should not be bidirectional" do
+        @tie.should_not be_bidirectional
+      end
+    end
+  end
 end
 

data/events/lib/social_stream/events/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Events
-    VERSION = "0.0.12".freeze
+    VERSION = "0.0.13".freeze
   end
 end

data/events/social_stream-events.gemspec

@@ -12,7 +12,7 @@ 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-base', '~> 0.9.21')
   s.add_runtime_dependency('conference_manager-ruby', '~> 0.0.3')
 
   # Development Gem dependencies

data/lib/social_stream/version.rb

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

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

@@ -2,16 +2,7 @@
 //Store password with session storage
 ////////////////////
 
-function log(msg) {
-    console.log(msg)
-}
-
 $(document).ready(function () {
-
-		$('#sign_in_header').bind('click', function () {
-      	 storePassword();
-    });
-		
 		$('.storePass').bind('click', function () {
          storePassword();
     });
@@ -22,6 +13,8 @@ function storePassword() {
     if (window.sessionStorage) {
 			if (($("#user_password").length==1)&&($("#user_password").val()!="")){
         sessionStorage.setItem("ss_user_pass", $('#user_password').val());
-      }
+      } else if (($("#password").length==1)&&($("#password").val()!="")){
+				sessionStorage.setItem("ss_user_pass", $('#password').val());
+			}
     }
 }

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

@@ -3,7 +3,7 @@
 ////////////////////
 
 function log(msg) {
-    console.log(msg)
+    //console.log(msg)
 }
 
 
@@ -155,6 +155,7 @@ function onMessage(msg) {
 
 
 function onPresence(presence) {
+	    //log(presence);
 		  from = $(presence).attr('from');
 		  slug = from.split("@")[0];
 		  if(slug != user_slug){
@@ -240,11 +241,6 @@ function initAndPlaySound(sound){
 //Chat view jquery
 ////////////////////
 
-$(document).ready(function () {
-		initialTimer = setTimeout("updateChatWindow()", 15000);
-		initAudio();
-});
-
 function setUserFunctions(){
 	
 	$("div.user_presence").click(function(event, ui){

data/presence/app/controllers/xmpp_controller.rb

@@ -139,7 +139,7 @@ class XmppController < ApplicationController
   
   
   def chatWindow
-    if (current_user) and (current_user.connected) and (current_user.status != 'disable') and (params[:userConnected]=="true")
+    if (current_user) and (current_user.status != 'disable') and (params[:userConnected]=="true")
       render :partial => 'xmpp/chat_contacts'
     else
       #User not connected or chat desactivated
@@ -160,23 +160,47 @@ class XmppController < ApplicationController
   def test
     puts "TEST"
       
-    #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(ss_sid, "Message&order")
-    msg.type=:chat
-    client.send(msg) 
-    client.close()
+#    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()
+#    }  
+
   end
   
   

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

@@ -50,6 +50,8 @@
 			if (connectToServer(null)==false){
 				refreshChatWindow();
 			}
+			initialTimer = setTimeout("updateChatWindow()", 15000);
+      initAudio();
 		});
 		
 	</script>

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

@@ -28,27 +28,32 @@ module SocialStream
             password= SocialStream::Presence.password
             #SS Username
             ss_name = SocialStream::Presence.social_stream_presence_username
+            ss_sid = ss_name + "@" + domain
               
             user_sid = self.sender.slug + "@" + domain
+            user_name =  self.sender.name  
             buddy_sid = self.receiver.slug + "@" + domain
             buddy_name =  self.receiver.name
-              
-            #Check Subscription_type
-            if isBidirectionalTie
-              sType = "both"
-            else
-              sType = "from"
-            end 
+            
             
             begin
-              ss_sid = ss_name + "@" + domain
               client = Jabber::Client.new(Jabber::JID.new(ss_sid))
               client.connect
               client.auth(password)
    
-              #Sending a message
-              #AddItemToRoster[UserSID,BuddySID,BuddyName,Subscription_type]
-              msg = Jabber::Message::new(ss_sid, "AddItemToRoster&" + user_sid + "&" + buddy_sid + "&" + buddy_name + "&" + sType)
+              #Check if is a positive and replied tie         
+              if self.bidirectional?
+                #SetRosterForBidirectionalTie[UserASID,UserBSID,UserAName,UserBName]
+                msg = Jabber::Message::new(ss_sid, "SetRosterForBidirectionalTie&" + user_sid + "&" + buddy_sid + "&" + buddy_name + "&" + user_name) 
+              elsif self.positive?
+                #Case: Possitive tie unidirectional
+                sType = "from"
+                #AddItemToRoster[UserSID,BuddySID,BuddyName,Subscription_type]
+                msg = Jabber::Message::new(ss_sid, "AddItemToRoster&" + user_sid + "&" + buddy_sid + "&" + buddy_name + "&" + sType)
+              else
+                return  
+              end
+
               msg.type=:chat
               client.send(msg)
               client.close()
@@ -64,10 +69,6 @@ module SocialStream
             
           end
           
-          def isBidirectionalTie
-            return true
-          end
-          
         end
       end
     end

data/presence/lib/tasks/presence/synchronize.rake

@@ -0,0 +1,63 @@
+namespace :presence do
+  desc 'Synchronize the Xmpp Server database with the Social Stream database'
+  task :synchronize => [ 'presence:synchronize:connections', 'presence:synchronize:rosters' ]
+
+  namespace :synchronize do
+
+
+    desc "Synchronize user presence."
+    task :connections => :environment do
+      puts "Starting presence:synchronize:connections"
+      puts "Synchronization complete"
+    end
+
+    desc "Remove all rosters and populate rosters from Social Stream data."
+    task :rosters => :environment do
+        puts "Starting presence:synchronize:rosters"
+        
+        #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 
+        
+        puts "Connecting to Xmpp Server"
+        client = Jabber::Client.new(Jabber::JID.new(ss_sid))
+        client.connect
+        client.auth(password)
+        puts "Connected to Xmpp Server"
+        
+        puts "Remove all rosters"
+        msg = Jabber::Message::new(ss_sid, "SynchronizeRosters")
+        msg.type=:chat
+        client.send(msg)
+        
+   
+        puts "Populate 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
+
+        puts "Synchronization complete"
+        puts "Closing connection"
+        client.close()  
+        puts "Connection closing"
+      
+    end
+  end
+end

data/social_stream.gemspec

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 61
   prerelease: 
   segments: 
   - 0
   - 11
-  - 6
-  version: 0.11.6
+  - 7
+  version: 0.11.7
 platform: ruby
 authors: 
 - GING - DIT - UPM
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-14 00:00:00 +02:00
+date: 2011-10-17 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,12 +27,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 17
         segments: 
         - 0
         - 9
-        - 20
-        version: 0.9.20
+        - 21
+        version: 0.9.21
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -59,12 +59,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 5
         segments: 
         - 0
         - 0
-        - 12
-        version: 0.0.12
+        - 13
+        version: 0.0.13
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -1169,6 +1169,7 @@ files:
 - presence/lib/social_stream/presence/config.rb
 - presence/lib/social_stream/presence/engine.rb
 - presence/lib/social_stream/presence/models/buddy_manager.rb
+- presence/lib/tasks/presence/synchronize.rake
 - presence/social_stream-presence.gemspec
 - presence/spec/demo/.gitignore
 - presence/spec/demo/.rspec