social_stream 0.23.4 → 0.24.0

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

@@ -0,0 +1,41 @@
+SocialStream.Toolbar = (function(SS, $, undefined){
+	var init = function(options){
+		$('.toolbar_menu ul li ul').hide();
+		$('.toolbar_menu li a').click(function() {
+			$(this).next().slideToggle('normal');
+		});
+
+		Menu.init(options);
+	}
+
+	var Menu = (function(SS, $, undefined){
+		var init = function(options){
+			//Logo menu for current subject
+			//Full Caption Sliding (Hidden to Visible)
+			$('.logo_grid.logo_full').hover( function() {
+				$(".logo_menu", this).stop().animate({top:'101px'},{queue:false,duration:160});
+			}, function() {
+				$(".logo_menu", this).stop().animate({top:'1119px'},{queue:false,duration:160});
+			});
+
+			if (options != undefined && options['option'] != undefined && options['option'].length) {
+				expand(options['option']);
+			}
+		}
+
+		var expand = function(id) {
+			$('#toolbar_menu-' + id).next().show();
+		}
+
+		return {
+			init: init,
+			expand: expand
+		}
+	})(SS, $)
+
+	return {
+		init: init,
+		expandMenu: Menu.expand
+	}
+
+})(SocialStream, jQuery);

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

@@ -14,6 +14,7 @@ select#language option {
 select#language option[value=browser] { padding-left: 0; }
 select#language option[value=en] { background-image: url(flags/en.png); }
 select#language option[value=es] { background-image: url(flags/es.png); }
+select#language option[value=pt] { background-image: url(flags/pt.png); }
 #api_token {
     font-weight: bold;
     font-style: italic;

data/base/app/controllers/activity_actions_controller.rb

@@ -0,0 +1,44 @@
+class ActivityActionsController < ApplicationController
+  # Last tendencies in rails talk about filtering params in the controller,
+  # instead of using attr_protected
+  #
+  # We hope it will be shiped in Rails 4, so we write our custom method for now
+  before_filter :clean_params
+
+  before_filter :can_read_activity_object, :only => :create
+
+  respond_to :js
+
+  def create
+    @activity_action =
+      current_subject.
+        sent_actions.
+        find_or_create_by_activity_object_id @activity_object.id
+
+    @activity_action.update_attributes params[:activity_action]
+  end
+
+  def update
+    activity_action.update_attributes params[:activity_action]
+  end
+
+  private
+
+  def clean_params
+    return if params[:activity_action].blank?
+
+    params[:activity_action].delete(:actor_id)
+    params[:activity_action].delete(:activity_object_id) if params[:id].present?
+  end
+
+  def can_read_activity_object
+    @activity_object = ActivityObject.find(params[:activity_action][:activity_object_id])
+
+    authorize! :read, @activity_object.object
+  end
+
+  def activity_action
+    @activity_action ||=
+      current_subject.sent_actions.find params[:id]
+  end
+end

data/base/app/controllers/followers_controller.rb

@@ -0,0 +1,39 @@
+class FollowersController < ApplicationController
+  before_filter :authenticate_user!, :except => :index
+
+  respond_to :html, :js
+
+  def index
+    @contacts =
+      if params[:following]
+        current_subject.sent_contacts
+      else
+        current_subject.received_contacts
+      end
+
+    respond_to do |format|
+      format.html { @contacts = @contacts.page(params[:page]).per(20) }
+      format.js { @contacts = @contacts.page(params[:page]).per(20) }
+      format.json { render :text => to_json(@contacts) }
+    end
+  end
+
+  def update
+    current_contact.relation_ids = Array.wrap(Relation::Follow.instance.id)
+
+    respond_to :js
+  end
+
+  def destroy
+    current_contact.relation_ids = Array.new
+
+    respond_to :js
+  end
+
+  private
+
+  def current_contact
+    @contact ||=
+      current_subject.sent_contacts.find params[:id]
+  end
+end

data/base/app/helpers/activities_helper.rb

@@ -35,22 +35,22 @@ module ActivitiesHelper
              :owner_id  => Actor.normalize_id(receiver)
   end
 
-  def like_sentence(activity)
-    likers_shown = 3
-    likers_count = activity.likes.count
-    likers_other = likers_count - likers_shown
+  def like_sentence(activity, options = {})
+    options[:likers_shown] ||= 2
 
     # TODO: select likers from current_subject's contacts
     likers =
-      activity.likes.first(likers_shown).
+      activity.likes.first(options[:likers_shown]).
       map{ |a| a.sender_subject }.
-      map{ |l| link_to l.name, l }.
-      join(", ")
+      map{ |l| link_to l.name, l }
+
+    likers_count = activity.likes.count
+    likers_other = likers_count - options[:likers_shown]
 
     if likers_other > 0
