social_stream-base 0.9.20 → 0.9.21

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream-base
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 9
-  - 20
-  version: 0.9.20
+  - 21
+  version: 0.9.21
 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