social_stream 1.1.12 → 2.0.0.beta1

data/base/app/controllers/permissions_controller.rb

@@ -1,15 +1,20 @@
-class PermissionsController < InheritedResources::Base
+class PermissionsController < ApplicationController
   before_filter :authenticate_user!
+  before_filter :relation!
 
-  respond_to :js
-
-  actions :index
+  def index
+    @permissions = @relation.permissions
 
-  belongs_to :relation
+    respond_to do |format|
+      format.html {
+        render partial: 'index', layout: false
+      }
+    end
+  end
 
-  def index
-    authorize! :read, parent
+  private
 
-    index!
+  def relation!
+    @relation = current_subject.relations.find(params[:relation_id])
   end
 end

data/base/app/controllers/profiles_controller.rb

@@ -5,10 +5,12 @@ class ProfilesController < ApplicationController
 
   def show
     subject_profile
-  end
 
-  def edit
-    current_profile
+    respond_to do |format|
+      format.html
+      format.js
+      format.json { render json: subject_profile.to_json }
+    end
   end
 
   def update
@@ -25,12 +27,15 @@ class ProfilesController < ApplicationController
   def profile_params
     params.
       require(:profile).
-      permit(:organization, :birthday, :city, :country, :description, :phone, :mobile, :fax, :address, :website, :experience, actor_attributes: [ :id, :name, :email, :tag_list ])
+      permit(:name, :organization, :birthday, :city, :country, :description,
+             :phone, :mobile, :fax, :email, :address, :website,
+             :experience,
+             :tag_list)
   end
 
   def subject_profile
     @profile ||=
-      profile_subject!.profile
+      profile_or_current_subject!.profile
   end
 
   def current_profile

data/base/app/controllers/repositories_controller.rb

@@ -0,0 +1,33 @@
+class RepositoriesController < ApplicationController
+
+  before_filter :profile_or_current_subject!
+
+  def show
+    respond_to do |format|
+      format.html {
+        collection
+
+        render collection if request.xhr?
+      }
+
+      format.json { render :json => collection }
+    end
+  end
+
+  def search
+    render SocialStream::Search.search(params[:q], current_subject, mode: :repository)
+  end
+
+  private
+
+  def collection
+    @collection ||=
+      ActivityObject.
+        select("DISTINCT activity_objects.*").
+        where(object_type: SocialStream.repository_models.map(&:to_s).map(&:classify)).
+        includes(SocialStream.repository_models).
+        collection(profile_subject, current_subject).
+        page(params[:page])
+  end
+end
+ 

data/base/app/controllers/search_controller.rb

@@ -1,13 +1,13 @@
 class SearchController < ApplicationController
   include ActionView::Helpers::SanitizeHelper
 
-  RESULTS_SEARCH_PER_PAGE=12
-  MIN_QUERY=2
+  RESULTS_SEARCH_PER_PAGE=16
+
   def index
     @search_result =
-      if params[:q].blank? || params[:q].strip.size < MIN_QUERY
-        []
-      elsif params[:mode].eql? "header_search"
+      if params[:q].blank? || params[:q].strip.size < SocialStream::Search::MIN_QUERY
+        Kaminari.paginate_array([])
+      elsif params[:mode] == "quick"
         search :quick
       else
         search :extended
@@ -15,8 +15,16 @@ class SearchController < ApplicationController
 
     respond_to do |format|
       format.html {
-        if params[:mode] == "header_search"
-          render :partial => "header_search"
+        if request.xhr?
+          if params[:mode] == "quick"
+            render partial: "quick"
+          else
+            if params[:q].present?
+              render partial: 'results'
+            else
+              render partial: 'index'
+            end
+          end
         end
       }
 

data/base/app/controllers/tags_controller.rb

@@ -2,14 +2,32 @@ class TagsController < ApplicationController
   before_filter :authenticate_user!
   
   def index
-    @tags = ActsAsTaggableOn::Tag.where('name like ?','%'+params[:tag]+'%').limit(10)
-    response = @tags.map{ |t| { 'key' => t.name, 'value' => t.name } }.to_json
-    if @tags.count == 0
-      response = "[{\"key\":\""+params[:tag]+"\" , \"value\":\""+params[:tag]+"\"}]"
+    @tags =
+      case params[:mode]
+      when "popular"
+        most_popular
+      else
+        match_tag
+      end
+
+    if @tags.blank? && params[:q].present?
+      @tags = [ ActsAsTaggableOn::Tag.new(name: params[:q]) ]
     end
 
     respond_to do |format|