-      t("activity.like_sentence.many", :likers => likers, :count => likers_other).html_safe
-    else
-      t("activity.like_sentence.few",  :likers => likers, :count => likers_count).html_safe
+      likers.push t("activity_action.sentence.more", :count => likers_other)
     end
+
+    t("activity.like_sentence", :likers => likers.to_sentence, :count => likers_count).html_safe
   end
 end

data/base/app/helpers/activity_actions_helper.rb

@@ -0,0 +1,35 @@
+module ActivityActionsHelper
+  def toggle_follow_action(activity_object)
+    action = activity_object.action_from(current_subject)
+    action ||= activity_object.received_actions.build :actor_id => current_subject.actor_id
+
+    action.follow ^= true
+
+    action
+  end
+
+  # Show the {SocialStream::Models::Subject Subjects} that follow
+  # the {ActivityObject object}
+  #
+  # TODO: DRY with ActivitiesHelper#like_sentence
+  def followers_sentence(object, options = {})
+    options[:followers_shown] ||= 2
+
+    followers_count = object.follower_count
+
+    return "" unless followers_count > 0
+
+    followers =
+      object.followers.
+      map{ |a| a.subject }.
+      map{ |l| link_to l.name, l }
+
+    followers_other = followers_count - options[:followers_shown]
+
+    if followers_other > 0
+      followers.push t("activity_action.sentence.more", :count => followers_other)
+    end
+
+    t("#{ object.object_type.underscore }.activity_action.sentence.follow", :followers => followers.to_sentence, :count => followers_count, :default => :"activity_action.sentence.follow").html_safe
+  end
+end

data/base/app/helpers/contacts_helper.rb

@@ -7,7 +7,7 @@ module ContactsHelper
     if c.reflexive?
       t('subject.this_is_you')
     else
-      render :partial => 'contacts/link', :locals => { :contact => c }
+      render :partial => "contacts/link_#{ SocialStream.relation_model }", :locals => { :contact => c }
     end
 
   end

data/base/app/helpers/followers_helper.rb

@@ -0,0 +1,5 @@
+module FollowersHelper
+  def follow_link_class(contact)
+    "follow-link-#{ dom_id contact }"
+  end
+end

data/base/app/helpers/toolbar_helper.rb

@@ -1,109 +1,96 @@
+# The toolbar is the left-side bar in Social Stream's layout
+#
 module ToolbarHelper
   # Configuration of toolbar items
-  include SocialStream::ToolbarConfig
+  include SocialStream::Views::Toolbar
 
-  # Define the toolbar content for your view. There are two typical cases, depending on the value of
-  # options[:profile]
-  # * If present, render the profile menu for the {SocialStream::Models::Subject subject}
-  # * If blank, render the home menu
+  # This method define the toolbar content for your view. The toolbar is at the left
+  # side of the screen in vanilla SocialStream distribution.
   #
-  # The menu option allows overwriting a menu slot with the content of the given block
+  # The {type} argument chooses diffent configurations. There are three build-in cases:
+  # * :home, render the home menu
+  # * :profile, render the profile menu for the {SocialStream::Models::Subject subject}
+  #   this {type} needs a :subject {option} with the subject in the sidebar
+  # * :messages, render the messages menu
   #
-  #
-  # Autoexpanding a menu section on your view:
+  # Autoexpand a menu section on your view:
   #
   # Toolbar allows you to autoexpand certain menu section that may be of interest for your view.
   # For example, the messages menu when you are looking your inbox. This is done through :option element.
   #
-  # To get it working, you should use the proper :option to be expanded, ":option => :messages" in the
-  # mentioned example. This will try
-      # Base toolbar items, automatically, to expand the section of the menu where its root
-  # list link, the one expanding the section, has an id equal to "#messages_menu". If you use
+  # To get it working, you should use the proper :option to be expanded. For instance,
   # ":options => :contacts" it will try to expand "#contacts_menu".
   #
-  # For now its working with :option => :messages, :contacts or :groups
-  #
-  #
   # Examples:
   #
   # Render the home toolbar:
   #
   #   <% toolbar %>
   #
+  # or
+  #
+  #   <% toolbar :home %>
+  #
   # Render the profile toolbar for a user:
   #
-  #   <% toolbar :profile => @user %>
+  #   <% toolbar :profile, :subject => @user %>
   #
-  # Render the home toolbar changing the messages menu option:
+  # Render the messages menu:
   #
-  #   <% toolbar :option => :messages %>
+  #   <% toolbar :messages %>
   #
   # Render the profile toolbar for group changing the contacts menu option:
   #
-  #   <% toolbar :profile => @group, :option => :contacts %>
+  #   <% toolbar :profile, :subject => @group, :option => :contacts %>
   #
