social_stream-base 0.12.1 → 0.13.0

data/app/models/actor.rb

@@ -316,10 +316,17 @@ class Actor < ActiveRecord::Base
   end
 
   # The {Contact} of this {Actor} to self (totally close!)
-  def ego_contact
+  def self_contact
     contact_to!(self)
   end
 
+  alias_method :ego_contact, :self_contact
+
+  # The {Channel} of this {Actor} to self (totally close!)
+  def self_channel
+    Channel.find_or_create_by_author_id_and_user_author_id_and_owner_id id, id, id
+  end
+
   def sent_active_contact_ids
     @sent_active_contact_ids ||=
       load_sent_active_contact_ids
@@ -483,7 +490,7 @@ class Actor < ActiveRecord::Base
   end
   
   def liked_by(subject) #:nodoc:
-    likes.joins(:contact).merge(Contact.sent_by(subject))
+    likes.joins(:channel).merge(Channel.subject_authored_by(subject))
   end
   
   # Does subject like this {Actor}?
@@ -492,9 +499,14 @@ class Actor < ActiveRecord::Base
   end
   
   # Build a new activity where subject like this
-  def new_like(subject)
+  def new_like(subject, user)
+    channel =
+      Channel.
+        find_or_create_by_author_id_and_user_author_id_and_owner_id Actor.normalize_id(subject),
+                                                                    Actor.normalize_id(user),
+                                                                    id
     a = Activity.new :verb => "like",
-                     :contact => subject.contact_to!(self),
+                     :channel => channel,
                      :relation_ids => Array(subject.relation_public.id)
     
     a.activity_objects << activity_object           
@@ -556,6 +568,10 @@ class Actor < ActiveRecord::Base
   def load_sent_active_contact_ids
     sent_contacts.active.map(&:receiver_id)
   end
+  
+  def unread_messages_count
+    mailbox.inbox(:unread => true).count(:id, :distinct => true)
+  end
 end
 
 ActiveSupport.run_load_hooks(:actor, Actor)

data/app/models/channel.rb

@@ -19,7 +19,8 @@ class Channel < ActiveRecord::Base
   belongs_to :user_author,
              :class_name => "Actor"
 
-  has_many :activity_objects
+  has_many :activity_objects, :dependent => :destroy
+  has_many :activities, :dependent => :destroy
 
   validates_uniqueness_of :author_id,      :scope => [ :owner_id,  :user_author_id ]
   validates_uniqueness_of :owner_id,       :scope => [ :author_id, :user_author_id ]
@@ -31,6 +32,12 @@ class Channel < ActiveRecord::Base
     where(arel_table[:author_id].eq(id).or(arel_table[:user_author_id].eq(id)))
   }
 
+  scope :subject_authored_by, lambda { |subject|
+    id = Actor.normalize_id subject
+
+    where(:author_id => id)
+  }
+
   # The {SocialStream::Models::Subject subject} author
   def author_subject
     author.subject
@@ -45,4 +52,9 @@ class Channel < ActiveRecord::Base
   def user_author_subject
     user_author.subject
   end
+
+  # Does this {Channel} have the same sender and receiver?
+  def reflexive?
+    author_id == owner_id
+  end
 end

data/app/models/comment.rb

@@ -3,6 +3,10 @@ class Comment < ActiveRecord::Base
 
   validates_presence_of :text
 
+  def parent_post
+    self.post_activity.parent.direct_object
+  end
+
   def _activity_parent_id=(id)
     self._relation_ids = Activity.find(id).relation_ids
     @_activity_parent_id = id

data/app/models/contact.rb

@@ -5,21 +5,6 @@
 # for instance), and they do not mean that there is a real link between those two
 # {SocialStream::Models::Subject Subjects}. Link existance is stored as {Tie Ties}.
 #
-# = {Contact Contacts} and {Activity activities}
-#
-# WARNING: This will be change soon to direct references to author, owner and user_author,
-# in the same way as {ActivityObject}
-#
-# Each {Activity} is attached to a {Contact}. When _Alice_ post in _Bob_'s wall,
-# the {Activity} is attached to the {Contact} from _Alice_ to _Bob_
-#
-# * The sender of the {Contact} is the author of the {Activity}.
-#   It is the user that uploads a resource to the website or the social entity that
-#   originates the {Activity} (for example: add as contact).
-#
-# * The receiver {Actor} of the {Contact} is the receiver of the {Activity}.
-#   The {Activity} will appear in the wall of the receiver, depending on the permissions
-#
 class Contact < ActiveRecord::Base
   # Send a message when this contact is created or updated
   attr_accessor :message
