social_stream 0.24.1 → 0.25.0

data/base/app/assets/javascripts/social_stream.action.js

@@ -0,0 +1,40 @@
+SocialStream.Action = (function(SS, $, undefined){
+	var updateCallbacks = [];
+
+	var addUpdateCallback = function(callback){
+		updateCallbacks.push(callback);
+	}
+
+	var update = function(action){
+		$.each(updateCallbacks, function(i, callback){ callback(action); });
+	}
+
+        var updateFollow = function(action){
+          var follow = action.follow;
+
+          if (!follow) {
+            return;
+          }
+
+          followForms(action).replaceWith(follow.form);
+          followSentences(action).replaceWith(follow.sentence);
+        }
+
+	var followForms = function(action) {
+		return $('.follow_form-' + action.activity_object.id);
+	}
+
+	var followSentences = function(action) {
+		return $('.follow_sentence-' + action.activity_object.id);
+	}
+
+        addUpdateCallback(updateFollow);
+
+	return {
+		addUpdateCallback: addUpdateCallback,
+		update: update,
+		followForms: followForms,
+		followSentences: followSentences
+	}
+
+})(SocialStream, jQuery);

data/base/app/assets/javascripts/social_stream.comments.js

@@ -10,22 +10,38 @@ SocialStream.Comments = (function(SS, $, undefined){
 		$(".activity_new_comment").each(function(){
 			if ($.trim($(this).siblings(".activity_comments").text()) != ""){
 				$(this).show();
+				$(this).find(".input_new_comments").val("");
 			}
 		});
 
+		hideNewCommentElements();
+		newCommentWatermark();
+		newCommentAutoSize();
+		newCommentClick();
+		newCommentLink();
+	}
+
+	var hideNewCommentElements = function(){
 		$(".activities_comment_btn").hide();
 		$(".actor_name_new_comment").hide();
 		$(".actor_logo_new_comment").hide();
+	}
 
+	var newCommentWatermark = function(){
 		$(".input_new_comments").watermark(I18n.t('comment.input'),"#666");
+	}
+
 
+	var newCommentAutoSize = function(){
 		$(".input_new_comments")
 			.change(function(){autoSize(this);})
 			.keydown(function(){autoSize(this);})
 			.keyup(function(){autoSize(this);});
 
 		$(".input_new_comments").each(function(){autoSize(this)});
+	}
 
+	var newCommentClick = function(){
 		$(".input_new_comments").click(function(){
 			$(".activities_comment_btn").hide();
 			$(".new_comment").removeClass("new_comment_shown");
@@ -38,7 +54,9 @@ SocialStream.Comments = (function(SS, $, undefined){
 			comment.find(".actor_logo_new_comment").show();
 			return false;
 		});
+	}
 
+	var newCommentLink = function(){
 		//javascript for tocomment option
 		$(".to_comment").click(function(){
 			$(this).parents(".activity_content").find(".activity_new_comment").show();
@@ -49,7 +67,7 @@ SocialStream.Comments = (function(SS, $, undefined){
 			.focus()
 			.val("");
 
-			return false;
+		return false;
 		});
 	}
 
@@ -61,6 +79,13 @@ SocialStream.Comments = (function(SS, $, undefined){
 	}  
 
 	SocialStream.Timeline.addInitCallback(initNew);
+
+	SocialStream.Timeline.addCreateCallback(hideNewCommentElements);
+	SocialStream.Timeline.addCreateCallback(newCommentWatermark);
+	SocialStream.Timeline.addCreateCallback(newCommentAutoSize);
+	SocialStream.Timeline.addCreateCallback(newCommentClick);
+	SocialStream.Timeline.addCreateCallback(newCommentLink);
+
 	SocialStream.Objects.addInitCallback(initNew);
 
 	return {

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

@@ -1,14 +1,24 @@
 SocialStream.Timeline = (function(SS, $, undefined){
+	// FIXME: DRY!!
 	var initCallbacks = [];
+	var createCallbacks = [];
 
 	var addInitCallback = function(callback){
 		initCallbacks.push(callback);
 	}
 
+	var addCreateCallback = function(callback){
+		createCallbacks.push(callback);
+	}
+
 	var init = function(){
 		$.each(initCallbacks, function(i, callback){ callback(); });
 	}
 
+	var create = function(activityId){
+		$.each(createCallbacks, function(i, callback){ callback(activityId); });
+	}
+
 	var initPrivacyTooltips = function(activityId) {
 		var fullId = '.activity_audience';
 		var summaryId = '.activity_audience_summary';
@@ -51,19 +61,17 @@ SocialStream.Timeline = (function(SS, $, undefined){
 	};
 
 
-	var newActivity = function(activityId){
-		initPrivacyTooltips(activityId);
-		SS.Wall.unblockForms();
-	}
-
 	addInitCallback(initPrivacyTooltips);
 	addInitCallback(initComments);
 
+	addCreateCallback(initPrivacyTooltips);
+
 	return {
 		addInitCallback: addInitCallback,
 		init: init,
+		addCreateCallback: addCreateCallback,
+		create: create,
 		initPrivacyTooltips: initPrivacyTooltips,
-		showAllComments: showAllComments,
-                newActivity: newActivity
+		showAllComments: showAllComments
 	};
 }) (SocialStream, jQuery);

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

@@ -140,6 +140,7 @@ SocialStream.Wall = (function(SS, $, undefined){
   addInitCallback(initSecuritySelect);
   addInitCallback(activateAntiRebounds);
 
+  SS.Timeline.addCreateCallback(unblockForms);
   return {
     addInitCallback: addInitCallback,
       init: init,

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

@@ -0,0 +1,13 @@
+/*
+ *= require avatars_for_rails
+ *
+ *= require_self
+ *= require_tree .
+ */
+
+@import "colors";
+
+.ui-effects-transfer {
+	border: 2px solid $separation-color;
+	background-color: $secondary-color;
+}

data/base/app/models/activity.rb

@@ -331,13 +331,17 @@ class Activity < ActiveRecord::Base
   def fill_relations
     return if relation_ids.present?
 
-    # FIXME: repeated in SocialStream::Models::Object#_relation_ids
     self.relation_ids =
+    # FIXME: repeated in ActivityObject#_relation_ids
+    if SocialStream.relation_model == :custom
       if channel.reflexive?
         receiver.relation_customs.map(&:id)
       else
         receiver.relation_customs.allow(channel.author, 'create', 'activity').map(&:id)
       end
+    else
+      Array.wrap Relation::Public.instance.id
+    end
   end
 
   #

data/base/app/models/activity_action.rb

@@ -15,6 +15,8 @@ class ActivityAction < ActiveRecord::Base
     where(:activity_object_id => ActivityObject.normalize_id(activity_object))
   }
 
+  before_create :follow_by_author_and_owner
+
   private
 
   # Updates the follower_count counter in the {ActivityObject}
@@ -25,4 +27,8 @@ class ActivityAction < ActiveRecord::Base
       activity_object.increment!(:follower_count) :
       activity_object.decrement!(:follower_count)
   end
+
+  def follow_by_author_and_owner
+    self.follow = true if author? || user_author? || owner?
+  end
 end

data/base/app/models/activity_object.rb

@@ -9,8 +9,8 @@
 # Objects are added to +config/initializers/social_stream.rb+
 #
 class ActivityObject < ActiveRecord::Base
-  # See {SocialStream::Models::Channeled}
-  channeled
+  attr_writer :_relation_ids
+  attr_reader :_activity_parent_id
 
   # ActivityObject is a supertype of SocialStream.objects
   supertype_of :object
@@ -22,7 +22,8 @@ class ActivityObject < ActiveRecord::Base
 
   has_many :received_actions,
            :class_name => "ActivityAction",
-           :dependent  => :destroy
+           :dependent  => :destroy,
+           :autosave   => true
   has_many :followers,
            :through => :received_actions,
            :source  => :actor,
@@ -43,10 +44,71 @@ class ActivityObject < ActiveRecord::Base
 
   validates_presence_of :object_type
 
+  # TODO: This is currently defined in lib/social_stream/models/object.rb
+  #
+  # Need to fix activity_object_spec_helper before activating it
+  #
+  # validates_presence_of :author_id, :owner_id, :user_author_id, :unless => :acts_as_actor?
+  # after_create :create_post_activity, :unless => :acts_as_actor?
+
   scope :authored_by, lambda { |subject|
-    joins(:channel).merge(Channel.authored_by(subject))
+    joins(:received_author_action).merge(ActivityAction.sent_by(subject))
   }
 
+  scope :followed, order("activity_objects.follower_count DESC")
+
+  def received_role_action(role)
+    received_actions.
+      find{ |a| a.__send__ "#{ role }?" }
+  end
+
+  %w{ author user_author owner }.each do |role|
+    code = <<-EOC
+      def #{ role }_id                     # def author_id
+        received_role_action(:#{ role }).  #   received_role_action(:author).
+          try(:actor_id)                   #     try(:actor_id)
+      end                                  # end
+
+      def #{ role }_id=(actor_id)                    # def author_id=(actor_id)
+        action =                                     #   action =
+          received_actions.                          #     received_actions.
+            find{ |a| a.actor_id == actor_id }       #       select{ |a| a.actor_id == actor_id }
+                                                     #
+        if action                                    #   if action 
+          action.#{ role } = true                    #     action.author = true
+        else                                         #   else
+          received_actions.                          #     received_actions.
+            build :actor_id  => actor_id,            #       build :actor_id => actor_id,
+                  :#{ role } => true                 #             :author   => true
+        end                                          #   end
+                                                     #
+        actor_id                                     #  actor_id
+      end                                            # end
+
+      def #{ role }                        # def author
+        received_role_action(:#{ role }).  #   received_role_action(:author).
+          try(:actor)                      #     try(:actor)
+      end                                  # end
+
+      def #{ role }=(actor)           # def author=(actor)
+        self.#{ role }_id =           #   self.author_id =
+          Actor.normalize_id(actor)   #     Actor.normalize_id(actor)
+      end                             # end
+
+      def #{ role }_subject # def author_subject
+        #{ role }.subject   #   author.subject
+      end                   # end
+
+    EOC
+
+    class_eval code, __FILE__, __LINE__ - code.lines.count - 2
+  end
+
+  # Was the author represented when this {ActivityObject} was created?
+  def represented_author?
+    author_id != user_author_id
+  end
+
   # The object of this activity object
   def object
     subtype_instance.is_a?(Actor) ?
@@ -54,11 +116,6 @@ class ActivityObject < ActiveRecord::Base
       subtype_instance
   end
 
-  # The activity in which this activity_object was created
-  def post_activity
-    activities.includes(:activity_verb).where('activity_verbs.name' => 'post').first
-  end
-
   # Does this {ActivityObject} has {Actor}?
   def acts_as_actor?
     object_type == "Actor"
@@ -69,4 +126,69 @@ class ActivityObject < ActiveRecord::Base
     received_actions.sent_by(actor).first
   end
 
+  # The activity in which this activity_object was created
+  def post_activity
+    activities.includes(:activity_verb).where('activity_verbs.name' => 'post').first
+  end
+
+  # Build the post activity when this object is not saved
+  def build_post_activity
+    Activity.new :author       => author,
+                 :user_author  => user_author,
+                 :owner        => owner,
+                 :relation_ids => Array(_relation_ids)
+  end
+
+  def _relation_ids
+    @_relation_ids ||=
+      if author.blank? || owner.blank?
+        nil
+      else
+        # FIXME: repeated in Activity#fill_relations
+        if SocialStream.relation_model == :custom
+          if author == owner
+            owner.relation_customs.map(&:id)
+          else
+            owner.
+              relation_customs.
+              allow(author, 'create', 'activity').
+              map(&:id)
+          end
+        else
+          Array.wrap Relation::Public.instance.id
+        end
+      end
+  end
+
+  def _activity_parent
+    @_activity_parent ||= Activity.find(_activity_parent_id)
+  end
+
+  def _activity_parent_id=(id)
+    self._relation_ids = Activity.find(id).relation_ids
+    @_activity_parent_id = id
+  end
+
+  private
+
+  def create_post_activity
+    create_activity "post"
+  end
+
+  def create_update_activity
+    create_activity "update"
+  end
+
+  def create_activity(verb)
+    a = Activity.new :verb         => verb,
+                     :author_id    => author_id,
+                     :user_author  => user_author,
+                     :owner        => owner,
+                     :relation_ids => _relation_ids,
+                     :parent_id    => _activity_parent_id
+
+    a.activity_objects << self
+
+    a.save!
+  end
 end

data/base/app/models/actor.rb

@@ -113,6 +113,8 @@ class Actor < ActiveRecord::Base
     joins(:received_contacts).merge(Contact.active.sent_by(a))
   }
 
+  scope :followed, joins(:activity_object).merge(ActivityObject.followed)
+
   scope :followed_by, lambda { |a|
     select("DISTINCT actors.*").
       joins(:received_ties => { :relation => :permissions }).

data/base/app/models/channel.rb

@@ -19,7 +19,6 @@ class Channel < ActiveRecord::Base
   belongs_to :user_author,
              :class_name => "Actor"
 
-  has_many :activity_objects, :dependent => :destroy
   has_many :activities, :dependent => :destroy
 
   validates_uniqueness_of :author_id,      :scope => [ :owner_id,  :user_author_id ]

data/base/app/models/comment.rb

@@ -10,16 +10,10 @@ class Comment < ActiveRecord::Base
     has created_at
   end
 
-
   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
-  end
-
   def title
     description.truncate(30, :separator =>' ')
   end

data/base/app/views/activity_actions/_update.js.erb

@@ -0,0 +1,11 @@
+SocialStream.Action.update({
+  activity_object: {
+    id: "<%= dom_id(@activity_action.activity_object) %>",
+    type: "<%= @activity_action.activity_object.object_type %>"
+  },
+  follow: {
+    following: <%= @activity_action.follow? %>,
+    form: "<%= escape_javascript render(:partial => 'activity_actions/follow_form', :locals => { :activity_object => @activity_action.activity_object }) %>",
+    sentence: "<%= escape_javascript render(:partial => 'activity_actions/follow_sentence', :locals => { :activity_object => @activity_action.activity_object }) %>"
+  }
+});