Skip to content

Commit c5df391

Browse files
committed
Made rubocop happy
1 parent 03365f4 commit c5df391

23 files changed

+54
-36
lines changed

app/controllers/api/v0/base_controller.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ def update
5656
#
5757
# Returns Object
5858
def retrieve_resource
59-
instance_variable_get("@#{resource_name}")
59+
instance_variable_get(:"@#{resource_name}")
6060
end
6161

6262
# The allowed parameters for searching. Override this method in each API
@@ -98,13 +98,13 @@ def resource_name
9898
# the method "#{resource_name}_params" to limit permitted
9999
# parameters for the individual model.
100100
def resource_params
101-
@resource_params ||= send("#{resource_name}_params")
101+
@resource_params ||= send(:"#{resource_name}_params")
102102
end
103103

104104
# Use callbacks to share common setup or constraints between actions.
105105
def define_resource(resource = nil)
106106
resource ||= resource_class.find(params[:id])
107-
instance_variable_set("@#{resource_name}", resource)
107+
instance_variable_set(:"@#{resource_name}", resource)
108108
end
109109

110110
def authenticate

app/controllers/application_controller.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@ def current_locale
5454
def store_location
5555
# store last url - this is needed for post-login redirect to whatever the user last
5656
# visited.
57+
# don't store ajax calls
5758
unless ['/users/sign_in',
5859
'/users/sign_up',
5960
'/users/password',
60-
'/users/invitation/accept'].any? { |ur| request.fullpath.include?(ur) } \
61-
|| request.xhr? # don't store ajax calls
61+
'/users/invitation/accept'].any? { |ur| request.fullpath.include?(ur) } || request.xhr?
6262
session[:previous_url] = request.fullpath
6363
end
6464
end

app/controllers/concerns/versionable.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ def get_new(obj)
7272
else
7373
found = find_in_space(obj.send(belongs), new_template.phases)
7474
obj = obj.send(:deep_copy)
75-
obj.send("#{belongs}=", found)
75+
obj.send(:"#{belongs}=", found)
7676
end
7777
end
7878
obj

app/controllers/plans_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ def show
176176
.joins(:templates)
177177
.where(templates: { published: true }).uniq.sort_by(&:name)
178178
# TODO: Seems strange to do this. Why are we just not using an `edit` route?
179-
@editing = (!params[:editing].nil? && @plan.administerable_by?(current_user.id))
179+
@editing = !params[:editing].nil? && @plan.administerable_by?(current_user.id)
180180

181181
# Get all Guidance Groups applicable for the plan and group them by org
182182
@all_guidance_groups = @plan.guidance_group_options

app/helpers/conditions_helper.rb

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,11 +107,10 @@ def num_section_questions(plan, section, phase = nil)
107107
def sections_info(plan)
108108
return [] if plan.nil?
109109

110-
info = []
111-
plan.sections.each do |section|
112-
info.push(section_info(plan, section))
110+
info = plan.sections.map do |section|
111+
section_info(plan, section)
113112
end
114-
info
113+
info || []
115114
end
116115

117116
def section_info(plan, section)
@@ -250,7 +249,7 @@ def conditions_to_param_form(conditions)
250249
def webhook_hash(conditions)
251250
web_hash = {}
252251
param_conditions = conditions_to_param_form(conditions)
253-
param_conditions.each do |_title, params|
252+
param_conditions.each_value do |params|
254253
web_hash.merge!(params[:number] => params[:webhook_data])
255254
end
256255
web_hash

app/models/application_record.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ def safe_regexp_where_clause(column:)
3535

3636
def sanitize_fields(*attrs)
3737
attrs.each do |attr|
38-
send("#{attr}=", ActionController::Base.helpers.sanitize(send(attr)))
38+
send(:"#{attr}=", ActionController::Base.helpers.sanitize(send(attr)))
3939
end
4040
end
4141
end

app/models/concerns/acts_as_sortable.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ module ActsAsSortable
88
class_methods do
99
def update_numbers!(ids, parent:)
1010
# Ensure only records belonging to this parent are included.
11-
ids = ids.map(&:to_i) & parent.public_send("#{model_name.singular}_ids")
11+
ids = ids.map(&:to_i) & parent.public_send(:"#{model_name.singular}_ids")
1212
return if ids.empty?
1313

1414
update_numbers_postgresql!(ids) if ApplicationRecord.postgres_db?

app/models/concerns/exportable_plan.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -282,8 +282,8 @@ def record_plan_export(user, format)
282282
ep.format = format
283283
plan_settings = settings(:export)
284284

285-
Settings::Template::DEFAULT_SETTINGS.each do |key, _value|
286-
ep.settings(:export).send("#{key}=", plan_settings.send(key))
285+
Settings::Template::DEFAULT_SETTINGS.each_key do |key|
286+
ep.settings(:export).send(:"#{key}=", plan_settings.send(key))
287287
end
288288
end
289289
exported_plan.save

app/models/question.rb

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -208,34 +208,33 @@ def update_conditions(param_conditions, old_to_new_opts, question_id_map)
208208
conditions.destroy_all
209209
return unless param_conditions.present?
210210

211-
param_conditions.each do |_key, value|
211+
param_conditions.each_value do |value|
212212
save_condition(value, old_to_new_opts, question_id_map)
213213
end
214214
end
215215

216216
# rubocop:disable Metrics/MethodLength, Metrics/AbcSize
217+
# rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
217218
def save_condition(value, opt_map, question_id_map)
218219
c = conditions.build
219220
c.action_type = value['action_type']
220221
c.number = value['number']
221222
# question options may have changed so rewrite them
222223
c.option_list = value['question_option']
223224
unless opt_map.blank?
224-
new_question_options = []
225-
c.option_list.each do |qopt|
226-
new_question_options << opt_map[qopt]
225+
new_question_options = c.option_list.map do |qopt|
226+
opt_map[qopt]
227227
end
228-
c.option_list = new_question_options
228+
c.option_list = new_question_options || []
229229
end
230230

231231
if value['action_type'] == 'remove'
232232
c.remove_data = value['remove_question_id']
233233
unless question_id_map.blank?
234-
new_question_ids = []
235-
c.remove_data.each do |qid|
236-
new_question_ids << question_id_map[qid]
234+
new_question_ids = c.remove_data.each do |qid|
235+
question_id_map[qid]
237236
end
238-
c.remove_data = new_question_ids
237+
c.remove_data = new_question_ids || []
239238
end
240239
else
241240
c.webhook_data = {
@@ -247,6 +246,7 @@ def save_condition(value, opt_map, question_id_map)
247246
end
248247
c.save
249248
end
249+
# rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
250250
# rubocop:enable Metrics/MethodLength, Metrics/AbcSize
251251

252252
private

app/models/research_output.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,14 +76,14 @@ class ResearchOutput < ApplicationRecord
7676

7777
# Helper method to convert selected repository form params into Repository objects
7878
def repositories_attributes=(params)
79-
params.each do |_i, repository_params|
79+
params.each_value do |repository_params|
8080
repositories << Repository.find_by(id: repository_params[:id])
8181
end
8282
end
8383

8484
# Helper method to convert selected metadata standard form params into MetadataStandard objects
8585
def metadata_standards_attributes=(params)
86-
params.each do |_i, metadata_standard_params|
86+
params.each_value do |metadata_standard_params|
8787
metadata_standards << MetadataStandard.find_by(id: metadata_standard_params[:id])
8888
end
8989
end

0 commit comments

Comments
 (0)