github/diaspora
1
1
Fork 0
mirror of https://github.com/diaspora/diaspora.git synced 2026-01-09 15:18:11 -05:00
Code Issues Packages Projects Releases Wiki Activity

Small style changes, add tests

Browse Source
This commit is contained in:
Steffen van Bergerem
2014-08-25 19:22:23 +02:00
parent f1408a7a09
commit ff84ee0485
28 changed files with 323 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
app/controllers/contacts_controller.rb
View File

@@ -34,29 +34,40 @@ class ContactsController < ApplicationController
private
def set_up_contacts
c = Contact.arel_table
@contacts = case params[:set]
when "only_sharing"
current_user.contacts.only_sharing.to_a.sort_by { |c| c.person.name }
when "all"
current_user.contacts.to_a.sort_by { |c| c.person.name }
else
if params[:a_id]
@aspect = current_user.aspects.find(params[:a_id])
@contacts_in_aspect = @aspect.contacts.includes(:aspect_memberships, :person => :profile).to_a.sort_by { |c| c.person.name }
if @contacts_in_aspect.empty?
@contacts_not_in_aspect = current_user.contacts.includes(:aspect_memberships, :person => :profile).to_a.sort_by { |c| c.person.name }
else
@contacts_not_in_aspect = current_user.contacts.where(c[:id].not_in(@contacts_in_aspect.map(&:id))).includes(:aspect_memberships, :person => :profile).to_a.sort_by { |c| c.person.name }
end
@contacts_in_aspect + @contacts_not_in_aspect
else
current_user.contacts.receiving.to_a.sort_by { |c| c.person.name }
end
end
type = params[:set].presence
type ||= "by_aspect" if params[:a_id].present?
type ||= "receiving"
@contacts = contacts_by_type(type)
@contacts_size = @contacts.length
end
def contacts_by_type(type)
contacts = case type
when "all"
[current_user.contacts]
when "only_sharing"
[current_user.contacts.only_sharing]
when "receiving"
[current_user.contacts.receiving]
when "by_aspect"
@aspect = current_user.aspects.find(params[:a_id])
@contacts_in_aspect = @aspect.contacts
@contacts_not_in_aspect = current_user.contacts.where.not(contacts: {id: @contacts_in_aspect.pluck(:id) })
[@contacts_in_aspect, @contacts_not_in_aspect].map {|relation|
relation.includes(:aspect_memberships)
}
else
raise ArgumentError, "unknown type #{type}"
end
contacts.map {|relation|
relation.includes(:person => :profile).to_a.tap {|contacts|
contacts.sort_by! {|contact| contact.person.name }
}
}.inject(:+)
end
def set_up_contacts_mobile
@contacts = case params[:set]
when "only_sharing"