cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix rubocop warnings

Browse source
This commit is contained in:
Tom Hughes 2016-10-20 22:00:56 +01:00
parent 9d106676b8
commit e17b89e89f
17 changed files with 105 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

14
app/controllers/application_controller.rb
View file

@ -62,7 +62,7 @@ class ApplicationController < ActionController::Base
unless current_token.nil?
unless current_token.read_attribute(cap)
report_error "OAuth token doesn't have that capability.", :forbidden
return false
false
end
end
end
@ -74,7 +74,7 @@ class ApplicationController < ActionController::Base
if params[:cookie_test].nil?
session[:cookie_test] = true
redirect_to Hash[params].merge(:cookie_test => "true")
return false
false
else
flash.now[:warning] = t "application.require_cookies.cookies_needed"
end
@ -192,7 +192,7 @@ class ApplicationController < ActionController::Base
# check user is a moderator
unless @user.moderator?
render :text => errormessage, :status => :forbidden
return false
false
end
end
@ -220,14 +220,14 @@ class ApplicationController < ActionController::Base
def check_api_readable
if api_status == :offline
report_error "Database offline for maintenance", :service_unavailable
return false
false
end
end
def check_api_writable
unless api_status == :online
report_error "Database offline for maintenance", :service_unavailable
return false
false
end
end
@ -262,7 +262,7 @@ class ApplicationController < ActionController::Base
def require_public_data
unless @user.data_public?
report_error "You must make your edits public to upload new data", :forbidden
return false
false
end
end
@ -375,7 +375,7 @@ class ApplicationController < ActionController::Base
##
# ensure that there is a "this_user" instance variable
def lookup_this_user
unless @this_user = User.active.find_by_display_name(params[:display_name])
unless @this_user = User.active.find_by(:display_name => params[:display_name])
render_unknown_user params[:display_name]
end
end

20
app/controllers/changeset_controller.rb
View file

@ -256,7 +256,7 @@ class ChangesetController < ApplicationController
end
if params[:display_name]
user = User.find_by_display_name(params[:display_name])
user = User.find_by(:display_name => params[:display_name])
if !user || !user.active?
render_unknown_user params[:display_name]
return
@ -481,7 +481,7 @@ class ChangesetController < ApplicationController
raise OSM::APIBadUserInput.new("invalid user ID") if user.to_i < 1
u = User.find(user.to_i)
else
u = User.find_by_display_name(name)
u = User.find_by(:display_name => name)
end
# make sure we found a user
@ -535,10 +535,10 @@ class ChangesetController < ApplicationController
# if parameter 'open' is nill then open and closed changesets are returned
def conditions_open(changesets, open)
if open.nil?
return changesets
changesets
else
return changesets.where("closed_at >= ? and num_changes <= ?",
Time.now.getutc, Changeset::MAX_ELEMENTS)
changesets.where("closed_at >= ? and num_changes <= ?",
Time.now.getutc, Changeset::MAX_ELEMENTS)
end
end
@ -547,10 +547,10 @@ class ChangesetController < ApplicationController
# ('closed at' time has passed or changes limit is hit)
def conditions_closed(changesets, closed)
if closed.nil?
return changesets
changesets
else
return changesets.where("closed_at < ? or num_changes > ?",
Time.now.getutc, Changeset::MAX_ELEMENTS)
changesets.where("closed_at < ? or num_changes > ?",
Time.now.getutc, Changeset::MAX_ELEMENTS)
end
end
@ -559,12 +559,12 @@ class ChangesetController < ApplicationController
# (either specified as array or comma-separated string)
def conditions_ids(changesets, ids)
if ids.nil?
return changesets
changesets
elsif ids.empty?
raise OSM::APIBadUserInput.new("No changesets were given to search for")
else
ids = ids.split(",").collect(&:to_i)
return changesets.where(:id => ids)
changesets.where(:id => ids)
end
end

4
app/controllers/diary_entry_controller.rb
View file

