Commit e1756b5b authored by Gonzalo's avatar Gonzalo

Privatize non-action controller methods

parent 78953fe2
......@@ -83,6 +83,7 @@ class AdminsController < ApplicationController
end
private
def percent_change(today, yesterday)
sprintf( "%0.02f", ((today-yesterday) / yesterday.to_f)*100).to_f
end
......
......@@ -22,6 +22,8 @@ class ApplicationController < ActionController::Base
:tags,
:open_publisher
private
def ensure_http_referer_is_set
request.env['HTTP_REFERER'] ||= '/'
end
......@@ -129,8 +131,6 @@ class ApplicationController < ActionController::Base
params[:max_time] ? Time.at(params[:max_time].to_i) : Time.now + 1
end
private
def current_user_redirect_path
current_user.getting_started? ? getting_started_path : root_path
end
......
......@@ -34,16 +34,6 @@ class AspectsController < ApplicationController
end
end
#person_id, user, @aspect
def connect_person_to_aspect(aspecting_person_id)
@person = Person.find(aspecting_person_id)
if @contact = current_user.contact_for(@person)
@contact.aspects << @aspect
else
@contact = current_user.share_with(@person, @aspect)
end
end
def new
@aspect = Aspect.new
@person_id = params[:person_id]
......@@ -120,4 +110,15 @@ class AspectsController < ApplicationController
end
@aspect.save
end
private
def connect_person_to_aspect(aspecting_person_id)
@person = Person.find(aspecting_person_id)
if @contact = current_user.contact_for(@person)
@contact.aspects << @aspect
else
@contact = current_user.share_with(@person, @aspect)
end
end
end
......@@ -32,7 +32,7 @@ class BlocksController < ApplicationController
end
end
protected
private
def disconnect_if_contact(person)
if contact = current_user.contact_for(person)
......
......@@ -61,7 +61,7 @@ class CommentsController < ApplicationController
end
end
protected
private
def find_post
if user_signed_in?
......
......@@ -33,7 +33,7 @@ class ContactsController < ApplicationController
@people = Person.community_spotlight
end
protected
private
def set_up_contacts
@contacts = case params[:set]
......@@ -51,5 +51,4 @@ class ContactsController < ApplicationController
end
@contacts = @contacts.for_a_stream.paginate(:page => params[:page], :per_page => 25)
end
end
......@@ -10,6 +10,8 @@ class InvitationCodesController < ApplicationController
redirect_to new_user_registration_path(:invite => {:token => params[:id]})
end
private
def ensure_valid_invite_code
InvitationCode.find_by_token!(params[:id])
end
......
......@@ -46,7 +46,7 @@ class LikesController < ApplicationController
end
end
protected
private
def target
@target ||= if params[:post_id]
......
......@@ -162,14 +162,6 @@ class PeopleController < ApplicationController
end
end
def diaspora_id?(query)
!query.try(:match, /^(\w)*@([a-zA-Z0-9]|[-]|[.]|[:])*$/).nil?
end
def search_query
@search_query ||= params[:q] || params[:term] || ''
end
def redirect_if_tag_search
if search_query.starts_with?('#')
if search_query.length > 1
......@@ -181,7 +173,15 @@ class PeopleController < ApplicationController
end
end
protected
private
def search_query
@search_query ||= params[:q] || params[:term] || ''
end
def diaspora_id?(query)
!query.try(:match, /^(\w)*@([a-zA-Z0-9]|[-]|[.]|[:])*$/).nil?
end
def remote_profile_with_no_user_session?
@person.try(:remote?) && !user_signed_in?
......
......@@ -64,7 +64,7 @@ class ProfilesController < ApplicationController
end
end
protected
private
def munge_tag_string
unless @profile_attrs[:tag_string].nil? || @profile_attrs[:tag_string] == I18n.t('profiles.edit.your_tags_placeholder')
......
......@@ -74,7 +74,6 @@ class PublicsController < ApplicationController
render :nothing => true, :status => 202
end
private
def check_for_xml
......
......@@ -30,6 +30,7 @@ class RegistrationsController < Devise::RegistrationsController
end
private
def check_valid_invite!
return true if AppConfig.settings.enable_registrations? #this sucks
return true if invite && invite.can_be_used?
......
......@@ -63,6 +63,5 @@ class ServicesController < ApplicationController
@service.destroy
flash[:notice] = I18n.t 'services.destroy.success'
redirect_to services_url
end
end
end
......@@ -15,7 +15,7 @@ class ShareVisibilitiesController < ApplicationController
render :nothing => true, :status => 200
end
protected
private
def accessible_post
@post ||= params[:shareable_type].constantize.where(:id => params[:post_id]).select("id, guid, author_id, created_at").first
......
......@@ -12,16 +12,6 @@ class StatusMessagesController < ApplicationController
:json
layout :bookmarklet_layout, :only => :bookmarklet
# Define bookmarklet layout depending on whether
# user is in mobile or desktop mode
def bookmarklet_layout
if request.format == :mobile
'application'
else
'blank'
end
end
# Called when a user clicks "Mention" on a profile page
# @param person_id [Integer] The id of the person to be mentioned
......@@ -88,6 +78,8 @@ class StatusMessagesController < ApplicationController
end
end
private
def destination_aspect_ids
if params[:status_message][:public] || params[:status_message][:aspect_ids].first == "all_aspects"
current_user.aspect_ids
......@@ -116,4 +108,14 @@ class StatusMessagesController < ApplicationController
def remove_getting_started
current_user.disable_getting_started
end
# Define bookmarklet layout depending on whether
# user is in mobile or desktop mode
def bookmarklet_layout
if request.format == :mobile
'application'
else
'blank'
end
end
end
......@@ -39,23 +39,26 @@ class TagsController < ApplicationController
end
end
def tag_followed?
TagFollowing.user_is_following?(current_user, params[:name])
end
private
def prep_tags_for_javascript
@tags.map! do |obj|
{ :name => ("#"+obj.name),
:value => ("#"+obj.name),
:url => tag_path(obj.name)
}
end
def tag_followed?
TagFollowing.user_is_following?(current_user, params[:name])
end
@tags << {
:name => ('#' + params[:q]),
:value => ("#" + params[:q]),
:url => tag_path(params[:q].downcase)
def prep_tags_for_javascript
@tags.map! do |tag|
{
:name => ("#" + tag.name),
:value => ("#" + tag.name),
:url => tag_path(tag.name)
}
@tags.uniq!
end
@tags << {
:name => ('#' + params[:q]),
:value => ("#" + params[:q]),
:url => tag_path(params[:q].downcase)
}
@tags.uniq!
end
end
......@@ -413,35 +413,35 @@ describe PeopleController do
describe '#diaspora_id?' do
it 'returns true for pods on urls' do
@controller.diaspora_id?("ilya_123@pod.geraspora.de").should be_true
@controller.send(:diaspora_id?, "ilya_123@pod.geraspora.de").should be_true
end
it 'returns true for pods on urls with port' do
@controller.diaspora_id?("ilya_123@pod.geraspora.de:12314").should be_true
@controller.send(:diaspora_id?, "ilya_123@pod.geraspora.de:12314").should be_true
end
it 'returns true for pods on localhost' do
@controller.diaspora_id?("ilya_123@localhost").should be_true
@controller.send(:diaspora_id?, "ilya_123@localhost").should be_true
end
it 'returns true for pods on localhost and port' do
@controller.diaspora_id?("ilya_123@localhost:1234").should be_true
@controller.send(:diaspora_id?, "ilya_123@localhost:1234").should be_true
end
it 'returns true for pods on ip' do
@controller.diaspora_id?("ilya_123@1.1.1.1").should be_true
@controller.send(:diaspora_id?, "ilya_123@1.1.1.1").should be_true
end
it 'returns true for pods on ip and port' do
@controller.diaspora_id?("ilya_123@1.2.3.4:1234").should be_true
@controller.send(:diaspora_id?, "ilya_123@1.2.3.4:1234").should be_true
end
it 'returns false for pods on with invalid url characters' do
@controller.diaspora_id?("ilya_123@join_diaspora.com").should be_false
@controller.send(:diaspora_id?, "ilya_123@join_diaspora.com").should be_false
end
it 'returns false for invalid usernames' do
@controller.diaspora_id?("ilya_2%3@joindiaspora.com").should be_false
@controller.send(:diaspora_id?, "ilya_2%3@joindiaspora.com").should be_false
end
end
end
......@@ -224,17 +224,17 @@ describe StatusMessagesController do
it 'removes the getting started flag from new users' do
alice.getting_started = true
alice.save
expect{
@controller.remove_getting_started
}.to change{
expect {
@controller.send(:remove_getting_started)
}.to change {
alice.reload.getting_started
}.from(true).to(false)
end
it 'does nothing for returning users' do
expect{
@controller.remove_getting_started
}.to_not change{
expect {
@controller.send(:remove_getting_started)
}.to_not change {
alice.reload.getting_started
}
end
......
......@@ -81,11 +81,11 @@ describe TagsController do
it 'returns true if the following already exists and should be case insensitive' do
TagFollowing.create!(:tag => @tag, :user => bob )
@controller.tag_followed?.should be_true
@controller.send(:tag_followed?).should be_true
end
it 'returns false if the following does not already exist' do
@controller.tag_followed?.should be_false
@controller.send(:tag_followed?).should be_false
end
end
end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment