From 2ecfd61ee9e7f1905638474b98b14b5597409fe6 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Tue, 17 Nov 2020 08:17:34 +0000 Subject: [PATCH] Fix new rubocop warnings --- app/validators/characters_validator.rb | 4 ++-- lib/gpx.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/validators/characters_validator.rb b/app/validators/characters_validator.rb index 94d340731..837e3e6cc 100644 --- a/app/validators/characters_validator.rb +++ b/app/validators/characters_validator.rb @@ -3,7 +3,7 @@ class CharactersValidator < ActiveModel::EachValidator INVALID_URL_CHARS = "/;.,?%#".freeze def validate_each(record, attribute, value) - record.errors[attribute] << (options[:message] || I18n.t("validations.invalid_characters")) if /[#{INVALID_CHARS}]/.match?(value) - record.errors[attribute] << (options[:message] || I18n.t("validations.url_characters", :characters => INVALID_URL_CHARS)) if options[:url_safe] && /[#{INVALID_URL_CHARS}]/.match?(value) + record.errors[attribute] << (options[:message] || I18n.t("validations.invalid_characters")) if /[#{INVALID_CHARS}]/o.match?(value) + record.errors[attribute] << (options[:message] || I18n.t("validations.url_characters", :characters => INVALID_URL_CHARS)) if options[:url_safe] && /[#{INVALID_URL_CHARS}]/o.match?(value) end end diff --git a/lib/gpx.rb b/lib/gpx.rb index 1a1d0b996..d0607233a 100644 --- a/lib/gpx.rb +++ b/lib/gpx.rb @@ -37,7 +37,7 @@ module GPX end def points(&block) - return enum_for(:points) unless block_given? + return enum_for(:points) unless block @possible_points = 0 @actual_points = 0 -- 2.45.1