@ -102,7 +102,7 @@ class DiaryEntryController < ApplicationController
def list
if params[:display_name]
@this_user = User.active.find_by_display_name(params[:display_name])
@this_user = User.active.find_by(:display_name => params[:display_name])
if @this_user
@title = t "diary_entry.list.user_title", :user => @this_user.display_name
@ -150,7 +150,7 @@ class DiaryEntryController < ApplicationController
def rss
if params[:display_name]
user = User.active.find_by_display_name(params[:display_name])
user = User.active.find_by(:display_name => params[:display_name])
if user
@entries = user.diary_entries

6
app/controllers/notes_controller.rb
View file

@ -127,7 +127,7 @@ class NotesController < ApplicationController
comment = params[:text]
# Find the note and check it is valid
@note = Note.find_by_id(id)
@note = Note.find_by(:id => id)
raise OSM::APINotFoundError unless @note
raise OSM::APIAlreadyDeletedError.new("note", @note.id) unless @note.visible?
raise OSM::APINoteAlreadyClosedError.new(@note) if @note.closed?
@ -157,7 +157,7 @@ class NotesController < ApplicationController
comment = params[:text]
# Find the note and check it is valid
@note = Note.find_by_id(id)
@note = Note.find_by(:id => id)
raise OSM::APINotFoundError unless @note
raise OSM::APIAlreadyDeletedError.new("note", @note.id) unless @note.visible? || @user.moderator?
raise OSM::APINoteAlreadyOpenError.new(@note) unless @note.closed? || !@note.visible?
@ -277,7 +277,7 @@ class NotesController < ApplicationController
# Display a list of notes by a specified user
def mine
if params[:display_name]
if @this_user = User.active.find_by_display_name(params[:display_name])
if @this_user = User.active.find_by(:display_name => params[:display_name])
@title = t "note.mine.title", :user => @this_user.display_name
@heading = t "note.mine.heading", :user => @this_user.display_name
@description = t "note.mine.subheading", :user => render_to_string(:partial => "user", :object => @this_user)

2
app/controllers/oauth_controller.rb
View file

@ -27,7 +27,7 @@ class OauthController < ApplicationController
end
def revoke
@token = current_user.oauth_tokens.find_by_token params[:token]
@token = current_user.oauth_tokens.find_by :token => params[:token]
if @token
@token.invalidate!
flash[:notice] = t("oauth.revoke.flash", :application => @token.client_application.name)

4
app/controllers/swf_controller.rb
View file

@ -161,10 +161,10 @@ class SwfController < ApplicationController
def swf_record(id, r)
if r.length > 62
# Long header: tag id, 0x3F, length
return pack_u16((id << 6) + 0x3F) + pack_u32(r.length) + r
pack_u16((id << 6) + 0x3F) + pack_u32(r.length) + r
else
# Short header: tag id, length
return pack_u16((id << 6) + r.length) + r
pack_u16((id << 6) + r.length) + r
end
end

40
app/controllers/user_controller.rb
View file