@@ -33,13 +18,12 @@ class Contact < ActiveRecord::Base
              :class_name => "Actor"
 
   has_many :ties,
-           :dependent => :destroy
+           :dependent  => :destroy,
+           :before_add => :set_user_author
+
   has_many :relations,
            :through => :ties
 
-  has_many :activities,
-           :dependent => :destroy
-
   scope :sent_by, lambda { |a|
     where(:sender_id => Actor.normalize_id(a))
   }
@@ -131,11 +115,27 @@ class Contact < ActiveRecord::Base
   # so follower_count will not be updated
   #
   # We need to update that status here
+  #
+  # FIXME: use :after_remove callback
+  # http://api.rubyonrails.org/classes/ActiveRecord/Associations/ClassMethods.html#label-Association+callbacks
   def relation_ids=(ids)
     remove_follower(ids)
     association(:relations).ids_writer(ids)
   end
 
+  # Record who creates ties in behalf of a group or organization
+  #
+  # Defaults to the sender actor, if it is a user
+  def user_author
+    @user_author ||
+      build_user_author
+  end
+
+  # Set who creates ties in behalf of a group or organization
+  def user_author= subject
+    @user_author = (subject.nil? ? nil : Actor.normalize(subject))
+  end
+
   # Is this {Contact} +new+ or +edit+ for {SocialStream::Models::Subject subject} ?
   #
   # action is +new+ when, despite of being created, it has not {Tie ties} or it has a {Tie} with a
@@ -161,8 +161,44 @@ class Contact < ActiveRecord::Base
     end
   end
 
+  # The related {Channel} to this {Contact}.
+  #
+  # If the sender of this {Contact} is a user, the {Channel} is defined. If it is
+  # other kind of {SocialStream::Models::Subject}, the {Channel#user_author} must
+  # be provided.
+  def channel(user = nil)
+    user_id =
+      if sender.subject_type == "User"
+        sender_id
+      elsif user.present? && Actor.normalize(user).subject_type == "User"
+        Actor.normalize_id(user)
+      else
+        raise "Invalid channel user_author: #{ user.inspect }"
+      end
+
+    Channel.
+      find_or_create_by_author_id_and_user_author_id_and_owner_id sender_id,
+                                                                  user_id,
+                                                                  receiver_id
+  end
+
   private
 
+  def build_user_author
+    return sender if sender.subject_type == "User"
+
+    raise "Cannot determine user_author for #{ sender.inspect }"
+  end
+
+  # user_author is not preserved when the associated tie is build, in:
+  #
+  #   contact.ties.build
+  #
+  # so we need to preserve so the tie activity is recorded
+  def set_user_author(tie)
+    tie.contact.user_author = @user_author
+  end
+
   def remove_follower(ids)
     # There was no follower
     return if relation_ids.blank?

data/app/models/group.rb

@@ -43,8 +43,11 @@ class Group < ActiveRecord::Base
   
   # Creates the ties from the group to the participants
   def create_ties_to_participants
-    ([ author_id, user_author_id ].uniq | Array.wrap(@_participants)).uniq.each do |a|
-      sent_contacts.create! :receiver_id => a,
+    participant_ids = ([ author_id, user_author_id ] | Array.wrap(@_participants)).uniq
+
+    participant_ids.each do |a|
+      sent_contacts.create! :receiver_id  => a,
+                            :user_author  => user_author,
                             :relation_ids => Array(relation_customs.sort.first.id)
     end
   end

data/app/models/like.rb

@@ -17,8 +17,8 @@ class Like
         raise(ActiveRecord::RecordNotFound)
     end
 
-    def build(subject, object)
-       new object.new_like(subject)
+    def build(subject, user, object)
+       new object.new_like(subject, user)
     end
   end
 

data/app/models/relation/custom.rb

@@ -101,7 +101,7 @@ class Relation::Custom < Relation
   def to_cheesecake_hash(options = {})
     {:id => id, :name => name}.tap do |hash|
       if options[:subsector]
