social_stream 0.25.2 → 0.26.0

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

@@ -0,0 +1,23 @@
+SocialStream.Follow = (function(SS, $, undefined){
+	var initButtons = function(){
+		$(".following-button").mouseenter(function(){
+			$(this).hide();
+			$(this).siblings(".unfollow-button").show();
+		});
+
+		$(".unfollow-button").mouseleave(function(){
+			$(this).hide();
+			$(this).siblings(".following-button").show();
+		});
+
+		$(".unfollow-button").hide();
+	}
+
+	$(function(){
+		SocialStream.Follow.initButtons();
+	});
+
+	return {
+		initButtons: initButtons
+	};
+})(SocialStream, jQuery);

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

@@ -91,7 +91,7 @@ SocialStream.Wall = (function(SS, $, undefined){
       });
       $("#masterSubmitButton").val(I18n.t('activity.sending') + '...').attr("disabled", true); 
 
-      // Add _relation_ids[] parameter from authorization selector
+      // Add relation_ids[] parameter from authorization selector
       $('.liveAdded').remove();
 
       var currentForm = $(this);
@@ -102,7 +102,7 @@ SocialStream.Wall = (function(SS, $, undefined){
           .addClass('liveAdded')
           .attr('type', 'hidden')
           .attr('name', currentForm
-            .attr('id').split('_')[1]+'[_relation_ids][]')
+            .attr('id').split('_')[1]+'[relation_ids][]')
           .val($(this).attr('value')));
       });
       return true;
@@ -128,7 +128,7 @@ SocialStream.Wall = (function(SS, $, undefined){
       $(this).removeAttr("readonly").val("").blur();
     });  
     //New comments