@ -149,7 +149,7 @@ class UserController < ApplicationController
@title = t "user.lost_password.title"
if params[:user] && params[:user][:email]
user = User.visible.find_by_email(params[:user][:email])
user = User.visible.find_by(:email => params[:user][:email])
if user.nil?
users = User.visible.where("LOWER(email) = LOWER(?)", params[:user][:email])
@ -172,7 +172,7 @@ class UserController < ApplicationController
@title = t "user.reset_password.title"
if params[:token]
token = UserToken.find_by_token(params[:token])
token = UserToken.find_by(:token => params[:token])
if token
@user = token.user
@ -270,7 +270,7 @@ class UserController < ApplicationController
if params[:session] == request.session_options[:id]
if session[:token]
token = UserToken.find_by_token(session[:token])
token = UserToken.find_by(:token => session[:token])
token.destroy if token
session.delete(:token)
end
@ -286,7 +286,7 @@ class UserController < ApplicationController
def confirm
if request.post?
token = UserToken.find_by_token(params[:confirm_string])
token = UserToken.find_by(:token => params[:confirm_string])
if token && token.user.active?
flash[:error] = t("user.confirm.already active")
redirect_to :action => "login"
@ -303,7 +303,7 @@ class UserController < ApplicationController
token.destroy
if session[:token]
token = UserToken.find_by_token(session[:token])
token = UserToken.find_by(:token => session[:token])
session.delete(:token)
else
token = nil
@ -321,15 +321,15 @@ class UserController < ApplicationController
end
end
else
user = User.find_by_display_name(params[:display_name])
user = User.find_by(:display_name => params[:display_name])
redirect_to root_path if user.nil? || user.active?
end
end
def confirm_resend
user = User.find_by_display_name(params[:display_name])
token = UserToken.find_by_token(session[:token])
user = User.find_by(:display_name => params[:display_name])
token = UserToken.find_by(:token => session[:token])
if user.nil? || token.nil? || token.user != user
flash[:error] = t "user.confirm_resend.failure", :name => params[:display_name]
@ -343,7 +343,7 @@ class UserController < ApplicationController
def confirm_email
if request.post?
token = UserToken.find_by_token(params[:confirm_string])
token = UserToken.find_by(:token => params[:confirm_string])
if token && token.user.new_email?
@user = token.user
@user.email = @user.new_email
@ -393,7 +393,7 @@ class UserController < ApplicationController
end
def view
@this_user = User.find_by_display_name(params[:display_name])
@this_user = User.find_by(:display_name => params[:display_name])
if @this_user &&
(@this_user.visible? || (@user && @user.administrator?))
@ -404,7 +404,7 @@ class UserController < ApplicationController
end
def make_friend
@new_friend = User.find_by_display_name(params[:display_name])
@new_friend = User.find_by(:display_name => params[:display_name])
if @new_friend
if request.post?
@ -432,7 +432,7 @@ class UserController < ApplicationController
end
def remove_friend
@friend = User.find_by_display_name(params[:display_name])
@friend = User.find_by(:display_name => params[:display_name])
if @friend
if request.post?
@ -530,11 +530,11 @@ class UserController < ApplicationController
redirect_to :action => "terms"
else
user = User.find_by_auth_provider_and_auth_uid(provider, uid)
user = User.find_by(:auth_provider => provider, :auth_uid => uid)
if user.nil? && provider == "google"
openid_url = auth_info[:extra][:id_info]["openid_id"]
user = User.find_by_auth_provider_and_auth_uid("openid", openid_url) if openid_url
user = User.find_by(:auth_provider => "openid", :auth_uid => openid_url) if openid_url
user.update(:auth_provider => provider, :auth_uid => uid) if user
end
@ -601,15 +601,15 @@ class UserController < ApplicationController
# try and come up with the correct URL based on what the user entered
def openid_expand_url(openid_url)
if openid_url.nil?
return nil
nil
elsif openid_url.match(%r{(.*)gmail.com(/?)$}) || openid_url.match(%r{(.*)googlemail.com(/?)$})
# Special case gmail.com as it is potentially a popular OpenID
# provider and, unlike yahoo.com, where it works automatically, Google
# have hidden their OpenID endpoint somewhere obscure this making it
# somewhat less user friendly.
return "https://www.google.com/accounts/o8/id"
"https://www.google.com/accounts/o8/id"
else
return openid_url
openid_url
end
end
@ -766,7 +766,7 @@ class UserController < ApplicationController
##
# ensure that there is a "this_user" instance variable
def lookup_user_by_name
@this_user = User.find_by_display_name(params[:display_name])
@this_user = User.find_by(:display_name => params[:display_name])
rescue ActiveRecord::RecordNotFound
redirect_to :action => "view", :display_name => params[:display_name] unless @this_user
end
@ -823,9 +823,9 @@ class UserController < ApplicationController
# display a message about th current status of the gravatar setting
def gravatar_status_message(user)
if user.image_use_gravatar
return t "user.account.gravatar.enabled"
t "user.account.gravatar.enabled"
else
return t "user.account.gravatar.disabled"
t "user.account.gravatar.disabled"
end
end
end