social_stream-base 0.7.2 → 0.7.3

data/app/assets/javascripts/conversations.js

@@ -1,3 +1,3 @@
 //= require jquery.scrollTo.min
 //= require jquery.validate
-//= require ckeditor.rails
+//= require jquery.cleditor.min

data/app/assets/javascripts/messages.js

@@ -1,3 +1,3 @@
 //= require jquery.fcbkcomplete
 //= require jquery.validate
-//= require ckeditor.rails
+//= require jquery.cleditor.min

data/app/assets/stylesheets/conversations.css

@@ -1,3 +1,4 @@
 /*
  *= require messages
+ *= require jquery.cleditor
  */

data/app/assets/stylesheets/messages.css

@@ -1,5 +1,6 @@
 /*
  *= require fcbkComplete
+ *= require jquery.cleditor
  */
 
 /******************** Common ***********************/

data/app/controllers/groups_controller.rb

@@ -20,6 +20,12 @@ class GroupsController < InheritedResources::Base
     end
   end
 
+  def show
+    show! do |format|
+      format.html { render :layout => (user_signed_in? ? 'application' : 'frontpage') }
+    end
+  end
+
   def create
     create! do |success, failure|
       success.html {

data/app/controllers/users_controller.rb

@@ -15,6 +15,12 @@ class UsersController < InheritedResources::Base
     end
   end
 
+  def show
+    show! do |format|
+      format.html { render :layout => (user_signed_in? ? 'application' : 'frontpage') }
+    end
+  end
+
   # Supported through devise
   def new; end; def create; end
   # Not supported yet

data/app/helpers/contacts_helper.rb

@@ -3,22 +3,20 @@ module ContactsHelper
     "N contacts in common"
   end
 
+  def contact_link(c)
+    link_to c.status,
+            edit_contact_path(c),
+            :title => t("contact.#{ c.action }.title", :name => c.receiver.name)
+
+  end
+
   # Show current ties from current user to actor, if they exist, or provide a link
   # to create new ties to actor
   def contact_to(a)
     if user_signed_in?
-      link_to contact_status(a),
-              edit_contact_path(current_subject.contact_to!(a)),
-                                :title => t("contact.new.title",
-                                :name => a.name)
+      contact_link current_subject.contact_to!(a)
     else
       link_to t("contact.new.link"), new_user_session_path
     end
   end
-
-  def contact_status(a)
-    current_subject.ties_to?(a) ?
-      current_subject.ties_to(a).map(&:relation_name).join(", ") :
-      t("contact.new.link")
-  end
 end

data/app/helpers/profiles_helper.rb

@@ -28,4 +28,10 @@ module ProfilesHelper
     end
   end
   
+  #Returns the value if user is signed in or a link to sign in view
+  def show_if_signed_in(info)
+    return info if user_signed_in?
+    return link_to t('profile.must_be_signed_id'), new_user_session_path
+  end
+  
 end

data/app/models/activity.rb

@@ -14,6 +14,8 @@
 class Activity < ActiveRecord::Base
   has_ancestry
 
+  paginates_per 10
+
   belongs_to :contact
   belongs_to :activity_verb
 

data/app/models/activity_object.rb

@@ -16,12 +16,12 @@ class ActivityObject < ActiveRecord::Base
   
   has_many :activity_object_activities, :dependent => :destroy
   has_many :activities, :through => :activity_object_activities
-  has_one  :actor
 
   # The object of this activity object
   def object
-    subtype_instance ||
-      actor.try(:subject)
+    subtype_instance.is_a?(Actor) ?
+      subtype_instance.subject :
+      subtype_instance
   end
 
   # The activity in which this activity_object was created

data/app/models/actor.rb

@@ -151,8 +151,7 @@ class Actor < ActiveRecord::Base
   
   # The subject instance for this actor
   def subject
-    subtype_instance ||
-    activity_object.try(:object)
+    subtype_instance
   end
 
   # All the {Relation relations} defined by this {Actor}
@@ -233,46 +232,24 @@ class Actor < ActiveRecord::Base
   # Return a contact to subject. Create it if it does not exist
   def contact_to!(subject)
     contact_to(subject) ||
-      sent_contacts.create!(:receiver_id => Actor.normalize_id(subject))
+      sent_contacts.create!(:receiver => Actor.normalize(subject))
   end
-  
-  # This is an scaffold for a recomendations engine
-  #
-  
-  # Make n suggestions
-  # TODO: make more
-  def suggestions(n)
-    n.times.map{ |m| suggestion }
+
+  def sent_active_contact_ids
+    sent_contacts.active.map(&:receiver_id)
   end
   
-  # By now, it returns a tie suggesting a relation from SuggestedRelations
-  # to another subject without any current relation
-  #
-  # Options::
-  # * type: the class of the recommended subject
+  # By now, it returns a suggested {Contact} to another {Actor} without any current {Tie}
   #
   # @return [Contact]
-  def suggestion(options = {})
-    candidates_types =
-      ( options[:type].present? ?
-          Array(options[:type]) :
-          self.class.subtypes )
-    
-    candidates_classes = candidates_types.map{ |t| t.to_s.classify.constantize }
-    
-    # Candidates are all the instance of "type" minus all the subjects
-    # that are receiving any tie from this actor
-    candidates = candidates_classes.inject([]) do |cs, klass|
-      cs += klass.all - contact_subjects(:type => klass.to_s.underscore, :direction => :sent, :relations => relations.to_a)
-      cs -= Array(subject) if subject.is_a?(klass)
-      cs
-    end
-    
-    candidate = candidates[rand(candidates.size)]
-    
-    return nil unless candidate.present?
-    
-    contact_to!(candidate)
+  def suggestions(size = 1)
+    candidates = Actor.where(Actor.arel_table[:id].not_in(sent_active_contact_ids + [id]))
+
+    size.times.map {
+      candidates.delete_at rand(candidates.size)
+    }.compact.map { |a|
+      contact_to! a
+    }
   end
   
   # Set of ties sent by this actor received by subject
@@ -280,15 +257,11 @@ class Actor < ActiveRecord::Base
     sent_ties.merge(Contact.received_by(subject))
   end
 
+  # Is there any {Tie} sent by this actor and received by subject
   def ties_to?(subject)
     ties_to(subject).present?
   end
 
- 
-  def ties_to?(a)
-    ties_to(a).present?
-  end
-
   # Can this actor be represented by subject. Does she has permissions for it?
   def represented_by?(subject)
     return false if subject.blank?
@@ -332,9 +305,17 @@ class Actor < ActiveRecord::Base
       Relation.allow(self, 'create', 'activity', :in => activity.relations)
   end
 
+  def pending_contacts_count
+    received_contacts.not_reflexive.pending.count
+  end
+
+  def pending_contacts?
+    pending_contacts_count > 0
+  end
+
   # Build a new {Contact} from each that has not inverse
   def pending_contacts
-    received_contacts.not_reflexive.pending.all.map do |c|
+    received_contacts.not_reflexive.pending.includes(:inverse).all.map do |c|
       c.inverse ||
         c.receiver.contact_to!(c.sender)
     end

data/app/models/contact.rb

@@ -21,15 +21,15 @@ class Contact < ActiveRecord::Base
              :class_name => "Contact"
 
   belongs_to :sender,
-             :class_name => "Actor",
-             :include => SocialStream.subjects
+             :class_name => "Actor"
   belongs_to :receiver,
-             :class_name => "Actor",
-             :include => SocialStream.subjects
+             :class_name => "Actor"
 
   has_many :ties
   has_many :relations, :through => :ties
 
+  has_many :activities
+
   scope :sent_by, lambda { |a|
     where(:sender_id => Actor.normalize_id(a))
   }
@@ -78,16 +78,23 @@ class Contact < ActiveRecord::Base
       receiver.contact_to!(sender)
   end
 
-  # Is not the inverse of this {Contact}
-  def pending?
-    inverse &&
+  # Has this {Contact} any {Tie}?
+  def established?
+    ties_count > 0
+  end
+
+  # The {Contact} in the other way is established
+  def replied?
+    inverse_id.present? &&
       inverse.ties_count > 0
   end
 
-  # The {ActivityVerb} corresponding to this {Contact}, depending on if
-  # it is pending or already replied
+  # 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
+  # is following
   def verb
-    pending? ? "follow" : "make-friend"
+    replied? ? "make-friend" : "follow"
   end
 
   # has_many collection=objects method does not trigger destroy callbacks,
@@ -115,6 +122,12 @@ class Contact < ActiveRecord::Base
     end
   end
 
+  def status
+    established? ?
+      ties.includes(:relation).map(&:relation_name).join(", ") :
+      I18n.t("contact.new.link")
+  end
+
   private
 
   def remove_follower(ids)

data/app/views/contacts/_contact.html.erb

@@ -11,7 +11,7 @@
       <%= contact_brief(contact.receiver_subject) %>
     </div>
     <div class="link" id="contact_link<%= dom_id(contact.receiver_subject)%>">
-      <%= contact_to(contact.receiver) %>
+      <%= contact_link(contact) %>
     </div>
   </div>
   <div class="close"><%= link_to 'X', contact, :method => :delete, :remote => true %></div>

data/app/views/contacts/_pendings.html.erb

@@ -1,4 +1,4 @@
-<% if current_subject.pending_contacts.any? %>
+<% if current_subject.pending_contacts? %>
 <div class="block">
   <div class="header">
     <%= image_tag('btn/btn_notifications.png', :class => "header_icon") %>
@@ -9,7 +9,7 @@
   <div class="content">
     <%= render current_subject.pending_contacts.shuffle.first(2) %>
     <div class="row more_pending">
-      <%= link_to t('contact.pending.all_n', :count => current_subject.pending_contacts.size), contacts_path(:pending=>true)%>
+      <%= link_to t('contact.pending.all_n', :count => current_subject.pending_contacts_count), contacts_path(:pending=>true)%>
     </div>
     <div class="space_center">
     </div>

data/app/views/contacts/_suggestions.html.erb

@@ -1,4 +1,4 @@
-<% if current_subject.suggestion.present? %>
+<% if (sgs = current_subject.suggestions(2)).present? %>
   <div class="block">
     <div class="header">
       <%= image_tag('btn/notifications.png', :class => "header_icon") %>
@@ -8,9 +8,7 @@
     </div>
     <div class="content">
       <div class="suggestions">
-        <% if (sgs = current_subject.suggestions(2)).present? %>
-          <%= render sgs %>
-        <%end%>
+        <%= render sgs %>
       </div>
     </div>
   </div>

data/app/views/contacts/destroy.js.erb

@@ -1,5 +1,5 @@
 <% 
-  new_contact = @contact.pending? ? current_subject.pending_contacts.last : current_subject.suggestion 
+  new_contact = @contact.replied? ? current_subject.pending_contacts.last : current_subject.suggestions.first
   render_string = new_contact.present? ? render(new_contact) : ""
 %>
 

data/app/views/conversations/show.html.erb

@@ -11,28 +11,17 @@
 <% content_for :javascript do %>
 $('.cont_conversation').validate();
 <% unless @box.eql?'trash' %>
-$('#body').ckeditor(
-	function(){
-		$('#cke_top_body').click(updateTextArea);
+  $("#body").cleditor({
+    width:493,
+    controls:  "<%= t('cleditor.controls')%>"   
+  });
+
 		var message_hash = window.location.hash.match(/^.*message_(\d+).*$/);
 		if (message_hash && message_hash.length > 0){
 			$.scrollTo('#message_' + message_hash[1] ,1500,{axis:'y'});
 		}else{
 			$.scrollTo('#message_<%= @conversation.last_message.id %>',1500,{axis:'y'});		
-		}}
-	,{ width:525 }
-);
-var editor = $('#body').ckeditorGet();
-editor.on("instanceReady", function(){
-this.document.on("keyup", updateTextArea);
-this.document.on("paste", updateTextArea);
-this.document.on("mousedown", updateTextArea);
-});
-
-var updateTextArea = function (){
-editor.updateElement();
-$("#body").trigger('keyup');
-}
+		}
 <% else %>
 		var message_hash = window.location.hash.match(/^.*message_(\d+).*$/);
 		if (message_hash && message_hash > 0){

data/app/views/conversations/show.js.erb

@@ -4,34 +4,23 @@ $("#content").html("<%= escape_javascript(render :partial => 'show') %>");
 
 $('.cont_conversation').validate();
 <% unless @box.eql?'trash' %>
-	$('#body').ckeditor(
-		function(){$('#cke_top_body').click( updateTextArea);
-		var message_hash = window.location.hash.match(/^.*message_(\d+).*$/);
-		if (message_hash && message_hash.length > 0){
-			$.scrollTo('#message_' + message_hash[1] ,1500,{axis:'y'});
-		}else{
-			$.scrollTo('#message_<%= @conversation.last_message.id %>',1500,{axis:'y'});		
-		}
-		},
-		{ width:525, customConfig:'/javascripts/ckeditor/config.js',skin:'../javascripts/ckeditor/skins/kama'}
-	);
-	var editor = $('#body').ckeditorGet();
-		editor.on("instanceReady", function(){
-			this.document.on("keyup", updateTextArea);
-			this.document.on("paste", updateTextArea);
-			this.document.on("mousedown", updateTextArea);
-		}
-	);
-	
-	var updateTextArea = function (){
-		editor.updateElement();
-		$("#body").trigger('keyup');
+  $("#body").cleditor({
+    width:493,
+    controls:  "<%= t('cleditor.controls')%>"   
+  });
+
+	var message_hash = window.location.hash.match(/^.*message_(\d+).*$/);
+	if (message_hash && message_hash.length > 0){
+		$.scrollTo('#message_' + message_hash[1] ,1500,{axis:'y'});
+	}else{
+		$.scrollTo('#message_<%= @conversation.last_message.id %>',1500,{axis:'y'});		
 	}
+
 <% else %>
 	var message_hash = window.location.hash.match(/^.*message_(\d+).*$/);
-		if (message_hash && message_hash.length > 0){
-			$.scrollTo('#message_' + message_hash[1] ,1500,{axis:'y'});
-		}else{
-			$.scrollTo('#message_<%= @conversation.last_message.id %>',1500,{axis:'y'});		
-		}
+	if (message_hash && message_hash.length > 0){
+		$.scrollTo('#message_' + message_hash[1] ,1500,{axis:'y'});
+	}else{
+		$.scrollTo('#message_<%= @conversation.last_message.id %>',1500,{axis:'y'});		
+	}
 <% end %>

data/app/views/messages/_new.html.erb

@@ -1,7 +1,4 @@
-<%= location(
-	link_to(image_tag("btn/new.png", :class => "menu_icon")+t('message.other'), conversations_path,:remote => true),
-	link_to(image_tag("btn/message_new.png", :class => "menu_icon")+ t('message.new'), new_message_path, :remote => true)
-) %>
+
 
 <br class="clearfloat" />
 <div class="space_center"></div>