-        hash[:actors] = ties.map{ |t| [t.contact.receiver_id, t.contact.receiver.name] }.uniq
+        hash[:actors] = ties.map{ |t| [t.contact.receiver_id, t.contact.receiver.name, t.contact_id] }.uniq
       else
         hash[:subsectors] = ( weaker.present? ?
                               weaker.map{ |w| w.to_cheesecake_hash(:subsector => true) } :

data/app/models/tie.rb

@@ -22,7 +22,6 @@
 #                        integer, array
 #
 class Tie < ActiveRecord::Base
-
   belongs_to :contact, :counter_cache => true
 
   has_one :sender,   :through => :contact
@@ -98,8 +97,10 @@ class Tie < ActiveRecord::Base
   def create_activity
     return if contact.reload.ties_count != 1 || relation.is_a?(Relation::Reject)
 
-    Activity.create! :contact => contact,
-                     :relation_ids => contact.relation_ids,
+    Activity.create! :author        => contact.sender,
+                     :user_author   => contact.user_author,
+                     :owner         => contact.receiver,
+                     :relation_ids  => contact.relation_ids,
                      :activity_verb => ActivityVerb[contact.verb]
   end
 

data/app/views/cheesecake/_cheesecake.html.erb

@@ -0,0 +1,63 @@
+$(function(){
+  var cheesecakeData = {
+    container: {
+      id: "contacts_cheesecake",
+      width: 440,
+      height: 440
+    },
+      grid: {
+        id: "contacts_grid",
+        divIdPrefix: "actor_"
+    },
+      rMax : 200, 
+      center: {x : 220, y : 220}           
+    };
+    cheesecakeData.highlightedSectorCallback = function(cheesecake){
+      $("#contacts_grid").css("overflow-y","hidden");   
+      var sector = cheesecake.highlightedSector;
+      var actors = [];
+      var visibles = 0;
+      var extra_text = ["<%= t('cheesecake.hidden_contact.one')%>","<%= t('cheesecake.hidden_contact.other')%>"];
+      if(sector){
+          actors = sector.actors;           
+      }else{         
+          actors = cheesecake.grid.actors;    
+      }
+      for(var i in actors){
+        if(actors[i].isVisible()){
+          visibles++;
+        }
+      }        
+      if(visibles <= 30){
+        $("#contacts_grid_extra").hide();          
+      }else{
+        $("#contacts_grid_extra_total").html(visibles - 30);
+        if((visibles - 30) == 1){
+          $("#contacts_grid_extra_text").html(extra_text[0]);
+        }else{
+          $("#contacts_grid_extra_text").html(extra_text[1]);
+        }          
+        $("#contacts_grid_extra").show();
+        $("#contacts_grid").scrollTo(0, 1000);
+      }  
+    }
+    cheesecakeData.sectors = <%= raw(current_subject.cheesecake_json) %>.sectors;
+    var cheese = new socialCheesecake.Cheesecake(cheesecakeData);  
+    $("#contacts_filter_input").keyup(function(){
+      cheese.searchEngine.filter($("#contacts_filter_input").val());
+      cheesecakeData.highlightedSectorCallback(cheese);
+    });    
+    cheese.onChange = function(cheesecake){
+      $("#contacts_save_changes").val(JSON.stringify(cheesecake.getChanges()));
+    }
+    if(cheese.grid.actors.length > 30){    
+      var extra_text = ["<%= t('cheesecake.hidden_contact.one')%>","<%= t('cheesecake.hidden_contact.other')%>"];
+      $("#contacts_grid_extra_total").html(cheese.grid.actors.length - 30);       
+      if((cheese.grid.actors.length - 30) == 1){
+        $("#contacts_grid_extra_text").html(extra_text[0]);
+      }else{
+        $("#contacts_grid_extra_text").html(extra_text[1]);
+      }       
+      $("#contacts_grid_extra").show();     
+    }
+});      

data/app/views/cheesecake/_index.html.erb

@@ -1,90 +1,47 @@
-<div id="cheesecake">
-  <div id="contacts_cheesecake"></div>
-  <div id="contacts_filter">
-    <%= text_field_tag :filter_query, nil,:autocomplete => :off, :id => :contacts_filter_input %>    
-  </div>
-  <div id="contacts_grid">    
-    <% @actors.each do |actor|%>
-      <%= render :partial => "actors/actor_cheesecake", :locals => {:actor => actor} %>
-    <% end %>
+
+<div id="contacts_cheesecake"></div>
+<div id="contacts_filter">
+  <%= text_field_tag :filter_query, nil,:autocomplete => :off, :id => :contacts_filter_input %>    
+</div>
+<div id="contacts_grid">    
+  <% @actors.each do |actor|%>
+    <%= render :partial => "actors/actor_cheesecake", :locals => {:actor => actor} %>
+  <% end %>
+</div>
+<div id="contacts_grid_extra" style="display:none;">    
+  <span id="contacts_grid_extra_total"></span> <span id="contacts_grid_extra_text"></span>
+</div>
+<div id="contacts_save">
+  <form action="<%= update_cheesecake_path %>" method="get" data-remote="true" id="contacts_save_form">
+     <input type="submit" id="contacts_save_button" value="Save changes">
+     <input type="hidden" id="contacts_save_changes" name="contacts_save_changes">
+  </form>
+</div>
+<br class="clearfloat"> 
+<div id="contacts_changes">
+  <div id="contacts_changes_title">
+   Changes details
   </div>
-  <div id="contacts_grid_extra" style="display:none;">    
-    <span id="contacts_grid_extra_total"></span> <span id="contacts_grid_extra_text"></span>
+  <div id="contacts_changes_details">
+    <ul>
+      <li>Working on it :)</li>
+    </ul>
   </div>
