social_stream-base 0.20.0 → 0.20.1

data/README.rdoc

@@ -7,8 +7,8 @@ network environment see https://github.com/ging/social_stream
 
 == Features
 
-* Social network infraestructure
-* Activity streams infraestructure
+* Social network infrastructure
+* Activity streams infrastructure
 * Subjects: {User} and {Group}
 * Objects: {Post} and {Comment}
 * Private messages and notifications, by {Mailboxer}[https://github.com/ging/mailboxer]

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

@@ -240,7 +240,7 @@ div.chzn-container ul.chzn-choices li.search-field input{ cursor:pointer;}
   padding: 5px 7px;
   background-color: $secondary-color;
 }
-.menu_plain_list li span.selected {
+.menu_plain_list li span.selected, .menu_plain_list li span.active {
   border: solid 1px $main-color;
 }
 .menu_plain_list li span.disabled {

data/app/controllers/activities_controller.rb

@@ -1,5 +1,4 @@
 class ActivitiesController < InheritedResources::Base
-  belongs_to_subjects
   actions :index
 
   respond_to :js
@@ -10,7 +9,7 @@ class ActivitiesController < InheritedResources::Base
     rel = params[:section].to_i if params[:section].present?
 
     # should be activities.page(params[:page], :count => { :select => 'activity.id', :distinct => true }) but it is not working in Rails 3.0.3 
-    @activities ||= association_chain[-1].
+    @activities ||= profile_subject.
                       wall(:profile,
                            :for => current_subject,
                            :relation => rel).

data/app/controllers/profiles_controller.rb

@@ -1,9 +1,41 @@
-class ProfilesController < InheritedResources::Base
-  belongs_to_subjects(:singleton => true)
-
-  load_and_authorize_resource :profile,
-                              :through => SocialStream.subjects,
-                              :singleton => true
-  
-  respond_to :html, :xml, :js
+class ProfilesController < ApplicationController
+  before_filter :authenticate_user!, :except => [ :show ]
+
+  respond_to :html, :js
+
+  def show
+    subject_profile
+  end
+
+  def edit
+    current_profile
+  end
+
+  def update
+    current_profile.update_attributes params[:profile]
+
+    respond_to do |format|
+      format.html{ redirect_to [profile_subject, :profile] }
+      format.js
+    end
+  end
+
+  private
+
+  def subject_profile
+    @profile ||=
+      profile_subject!.profile
+  end
+
+  def current_profile
+    @profile ||= find_current_profile
+  end
+
+  def find_current_profile
+    unless profile_subject!.represented_by?(current_subject) 
+      raise CanCan::AccessDenied
+    end
+
+    current_subject.profile
+  end
 end

data/app/controllers/search_controller.rb

@@ -1,18 +1,14 @@
 class SearchController < ApplicationController
   include ActionView::Helpers::SanitizeHelper
 
-  helper_method :get_search_query
-
   RESULTS_SEARCH_PER_PAGE=12
   MIN_QUERY=2
   def index
     @search_result =
-      if params[:q].blank? || too_short_query
+      if params[:q].blank? || params[:q].strip.size < MIN_QUERY
         []
       elsif params[:mode].eql? "header_search"
         search :quick
-      elsif params[:type].present?
-        focus_search
       else
         search :extended
       end
@@ -41,56 +37,17 @@ class SearchController < ApplicationController
   private
 
   def search mode
-    models = ( mode.to_s.eql?("quick") ?
-              SocialStream.extended_search_models :
-              SocialStream.quick_search_models
-             ).dup
+    result = SocialStream::Search.search(params[:q],
+                                         current_subject,
+                                         :mode => mode,
+                                         :key  => params[:type])
 
-    models.map! {|model_sym| model_sym.to_s.classify.constantize}
-    result = ThinkingSphinx.search(get_search_query, :classes => models)
-    result = authorization_filter result
     if mode.to_s.eql? "quick"
       result = Kaminari.paginate_array(result).page(1).per(7)
     else
       result = Kaminari.paginate_array(result).page(params[:page]).per(RESULTS_SEARCH_PER_PAGE)
     end
-    return result
-  end
-
-  def focus_search
-    @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
-    return Kaminari.paginate_array(result).page(params[:page]).per(RESULTS_SEARCH_PER_PAGE)
-  end
-
-  def too_short_query
-    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[:q]) || ""
-    bare_query = param unless bare_query.html_safe?
-    search_query_words = bare_query.strip.split
-    search_query_words.each_index do |i|
-      search_query+= search_query_words[i] + " " if i < (search_query_words.size - 1)
-      search_query+= "*" + search_query_words[i] + "* " if i == (search_query_words.size - 1)
-    end
-    return search_query.strip
-  end
 
-  def authorization_filter results
-    filtered_results = Array.new
-    results.each do |result|
-      if result.is_a? SocialStream::Models::Object
-        filtered_results << result if can? :read, result
-      else
-      filtered_results << result
-      end
-    end
-    return filtered_results
+    result
   end
 end

data/app/helpers/search_helper.rb

@@ -30,39 +30,9 @@ module SearchHelper
     return bare_query.strip.split
   end
 
-  def search_class(type, model_sym)
-    case type
-    when :selected
-     params[:type].present? &&
-      params[:type].eql?(model_sym.to_s) &&
-      'selected' || ''
-    when :disabled
-      search_results?(model_sym) &&
-        '' || 'disabled'
-    else
-      raise "Unknown select search class type"
-   end
-  end
-
-  def search_results?(model_sym)
-    ThinkingSphinx.count(get_search_query,
-                         :classes => [model_sym.to_s.classify.constantize]) > 0
-  end
-
-  def search_tab(model_sym)
-    span_options = {}
-    span_options[:class] = "#{ search_class(:selected, model_sym) } #{ search_class(:disabled, model_sym) } #{ model_sym.to_s.pluralize.downcase }"
-
-    results = search_results?(model_sym)
-
-    unless results
-      span_options[:title] = t('search.no_subject_found', :subject => model_sym.to_s)
-    end
-
-    link_to_if results,
-               content_tag(:span, t("#{ model_sym }.title.other"), span_options),
-               search_path(:type => model_sym,
-                           :q => params[:q]),
-               :remote => true
+  def search_results?(key)
+    SocialStream::Search.count(params[:q],
+                               current_subject,
+                               :key => key) > 0
   end
 end

data/app/models/activity_object.rb

@@ -32,9 +32,12 @@ class ActivityObject < ActiveRecord::Base
            :conditions => { 'activity_actions.follow' => true }
 
   # Associations for indexing
-  has_many :author_action,
+  has_many :author_actions,
            :class_name => "ActivityAction",
-           :conditions => { 'activity_actions.author' => true }
+           :conditions => { :author => true }
+  has_many :owner_actions,
+           :class_name => "ActivityAction",
+           :conditions => { :owner => true }
 
   has_many :activity_object_properties,
            :dependent => :destroy
@@ -49,7 +52,8 @@ class ActivityObject < ActiveRecord::Base
            :through => :activity_object_holders,
            :source  => :activity_object
 
-  before_validation :fill_relation_ids, :if => lambda { |obj| obj.object_type != "Actor" }
+
+  before_validation :fill_owner_id, :fill_user_author_id, :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" }
@@ -71,8 +75,23 @@ class ActivityObject < ActiveRecord::Base
       merge(ActivityAction.not_sent_by(subject).where(:author => true))
   }
 
