zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-07-25 20:18:22 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix rubocop #2565

Browse source
This commit is contained in:
Martin Lensment 2015-07-09 13:04:16 +03:00
parent 55b746a428
commit bf2c0c6bb7
2 changed files with 0 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/controllers/admin/blocked_domains_controller.rb
View file

@ -19,6 +19,5 @@ class Admin::BlockedDomainsController < AdminController
flash.now[:alert] = I18n.t('failed_to_update_record') flash.now[:alert] = I18n.t('failed_to_update_record')
render :index render :index
end end
end end
end end

12
app/validators/domain_name_validator.rb
View file

@ -1,17 +1,11 @@
class DomainNameValidator < ActiveModel::EachValidator class DomainNameValidator < ActiveModel::EachValidator
# rubocop: disable Metrics/PerceivedComplexity
# rubocop: disable Metrics/CyclomaticComplexity
def validate_each(record, attribute, value) def validate_each(record, attribute, value)
if !self.class.validate_format(value) if !self.class.validate_format(value)
record.errors[attribute] << (options[:message] || record.errors.generate_message(attribute, :invalid)) record.errors[attribute] << (options[:message] || record.errors.generate_message(attribute, :invalid))
elsif !self.class.validate_blocked(value) elsif !self.class.validate_blocked(value)
record.errors.add(attribute, (options[:message] || record.errors.generate_message(attribute, :blocked))) record.errors.add(attribute, (options[:message] || record.errors.generate_message(attribute, :blocked)))
# elsif !self.class.validate_reservation(value)
# record.errors.add(attribute, (options[:message] || record.errors.generate_message(attribute, :reserved)))
end end
end end
# rubocop: enable Metrics/PerceivedComplexity
# rubocop: enable Metrics/CyclomaticComplexity
class << self class << self
def validate_format(value) def validate_format(value)
@ -41,11 +35,5 @@ class DomainNameValidator < ActiveModel::EachValidator
return true unless value return true unless value
BlockedDomain.where("names @> ?::varchar[]", "{#{value}}").count == 0 BlockedDomain.where("names @> ?::varchar[]", "{#{value}}").count == 0
end end
# def validate_reservation(record, value)
# return true unless value
# return true if record.reserved_pw == record.auth_info
# !ReservedDomain.exists?(name: value.mb_chars.downcase.strip)
# end
end end
end end