From: Tom Hughes Date: Tue, 23 Apr 2019 08:25:47 +0000 (+0100) Subject: Fix new rubocop warnings X-Git-Tag: live~2575 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/9f57f60b87ff55a4ba69db3afadb21bbbdcb3385 Fix new rubocop warnings --- diff --git a/app/controllers/api/amf_controller.rb b/app/controllers/api/amf_controller.rb index 0cf511d76..0f368c3dc 100644 --- a/app/controllers/api/amf_controller.rb +++ b/app/controllers/api/amf_controller.rb @@ -114,18 +114,18 @@ module Api def amf_handle_error(call, rootobj, rootid) yield - rescue OSM::APIAlreadyDeletedError => ex - [-4, ex.object, ex.object_id] - rescue OSM::APIVersionMismatchError => ex - [-3, [rootobj, rootid], [ex.type.downcase, ex.id, ex.latest]] - rescue OSM::APIUserChangesetMismatchError => ex - [-2, ex.to_s] - rescue OSM::APIBadBoundingBox => ex - [-2, "Sorry - I can't get the map for that area. The server said: #{ex}"] - rescue OSM::APIError => ex - [-1, ex.to_s] - rescue StandardError => ex - [-2, "An unusual error happened (in #{call}). The server said: #{ex}"] + rescue OSM::APIAlreadyDeletedError => e + [-4, e.object, e.object_id] + rescue OSM::APIVersionMismatchError => e + [-3, [rootobj, rootid], [e.type.downcase, e.id, e.latest]] + rescue OSM::APIUserChangesetMismatchError => e + [-2, e.to_s] + rescue OSM::APIBadBoundingBox => e + [-2, "Sorry - I can't get the map for that area. The server said: #{e}"] + rescue OSM::APIError => e + [-1, e.to_s] + rescue StandardError => e + [-2, "An unusual error happened (in #{call}). The server said: #{e}"] end def amf_handle_error_with_timeout(call, rootobj, rootid) diff --git a/app/controllers/api/changesets_controller.rb b/app/controllers/api/changesets_controller.rb index fb6523f4e..ffd9a112b 100644 --- a/app/controllers/api/changesets_controller.rb +++ b/app/controllers/api/changesets_controller.rb @@ -364,10 +364,10 @@ module Api end # stupid Time seems to throw both of these for bad parsing, so # we have to catch both and ensure the correct code path is taken. - rescue ArgumentError => ex - raise OSM::APIBadUserInput, ex.message.to_s - rescue RuntimeError => ex - raise OSM::APIBadUserInput, ex.message.to_s + rescue ArgumentError => e + raise OSM::APIBadUserInput, e.message.to_s + rescue RuntimeError => e + raise OSM::APIBadUserInput, e.message.to_s end ## diff --git a/app/controllers/api/map_controller.rb b/app/controllers/api/map_controller.rb index 27d6f3667..e1d1a3b37 100644 --- a/app/controllers/api/map_controller.rb +++ b/app/controllers/api/map_controller.rb @@ -22,8 +22,8 @@ module Api bbox = BoundingBox.from_bbox_params(params) bbox.check_boundaries bbox.check_size - rescue StandardError => err - report_error(err.message) + rescue StandardError => e + report_error(e.message) return end diff --git a/app/controllers/api/tracepoints_controller.rb b/app/controllers/api/tracepoints_controller.rb index b22bcfaea..5fbece05b 100644 --- a/app/controllers/api/tracepoints_controller.rb +++ b/app/controllers/api/tracepoints_controller.rb @@ -25,8 +25,8 @@ module Api bbox = BoundingBox.from_bbox_params(params) bbox.check_boundaries bbox.check_size - rescue StandardError => err - report_error(err.message) + rescue StandardError => e + report_error(e.message) return end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index c880e6add..bee5e8169 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -37,8 +37,8 @@ class ApplicationController < ActionController::Base elsif session[:token] session[:user] = current_user.id if self.current_user = User.authenticate(:token => session[:token]) end - rescue StandardError => ex - logger.info("Exception authorizing user: #{ex}") + rescue StandardError => e + logger.info("Exception authorizing user: #{e}") reset_session self.current_user = nil end @@ -185,22 +185,22 @@ class ApplicationController < ActionController::Base def api_call_handle_error yield - rescue ActiveRecord::RecordNotFound => ex + rescue ActiveRecord::RecordNotFound => e head :not_found - rescue LibXML::XML::Error, ArgumentError => ex - report_error ex.message, :bad_request - rescue ActiveRecord::RecordInvalid => ex - message = "#{ex.record.class} #{ex.record.id}: " - ex.record.errors.each { |attr, msg| message << "#{attr}: #{msg} (#{ex.record[attr].inspect})" } + rescue LibXML::XML::Error, ArgumentError => e + report_error e.message, :bad_request + rescue ActiveRecord::RecordInvalid => e + message = "#{e.record.class} #{e.record.id}: " + e.record.errors.each { |attr, msg| message << "#{attr}: #{msg} (#{e.record[attr].inspect})" } report_error message, :bad_request - rescue OSM::APIError => ex - report_error ex.message, ex.status - rescue AbstractController::ActionNotFound => ex + rescue OSM::APIError => e + report_error e.message, e.status + rescue AbstractController::ActionNotFound => e raise - rescue StandardError => ex - logger.info("API threw unexpected #{ex.class} exception: #{ex.message}") - ex.backtrace.each { |l| logger.info(l) } - report_error "#{ex.class}: #{ex.message}", :internal_server_error + rescue StandardError => e + logger.info("API threw unexpected #{e.class} exception: #{e.message}") + e.backtrace.each { |l| logger.info(l) } + report_error "#{e.class}: #{e.message}", :internal_server_error end ## @@ -227,11 +227,11 @@ class ApplicationController < ActionController::Base OSM::Timer.timeout(Settings.web_timeout, Timeout::Error) do yield end - rescue ActionView::Template::Error => ex - ex = ex.cause + rescue ActionView::Template::Error => e + e = e.cause - if ex.is_a?(Timeout::Error) || - (ex.is_a?(ActiveRecord::StatementInvalid) && ex.message =~ /execution expired/) + if e.is_a?(Timeout::Error) || + (e.is_a?(ActiveRecord::StatementInvalid) && e.message =~ /execution expired/) render :action => "timeout" else raise diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb index 4a8f77650..d1af43a72 100644 --- a/app/controllers/geocoder_controller.rb +++ b/app/controllers/geocoder_controller.rb @@ -98,8 +98,8 @@ class GeocoderController < ApplicationController end render :action => "results" - rescue StandardError => ex - @error = "Error contacting geocoder.ca: #{ex}" + rescue StandardError => e + @error = "Error contacting geocoder.ca: #{e}" render :action => "error" end @@ -166,8 +166,8 @@ class GeocoderController < ApplicationController end render :action => "results" - rescue StandardError => ex - @error = "Error contacting nominatim.openstreetmap.org: #{ex}" + rescue StandardError => e + @error = "Error contacting nominatim.openstreetmap.org: #{e}" render :action => "error" end @@ -198,8 +198,8 @@ class GeocoderController < ApplicationController end render :action => "results" - rescue StandardError => ex - @error = "Error contacting api.geonames.org: #{ex}" + rescue StandardError => e + @error = "Error contacting api.geonames.org: #{e}" render :action => "error" end @@ -230,8 +230,8 @@ class GeocoderController < ApplicationController end render :action => "results" - rescue StandardError => ex - @error = "Error contacting nominatim.openstreetmap.org: #{ex}" + rescue StandardError => e + @error = "Error contacting nominatim.openstreetmap.org: #{e}" render :action => "error" end @@ -261,8 +261,8 @@ class GeocoderController < ApplicationController end render :action => "results" - rescue StandardError => ex - @error = "Error contacting api.geonames.org: #{ex}" + rescue StandardError => e + @error = "Error contacting api.geonames.org: #{e}" render :action => "error" end diff --git a/app/controllers/traces_controller.rb b/app/controllers/traces_controller.rb index 334aa2aa6..3497e92d5 100644 --- a/app/controllers/traces_controller.rb +++ b/app/controllers/traces_controller.rb @@ -113,8 +113,8 @@ class TracesController < ApplicationController begin @trace = do_create(params[:trace][:gpx_file], params[:trace][:tagstring], params[:trace][:description], params[:trace][:visibility]) - rescue StandardError => ex - logger.debug ex + rescue StandardError => e + logger.debug e end if @trace.id diff --git a/app/jobs/trace_importer_job.rb b/app/jobs/trace_importer_job.rb index 6b8943aa2..e4395bf3d 100644 --- a/app/jobs/trace_importer_job.rb +++ b/app/jobs/trace_importer_job.rb @@ -10,10 +10,10 @@ class TraceImporterJob < ApplicationJob Notifier.gpx_failure(trace, "0 points parsed ok. Do they all have lat,lng,alt,timestamp?").deliver_later trace.destroy end - rescue StandardError => ex - logger.info ex.to_s - ex.backtrace.each { |l| logger.info l } - Notifier.gpx_failure(trace, ex.to_s + "\n" + ex.backtrace.join("\n")).deliver_later + rescue StandardError => e + logger.info e.to_s + e.backtrace.each { |l| logger.info l } + Notifier.gpx_failure(trace, e.to_s + "\n" + e.backtrace.join("\n")).deliver_later trace.destroy end end diff --git a/app/models/changeset.rb b/app/models/changeset.rb index 3ca719f6c..b98d213c7 100644 --- a/app/models/changeset.rb +++ b/app/models/changeset.rb @@ -88,8 +88,8 @@ class Changeset < ActiveRecord::Base return Changeset.from_xml_node(pt, create) end raise OSM::APIBadXMLError.new("changeset", xml, "XML doesn't contain an osm/changeset element.") - rescue LibXML::XML::Error, ArgumentError => ex - raise OSM::APIBadXMLError.new("changeset", xml, ex.message) + rescue LibXML::XML::Error, ArgumentError => e + raise OSM::APIBadXMLError.new("changeset", xml, e.message) end def self.from_xml_node(pt, create = false) diff --git a/app/models/node.rb b/app/models/node.rb index 989cdee5c..be561fb5d 100644 --- a/app/models/node.rb +++ b/app/models/node.rb @@ -79,8 +79,8 @@ class Node < ActiveRecord::Base return Node.from_xml_node(pt, create) end raise OSM::APIBadXMLError.new("node", xml, "XML doesn't contain an osm/node element.") - rescue LibXML::XML::Error, ArgumentError => ex - raise OSM::APIBadXMLError.new("node", xml, ex.message) + rescue LibXML::XML::Error, ArgumentError => e + raise OSM::APIBadXMLError.new("node", xml, e.message) end def self.from_xml_node(pt, create = false) diff --git a/app/models/relation.rb b/app/models/relation.rb index f55711a69..884e96ed7 100644 --- a/app/models/relation.rb +++ b/app/models/relation.rb @@ -62,8 +62,8 @@ class Relation < ActiveRecord::Base return Relation.from_xml_node(pt, create) end raise OSM::APIBadXMLError.new("node", xml, "XML doesn't contain an osm/relation element.") - rescue LibXML::XML::Error, ArgumentError => ex - raise OSM::APIBadXMLError.new("relation", xml, ex.message) + rescue LibXML::XML::Error, ArgumentError => e + raise OSM::APIBadXMLError.new("relation", xml, e.message) end def self.from_xml_node(pt, create = false) diff --git a/app/models/trace.rb b/app/models/trace.rb index 0e8763328..1a2dfc9e4 100644 --- a/app/models/trace.rb +++ b/app/models/trace.rb @@ -208,8 +208,8 @@ class Trace < ActiveRecord::Base end raise OSM::APIBadXMLError.new("trace", xml, "XML doesn't contain an osm/gpx_file element.") - rescue LibXML::XML::Error, ArgumentError => ex - raise OSM::APIBadXMLError.new("trace", xml, ex.message) + rescue LibXML::XML::Error, ArgumentError => e + raise OSM::APIBadXMLError.new("trace", xml, e.message) end def update_from_xml_node(pt, create = false) diff --git a/app/models/way.rb b/app/models/way.rb index 6573b9805..ddb82ed1e 100644 --- a/app/models/way.rb +++ b/app/models/way.rb @@ -60,8 +60,8 @@ class Way < ActiveRecord::Base return Way.from_xml_node(pt, create) end raise OSM::APIBadXMLError.new("node", xml, "XML doesn't contain an osm/way element.") - rescue LibXML::XML::Error, ArgumentError => ex - raise OSM::APIBadXMLError.new("way", xml, ex.message) + rescue LibXML::XML::Error, ArgumentError => e + raise OSM::APIBadXMLError.new("way", xml, e.message) end def self.from_xml_node(pt, create = false) diff --git a/config/initializers/i18n.rb b/config/initializers/i18n.rb index b4399a9f8..6e0930017 100644 --- a/config/initializers/i18n.rb +++ b/config/initializers/i18n.rb @@ -3,10 +3,10 @@ module I18n module PluralizationFallback def pluralize(locale, entry, count) super - rescue InvalidPluralizationData => ex - raise ex unless ex.entry.key?(:other) + rescue InvalidPluralizationData => e + raise e unless e.entry.key?(:other) - ex.entry[:other] + e.entry[:other] end end end diff --git a/lib/diff_reader.rb b/lib/diff_reader.rb index e3c533b7a..19e0b8afc 100644 --- a/lib/diff_reader.rb +++ b/lib/diff_reader.rb @@ -33,8 +33,8 @@ class DiffReader # NOTE: XML::Reader#read returns false for EOF and raises an # exception if an error occurs. @reader.read - rescue LibXML::XML::Error => ex - raise OSM::APIBadXMLError.new("changeset", xml, ex.message) + rescue LibXML::XML::Error => e + raise OSM::APIBadXMLError.new("changeset", xml, e.message) end ## diff --git a/test/controllers/api/changesets_controller_test.rb b/test/controllers/api/changesets_controller_test.rb index f9643685f..9f2b64c0a 100644 --- a/test/controllers/api/changesets_controller_test.rb +++ b/test/controllers/api/changesets_controller_test.rb @@ -176,8 +176,8 @@ module Api [0, -32, 233455644, "afg", "213"].each do |id| get :show, :params => { :id => id } assert_response :not_found, "should get a not found" - rescue ActionController::UrlGenerationError => ex - assert_match(/No route matches/, ex.to_s) + rescue ActionController::UrlGenerationError => e + assert_match(/No route matches/, e.to_s) end end @@ -248,8 +248,8 @@ module Api cs_ids.each do |id| put :close, :params => { :id => id } assert_response :unauthorized, "Shouldn't be able close the non-existant changeset #{id}, when not authorized" - rescue ActionController::UrlGenerationError => ex - assert_match(/No route matches/, ex.to_s) + rescue ActionController::UrlGenerationError => e + assert_match(/No route matches/, e.to_s) end # Now try with auth @@ -257,8 +257,8 @@ module Api cs_ids.each do |id| put :close, :params => { :id => id } assert_response :not_found, "The changeset #{id} doesn't exist, so can't be closed" - rescue ActionController::UrlGenerationError => ex - assert_match(/No route matches/, ex.to_s) + rescue ActionController::UrlGenerationError => e + assert_match(/No route matches/, e.to_s) end end diff --git a/test/controllers/api/old_nodes_controller_test.rb b/test/controllers/api/old_nodes_controller_test.rb index 375a553b8..0f8954541 100644 --- a/test/controllers/api/old_nodes_controller_test.rb +++ b/test/controllers/api/old_nodes_controller_test.rb @@ -156,8 +156,8 @@ module Api def check_not_found_id_version(id, version) get :version, :params => { :id => id, :version => version } assert_response :not_found - rescue ActionController::UrlGenerationError => ex - assert_match(/No route matches/, ex.to_s) + rescue ActionController::UrlGenerationError => e + assert_match(/No route matches/, e.to_s) end ## diff --git a/test/models/message_test.rb b/test/models/message_test.rb index 9c321d3c3..60ff19e44 100644 --- a/test/models/message_test.rb +++ b/test/models/message_test.rb @@ -63,8 +63,8 @@ class MessageTest < ActiveSupport::TestCase # its OK to accept invalid UTF-8 as long as we return it unmodified. db_msg = msg.class.find(msg.id) assert_equal char, db_msg.title, "Database silently truncated message title" - rescue ArgumentError => ex - assert_equal ex.to_s, "invalid byte sequence in UTF-8" + rescue ArgumentError => e + assert_equal e.to_s, "invalid byte sequence in UTF-8" end end