-    $('.input_new_comments').each(function() {chosen.result_deselect(0)
+    $('.input_new_comments').each(function() {
       $(this).removeAttr("readonly").val("");
     }); 
   }

data/base/app/controllers/search_controller.rb

@@ -6,20 +6,35 @@ class SearchController < ApplicationController
   RESULTS_SEARCH_PER_PAGE=12
   MIN_QUERY=2
   def index
-    if params[:search_query].blank? or too_short_query
-    @search_result = []
-    else
-      if params[:mode].eql? "header_search"
-        @search_result = search :quick
-        render :partial => "header_search"
-      return
+    @search_result =
+      if params[:q].blank? || too_short_query
+        []
+      elsif params[:mode].eql? "header_search"
+        search :quick
+      elsif params[:type].present?
+        focus_search
       else
-        if params[:focus].present?
-          @search_result = focus_search
-        else
-          @search_result = search :extended
-        end
+        search :extended
       end
+
+    respond_to do |format|
+      format.html {
+        if params[:mode] == "header_search"
+          render :partial => "header_search"
+        end
+      }
+
+      format.json {
+        json_obj = (
+          params[:type].present? ?
+          { params[:type].pluralize => @search_result } :
+          @search_result
+        )
+
+        render :json => json_obj
+      }
+
+      format.js
     end
   end
 
@@ -43,7 +58,7 @@ class SearchController < ApplicationController
   end
 
   def focus_search
-    @search_class_sym = params[:focus].singularize.to_sym unless params[:focus].blank?
+    @search_class_sym = params[:type].singularize.to_sym unless params[:type].blank?
     search_class = @search_class_sym.to_s.classify.constantize
     result = ThinkingSphinx.search(get_search_query, :classes => [search_class])
     result = authorization_filter result
@@ -51,13 +66,13 @@ class SearchController < ApplicationController
   end
 
   def too_short_query
-    bare_query = strip_tags(params[:search_query]) unless bare_query.html_safe?
+    bare_query = strip_tags(params[:q]) unless bare_query.html_safe?
     return bare_query.strip.size < MIN_QUERY
   end
 
   def get_search_query
     search_query = ""
-    param = strip_tags(params[:search_query]) || ""
+    param = strip_tags(params[:q]) || ""
     bare_query = param unless bare_query.html_safe?
     search_query_words = bare_query.strip.split
     search_query_words.each_index do |i|
@@ -70,7 +85,6 @@ class SearchController < ApplicationController
   def authorization_filter results
     filtered_results = Array.new
     results.each do |result|
-      puts result
       if result.is_a? SocialStream::Models::Object
         filtered_results << result if can? :read, result
       else

data/base/app/helpers/location_helper.rb

@@ -1,46 +1,3 @@
 module LocationHelper
-  
-  # Renders the location stack for your view. You can add as many stack levels as you wish.
-  #
-  # Usage:  
-  # <%= location(level1,leve2,level3,level4,....) %> 
-  #
-  # Output: 
-  # base > level1 > level2 > level3 > level 4
-  #
-  # Default configuration:
-  # base => "You are here" ("location.base" on config/locales)
-  # separator => ">" ("location.separator" on config/locales)
-  #
-  # Styles and HTML wrapping:
-  # partial => location/_location.html.erb 
-  #
-  # Example:  
-  # 	Render a location with two leves depth:
-  #
-  #   	<%= location(link_to(leve1.name, level1.url),link_to(leve2.name, level2.url)) %>
-  #
-  def location(*stack)
-    
-    location_body = render :partial => "location/location_body", :locals=>{:stack => stack}
-    
-    location_div = capture do
-      render :partial => "location/location", :locals=>{:location_body => location_body}
-    end
-    
-    case request.format
-      when Mime::JS
-      response = <<-EOJ
-
-          $('#map_location').html("#{ escape_javascript(location_div) }");
-          EOJ
-      
-      response.html_safe
-    else
-      content_for(:location) do
-        location_div
-      end
-    end
-    
-  end
+  include SocialStream::Views::Location
 end

data/base/app/helpers/search_helper.rb

@@ -1,7 +1,7 @@
 module SearchHelper  
   def too_short_query?
-    return true if params[:search_query].blank?
-    bare_query = strip_tags(params[:search_query]) unless bare_query.html_safe?
+    return true if params[:q].blank?
+    bare_query = strip_tags(params[:q]) unless bare_query.html_safe?
     return bare_query.strip.size < SearchController::MIN_QUERY
   end
   
@@ -26,15 +26,15 @@ module SearchHelper
   
   def get_search_query_words
     search_query = ""
-    bare_query = strip_tags(params[:search_query]) unless bare_query.html_safe?
+    bare_query = strip_tags(params[:q]) unless bare_query.html_safe?
     return bare_query.strip.split
   end
 
   def search_class(type, model_sym)
     case type
     when :selected
-     params[:focus].present? &&
-      params[:focus].eql?(model_sym.to_s) &&
+     params[:type].present? &&
+      params[:type].eql?(model_sym.to_s) &&
       'selected' || ''
     when :disabled
       search_results?(model_sym) &&
@@ -61,8 +61,8 @@ module SearchHelper
 
     link_to_if results,
                content_tag(:span, t("#{ model_sym }.title.other"), span_options),
-               search_path(:focus => model_sym,
-                           :search_query => params[:search_query]),
+               search_path(:type => model_sym,
+                           :q => params[:q]),
                :remote => true
   end
 end

data/base/app/models/activity.rb

@@ -90,8 +90,6 @@ class Activity < ActiveRecord::Base
       order("created_at desc")
   }
 
-  before_validation :fill_relations
-
   after_create  :increment_like_count
   after_destroy :decrement_like_count, :delete_notifications
 
@@ -325,25 +323,6 @@ class Activity < ActiveRecord::Base
 
   private
 
-  # Before validation callback
-  #
-  # Fill the relations when posting to other subject's wall
-  def fill_relations
-    return if relation_ids.present?
-
-    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
-
   #
   # Get the email subject for the activity's notification
   #

data/base/app/models/activity_action.rb

@@ -19,6 +19,14 @@ class ActivityAction < ActiveRecord::Base
     where(:activity_object_id => ActivityObject.normalize_id(activity_object))
   }
 
+  scope :authored_or_owned, where(arel_table[:author].eq(true).
+                                or(arel_table[:user_author].eq(true)).
+                                or(arel_table[:owner].eq(true)))
+
+  scope :authored_or_owned_by, lambda{ |subject|
+    authored_or_owned.sent_by(subject)
+  }
+
   before_create :follow_by_author_and_owner
 
   private

data/base/app/models/activity_object.rb

@@ -9,7 +9,6 @@
 # Objects are added to +config/initializers/social_stream.rb+
 #
 class ActivityObject < ActiveRecord::Base
-  attr_writer :_relation_ids
   attr_reader :_activity_parent_id
 
   # ActivityObject is a supertype of SocialStream.objects
@@ -17,6 +16,9 @@ class ActivityObject < ActiveRecord::Base
 
   acts_as_taggable
 
