From 0d2e9ca9b8f4210cded4a039905c333a2dba5656 Mon Sep 17 00:00:00 2001 From: Markus Boremski Date: Thu, 27 Aug 2026 10:59:12 +0000 Subject: [PATCH] Rename camelCase methods, parameters and variables to snake_case Fixes #4 * `sanitizeDateParameter` -> `sanitize_date_parameter` (WorkloadsController) * `clearCache` -> `clear_cache` (WlUserVacation, WlNationalHoliday) * `usersToShow`/`selectedUsers`/`groupsToShow`/`selectedGroups` -> snake_case (WorkloadFiltersHelper) All of them are internal: the two model methods are private callbacks, the controller method is private, and the helper is called positionally from `_filters.erb`. No public API changes. The three `Naming/*` entries are removed from .rubocop_todo.yml. Note that `Naming/MethodParameterName` is a minimum-length cop, not a style cop -- its four recorded offences do not match the current parameter names and look stale. Rubocop is in no Gemfile and does not run in CI, so this could not be verified here; if it still fires, `rubocop --auto-gen-config` regenerates the file. --- .rubocop_todo.yml | 23 ----------------------- app/controllers/workloads_controller.rb | 8 ++++---- app/helpers/workload_filters_helper.rb | 16 ++++++++-------- app/models/wl_national_holiday.rb | 6 +++--- app/models/wl_user_vacation.rb | 6 +++--- 5 files changed, 18 insertions(+), 41 deletions(-) diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 112103b..9c3491b 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -41,26 +41,3 @@ Metrics/MethodLength: # Configuration parameters: IgnoredMethods. Metrics/PerceivedComplexity: Max: 32 - -# Offense count: 3 -# Configuration parameters: EnforcedStyle, AllowedPatterns, IgnoredPatterns. -# SupportedStyles: snake_case, camelCase -Naming/MethodName: - Exclude: - - 'app/controllers/workloads_controller.rb' - - 'app/models/wl_national_holiday.rb' - - 'app/models/wl_user_vacation.rb' - -# Offense count: 4 -# Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames. -# AllowedNames: at, by, db, id, in, io, ip, of, on, os, pp, to -Naming/MethodParameterName: - Exclude: - - 'app/helpers/workload_filters_helper.rb' - -# Offense count: 8 -# Configuration parameters: EnforcedStyle, AllowedIdentifiers. -# SupportedStyles: snake_case, camelCase -Naming/VariableName: - Exclude: - - 'app/helpers/workload_filters_helper.rb' diff --git a/app/controllers/workloads_controller.rb b/app/controllers/workloads_controller.rb index 4d83a10..0abd7a2 100644 --- a/app/controllers/workloads_controller.rb +++ b/app/controllers/workloads_controller.rb @@ -19,9 +19,9 @@ class WorkloadsController < ApplicationController accept_api_auth :index def index - @first_day = sanitizeDateParameter(workload_params[:first_day], Time.zone.today - 10) - @last_day = sanitizeDateParameter(workload_params[:last_day], Time.zone.today + 50) - @today = sanitizeDateParameter(workload_params[:start_date], Time.zone.today) + @first_day = sanitize_date_parameter(workload_params[:first_day], Time.zone.today - 10) + @last_day = sanitize_date_parameter(workload_params[:last_day], Time.zone.today + 50) + @today = sanitize_date_parameter(workload_params[:start_date], Time.zone.today) @date_check = @last_day >= @first_day # if @today ("select as today") is before @first_day take @today as @first_day @@ -114,7 +114,7 @@ def assignee_ids groups ? { groups: WlGroupSelection.new.all_group_ids } : { users: WlUserSelection.new.all_user_ids } end - def sanitizeDateParameter(parameter, default) + def sanitize_date_parameter(parameter, default) return default unless parameter.respond_to?(:to_date) parameter.to_date diff --git a/app/helpers/workload_filters_helper.rb b/app/helpers/workload_filters_helper.rb index 2690d18..e783c48 100644 --- a/app/helpers/workload_filters_helper.rb +++ b/app/helpers/workload_filters_helper.rb @@ -1,12 +1,12 @@ # frozen_string_literal: true module WorkloadFiltersHelper - def user_options_for_select(usersToShow, selectedUsers) + def user_options_for_select(users_to_show, selected_users) result = '' - return unless usersToShow + return unless users_to_show - usersToShow.each do |user| - selected = selectedUsers.include?(user) ? 'selected="selected"' : '' + users_to_show.each do |user| + selected = selected_users.include?(user) ? 'selected="selected"' : '' result += "" end @@ -14,12 +14,12 @@ def user_options_for_select(usersToShow, selectedUsers) result.html_safe end - def group_options_for_select(groupsToShow, selectedGroups) + def group_options_for_select(groups_to_show, selected_groups) result = '' - return unless groupsToShow + return unless groups_to_show - groupsToShow.each do |group| - selected = selectedGroups.include?(group) ? 'selected="selected"' : '' + groups_to_show.each do |group| + selected = selected_groups.include?(group) ? 'selected="selected"' : '' result += "" end diff --git a/app/models/wl_national_holiday.rb b/app/models/wl_national_holiday.rb index 4ca94f1..c7f74aa 100644 --- a/app/models/wl_national_holiday.rb +++ b/app/models/wl_national_holiday.rb @@ -6,8 +6,8 @@ class WlNationalHoliday < ActiveRecord::Base validates :start, :end, :reason, presence: true validate :check_datum - after_destroy :clearCache - after_save :clearCache + after_destroy :clear_cache + after_save :clear_cache def check_datum errors.add :end, :greater_than_start_date if workload_end_before_start? @@ -19,7 +19,7 @@ def workload_end_before_start? start && self.end && (start_changed? || end_changed?) && self.end < start end - def clearCache + def clear_cache Rails.cache.clear end end diff --git a/app/models/wl_user_vacation.rb b/app/models/wl_user_vacation.rb index caf679a..1e90529 100644 --- a/app/models/wl_user_vacation.rb +++ b/app/models/wl_user_vacation.rb @@ -9,8 +9,8 @@ class WlUserVacation < ActiveRecord::Base validates :date_from, :date_to, presence: true validate :check_datum - after_destroy :clearCache - after_save :clearCache + after_destroy :clear_cache + after_save :clear_cache def check_datum errors.add :date_to, :greater_than_start_date if workload_end_before_start? @@ -22,7 +22,7 @@ def workload_end_before_start? date_from && date_to && (date_from_changed? || date_to_changed?) && date_to < date_from end - def clearCache + def clear_cache Rails.cache.clear end end