-      format.json { render :text => response}
+      format.json {
+        render json: @tags
+      }
     end
   end
-end
+
+  private
+
+  def match_tag
+    ActsAsTaggableOn::Tag.where('name LIKE ?',"%#{ params[:q] }%").page(params[:page])
+  end
+
+  def most_popular
+    ActivityObject.tag_counts(:order => "count desc").page(params[:page])
+  end
+end

data/base/app/controllers/users_controller.rb

@@ -1,18 +1,20 @@
 class UsersController < ApplicationController
   include SocialStream::Controllers::Subjects
 
-  load_and_authorize_resource
+  load_and_authorize_resource except: :current
+
+  before_filter :authenticate_user!, only: :current
 
   respond_to :html, :xml, :js
   
   def index
-    @users = User.alphabetic.
-                  letter(params[:letter]).
-                  name_search(params[:search]).
-                  tagged_with(params[:tag]).
-                  page(params[:page]).per(10)
-
+    raise ActiveRecord::RecordNotFound
+  end
 
+  def current
+    respond_to do |format|
+      format.json { render json: current_user.to_json }
+    end
   end
 
   # Supported through devise

data/base/app/helpers/activities_helper.rb

@@ -1,28 +1,13 @@
 module ActivitiesHelper
-  # Link to 'like' or 'unlike' depending on the like status of the activity to current_subject
+  # Link to 'like' or 'unlike' depending if current_subject already unlikes or likes
+  # the object respectively
   #
   # @param [Object]
   # @return [String]
-  def link_like(object)
-    params = link_like_params(object)
-    link_to params[0],params[1],params[2]
-  end
-
-  def link_like_params(object)
-    params = Array.new
-    if !user_signed_in?
-      params << image_tag("btn/nolike.png", :class => "menu_icon")+t('activity.like')
-      params << new_user_session_path
-      params << {:class => "verb_like",:id => "like_" + dom_id(object)}
-    else
-      if (object.liked_by?(current_subject))
-        params << image_tag("btn/like.png", :class => "menu_icon")+t('activity.unlike')
-        params << [object, :like]
-        params << {:class => "verb_like",:id => "like_" + dom_id(object),:method => :delete, :remote => true}
-      else
-        params << image_tag("btn/nolike.png", :class => "menu_icon")+t('activity.like')
-        params << [object, :like]
-        params << {:class => "verb_like",:id => "like_" + dom_id(object),:method => :post, :remote => true}
+  def like_status object
+    [ 'like', 'unlike' ].tap do |s|
+      if user_signed_in? && object.liked_by?(current_subject)
+        s.reverse!
       end
     end
   end

data/base/app/helpers/contacts_helper.rb

@@ -1,6 +1,10 @@
 module ContactsHelper
   def contact_brief(subject)
-    t 'contact.in_common', :count => current_subject.common_contacts_count(subject)
+    if user_signed_in?
+      t 'contact.in_common', :count => current_subject.common_contacts_count(subject)
+    else
+      t 'contact.n', count: subject.sent_active_contact_count
+    end
   end
 
   def contact_link(c)
@@ -27,4 +31,8 @@ module ContactsHelper
       end
     end
   end
+
+  def current_contact_section? section
+    params[:type] == section.to_s
+  end
 end

data/base/app/helpers/explore_helper.rb

@@ -0,0 +1,16 @@
+module ExploreHelper
+  def current_explore_section? s
+    case s
+    when 'explore'
+      params[:section].blank? && controller.controller_name == 'explore'
+    when 'search'
+      controller.controller_name == 'search'
+    else 
+      s == params[:section]
+    end
+  end
+
+  def explore_button_class btn
+    current_explore_section?(btn) ? 'active' : ''
+  end
+end

data/base/app/helpers/layouts_helper.rb

@@ -0,0 +1,31 @@
+module LayoutsHelper
+  def current_header_icon_class type
+    current_header_icon?(type) ? 'active' : ''
+  end
+
+  def current_header_icon? type
+    controllers =
+      case type
+      when :home
+        'home'
+      when :contacts
+        'contacts'
+      when :events
+        'events'
+      when :resources
+        'repositories'
+      when :messages
+        [ 'messages', 'conversations' ]
+      end
+
+    Array.wrap(controllers).include? controller.controller_name
+  end
+
+  # Sets "out" class to header_signed_out in frontpage and devise's controllers
+  # and "in" class in the rest of the application
+  def header_logo_class
+    controller.controller_path =~ /frontpage|devise/ ?
+      'out' :
+      'in'
+  end
+end

