From 322d93185625b58cbb28a1df233aa408a4f0b2df Mon Sep 17 00:00:00 2001 From: Maciej Szlosarczyk Date: Fri, 10 Aug 2018 15:18:53 +0300 Subject: [PATCH] Further massage rubocop issues --- .../admin/domains/registry_lock_controller.rb | 6 +-- app/models/concerns/domain/lockable.rb | 49 ----------------- .../concerns/domain/registry_lockable.rb | 53 +++++++++++++++++++ app/models/domain.rb | 2 +- app/presenters/domain_presenter.rb | 4 +- config/locales/admin/domains.en.yml | 12 ++--- ...able_test.rb => registry_lockable_test.rb} | 2 +- 7 files changed, 65 insertions(+), 63 deletions(-) delete mode 100644 app/models/concerns/domain/lockable.rb create mode 100644 app/models/concerns/domain/registry_lockable.rb rename test/models/domain/{lockable_test.rb => registry_lockable_test.rb} (97%) diff --git a/app/controllers/admin/domains/registry_lock_controller.rb b/app/controllers/admin/domains/registry_lock_controller.rb index 6895ac711..cd04c5f2a 100644 --- a/app/controllers/admin/domains/registry_lock_controller.rb +++ b/app/controllers/admin/domains/registry_lock_controller.rb @@ -5,11 +5,9 @@ module Admin set_domain authorize! :manage, @domain if @domain.remove_registry_lock - redirect_to edit_admin_domain_url(@domain), - notice: t('admin.domains.registry_lock_delete.success') + redirect_to edit_admin_domain_url(@domain), notice: t('.success') else - redirect_to edit_admin_domain_url(@domain), - alert: t('admin.domains.registry_lock_delete.error') + redirect_to edit_admin_domain_url(@domain), alert: t('.error') end end diff --git a/app/models/concerns/domain/lockable.rb b/app/models/concerns/domain/lockable.rb deleted file mode 100644 index ae7e215b7..000000000 --- a/app/models/concerns/domain/lockable.rb +++ /dev/null @@ -1,49 +0,0 @@ -module Concerns::Domain::Lockable - extend ActiveSupport::Concern - - def apply_registry_lock - return unless registry_lockable? - return if locked_by_registrant? - - transaction do - statuses << DomainStatus::SERVER_UPDATE_PROHIBITED - statuses << DomainStatus::SERVER_DELETE_PROHIBITED - statuses << DomainStatus::SERVER_TRANSFER_PROHIBITED - self.locked_by_registrant_at = Time.zone.now - save - end - end - - def registry_lockable? - (statuses & [DomainStatus::PENDING_DELETE_CONFIRMATION, - DomainStatus::PENDING_CREATE, DomainStatus::PENDING_UPDATE, - DomainStatus::PENDING_DELETE, DomainStatus::PENDING_RENEW, - DomainStatus::PENDING_TRANSFER, DomainStatus::FORCE_DELETE - ]).empty? - end - - def locked_by_registrant? - return false unless locked_by_registrant_at - - lock_statuses = [ - DomainStatus::SERVER_UPDATE_PROHIBITED, - DomainStatus::SERVER_DELETE_PROHIBITED, - DomainStatus::SERVER_TRANSFER_PROHIBITED, - ] - - (statuses & lock_statuses).count == 3 - end - - def remove_registry_lock - return unless locked_by_registrant? - - transaction do - statuses.delete(DomainStatus::SERVER_UPDATE_PROHIBITED) - statuses.delete(DomainStatus::SERVER_DELETE_PROHIBITED) - statuses.delete(DomainStatus::SERVER_TRANSFER_PROHIBITED) - self.locked_by_registrant_at = nil - - save - end - end -end diff --git a/app/models/concerns/domain/registry_lockable.rb b/app/models/concerns/domain/registry_lockable.rb new file mode 100644 index 000000000..7a806559e --- /dev/null +++ b/app/models/concerns/domain/registry_lockable.rb @@ -0,0 +1,53 @@ +module Concerns + module Domain + module RegistryLockable + extend ActiveSupport::Concern + + def apply_registry_lock + return unless registry_lockable? + return if locked_by_registrant? + + transaction do + statuses << DomainStatus::SERVER_UPDATE_PROHIBITED + statuses << DomainStatus::SERVER_DELETE_PROHIBITED + statuses << DomainStatus::SERVER_TRANSFER_PROHIBITED + self.locked_by_registrant_at = Time.zone.now + save + end + end + + def registry_lockable? + (statuses & [DomainStatus::PENDING_DELETE_CONFIRMATION, + DomainStatus::PENDING_CREATE, DomainStatus::PENDING_UPDATE, + DomainStatus::PENDING_DELETE, DomainStatus::PENDING_RENEW, + DomainStatus::PENDING_TRANSFER, DomainStatus::FORCE_DELETE + ]).empty? + end + + def locked_by_registrant? + return false unless locked_by_registrant_at + + lock_statuses = [ + DomainStatus::SERVER_UPDATE_PROHIBITED, + DomainStatus::SERVER_DELETE_PROHIBITED, + DomainStatus::SERVER_TRANSFER_PROHIBITED, + ] + + (statuses & lock_statuses).count == 3 + end + + def remove_registry_lock + return unless locked_by_registrant? + + transaction do + statuses.delete(DomainStatus::SERVER_UPDATE_PROHIBITED) + statuses.delete(DomainStatus::SERVER_DELETE_PROHIBITED) + statuses.delete(DomainStatus::SERVER_TRANSFER_PROHIBITED) + self.locked_by_registrant_at = nil + + save + end + end + end + end +end diff --git a/app/models/domain.rb b/app/models/domain.rb index 66b1feb47..c9023a29c 100644 --- a/app/models/domain.rb +++ b/app/models/domain.rb @@ -6,7 +6,7 @@ class Domain < ActiveRecord::Base include Concerns::Domain::ForceDelete include Concerns::Domain::Deletable include Concerns::Domain::Transferable - include Concerns::Domain::Lockable + include Concerns::Domain::RegistryLockable has_paper_trail class_name: "DomainVersion", meta: { children: :children_log } diff --git a/app/presenters/domain_presenter.rb b/app/presenters/domain_presenter.rb index 59568f83c..824b7fc9c 100644 --- a/app/presenters/domain_presenter.rb +++ b/app/presenters/domain_presenter.rb @@ -74,10 +74,10 @@ class DomainPresenter def remove_registry_lock_btn return unless domain.locked_by_registrant? - view.link_to(view.t('admin.domains.registry_lock_delete.btn'), + view.link_to(view.t('admin.domains.registry_lock.destroy.btn'), view.admin_domain_registry_lock_path(domain), method: :delete, - data: { confirm: view.t('admin.domains.registry_lock_delete.confirm') }, + data: { confirm: view.t('admin.domains.registry_lock.destroy.confirm') }, class: 'dropdown-item') end diff --git a/config/locales/admin/domains.en.yml b/config/locales/admin/domains.en.yml index bb157fe9c..d86926568 100644 --- a/config/locales/admin/domains.en.yml +++ b/config/locales/admin/domains.en.yml @@ -23,12 +23,12 @@ en: close_btn: Close dialog submit_btn: Force delete domain - registry_lock_delete: - btn: Remove registry lock - banner: Domain has a registry lock set by registrant. - confirm: Are you sure you want to remove the registry lock? - success: Registry lock removed - error: Registry lock could not be removed + registry_lock: + destroy: + btn: Remove registry lock + confirm: Are you sure you want to remove the registry lock? + success: Registry lock removed + error: Registry lock could not be removed versions: time: Time diff --git a/test/models/domain/lockable_test.rb b/test/models/domain/registry_lockable_test.rb similarity index 97% rename from test/models/domain/lockable_test.rb rename to test/models/domain/registry_lockable_test.rb index 2f14f99da..cadef69d2 100644 --- a/test/models/domain/lockable_test.rb +++ b/test/models/domain/registry_lockable_test.rb @@ -1,6 +1,6 @@ require 'test_helper' -class DomainLockableTest < ActiveSupport::TestCase +class DomainRegistryLockableTest < ActiveSupport::TestCase def setup super