social_stream-base 0.20.2 → 0.21.0

data/app/assets/javascripts/social_stream.timeline.js

@@ -31,6 +31,8 @@ SocialStream.Timeline = (function(SS, $, undefined){
 		$(fullId).hide();
 		$(summaryId).tipsy({
 			html: true,
+			hoverable: true,
+			opacity: 0.95,
 			title: function(){
 				return $(this).siblings('.activity_audience').html();
 			}

data/app/assets/javascripts/social_stream.wall.js.erb

@@ -38,6 +38,12 @@ SocialStream.Wall = (function(SS, $, undefined){
     });
   }
 
+  var changeSecurityImage = function(type) {
+    $('#security_chzn .chzn-choices').
+      css('background-image', 'url(<%= asset_path('btn/') %>' + type + '.png)');
+  }
+
+
   var initSecuritySelect = function(){
     var default_security_width = '100px';
 
@@ -63,6 +69,9 @@ SocialStream.Wall = (function(SS, $, undefined){
               chosen.results_update_field();
             }
           }
+          changeSecurityImage('public');
+        } else {
+          changeSecurityImage('restricted');
         }
       });
 
@@ -145,6 +154,6 @@ SocialStream.Wall = (function(SS, $, undefined){
     addInitCallback: addInitCallback,
       init: init,
       activateAntiRebounds: activateAntiRebounds,
-      unblockForms: unblockForms  
+      unblockForms: unblockForms
   };
 }) (SocialStream, jQuery)

data/app/assets/stylesheets/activities.css.scss.erb

@@ -27,7 +27,7 @@
 
 #security_chzn .chzn-choices {
 	padding-left: 20px;
-	background: url('btn/btn_security.png') no-repeat 10px center;
+	background: url('btn/restricted.png') no-repeat 10px center;
 }
 /******************* WALL - ACTIVITY ***************/
 .super_activity{width: 95%;}
@@ -55,7 +55,6 @@
 
 .security, .post_time_ago, .verb_comment, .verb_like, .verb_comment, .verb_delete{ display: inline-block;}
 
-
 /************* ACTIVITY - FOOTER *********/
 .space_comments {	padding-top: 1px; 	padding-bottom: 1px;}
 .space_activities {	text-align:center;	padding: 0px 0px 0px 1px;	width:100%;}
@@ -88,3 +87,15 @@
 .input_new_comments_container{min-height: 30px; position: relative;  }
 
 .activity_likes{ margin-bottom: 2px; }
+
+.timeline-130 {
+  width: 130px;
+  margin: 10px;
+  float: left;
+}
+
+.audience_logo {
+  padding: 2px;
+  display: inline-block;
+}
+

data/app/assets/stylesheets/base.css.scss

@@ -137,7 +137,7 @@ div.chzn-container ul.chzn-choices li.search-field input{ cursor:pointer;}
 
 /*************MENU ICON SECTION**********/
 .menu_header{  border-bottom: thin solid $separation-color;  width:14.5em;  padding-left:3px;  padding-right:3px;}