data/base/app/helpers/profiles_helper.rb

@@ -1,37 +1,8 @@
 module ProfilesHelper
-  
-  #Tells if the current subject accessing the profile is its owner or not
-  def is_owner?
-    if (current_subject.present?) and (@profile.present?) and (@profile.actor == current_subject.actor)
-      return true
-    else
-      return false
-    end
-  end
-  
-  #Returns true if the "Personal Information" section is empty
-  def is_personal_empty?
-    if (@profile.organization?) or (@profile.birthday?) or (@profile.city?) or (@profile.description?)
-      return false
-    else
-      return true
-    end
-  end
-  
-  #Returns true if the "Personal Information" section is empty
-  def is_contact_empty?
-    if (@profile.phone?) or (@profile.mobile?) or (@profile.fax?) or (@profile.address?)or 
-       (@profile.website?) or (@profile.subject.email?)
-      return false
-    else
-      return true
-    end
-  end
-  
   #Returns the value if user is signed in or a link to sign in view
   def show_if_signed_in(info)
     return info if user_signed_in?
     return link_to t('profile.must_be_signed_id'), new_user_session_path
   end
   
-end
+end

data/base/app/helpers/search_helper.rb

@@ -1,29 +1,4 @@
 module SearchHelper  
-  def too_short_query?
-    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
-  
-  def render_global_search_for model
-    render_model_view model, "_global_search"    
-  end
-  
-  def render_focus_search_for model
-    render_model_view model, "_focus_search"    
-  end
-  
-  def model_with_details model
-    render_model_view model, "_with_details"
-  end
-  
-  def render_model_view model, type
-    model = model.model if model.is_a? Actor    
-    render :partial => model.class.to_s.pluralize.downcase + '/' + model.class.to_s.downcase + type,
-           :locals => {model.class.to_s.downcase.to_sym => model}
-    
-  end
-  
   def get_search_query_words
     search_query = ""
     bare_query = strip_tags(params[:q]) unless bare_query.html_safe?

data/base/app/helpers/tags_helper.rb

@@ -0,0 +1,13 @@
+module TagsHelper
+  def tag_list taggable
+    ''.html_safe.tap do |safe_string|
+      taggable.tags.
+        map(&:name).
+        map{ |t| 
+          safe_string << '<span rel="tag">'.html_safe
+          safe_string << t
+          safe_string << '</span>'.html_safe
+        }
+    end
+  end
+end

data/base/app/models/activity.rb

@@ -31,6 +31,7 @@ class Activity < ActiveRecord::Base
   # This has to be declared before 'has_ancestry' to work around rails issue #670
   # See: https://github.com/rails/rails/issues/670
   before_destroy :destroy_children_comments
+  before_destroy :decrement_like_count, :delete_notifications
 
   has_ancestry
 
@@ -60,9 +61,11 @@ class Activity < ActiveRecord::Base
     where(:owner_id => Actor.normalize_id(subject))
   }
   scope :authored_or_owned_by, lambda { |subjects|
-    ids = Actor.normalize_id(subjects)
+    if subjects.present?
+      ids = Actor.normalize_id(subjects)
 
-    where(arel_table[:author_id].in(ids).or(arel_table[:owner_id].in(ids)))
+      where(arel_table[:author_id].in(ids).or(arel_table[:owner_id].in(ids)))
+    end
   }
 
   scope :shared_with, lambda { |subject|
@@ -70,8 +73,21 @@ class Activity < ActiveRecord::Base
       merge(Audience.where(:relation_id => Relation.ids_shared_with(subject)))
   }
 
+  scope :timeline, lambda { |senders = nil, receivers = nil|
+    if senders == :home
+      senders = receivers.following_actor_and_self_ids
+    end
+
+    select("DISTINCT activities.*").
+      roots.
+      includes(:author, :user_author, :owner, :activity_objects, :activity_verb, :relations).
+      authored_or_owned_by(senders).
+      shared_with(receivers).
+      order("created_at desc")
+  }
+
+
   after_create  :increment_like_count
-  after_destroy :decrement_like_count, :delete_notifications
 
   validates_presence_of :author_id, :user_author_id, :owner_id, :relations
  

data/base/app/models/activity_object.rb

@@ -39,20 +39,6 @@ class ActivityObject < ActiveRecord::Base
            :class_name => "ActivityAction",
            :conditions => { :owner => true }
 