-  <%= javascript_tag do %>
-    $("#contacts_grid_extra").click(function(){
-      $("#contacts_grid").css("overflow-y","scroll");
-      $("#contacts_grid").scrollTo("+=308px", 800, {axis:'y'});
-      $("#contacts_grid_extra").hide();
+</div>
+<%= javascript_tag do %>
+  $("#center_body").css("width","782px");
+  $("#center_body").css("max-width","782px");
+  $("#content").css("width","782px");
+  $("#contacts_filter_input").Watermark("<%= escape_javascript(I18n.t('search.name')) %>");
+  $("#contacts_grid_extra").click(function(){
+    $("#contacts_grid").css("overflow-y","scroll");
+    $("#contacts_grid").scrollTo("+=308px", 800, {axis:'y'});
+    $("#contacts_grid_extra").hide();
+  });
+  $("#contacts_changes_title").click(function(){
+    $("#contacts_changes_details").slideToggle("slow", function(){
+      $.scrollTo('#contacts_changes_details' ,300,{axis:'y'});
     });
-  <% end %>
-  <br class="clearfloat">
-  <%= javascript_tag do %>
-  $(function(){
-    $("#center_body").css("width","782px");
-    $("#center_body").css("max-width","782px");
-    $("#content").css("width","782px");
-    $("#contacts_filter_input").Watermark("<%= escape_javascript(I18n.t('search.name')) %>");
   });
-  window.onload = function() {
-    var cheesecakeData = {
-      container: {
-        id: "contacts_cheesecake",
-        width: 440,
-        height: 440
-      },
-        grid: {
-          id: "contacts_grid",
-          divIdPrefix: "actor_"
-      },
-        rMax : 200, 
-        center: {x : 220, y : 220}           
-      };
-      cheesecakeData.highlightedSectorCallback = function(cheesecake){
-        $("#contacts_grid").css("overflow-y","hidden");   
-        var sector = cheesecake.highlightedSector;
-        var actors = [];
-        var visibles = 0;
-        var extra_text = ["<%= t('cheesecake.hidden_contact.one')%>","<%= t('cheesecake.hidden_contact.other')%>"];
-        if(sector){
-            actors = sector.actors;           
-        }else{         
-            actors = cheesecake.grid.actors;    
-        }
-        for(var i in actors){
-          if(actors[i].isVisible()){
-            visibles++;
-          }
-        }        
-        if(visibles <= 30){
-          $("#contacts_grid_extra").hide();          
-        }else{
-          $("#contacts_grid_extra_total").html(visibles - 30);
-          if((visibles - 30) == 1){
-            $("#contacts_grid_extra_text").html(extra_text[0]);
-          }else{
-            $("#contacts_grid_extra_text").html(extra_text[1]);
-          }          
-          $("#contacts_grid_extra").show();
-          $("#contacts_grid").scrollTo(0, 0);
-        }  
-      }
-      cheesecakeData.sectors = <%= raw(current_subject.cheesecake_json) %>.sectors;
-      var cheese = new socialCheesecake.Cheesecake(cheesecakeData);  
-      $("#contacts_filter_input").keyup(function(){
-        cheese.searchEngine.filter($("#contacts_filter_input").val());
-        cheesecakeData.highlightedSectorCallback(cheese);
-      });
-      if(cheese.grid.actors.length > 30){    
-        var extra_text = ["<%= t('cheesecake.hidden_contact.one')%>","<%= t('cheesecake.hidden_contact.other')%>"];
-        $("#contacts_grid_extra_total").html(cheese.grid.actors.length - 30);       
-        if((cheese.grid.actors.length - 30) == 1){
-          $("#contacts_grid_extra_text").html(extra_text[0]);
-        }else{
-          $("#contacts_grid_extra_text").html(extra_text[1]);
-        }       
-        $("#contacts_grid_extra").show();     
-      }
-  }      
-  <% end %>
-</div>
+  <%= render :partial => 'cheesecake' %>
+<% end %>