-  def toolbar(options = {}, &block)
-    if options[:option] && block_given?
-      menu_options[options[:option]] = capture(&block)
-    end
-
-    content = capture do
-      if options[:profile]
-        render :partial => 'toolbar/profile', :locals => { :subject => options[:profile] }
-      elsif options[:option].present? and options[:option].to_s.eql? 'messages'
-        render :partial => 'toolbar/messages'
-      else
-        render :partial => 'toolbar/home'
-      end
-    end
+  def toolbar(type = :home, options = {})
+    content = toolbar_items(type, options).inject(ActiveSupport::SafeBuffer.new){ |result, item|
+      result + item[:html]
+    }
 
     case request.format
     when Mime::JS
       response = <<-EOJ
-
-          $('#toolbarContent').html("#{ escape_javascript(content) }");
-          initMenu();
-          expandSubMenu('#{ options[:option] }');
-          EOJ
+        $('#toolbarContent').html("#{ escape_javascript(content) }");
+        SocialStream.Toolbar.init({ option: '#{ options[:option] }' });
+      EOJ
 
       response.html_safe
     else
-    content_for(:toolbar) do
-    content
-    end
-    content_for(:javascript) do
-    <<-EOJ
-    expandSubMenu('#{ options[:option] }');
-    EOJ
-    end
+      content_for(:toolbar) do
+        content
+      end
+
+      content_for(:javascript) do
+      <<-EOJ
+        SocialStream.Toolbar.init({ option: '#{ options[:option] }' });
+      EOJ
+      end
     end
   end
 
-  # Cache menu options for toolbar
-  #
-  # @api private
-  def menu_options #:nodoc:
-    @menu_options ||= {}
-  end
+  def toolbar_menu(type, options = {})
+    ActiveSupport::SafeBuffer.new.tap do |menu|
+      menu << '<div class="toolbar_menu">'.html_safe
 
-  #Prints the home toolbar menu.
-  def home_toolbar_menu
-    render_items home_toolbar_items
-  end
+      toolbar_menu_render(toolbar_menu_items(type, options), menu)
 
-  #Prints the profile toolbar menu.
-  def profile_toolbar_menu(subject=current_subject)
-    render_items profile_toolbar_items(subject)
+      menu << '</div>'.html_safe
+    end
   end
 
-  #Prints the messages toolbar menu.
-  def messages_toolbar_menu
-    render_items messages_toolbar_items
-  end
- 
-  #Renders array of navigation items with simple_navigation
-  def render_items(items)
-    menu = render_navigation :items => items
-    return raw menu
+  def toolbar_menu_render(items, menu)
+    menu << '<ul>'.html_safe
+    items.each do |item|
+      menu << '<li>'.html_safe
+
+      menu << item[:html]
+      if item[:items].present?
+        toolbar_menu_render(item[:items], menu)
+      end
+
+      menu << '</li>'.html_safe
+    end
+    menu << '</ul>'.html_safe
   end
 end

data/base/app/models/activity_action.rb

@@ -0,0 +1,28 @@
+# This model includes all the actions performed by {Actor actors}
+# on {ActivityObject activity objects}
+# 
+class ActivityAction < ActiveRecord::Base
+  belongs_to :actor
+  belongs_to :activity_object
+
+  before_save :change_follower_count
+
+  scope :sent_by, lambda{ |actor|
+    where(:actor_id => Actor.normalize_id(actor))
+  }
+
+  scope :received_by, lambda{ |activity_object|
+    where(:activity_object_id => ActivityObject.normalize_id(activity_object))
+  }
+
+  private
+
+  # Updates the follower_count counter in the {ActivityObject}
+  def change_follower_count
+    return unless follow_changed?
+
+    follow? ?
+      activity_object.increment!(:follower_count) :
+      activity_object.decrement!(:follower_count)
+  end
+end

data/base/app/models/activity_object.rb

@@ -20,6 +20,14 @@ class ActivityObject < ActiveRecord::Base
   has_many :activity_object_activities, :dependent => :destroy
   has_many :activities, :through => :activity_object_activities
 
+  has_many :received_actions,
+           :class_name => "ActivityAction",
+           :dependent  => :destroy
+  has_many :followers,
+           :through => :received_actions,
+           :source  => :actor,
+           :conditions => { 'activity_actions.follow' => true }
+
   has_many :activity_object_properties,
            :dependent => :destroy
   has_many :object_properties,
@@ -56,8 +64,9 @@ class ActivityObject < ActiveRecord::Base
     object_type == "Actor"
   end
 
-  def object_holder_hash
-
+  # Return the {Action} model to an {Actor}
+  def action_from(actor)
+    received_actions.sent_by(actor).first
   end
 
 end