-  has_many :activity_object_properties,
-           :dependent => :destroy
-  has_many :object_properties,
-           :through => :activity_object_properties,
-           :source => :property
-  has_many :activity_object_holders,
-           :class_name  => "ActivityObjectProperty",
-           :foreign_key => :property_id,
-           :dependent   => :destroy
-  has_many :object_holders,
-           :through => :activity_object_holders,
-           :source  => :activity_object
-
-
   before_validation :fill_owner_id, :fill_user_author_id, :fill_relation_ids, :if => lambda { |obj| obj.object_type != "Actor" }
 
   validates_presence_of :object_type
@@ -80,6 +66,32 @@ class ActivityObject < ActiveRecord::Base
       merge(ActivityAction.sent_by(subject).where(:owner => true))
   }
 
+  scope :collection, lambda { |profile_subject = nil, current_subject = nil|
+    if profile_subject.present?
+      # /users/demo/posts
+      #
+      # get posts posted to demo's wall
+      col = owned_by(profile_subject)
+
+      # if current_subject != demo, auth filter results
+      if profile_subject != current_subject
+        col = col.shared_with(current_subject)
+      end
+    else
+      # auth filter results
+      col = shared_with(current_subject)
+
+      # if logged in, show the posts from the people following
+      if current_subject.present?
+        col = col.followed_by(current_subject)
+      end
+    end
+
+    col
+  }
+
+  scope :created, order("activity_objects.created_at DESC")
+
   scope :followed, order("activity_objects.follower_count DESC")
 
   scope :followed_by, lambda { |subject|
@@ -87,6 +99,12 @@ class ActivityObject < ActiveRecord::Base
       merge(ActivityAction.sent_by(subject).where(:follow => true))
   }
 
+  scope :not_actor, where('activity_objects.object_type != ?', "Actor")
+
+  scope :popular, order("activity_objects.like_count DESC")
+
+  scope :visited, order("activity_objects.visit_count DESC")
+
   scope :shared_with, lambda { |subject|
     joins(:activity_object_audiences).
       merge(ActivityObjectAudience.where(:relation_id => Relation.ids_shared_with(subject)))
@@ -133,10 +151,12 @@ class ActivityObject < ActiveRecord::Base
           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 }=(actor)             # def author=(actor)
+        self.#{ role }_id =             #   self.author_id =
+          (actor.blank? ?               #     (actor.blank? ?
+             nil :                      #       nil :
+             Actor.normalize_id(actor)) #       Actor.normalize_id(actor))
+      end                               # end
 
       def #{ role }_subject # def author_subject
         #{ role }.subject   #   author.subject
@@ -237,12 +257,13 @@ class ActivityObject < ActiveRecord::Base
       owner.relations.allowing('read', 'activity') + 
       Relation::Single.allowing('read', 'activity')
 
-    if (relation_ids - allowed_rels.map(&:id)).any?
-      errors.add(:relation_ids, "not allowed: #{ relation_ids }, author_id: #{ author_id }, owner_id: #{ owner_id }")
+    not_allowed_ids = relation_ids - allowed_rels.map(&:id)
+
+    if not_allowed_ids.any?
+      errors.add(:relation_ids, "not allowed: #{ not_allowed_ids }, author_id: #{ author_id }, owner_id: #{ owner_id }")
     end
   end
 
-
   def create_post_activity
     create_activity "post"
   end
@@ -263,4 +284,34 @@ class ActivityObject < ActiveRecord::Base
 
     a.save!
   end
+
+  # The 'like' qualifications emmited to this activity object
+  def likes
+    Activity.joins(:activity_verb).where('activity_verbs.name' => "like").
+             joins(:activity_objects).where('activity_objects.id' => id)
+  end
+
+  def liked_by(subject) #:nodoc:
+    likes.authored_by(subject)
+  end
+
+  # Does subject like this {ActivityObject}?
+  def liked_by?(subject)
+    liked_by(subject).present?
+  end
+
+  # Build a new activity where subject like this
+  def new_like(subject, user)
+    a = Activity.new :verb           => "like",
+     :author_id      => Actor.normalize_id(subject),
+     :user_author_id => Actor.normalize_id(user),
+     :owner_id       => object_type == "Actor" ? subtype_instance.id : owner_id,
+     :relation_ids   => Array(Relation::Public.instance.id)
+
+    a.activity_objects << self
+
+    a
+  end
+
+  include Properties
 end