+  scope :owned_by, lambda { |subject|
+    joins(:received_actions).
+      merge(ActivityAction.sent_by(subject).where(:owner => true))
+  }
+
   scope :followed, order("activity_objects.follower_count DESC")
 
+  scope :followed_by, lambda { |subject|
+    joins(:received_actions).
+      merge(ActivityAction.sent_by(subject).where(:follow => true))
+  }
+
+  scope :shared_with, lambda { |subject|
+    joins(:activity_object_audiences).
+      merge(ActivityObjectAudience.where(:relation_id => Relation.ids_shared_with(subject)))
+  }
+
   def received_role_action(role)
     received_actions.
       find{ |a| a.__send__ "#{ role }?" }
@@ -179,6 +198,20 @@ class ActivityObject < ActiveRecord::Base
 
   private
 
+  def fill_owner_id
+    return if owner_id.present? || author_id.blank?
+
+    self.owner_id = author_id
+  end
+
+  def fill_user_author_id
+    return if user_author_id.present? ||
+                author_id.blank? ||
+                author.subject_type != "User"
+
+    self.user_author_id = author_id
+  end
+
   def fill_relation_ids
     return if relation_ids.present? || author.blank? || owner.blank?
 
@@ -206,7 +239,7 @@ class ActivityObject < ActiveRecord::Base
       Relation::Single.allowing('read', 'activity')
 
     if (relation_ids - allowed_rels.map(&:id)).any?
