From: J Guthrie Date: Sun, 4 Nov 2018 16:40:01 +0000 (+0000) Subject: Fix rubucop errors X-Git-Tag: live~2767^2~11 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/7d6c5d7cd7202c59cd8551750f72f0289f9df5d3?ds=sidebyside Fix rubucop errors --- diff --git a/app/models/user.rb b/app/models/user.rb index 795ddc132..04524e6a2 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -88,18 +88,18 @@ class User < ActiveRecord::Base :default_url => "/assets/:class/:attachment/:style.png", :styles => { :large => "100x100>", :small => "50x50>" } - INVALID_ASCII_CHARS = "/;.,?%#" - INVALID_NON_ASCII_CHARS = "\x00-\x1f\x7f\ufffe\uffff" + INVALID_ASCII_CHARS = "/;.,?%#".freeze + INVALID_NON_ASCII_CHARS = "\x00-\x1f\x7f\ufffe\uffff".freeze validates :display_name, :presence => true, :allow_nil => true, :length => 3..255, :exclusion => %w[new terms save confirm confirm-email go_public reset-password forgot-password suspended] validates :display_name, :if => proc { |u| u.display_name_changed? }, :uniqueness => { :case_sensitive => false } validates :display_name, :if => proc { |u| u.display_name_changed? }, - :format => { :with => %r{\A[^#{INVALID_NON_ASCII_CHARS}]*\z} } + :format => { :with => /\A[^#{INVALID_NON_ASCII_CHARS}]*\z/ } validates :display_name, :if => proc { |u| u.display_name_changed? }, - :format => { :with => %r{\A[^#{INVALID_ASCII_CHARS}]*\z}, - :message => I18n.t("users.account.invalid chars", invalid_chars: INVALID_ASCII_CHARS) } + :format => { :with => /\A[^#{INVALID_ASCII_CHARS}]*\z/, + :message => I18n.t("users.account.invalid chars", :invalid_chars => INVALID_ASCII_CHARS) } validates :display_name, :if => proc { |u| u.display_name_changed? }, :format => { :with => /\A\S/, :message => I18n.t("users.account.leading whitespace") } validates :display_name, :if => proc { |u| u.display_name_changed? },