+  has_many :activity_object_audiences, :dependent => :destroy
+  has_many :relations, :through => :activity_object_audiences
+
   has_many :activity_object_activities, :dependent => :destroy
   has_many :activities, :through => :activity_object_activities
 
@@ -29,6 +31,11 @@ class ActivityObject < ActiveRecord::Base
            :source  => :actor,
            :conditions => { 'activity_actions.follow' => true }
 
+  # Associations for indexing
+  has_many :author_action,
+           :class_name => "ActivityAction",
+           :conditions => { 'activity_actions.author' => true }
+
   has_many :activity_object_properties,
            :dependent => :destroy
   has_many :object_properties,
@@ -42,7 +49,10 @@ class ActivityObject < ActiveRecord::Base
            :through => :activity_object_holders,
            :source  => :activity_object
 
+  before_validation :fill_relation_ids, :if => lambda { |obj| obj.object_type != "Actor" }
+
   validates_presence_of :object_type
+  validate :allowed_relations, :if => lambda { |obj| obj.object_type != "Actor" }
 
   # TODO: This is currently defined in lib/social_stream/models/object.rb
   #
@@ -110,6 +120,15 @@ class ActivityObject < ActiveRecord::Base
     class_eval code, __FILE__, __LINE__ - code.lines.count - 2
   end
 
+  # subject was the author, user author or owner of this {ActivityObject}?
+  def authored_or_owned_by?(subject)
+    return false if subject.blank?
+
+    received_actions.
+      merge(ActivityAction.authored_or_owned_by(subject)).
+      any?
+  end
+
   # Was the author represented when this {ActivityObject} was created?
   def represented_author?
     author_id != user_author_id
@@ -146,28 +165,7 @@ class ActivityObject < ActiveRecord::Base
     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
+                 :relation_ids => relation_ids
   end
 
   def _activity_parent
@@ -175,12 +173,44 @@ class ActivityObject < ActiveRecord::Base
   end
 
   def _activity_parent_id=(id)
-    self._relation_ids = Activity.find(id).relation_ids
+    self.relation_ids = Activity.find(id).relation_ids
     @_activity_parent_id = id
   end
 
   private
 
+  def fill_relation_ids
+    return if relation_ids.present? || author.blank? || owner.blank?
+
+    @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
+  end
+
+  # validate method
+  #
+  # check relations are included in 
+  def allowed_relations
+    return if @valid_relations
+
+    allowed_rels =
+      owner.relations.allowing('read', 'activity') + 
+      Relation::Single.allowing('read', 'activity')
+
+    if (relation_ids - allowed_rels.map(&:id)).any?
+      errors.add(:relation_ids, "not allowed")
+    end
+  end
+
+
   def create_post_activity
     create_activity "post"
   end
@@ -194,7 +224,7 @@ class ActivityObject < ActiveRecord::Base
                      :author_id    => author_id,
                      :user_author  => user_author,
                      :owner        => owner,
-                     :relation_ids => _relation_ids,
+                     :relation_ids => relation_ids,
                      :parent_id    => _activity_parent_id
 
     a.activity_objects << self

data/base/app/models/activity_object_audience.rb

@@ -0,0 +1,8 @@
+# Every {ActivityObject} ({Post}, {Comment}, etc.) is shared with one or more {Relation Relations}.
+#
+# Each {Relation} is equivalent to a set {Actor Actors}, which are the ones that have {Tie Ties}
+# to that {Relation}, in other words, the contacts that were added to that {Relation}
+class ActivityObjectAudience < ActiveRecord::Base
+  belongs_to :activity_object
+  belongs_to :relation
+end

data/base/app/models/actor.rb

@@ -57,6 +57,10 @@ class Actor < ActiveRecord::Base
   has_many :received_ties,
            :through => :received_contacts,
            :source  => :ties
+
+  has_many :received_relations,
+           :through => :received_ties,
+           :source  => :relation
   
   has_many :senders,
            :through => :received_contacts,
@@ -313,6 +317,11 @@ class Actor < ActiveRecord::Base
       map(&:id)
   end
 
+  # Does this {Actor} allow subject to perform action on object?
+  def allow?(subject, action, object)
+    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

data/base/app/models/comment.rb

@@ -5,9 +5,7 @@ class Comment < ActiveRecord::Base
   validates_presence_of :text
 
   define_index do
-    indexes activity_object.description
-
-    has created_at
+    activity_object_index
   end
 
   def parent_post