From 3d4d66983878943df6c825647a748641920b4b79 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Mon, 7 Jan 2019 00:54:14 +0200 Subject: [PATCH] Improve readability --- app/controllers/epp/domains_controller.rb | 4 ++-- app/models/epp/domain.rb | 29 ++++++++++++----------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/app/controllers/epp/domains_controller.rb b/app/controllers/epp/domains_controller.rb index 12b2277ef..f39aee81b 100644 --- a/app/controllers/epp/domains_controller.rb +++ b/app/controllers/epp/domains_controller.rb @@ -87,8 +87,8 @@ class Epp::DomainsController < EppController def check authorize! :check, Epp::Domain - names = params[:parsed_frame].css('name').map(&:text) - @domains = Epp::Domain.check_availability(names) + domain_names = params[:parsed_frame].css('name').map(&:text) + @domains = Epp::Domain.check_availability(domain_names) render_epp_response '/epp/domains/check' end diff --git a/app/models/epp/domain.rb b/app/models/epp/domain.rb index 2f25f3da5..ed04720af 100644 --- a/app/models/epp/domain.rb +++ b/app/models/epp/domain.rb @@ -788,31 +788,32 @@ class Epp::Domain < Domain } end - def check_availability(domains) - domains = [domains] if domains.is_a?(String) + def check_availability(domain_names) + domain_names = [domain_names] if domain_names.is_a?(String) - res = [] - domains.each do |x| - x.strip! - x.downcase! - unless DomainNameValidator.validate_format(x) - res << { name: x, avail: 0, reason: 'invalid format' } + result = [] + + domain_names.each do |domain_name| + domain_name.strip! + domain_name.downcase! + unless DomainNameValidator.validate_format(domain_name) + result << { name: domain_name, avail: 0, reason: 'invalid format' } next end - if ReservedDomain.pw_for(x).present? - res << { name: x, avail: 0, reason: I18n.t('errors.messages.epp_domain_reserved') } + if ReservedDomain.pw_for(domain_name).present? + result << { name: domain_name, avail: 0, reason: I18n.t('errors.messages.epp_domain_reserved') } next end - if Domain.find_by_idn x - res << { name: x, avail: 0, reason: 'in use' } + if Domain.find_by_idn domain_name + result << { name: domain_name, avail: 0, reason: 'in use' } else - res << { name: x, avail: 1 } + result << { name: domain_name, avail: 1 } end end - res + result end end