-      errors.add(:relation_ids, "not allowed")
+      errors.add(:relation_ids, "not allowed: #{ relation_ids }, author_id: #{ author_id }, owner_id: #{ owner_id }")
     end
   end
 

data/app/models/actor.rb

@@ -317,6 +317,12 @@ class Actor < ActiveRecord::Base
       map(&:id)
   end
 
+  # An array with the ids of {Actor Actors} followed by this {Actor}
+  # plus the id from this {Actor}
+  def following_actor_and_self_ids
+    following_actor_ids + [ 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?

data/app/models/relation.rb

@@ -152,6 +152,21 @@ class Relation < ActiveRecord::Base
     def allow?(*args)
       allow(*args).to_a.any?
     end
+
+    # All the {Relation} ids in {Tie Ties} this subject has received
+    # plus the one from {Relation::Public}
+    def ids_shared_with(subject)
+      ids = [Relation::Public.instance.id]
+
+      if SocialStream.relation_model == :custom && subject.present?
+        # Subject own defined custom relations
+        ids += subject.relation_ids
+        # From Ties sent by other subject
+        ids += subject.received_relation_ids
+      end
+
+      ids
+    end
   end
 
   # Relation class scoped in the same mode that this relation

data/app/models/tie.rb

@@ -28,6 +28,12 @@ class Tie < ActiveRecord::Base
   has_one :receiver, :through => :contact
 
   belongs_to :relation
+  has_many :permissions, :through => :relation
+
+  scope :allowing, lambda { |action, object|
+    joins(:relation).
+      merge(Relation.allowing(action, object))
+  }
 
   scope :recent, order("ties.created_at DESC")
 

data/app/views/comments/create.js.erb

@@ -1,8 +1,13 @@
-//Display the new comment
-$("#comments_activity_<%= @comment.post_activity.parent.id %>").append("<%= escape_javascript(render @comment.post_activity) %>");
-$(".activities_comment_btn").hide();
-$(".input_new_comments").each(function() {
-  $(this).focus().val("").blur();   
-});
+<% if @comment.valid? %>
+  //Display the new comment
+  $("#comments_activity_<%= @comment.post_activity.parent.id %>").append("<%= escape_javascript(render @comment.post_activity) %>");
+  $(".activities_comment_btn").hide();
+  $(".input_new_comments").each(function() {
+    $(this).focus().val("").blur();   
+  });
 
-SocialStream.Timeline.create("<%= escape_javascript dom_id(@comment.post_activity) %>");
+  SocialStream.Timeline.create("<%= escape_javascript dom_id(@comment.post_activity) %>");
+<% else %>
+  SocialStream.Timeline.create();
+  alert('<%= j @comment.errors.full_messages.to_sentence %>');
+<% end %>

data/app/views/messages/_form.html.erb

@@ -1,4 +1,4 @@
-<h2>New Message</h2>
+<h2><%= t('mailbox.message.new') %></h2>
 <%= form_tag messages_path, :method => :post , :class => "new_message" do %>
 <% if @receipt and @receipt.errors.any? %>
 <div class="error">

data/app/views/posts/create.js.erb

@@ -1,4 +1,9 @@
-//Display the new post
-$("#wall").prepend("<%= escape_javascript(render @post.post_activity) %>");
+<% if @post.valid? %>
+  //Display the new post
+  $("#wall").prepend("<%= escape_javascript(render @post.post_activity) %>");
 
-SocialStream.Timeline.create("<%= escape_javascript dom_id(@post.post_activity) %>");
+  SocialStream.Timeline.create("<%= escape_javascript dom_id(@post.post_activity) %>");
+<% else %>
+  SocialStream.Timeline.create();
+  alert('<%= j @post.errors.full_messages.to_sentence %>');
+<% end %>

data/app/views/search/_extended_search.html.erb

@@ -4,7 +4,7 @@
   </div>
 <% else %>
   <% @search_result.each do |model|%>
-    <% if @search_class_sym.nil? %>
+    <% if params[:type].blank? %>
       <div class="subject_search_results block left">
         <%= render_global_search_for model %>
       </div>

data/app/views/search/_extended_tab.html.erb

@@ -0,0 +1,5 @@
+<%= link_to (search_results?(key) ? search_path(:type => key, :q => params[:q]) : '#') do %>
+  <span class="<%= key %><%= " active" if params[:type] == key.to_s %><%= " disabled" unless search_results?(key) %>" <%= "title=\"#{ t 'search.no_subject_found', :subject => key.to_s }\"" %>>
+    <%= t("#{ key }.title.other") %>
+  </span>
+<% end %>

data/app/views/search/_form.html.erb

@@ -13,12 +13,12 @@
       <ul class="menu_plain_list">
         <li><%= link_to content_tag(:span,
                                     t('search.show_all'),
-                                    :class => "global #{ params[:type].blank? && 'selected' }"),
+                                    :class => "global #{ params[:type].blank? && 'active' }"),
                         search_path(:q => params[:q]),
                                     :remote => true %></li>