-.menu_icon{	vertical-align: middle; padding-bottom: 3px;	padding-right: 3px;  padding-left: 3px;	
+.menu_icon{	vertical-align: middle; padding-bottom: 3px;	padding-right: 2px;  padding-left: 2px;	
             display: inline-block;}
 
 /*************SPACES SECTION *************/

data/app/controllers/audience_controller.rb

@@ -0,0 +1,16 @@
+class AudienceController < ApplicationController
+  before_filter :read_activity
+
+  respond_to :js
+
+  def index
+  end
+
+  private
+
+  def read_activity
+    @activity = Activity.find params[:activity_id]
+
+    authorize! :read, @activity
+  end
+end

data/app/models/activity.rb

@@ -1,21 +1,32 @@
 # Activities follow the {Activity Streams}[http://activitystrea.ms/] standard.
 #
-# == {Activity Activities}, {Channel Channels} and Audiences
-# Every activity is attached to a {Channel}, which defines the sender and the receiver of the {Activity}
+# Every {Activity} has an {#author}, {#user_author} and {#owner}
 #
-# Besides, the activity is attached to one or more relations, which define the audience of the activity,
-# in other words, the {actors Actor} that can reach it and their {permissions Permission}
+# author:: Is the {SocialStream::Models::Subject subject} that originated
+#          the activity. The entity that posted something, liked, etc..
 #
-# == Wall
-# The Activity.wall(args) scope provides all the activities appearing in a wall
+# user_author:: The {User} logged in when the {Activity} was created.
+#               If the {User} has not changed the session to represent
+#               other entity (a {Group} for example), the user_author
+#               will be the same as the author.
 #
-# There are two types of wall, :home and :profile. Check {Actor#wall} for more information
+# owner:: The {SocialStream::Models::Subject subject} whose wall was posted
+#         or comment was liked, etc..
+#
+# == {Audience Audiences} and visibility
+# Each activity is attached to one or more {Relation relations}, which define
+# the {SocialStream::Models::Subject subject} that can reach the activity
+#
+# In the case of a {Relation::Public public relation} everyone will be
+# able to see the activity.
+#
+# In the case of {Relation::Custom custom relations}, only the subjects
+# that have a {Tie} with that relation (in other words, the contacts that
+# have been added as friends with that relation} will be able to reach the {Activity}
 #
-include NotificationsHelper
-
 class Activity < ActiveRecord::Base
-  # See {SocialStream::Models::Channeled}
-  channeled
+  # FIXME: this does not follow the Rails way
+  include NotificationsHelper
 
   # This has to be declared before 'has_ancestry' to work around rails issue #670
   # See: https://github.com/rails/rails/issues/670
@@ -27,6 +38,13 @@ class Activity < ActiveRecord::Base
 
   belongs_to :activity_verb
 
+  belongs_to :author,
+             :class_name => "Actor"
+  belongs_to :owner,
+             :class_name => "Actor"
+  belongs_to :user_author,
+             :class_name => "Actor"
+
   has_many :audiences, :dependent => :destroy
   has_many :relations, :through => :audiences
 
@@ -35,10 +53,26 @@ class Activity < ActiveRecord::Base
   has_many :activity_objects,
            :through => :activity_object_activities
 
+  scope :authored_by, lambda { |subject|
+    where(:author_id => Actor.normalize_id(subject))
+  }
+  scope :owned_by, lambda { |subject|
+    where(:owner_id => Actor.normalize_id(subject))
+  }
+  scope :authored_or_owned_by, lambda { |subjects|
+    ids = Actor.normalize_id(subjects)
+
+    where(arel_table[:author_id].in(ids).or(arel_table[:owner_id].in(ids)))
+  }
+
+  scope :shared_with, lambda { |subject|
+    joins(:audiences).
+      merge(Audience.where(:relation_id => Relation.ids_shared_with(subject)))
+  }
+
   scope :wall, lambda { |args|
     q =
       select("DISTINCT activities.*").
-      joins(:channel).
       joins(:audiences).
       joins(:relations).
       roots
@@ -48,14 +82,13 @@ class Activity < ActiveRecord::Base
             where('activity_objects.object_type' => args[:object_type])
     end
 
-    channels   = Channel.arel_table
     audiences  = Audience.arel_table
     relations  = Relation.arel_table
 
     owner_conditions =
-      channels[:author_id].eq(Actor.normalize_id(args[:owner])).
-        or(channels[:user_author_id].eq(Actor.normalize_id(args[:owner]))).
-        or(channels[:owner_id].eq(Actor.normalize_id(args[:owner])))
+      arel_table[:author_id].eq(Actor.normalize_id(args[:owner])).
+        or(arel_table[:user_author_id].eq(Actor.normalize_id(args[:owner]))).
+        or(arel_table[:owner_id].eq(Actor.normalize_id(args[:owner])))
 
     audience_conditions =
       audiences[:relation_id].in(args[:relation_ids]).
@@ -65,16 +98,16 @@ class Activity < ActiveRecord::Base
       case args[:type]
       when :home
         followed_conditions =
-          channels[:author_id].in(args[:followed]).
-            or(channels[:owner_id].in(args[:followed]))
+          arel_table[:author_id].in(args[:followed]).
+            or(arel_table[:owner_id].in(args[:followed]))
 
         owner_conditions.
           or(followed_conditions.and(audience_conditions))
       when :profile
         if args[:for].present?
           visitor_conditions =
-            channels[:author_id].eq(Actor.normalize_id(args[:for])).
-              or(channels[:owner_id].eq(Actor.normalize_id(args[:for])))
+            arel_table[:author_id].eq(Actor.normalize_id(args[:for])).
+              or(arel_table[:owner_id].eq(Actor.normalize_id(args[:for])))
 
           owner_conditions.
             and(visitor_conditions.or(audience_conditions))
@@ -93,7 +126,7 @@ class Activity < ActiveRecord::Base
   after_create  :increment_like_count
   after_destroy :decrement_like_count, :delete_notifications
 
-  validates_presence_of :relations
+  validates_presence_of :author_id, :user_author_id, :owner_id, :relations
  
   #For now, it should be the last one
   #FIXME
@@ -109,12 +142,37 @@ class Activity < ActiveRecord::Base
     self.activity_verb = ActivityVerb[name]
   end
 
+  # The {SocialStream::Models::Subject subject} author
+  def author_subject
+    author.subject
+  end
+
+  # The {SocialStream::Models::Subject subject} owner
+  def owner_subject
+    owner.subject
+  end
+
+  # The {SocialStream::Models::Subject subject} user actor
+  def user_author_subject
+    user_author.subject
+  end
+
+  # Does this {Activity} have the same sender and receiver?
+  def reflexive?
+    author_id == owner_id
+  end
+
+  # Is the author represented in this {Activity}?
+  def represented_author?
+    author_id != user_author_id
+  end
+
   # The {Actor} author of this activity
   #
   # This method provides the {Actor}. Use {#sender_subject} for the {SocialStream::Models::Subject Subject}
   # ({User}, {Group}, etc..)
   def sender
-    channel.author
+    author
   end
 
   # The {SocialStream::Models::Subject Subject} author of this activity
@@ -122,7 +180,7 @@ class Activity < ActiveRecord::Base
   # This method provides the {SocialStream::Models::Subject Subject} ({User}, {Group}, etc...).
   # Use {#sender} for the {Actor}.
   def sender_subject
-    channel.author_subject
+    author_subject
   end
 
   # The wall where the activity is shown belongs to receiver
@@ -130,7 +188,7 @@ class Activity < ActiveRecord::Base
   # This method provides the {Actor}. Use {#receiver_subject} for the {SocialStream::Models::Subject Subject}
   # ({User}, {Group}, etc..)
   def receiver
-    channel.owner
+    owner
   end
 
   # The wall where the activity is shown belongs to the receiver
@@ -138,7 +196,7 @@ class Activity < ActiveRecord::Base
   # This method provides the {SocialStream::Models::Subject Subject} ({User}, {Group}, etc...).
   # Use {#receiver} for the {Actor}.
   def receiver_subject
-    channel.owner_subject
+    owner_subject
   end
 
   # The comments about this activity
@@ -152,7 +210,7 @@ class Activity < ActiveRecord::Base
   end
 
   def liked_by(user) #:nodoc:
-    likes.joins(:channel).merge(Channel.subject_authored_by(user))
+    likes.authored_by(user)
   end
 
   # Does user like this activity?
@@ -162,12 +220,11 @@ class Activity < ActiveRecord::Base
 
   # Build a new children activity where subject like this
   def new_like(subject, user)
-    channel = Channel.new :author      => Actor.normalize(subject),
-                          :user_author => Actor.normalize(user),
-                          :owner       => owner
-    a = children.new :verb => "like",
-                     :channel => channel,
-                     :relation_ids => self.relation_ids
+    a = children.new :verb           => "like",
+                     :author_id      => Actor.normalize_id(subject),
+                     :user_author_id => Actor.normalize_id(user),
+                     :owner_id       => owner_id,
+                     :relation_ids   => self.relation_ids
 
     if direct_activity_object.present?
       a.activity_objects << direct_activity_object
@@ -218,7 +275,7 @@ class Activity < ActiveRecord::Base
       participants.each do |p|
         p.notify(notification_subject, "Youre not supposed to see this", self) unless p == sender
       end
-    elsif ['like','follow','make-friend','post','update'].include? verb and !channel.reflexive?
+    elsif ['like','follow','make-friend','post','update'].include? verb and !reflexive?
       receiver.notify(notification_subject, "Youre not supposed to see this", self)
     end
     true
@@ -241,15 +298,15 @@ class Activity < ActiveRecord::Base
 
   # Is subject allowed to perform action on this {Activity}?
   def allow?(subject, action)
-    return false if channel.blank?
+    return false if author.blank?
 
     case action
     when 'create'
-      return false if subject.blank? || channel.author_id != Actor.normalize_id(subject)
+      return false if subject.blank? || author_id != Actor.normalize_id(subject)
 
       rels = Relation.normalize(relation_ids)
 
-      own_rels = rels.select{ |r| r.actor_id == channel.author_id }
+      own_rels = rels.select{ |r| r.actor_id == author_id }
       # Consider Relation::Single as own_relations
       own_rels += rels.select{ |r| r.is_a?(Relation::Single) }
 
@@ -268,12 +325,12 @@ class Activity < ActiveRecord::Base
 
       return false if subject.blank?
 
-      return true if [channel.author_id, channel.owner_id].include?(Actor.normalize_id(subject))
+      return true if [author_id, owner_id].include?(Actor.normalize_id(subject))
     when 'update'
-      return true if [channel.author_id, channel.owner_id].include?(Actor.normalize_id(subject))
+      return true if [author_id, owner_id].include?(Actor.normalize_id(subject))
     when 'destroy'
       # We only allow destroying to sender and receiver by now
-      return [channel.author_id, channel.owner_id].include?(Actor.normalize_id(subject))
+      return [author_id, owner_id].include?(Actor.normalize_id(subject))
     end
 
     Relation.
@@ -298,6 +355,21 @@ class Activity < ActiveRecord::Base
       allow?(subject, 'update')
   end
 
+  # Is this activity public?
+  def public?
+    relation_ids.include? Relation::Public.instance.id
+  end
+
+  # The {Actor Actors} this activity is shared with
+  def audience
+    raise "Cannot get the audience of a public activity!" if public?
+
+    [ author, user_author, owner ].uniq |
+      Actor.
+        joins(:received_ties).
+        merge(Tie.where(:relation_id => relation_ids))
+  end
+
   # The {Relation} with which activity is shared
   def audience_in_words(subject, options = {})
     options[:details] ||= :full

data/app/models/activity_object.rb

@@ -217,15 +217,7 @@ class ActivityObject < ActiveRecord::Base
 
     @valid_relations = true
 
-    self.relation_ids =
-      if SocialStream.relation_model == :custom
-        owner.
-          relations.
-          allowing('read', 'activity').
-          map(&:id)
-      else
-        Array.wrap Relation::Public.instance.id
-      end
+    self.relation_ids = owner.activity_relation_ids
   end
 
   # validate method

data/app/models/actor.rb

@@ -73,16 +73,6 @@ class Actor < ActiveRecord::Base
   has_many :relations,
            :dependent => :destroy
 
-  has_many :authored_channels,
-           :class_name => "Channel",
-           :foreign_key => :author_id,
-           :dependent => :destroy
-
-  has_many :owned_channels,
-           :class_name => "Channel",
-           :foreign_key => :owner_id,
-           :dependent => :destroy
-
   has_many :sent_actions,
            :class_name => "ActivityAction",
            :dependent  => :destroy
@@ -328,11 +318,6 @@ class Actor < ActiveRecord::Base
     ties_to(subject).with_permissions(action, object).any?
   end
 
-  # 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
-
   # Return the {ActivityAction} model to an {ActivityObject}
   def action_to(activity_object)
     sent_actions.received_by(activity_object).first
@@ -391,12 +376,26 @@ class Actor < ActiveRecord::Base
         any?
   end
 
-  # An {Activity} can be shared with multiple {audicences Audience}, which corresponds to a {Relation}.
-  #
-  # This method returns all the {relations Relation} that this actor can use to broadcast an Activity
+  # The default {Relation Relations} for sharing an {Activity} owned
+  # by this {Actor}
+  def activity_relations
+    SocialStream.relation_model == :custom ?
+      relations.
+        allowing('read', 'activity') :
+      [ Relation::Public.instance ]
+  end
+
+  # The ids of the default {Relation Relations} for sharing an {Activity}
+  # owned by this {Actor}
+  def activity_relation_ids
+    activity_relations.map(&:id)
+  end
+
+  # This method returns all the {relations Relation} that subject can choose to broadcast an Activity in this {Actor}'s wall
   #
+  # See {Activity} on how they can be shared with multiple {audicences Audience}, which corresponds to a {Relation}.
   #
-  def activity_relations(subject, options = {})
+  def activity_relations_for(subject, options = {})
     if Actor.normalize(subject) == self
       return relation_customs + Array.wrap(Relation::Public.instance)
     else
@@ -404,9 +403,9 @@ class Actor < ActiveRecord::Base
     end
   end
 
-  # Are there any activity_relations present?
-  def activity_relations?(*args)
-    activity_relations(*args).any?
+  # Are {#activity_relations} available for subject?
+  def activity_relations_for?(subject, options = {})
+    activity_relations(subject, options).any?
   end
 
   # Is this {Actor} allowed to create a comment on activity?
@@ -459,37 +458,30 @@ class Actor < ActiveRecord::Base
   #             the wall for members of the group.
   #             
   def wall(type, options = {})
-    args = {}
-
-    args[:type]  = type
-    args[:owner] = self
-    # Preserve this options
-    [ :for, :object_type ].each do |opt|
-      args[opt]   = options[opt]
-    end
+    options[:for] = self if type == :home
 
-    if type == :home
-      args[:followed] = Actor.followed_by(self).map(&:id)
-    end
+    wall =
+      Activity.
+        select("DISTINCT activities.*").
+        roots.
+        includes(:author, :user_author, :owner, :activity_objects, :activity_verb, :relations)
 
-    # TODO: this is not scalling for sure. We must use a fact table in the future
-    args[:relation_ids] =
+    actor_ids =
       case type
       when :home
-        # The relations from followings that can be read
-        Relation.allow(self, 'read', 'activity').map(&:id)
+        following_actor_and_self_ids
       when :profile
-        # FIXME: options[:relation]
-        #
-        # The relations that can be read by options[:for]
-        options[:for].present? ?
-          Relation.allow(options[:for], 'read', 'activity').map(&:id) :
-          []
+        id
       else
         raise "Unknown type of wall: #{ type }"
       end
 
-    Activity.wall args
+    wall = wall.authored_or_owned_by(actor_ids)
+
+    # Authentication
+    wall = wall.shared_with(options[:for])
+
+    wall = wall.order("created_at desc")
   end
  
   def logo
@@ -507,7 +499,7 @@ class Actor < ActiveRecord::Base
   end
   
   def liked_by(subject) #:nodoc:
-    likes.joins(:channel).merge(Channel.subject_authored_by(subject))
+    likes.authored_by(subject)
   end
   
   # Does subject like this {Actor}?
@@ -517,14 +509,11 @@ class Actor < ActiveRecord::Base
   
   # Build a new activity where subject like this
   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",
-                     :channel => channel,
-                     :relation_ids => Array(Relation::Public.instance.id)
+    a = Activity.new :verb           => "like",
+                     :author_id      => Actor.normalize_id(subject),
+                     :user_author_id => Actor.normalize_id(user),
+                     :owner_id       => id,
+                     :relation_ids   => Array(Relation::Public.instance.id)
     
     a.activity_objects << activity_object           
                     

data/app/models/contact.rb

@@ -164,27 +164,6 @@ 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

data/app/models/tie.rb

@@ -146,7 +146,7 @@ class Tie < ActiveRecord::Base
     Activity.create! :author        => contact.sender,
                      :user_author   => contact.user_author,
                      :owner         => contact.receiver,
-                     :relation_ids  => contact.relation_ids,
+                     :relation_ids  => contact.receiver.activity_relation_ids,
                      :activity_verb => ActivityVerb[contact.verb]
   end
 

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

@@ -21,7 +21,7 @@
     <%= javascript_tag do %>
       var relation_public = <%= Relation::Public.instance.id %>;
       var public_selected = false;
-      var relation_options = <%= escape_javascript(current_subject.activity_relations(receiver).sort.map{ |r| r.id }.to_json) %>;
+      var relation_options = <%= escape_javascript(current_subject.activity_relations_for(receiver).sort.map{ |r| r.id }.to_json) %>;
       var relation_public_pos = 0;
       for(id in relation_options){
         if(relation_options[id]==relation_public){
@@ -32,7 +32,7 @@
       }
       //For security with check "var default_security_width = '100px';" in activities.js.erb
     <% end %>
-    <%= select_tag :relation_ids, options_for_select(current_subject.activity_relations(receiver).sort.map{ |r| [ r.name, r.id ] }), :id => 'security', :multiple => true, :title => t("activity.privacy.myself.contacts.#{ receiver.class.to_s.underscore }") %>
+    <%= select_tag :relation_ids, options_for_select(current_subject.activity_relations_for(receiver).sort.map{ |r| [ r.name, r.id ] }), :id => 'security', :multiple => true, :title => t("activity.privacy.myself.contacts.#{ receiver.class.to_s.underscore }") %>
   <% else %>
     <div id="security_chzn" class="chzn-container chzn-container-multi">
       <ul class="chzn-choices">

data/app/views/activities/_options.html.erb

@@ -8,11 +8,17 @@
 
     <% if user_signed_in? %>
       ·
-      <%= link_to activity.audience_in_words(current_subject, :details => :summary),
+      <%= link_to image_tag("btn/#{ activity.public? ? 'public' : 'restricted' }.png", :class => 'menu_icon') + activity.audience_in_words(current_subject, :details => :summary),
                   'javascript:;',
                   :class => 'activity_audience_summary' %>
       <div class="activity_audience">
         <%= activity.audience_in_words(current_subject) %>
+        <% unless activity.public? %>
+          ·
+          <%= link_to t('activity.audience.show'), audience_path(:activity_id => activity.id), :remote => true %>
+          <div class="activity-audience-list-<%= activity.id %>">
+          </div>
+        <% end %>
       </div>
     <% end %>
 

data/app/views/audience/_list.html.erb

@@ -0,0 +1,8 @@
+<% @activity.audience.each do |a| %>
+  <div class="audience_logo">
+    <%= link_to image_tag(a.logo.url(:contact),
+                          :alt => a.name),
+                 a.subject,
+                 :title => a.name %>
+  </div>
+<% end %>

data/app/views/audience/index.js.erb

@@ -0,0 +1 @@
+$('.activity-audience-list-<%= @activity.id %>').html('<%= j render(:partial => 'list') %>');

data/config/locales/en.yml

@@ -38,6 +38,7 @@ en:
       public:
         summary: "Public"
         full: "Shared with all the Internet"
+      show: "Mostrar"
       visible:
         summary: "Restricted"
         full: "Shared with %{audience}"

data/config/locales/es.yml

@@ -38,6 +38,7 @@ es:
       public:
         summary: "Público"
         full: "Accesible por toda Internet"
+      show: "Show"
       visible:
         summary: "Restringido"
         full: "Compartido con %{audience}"

data/config/routes.rb

@@ -86,6 +86,8 @@ Rails.application.routes.draw do
   resources :activities do
     resource :like
   end
+
+  get 'audience/index', :as => :audience
   
   match 'cheesecake' => 'cheesecake#index', :as => :cheesecake  
   match 'update_cheesecake' => 'cheesecake#update', :as => :update_cheesecake  

data/db/migrate/20120526171311_remove_activity_channels.rb

@@ -0,0 +1,35 @@
+class RemoveActivityChannels < ActiveRecord::Migration
+  class Channel < ActiveRecord::Base; end
+
+  def up
+    change_table :activities do |t|
+      t.references :author
+      t.references :user_author
+      t.references :owner
+    end
+
+    Activity.record_timestamps = false
+    Activity.reset_column_information
+
+    Activity.all.each do |a|
+      c = Channel.find a.channel_id
+      %w{ author_id user_author_id owner_id }.each do |m|
+        a.__send__ "#{ m }=", c.__send__(m) # a.author_id = c.author_id
+      end
+      a.save!
+    end
+
+    Activity.record_timestamps = true
+
+    remove_foreign_key :activities, :name => 'index_activities_on_channel_id'
+    remove_column :activities, :channel_id
+
+    Activity.reset_column_information
+
+    drop_table :channels
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end

data/lib/social_stream/ability/base.rb

@@ -58,7 +58,9 @@ module SocialStream
         end
 
         can :read, Activity do |a|
-          a.allow?(subject, 'read')
+          a.public? ||
+            subject.present? &&
+            a.audience.include?(subject.actor) 
         end
 
         can :update, Activity do |a|

data/lib/social_stream/base/engine.rb

@@ -20,7 +20,6 @@ module SocialStream
 
       initializer "social_stream-base.model.supertypes" do
         ActiveSupport.on_load(:active_record) do
-          include SocialStream::Models::Channeled::ActiveRecord
           include SocialStream::Models::Subtype::ActiveRecord
           include SocialStream::Models::Supertype::ActiveRecord
         end

data/lib/social_stream/base/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.20.2".freeze
+    VERSION = "0.21.0".freeze
   end
 end

data/lib/social_stream-base.rb

@@ -19,7 +19,6 @@ module SocialStream
   end
 
   module Models
-    autoload :Channeled, 'social_stream/models/channeled'
     autoload :Object,    'social_stream/models/object'
     autoload :Subject,   'social_stream/models/subject'
     autoload :Subtype,   'social_stream/models/subtype'

data/lib/tasks/db/populate.rake

@@ -112,14 +112,16 @@ namespace :db do
       ties_start = Time.now
 
       @available_actors.each do |a|
-        actors = @available_actors.dup - Array(a)
-        relations = a.relation_customs + Array.wrap(Relation::Reject.instance)
-        break if actors.size==0
+        actors = @available_actors.dup
+        actors.delete(a)
+
+        relations = a.relation_customs + [ Relation::Reject.instance ]
+
         Forgery::Basic.number(:at_most => actors.size).times do
           actor = actors.delete_at((rand * actors.size).to_i)
           contact = a.contact_to!(actor)
           contact.user_author = a.user_author if a.subject_type != "User"
-          contact.relation_ids = Array(Forgery::Extensions::Array.new(relations).random.id) unless a==actor
+          contact.relation_ids = [ Forgery::Extensions::Array.new(relations).random.id ]
         end
       end
 

data/spec/controllers/audience_controller_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+describe AudienceController do
+  include SocialStream::TestHelpers
+  include SocialStream::TestHelpers::Controllers
+
+  render_views
+
+  context "with activity" do
+    before :all do
+      @activity = Factory(:activity)
+    end
+
+    it "should not be redered to public" do
+      get :index, :activity_id => @activity.id, :format => :js
+
+      response.should redirect_to(:new_user_session)
+    end
+
+    it "should not be rendered to anyone" do
+      sign_in Factory(:user)
+
+      begin
+        get :index, :activity_id => @activity.id, :format => :js
+
+        assert false
+      rescue CanCan::AccessDenied
+        assert true
+      end
+    end
+
+    it "should not be rendered to author" do
+      sign_in @activity.author_subject
+
+      get :index, :activity_id => @activity.id, :format => :js
+
+      response.should be_success
+    end
+  end
+end

data/spec/controllers/comments_controller_spec.rb

@@ -13,7 +13,7 @@ describe CommentsController do
 
     describe "comment from user" do
       before do
-        activity = Factory(:self_activity, :channel => @user.self_channel)
+        activity = Factory(:self_activity, :author => @user.actor)
 
         model_attributes[:author_id] = @user.actor_id
         model_attributes[:owner_id]  = @user.actor_id
@@ -38,7 +38,7 @@ describe CommentsController do
     describe "comment to friend" do
       before do
         f = Factory(:friend, :contact => Factory(:contact, :receiver => @user.actor)).sender
-        activity = Factory(:self_activity, :channel => f.contact_to!(f).channel)
+        activity = Factory(:self_activity, :author => f)
 
         model_attributes[:author_id] = @user.actor_id
         model_attributes[:owner_id]  = f.id
@@ -52,7 +52,7 @@ describe CommentsController do
     describe "post to acquaintance" do
       before do
         a = Factory(:acquaintance, :contact => Factory(:contact, :receiver => @user.actor)).sender
-        activity = Factory(:self_activity, :channel => a.self_channel)
+        activity = Factory(:self_activity, :author => a)
 
         model_attributes[:author_id] = @user.actor_id
         model_attributes[:owner_id]  = a.id

data/spec/factories/activity.rb

@@ -23,9 +23,11 @@ end
 ## End of helpers
 
 Factory.define :activity do |a|
-  a.channel { Factory(:friend).contact.channel }
+  a.author        { Factory(:user).actor }
+  a.user_author   { |b| b.author }
+  a.owner         { |b| Factory(:friend, :contact => Factory(:contact, :receiver => b.author)).sender }
   a.activity_verb { ActivityVerb["post"] }
-  a.relation_ids  { |b| Array(b.sender.relation_custom('friend').id) }
+  a.relation_ids  { |b| [ b.owner.relation_custom('friend').id ] }
   a.activity_object_ids { |b|
     # Create post
     post = Factory(:post,
@@ -40,8 +42,10 @@ Factory.define :activity do |a|
 end
 
 Factory.define :self_activity, :parent => :activity do |a|
-  a.channel { Factory(:self_contact).channel }
-  a.relation_ids  { |b| Array(b.sender.relation_custom('friend').id) }
+  a.author       { Factory(:user).actor }
+  a.user_author  { |b| b.author }
+  a.owner        { |b| b.author }
+  a.relation_ids { |b| [ b.author.relation_custom('friend').id ] }
   a.activity_object_ids { |b|
     # Create post
     post = Factory(:post,
@@ -63,10 +67,12 @@ end
 
 Factory.define :like_activity, :class => 'Activity' do |a|
   a.association :parent, :factory => :activity
-  a.channel { |b| Factory(:friend, :sender => b.parent.sender).receiver.contact_to!(b.parent.sender).channel }
+  a.author        { |b| Factory(:friend, :sender => b.parent.owner).receiver }
+  a.user_author   { |b| b.author }
+  a.owner         { |b| b.parent.owner }
   a.activity_verb { ActivityVerb["like"] }
   a.relation_ids  { |b| b.parent.relation_ids }
-  a.after_build{ |b| b.activity_object_ids = b.parent.activity_object_ids }
+  a.after_build   { |b| b.activity_object_ids = b.parent.activity_object_ids }
 end
 
 

data/spec/models/tie_spec.rb

@@ -41,8 +41,9 @@ describe Tie do
     end
 
     it "should create activity with follow verb" do
-      @tie.contact.channel.activities.should be_present
-      @tie.contact.channel.activities.first.verb.should eq('follow')
+      activity = Activity.authored_by(@tie.sender).owned_by(@tie.receiver).first
+      activity.should be_present
+      activity.verb.should eq('follow')
     end
 
     context "reciprocal" do
@@ -51,8 +52,10 @@ describe Tie do
       end
 
       it "should create activity with make-friend verb" do
-        @reciprocal.contact.channel.activities.should be_present
-        @reciprocal.contact.channel.activities.first.verb.should eq('make-friend')
+        activity = Activity.authored_by(@reciprocal.sender).owned_by(@reciprocal.receiver).first
+
+        activity.should be_present
+        activity.verb.should eq('make-friend')
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_stream-base
 version: !ruby/object:Gem::Version
-  version: 0.20.2
+  version: 0.21.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-17 00:00:00.000000000 Z
+date: 2012-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deep_merge
@@ -596,7 +596,6 @@ files:
 - app/assets/images/btn/btn_profile.png
 - app/assets/images/btn/btn_rank.png
 - app/assets/images/btn/btn_read.png
-- app/assets/images/btn/btn_security.png
 - app/assets/images/btn/btn_send.png
 - app/assets/images/btn/btn_spam.png
 - app/assets/images/btn/btn_star.png
@@ -636,6 +635,8 @@ files:
 - app/assets/images/btn/point_blue.png
 - app/assets/images/btn/point_gray.png
 - app/assets/images/btn/post.png
+- app/assets/images/btn/public.png
+- app/assets/images/btn/restricted.png
 - app/assets/images/btn/search.png
 - app/assets/images/btn/search_icon.png
 - app/assets/images/btn/shadow.png
@@ -770,6 +771,7 @@ files:
 - app/controllers/activities_controller.rb
 - app/controllers/activity_actions_controller.rb
 - app/controllers/api_controller.rb
+- app/controllers/audience_controller.rb
 - app/controllers/authentications_controller.rb
 - app/controllers/cheesecake_controller.rb
 - app/controllers/comments_controller.rb
@@ -821,7 +823,6 @@ files:
 - app/models/actor.rb
 - app/models/audience.rb
 - app/models/authentication.rb
-- app/models/channel.rb
 - app/models/comment.rb
 - app/models/contact.rb
 - app/models/group.rb
@@ -858,6 +859,8 @@ files:
 - app/views/actors/_actor.html.erb
 - app/views/actors/_actor_cheesecake.html.erb
 - app/views/api/activity_atom_feed.atom.builder
+- app/views/audience/_list.html.erb
+- app/views/audience/index.js.erb
 - app/views/avatars/index.html.erb
 - app/views/avatars/update.js.erb
 - app/views/cheesecake/_cheesecake.html.erb
@@ -1055,6 +1058,7 @@ files:
 - db/migrate/20120403175913_create_activity_object_audiences.rb
 - db/migrate/20120411132550_add_visit_count_to_activity_object.rb
 - db/migrate/20120411151413_relation_public_permissions.rb
+- db/migrate/20120526171311_remove_activity_channels.rb
 - lib/acts_as_taggable_on/acts_as_taggable_on/dirty.rb
 - lib/acts_as_taggable_on/social_stream.rb
 - lib/generators/social_stream/base/install_generator.rb
@@ -1109,7 +1113,6 @@ files:
 - lib/social_stream/d3.rb
 - lib/social_stream/migrations/base.rb
 - lib/social_stream/migrations/components.rb
-- lib/social_stream/models/channeled.rb
 - lib/social_stream/models/object.rb
 - lib/social_stream/models/subject.rb
 - lib/social_stream/models/subtype.rb
@@ -1132,6 +1135,7 @@ files:
 - lib/tasks/workers.rake
 - lib/thinking-sphinx/social_stream.rb
 - social_stream-base.gemspec
+- spec/controllers/audience_controller_spec.rb
 - spec/controllers/comments_controller_spec.rb
 - spec/controllers/contacts_controller_spec.rb
 - spec/controllers/followers_controller_spec.rb

data/app/models/channel.rb

@@ -1,64 +0,0 @@
-# A {Channel} is the union of the three {Actors} that are involved in an {Activity}:
-#
-# * The author that creates a post, comment, etc. This can be a {User}, {Group}
-#   or any kind of {SocialStream::Models::Subject subject}
-# * The user_author representing the author. When users change session and
-#   act in behalf of a {Group}, Social Stream still records which user is responsible
-#   for an {Activity}
-# * The owner in whose wall the Activity is performed.
-#
-class Channel < ActiveRecord::Base
-  # Author can be any type of Actor: User, Group, etc.
-  belongs_to :author,
-             :class_name => "Actor"
-  # Owner is the wall's subject this object is posted to
-  belongs_to :owner,
-             :class_name => "Actor"
-
-  # UserAuthor is the real user behind the Author
-  belongs_to :user_author,
-             :class_name => "Actor"
-
-  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 ]
-  validates_uniqueness_of :user_author_id, :scope => [ :author_id, :owner_id ]
-
-  scope :authored_by, lambda { |subject|
-    id = Actor.normalize_id subject
-
-    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
-  end
-
-  # The {SocialStream::Models::Subject subject} owner
-  def owner_subject
-    owner.subject
-  end
-
-  # The {SocialStream::Models::Subject subject} user actor
-  def user_author_subject
-    user_author.subject
-  end
-
-  # Does this {Channel} have the same sender and receiver?
-  def reflexive?
-    author_id == owner_id
-  end
-
-  # Is the author represented in this {Channel}?
-  def represented_author?
-    author_id != user_author_id
-  end
-end

data/lib/social_stream/models/channeled.rb

@@ -1,56 +0,0 @@
-module SocialStream
-  module Models
-    # Models that have author, user_author and owner, properties saved in {Channel}.
-    # Currently {Activity} and {ActivityObject}
-    module Channeled
-      # Add the method {#channeled} to ActiveRecord
-      module ActiveRecord
-        extend ActiveSupport::Concern
-
-        module ClassMethods
-          # This class is channeled. See {Channel}
-          def channeled
-            include SocialStream::Models::Channeled
-          end
-        end
-      end
-
-      extend ActiveSupport::Concern
-
-      included do
-        # Channeled models are subtypes of {Channel}
-        # Author, owner and user_author are defined in its channel
-        subtype_of :channel,
-                   :belongs => { :dependent => nil }
-
-        # before_validation :set_owner_id, :on => :create
-
-        before_validation :check_existing_channel
-      end
-
-      protected
-
-      # Use existing channel, do not create a new one
-      def check_existing_channel
-        return unless channel!.new_record?
-
-        existing_channel =
-          Channel.
-            where(:author_id      => author_id,
-                  :owner_id       => owner_id,
-                  :user_author_id => user_author_id).
-            first
-
-        return if existing_channel.blank?
-
-        self.channel = existing_channel
-      end
-
-      private
-
-      def set_owner_id
-        self.owner_id ||= author_id
-      end
-    end
-  end
-end