From: Tom Hughes Date: Tue, 5 Dec 2023 18:13:13 +0000 (+0000) Subject: Fix new rubocop warnings X-Git-Tag: live~917 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/0c2e471708911235ded4015dfe9e957e9f1430f0?ds=inline;hp=-c Fix new rubocop warnings --- 0c2e471708911235ded4015dfe9e957e9f1430f0 diff --git a/app/models/changeset.rb b/app/models/changeset.rb index 137de18fd..7f70f4a38 100644 --- a/app/models/changeset.rb +++ b/app/models/changeset.rb @@ -72,7 +72,7 @@ class Changeset < ApplicationRecord # note that this may not be a hard limit - due to timing changes and # concurrency it is possible that some changesets may be slightly # longer than strictly allowed or have slightly more changes in them. - ((closed_at > Time.now.utc) && (num_changes <= MAX_ELEMENTS)) + (closed_at > Time.now.utc) && (num_changes <= MAX_ELEMENTS) end def set_closed_time_now diff --git a/config/initializers/cors.rb b/config/initializers/cors.rb index 7421bd334..fdbf11a2c 100644 --- a/config/initializers/cors.rb +++ b/config/initializers/cors.rb @@ -6,7 +6,7 @@ module OpenStreetMap class Cors < Rack::Cors def call(env) - status, headers, body = super env + status, headers, body = super(env) headers["Cache-Control"] = "no-cache" if headers["Access-Control-Allow-Origin"] [status, headers, body] end diff --git a/config/initializers/oauth.rb b/config/initializers/oauth.rb index 57b89564f..fbe4ad219 100644 --- a/config/initializers/oauth.rb +++ b/config/initializers/oauth.rb @@ -40,12 +40,12 @@ module OpenStreetMap def render(options = {}) text = options.delete(:text) if text - super options.merge(:plain => text) + super(options.merge(:plain => text)) elsif options.delete(:nothing) status = options.delete(:status) || :ok head status, options else - super options + super(options) end end @@ -61,7 +61,7 @@ module OpenStreetMap end end - super controller + super(controller) end end end diff --git a/db/migrate/20120208122334_merge_acl_address_and_mask.rb b/db/migrate/20120208122334_merge_acl_address_and_mask.rb index 09b0ae3b0..5cac10740 100644 --- a/db/migrate/20120208122334_merge_acl_address_and_mask.rb +++ b/db/migrate/20120208122334_merge_acl_address_and_mask.rb @@ -21,7 +21,7 @@ class MergeAclAddressAndMask < ActiveRecord::Migration[4.2] prefix = 0 while netmask != "0.0.0.0" - netmask = netmask << 1 + netmask <<= 1 prefix += 1 end diff --git a/lib/osm.rb b/lib/osm.rb index c7f8bef2f..65eab6907 100644 --- a/lib/osm.rb +++ b/lib/osm.rb @@ -8,7 +8,7 @@ module OSM # The base class for API Errors. class APIError < RuntimeError def initialize(message = "Generic API Error") - super message + super(message) end def status @@ -19,7 +19,7 @@ module OSM # Raised when access is denied. class APIAccessDenied < APIError def initialize - super "Access denied" + super("Access denied") end def status @@ -30,7 +30,7 @@ module OSM # Raised when an API object is not found. class APINotFoundError < APIError def initialize - super "Object not found" + super("Object not found") end def status @@ -41,7 +41,7 @@ module OSM # Raised when a precondition to an API action fails sanity check. class APIPreconditionFailedError < APIError def initialize(message = "") - super "Precondition failed: #{message}" + super("Precondition failed: #{message}") end def status @@ -55,7 +55,7 @@ module OSM @object = object @object_id = object_id - super "The #{object} with the id #{object_id} has already been deleted" + super("The #{object} with the id #{object_id} has already been deleted") end attr_reader :object, :object_id @@ -68,7 +68,7 @@ module OSM # Raised when the user logged in isn't the same as the changeset class APIUserChangesetMismatchError < APIError def initialize - super "The user doesn't own that changeset" + super("The user doesn't own that changeset") end def status @@ -81,7 +81,7 @@ module OSM def initialize(changeset) @changeset = changeset - super "The changeset #{changeset.id} was closed at #{changeset.closed_at}" + super("The changeset #{changeset.id} was closed at #{changeset.closed_at}") end attr_reader :changeset @@ -96,7 +96,7 @@ module OSM def initialize(changeset) @changeset = changeset - super "The changeset #{changeset.id} is not yet closed." + super("The changeset #{changeset.id} is not yet closed.") end attr_reader :changeset @@ -111,7 +111,7 @@ module OSM def initialize(changeset) @changeset = changeset - super "You are already subscribed to changeset #{changeset.id}." + super("You are already subscribed to changeset #{changeset.id}.") end attr_reader :changeset @@ -126,7 +126,7 @@ module OSM def initialize(changeset) @changeset = changeset - super "You are not subscribed to changeset #{changeset.id}." + super("You are not subscribed to changeset #{changeset.id}.") end attr_reader :changeset @@ -139,7 +139,7 @@ module OSM # Raised when a change is expecting a changeset, but the changeset doesn't exist class APIChangesetMissingError < APIError def initialize - super "You need to supply a changeset to be able to make a change" + super("You need to supply a changeset to be able to make a change") end def status @@ -151,7 +151,7 @@ module OSM # the changeset ID that the diff was uploaded to. class APIChangesetMismatchError < APIError def initialize(provided, allowed) - super "Changeset mismatch: Provided #{provided} but only #{allowed} is allowed" + super("Changeset mismatch: Provided #{provided} but only #{allowed} is allowed") end def status @@ -163,7 +163,7 @@ module OSM # modify, or delete class APIChangesetActionInvalid < APIError def initialize(provided) - super "Unknown action #{provided}, choices are create, modify, delete" + super("Unknown action #{provided}, choices are create, modify, delete") end def status @@ -175,7 +175,7 @@ module OSM # they should. class APIBadXMLError < APIError def initialize(model, xml, message = "") - super "Cannot parse valid #{model} from xml string #{xml}. #{message}" + super("Cannot parse valid #{model} from xml string #{xml}. #{message}") end def status @@ -191,7 +191,7 @@ module OSM @provided = provided @latest = latest - super "Version mismatch: Provided #{provided}, server had: #{latest} of #{type} #{id}" + super("Version mismatch: Provided #{provided}, server had: #{latest} of #{type} #{id}") end attr_reader :provided, :latest, :id, :type @@ -209,7 +209,7 @@ module OSM @id = id @tag_key = tag_key - super "Element #{type}/#{id} has duplicate tags with key #{tag_key}" + super("Element #{type}/#{id} has duplicate tags with key #{tag_key}") end attr_reader :type, :id, :tag_key @@ -223,7 +223,7 @@ module OSM # This prevents ways from being to long and difficult to work with class APITooManyWayNodesError < APIError def initialize(id, provided, max) - super "You tried to add #{provided} nodes to way #{id}, however only #{max} are allowed" + super("You tried to add #{provided} nodes to way #{id}, however only #{max} are allowed") @id = id @provided = provided @@ -241,7 +241,7 @@ module OSM # This prevents relations from being too complex and difficult to work with class APITooManyRelationMembersError < APIError def initialize(id, provided, max) - super "You tried to add #{provided} members to relation #{id}, however only #{max} are allowed" + super("You tried to add #{provided} members to relation #{id}, however only #{max} are allowed") @id = id @provided = provided @@ -275,7 +275,7 @@ module OSM # raised when an API call is made using a method not supported on that URI class APIBadMethodError < APIError def initialize(supported_method) - super "Only method #{supported_method} is supported on this URI" + super("Only method #{supported_method} is supported on this URI") end def status @@ -287,7 +287,7 @@ module OSM # raised when an API call takes too long class APITimeoutError < APIError def initialize - super "Request timed out" + super("Request timed out") end def status @@ -300,7 +300,7 @@ module OSM # an element - only historical versions can be redacted. class APICannotRedactError < APIError def initialize - super "Cannot redact current version of element, only historical versions may be redacted." + super("Cannot redact current version of element, only historical versions may be redacted.") end def status @@ -313,7 +313,7 @@ module OSM def initialize(note) @note = note - super "The note #{note.id} was closed at #{note.closed_at}" + super("The note #{note.id} was closed at #{note.closed_at}") end attr_reader :note @@ -328,7 +328,7 @@ module OSM def initialize(note) @note = note - super "The note #{note.id} is already open" + super("The note #{note.id} is already open") end attr_reader :note @@ -343,7 +343,7 @@ module OSM def initialize(key) @key = key - super "Duplicate preferences with key #{key}" + super("Duplicate preferences with key #{key}") end attr_reader :key @@ -356,7 +356,7 @@ module OSM # Raised when a rate limit is exceeded class APIRateLimitExceeded < APIError def initialize - super "Rate limit exceeded" + super("Rate limit exceeded") end def status diff --git a/test/controllers/changesets_controller_test.rb b/test/controllers/changesets_controller_test.rb index 79fd7a571..d9a4b256b 100644 --- a/test/controllers/changesets_controller_test.rb +++ b/test/controllers/changesets_controller_test.rb @@ -332,7 +332,7 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest assert_select "> entry > content > xhtml|div > xhtml|table" do assert_select "> xhtml|tr > xhtml|td > xhtml|table" do - changeset.tags.each do |key, _| + changeset.tags.each_key do |key| assert_select "> xhtml|tr > xhtml|td", :text => /^#{key} = / end end diff --git a/test/lib/i18n_test.rb b/test/lib/i18n_test.rb index a25e4887c..8d597fc65 100644 --- a/test/lib/i18n_test.rb +++ b/test/lib/i18n_test.rb @@ -2,7 +2,7 @@ require "test_helper" class I18nTest < ActiveSupport::TestCase I18n.available_locales.each do |locale| - define_method("test_#{locale.to_s.underscore}".to_sym) do + define_method(:"test_#{locale.to_s.underscore}") do without_i18n_exceptions do # plural_keys = plural_keys(locale) @@ -57,7 +57,7 @@ class I18nTest < ActiveSupport::TestCase Rails.root.glob("config/locales/*.yml").each do |filename| lang = File.basename(filename, ".yml") - define_method("test_#{lang}_for_raw_html".to_sym) do + define_method(:"test_#{lang}_for_raw_html") do yml = YAML.load_file(filename) assert_nothing_raised do check_values_for_raw_html(yml)