-        <% SocialStream.extended_search_models.each do |model_sym| %>
+        <% SocialStream::Search.keys(:extended).each do |model_sym| %>
           <li>
-            <%= search_tab(model_sym) %>
+            <%= render :partial => 'extended_tab', :locals => { :key => model_sym } %>
           </li>
         <% end %>
       </ul>

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

@@ -1,12 +1,12 @@
   $('#search_results').html("<%= escape_javascript render :partial => 'extended_search' %>");
   $('#search_form_div').html("<%= escape_javascript render :partial => 'form' %>");
   
-  $('#focus_options ul li a span').removeClass('selected');
+  $('#focus_options ul li a span').removeClass('active');
   
   <% if params[:type].present? %>
-  $('#focus_options ul li a span.<%= params[:type].pluralize.downcase %>').addClass('selected');
+  $('#focus_options ul li a span.<%= params[:type].pluralize.downcase %>').addClass('active');
   <% else %>
-  $('#focus_options ul li a span.global').addClass('selected');
+  $('#focus_options ul li a span.global').addClass('active');
   <% end %>
   
   $('title').text('<%= t('search.name')%> <%= escape_javascript(params[:q].present? ? ": #{params[:q]}" : "")%>');

data/config/routes.rb

@@ -17,7 +17,9 @@ Rails.application.routes.draw do
       #
       # /users/demo/posts
       (SocialStream.objects - [ :actor ]).each do |object|
-        resources object.to_s.pluralize
+        resources object.to_s.pluralize do
+          get 'search', :on => :collection
+        end
       end
     end
   end
@@ -26,7 +28,9 @@ Rails.application.routes.draw do
   #
   # /posts
   (SocialStream.objects - [ :actor ]).each do |object|
-    resources object.to_s.pluralize
+    resources object.to_s.pluralize do
+      get 'search', :on => :collection
+    end
   end
 
   resources :comments