Merge pull request #1873 from internetee/1872-zeitwerk-migration

Introduce Zeitwerk class loader
internetee · Mar 9, 2021 · f47f1a9 · f47f1a9
2 parents 32634c7 + 43b3033
commit f47f1a9
Show file tree

Hide file tree

Showing 78 changed files with 626 additions and 664 deletions.
diff --git a/.codeclimate.yml b/.codeclimate.yml
@@ -31,6 +31,9 @@ plugins:
   rubocop:
     enabled: true
     channel: rubocop-0-74
+    checks:
+      Rubocop/Style/ClassAndModuleChildren:
+        enabled: false
 checks:
   method-lines:
     config:

diff --git a/app/controllers/admin/contact_versions_controller.rb b/app/controllers/admin/contact_versions_controller.rb
@@ -2,12 +2,12 @@ module Admin
   class ContactVersionsController < BaseController
     include ObjectVersionsHelper
 
-    load_and_authorize_resource
+    load_and_authorize_resource class: Version::ContactVersion
 
     def index
       params[:q] ||= {}
 
-      @q = ContactVersion.search(params[:q])
+      @q = Version::ContactVersion.search(params[:q])
       @versions = @q.result.page(params[:page])
       search_params = params[:q].deep_dup
 
@@ -23,7 +23,7 @@ def index
         end
       end
 
-      versions = ContactVersion.includes(:item).where(whereS).order(created_at: :desc, id: :desc)
+      versions = Version::ContactVersion.includes(:item).where(whereS).order(created_at: :desc, id: :desc)
       @q = versions.search(params[:q])
       @versions = @q.result.page(params[:page])
       @versions = @versions.per(params[:results_per_page]) if params[:results_per_page].to_i.positive?
@@ -32,8 +32,8 @@ def index
 
     def show
       per_page = 7
-      @version = ContactVersion.find(params[:id])
-      @versions = ContactVersion.where(item_id: @version.item_id).order(created_at: :desc, id: :desc)
+      @version = Version::ContactVersion.find(params[:id])
+      @versions = Version::ContactVersion.where(item_id: @version.item_id).order(created_at: :desc, id: :desc)
       @versions_map = @versions.all.map(&:id)
 
       # what we do is calc amount of results until needed version
@@ -49,7 +49,7 @@ def show
     end
 
     def search
-      render json: ContactVersion.search_by_query(params[:q])
+      render json: Version::ContactVersion.search_by_query(params[:q])
     end
 
     def create_where_string(key, value)

diff --git a/app/controllers/admin/domain_versions_controller.rb b/app/controllers/admin/domain_versions_controller.rb
@@ -2,12 +2,12 @@ module Admin
   class DomainVersionsController < BaseController
     include ObjectVersionsHelper
 
-    load_and_authorize_resource
+    load_and_authorize_resource class: Version::DomainVersion
 
     def index
       params[:q] ||= {}
 
-      @q = DomainVersion.includes(:item).search(params[:q])
+      @q = Version::DomainVersion.includes(:item).search(params[:q])
       @versions = @q.result.page(params[:page])
       search_params = params[:q].deep_dup
 
@@ -40,7 +40,7 @@ def index
       whereS += "  AND object->>'registrar_id' IN (#{registrars.map { |r| "'#{r.id.to_s}'" }.join ','})" if registrars.present?
       whereS += "  AND 1=0" if registrars == []
 
-      versions = DomainVersion.includes(:item).where(whereS).order(created_at: :desc, id: :desc)
+      versions = Version::DomainVersion.includes(:item).where(whereS).order(created_at: :desc, id: :desc)
       @q = versions.search(params[:q])
       @versions = @q.result.page(params[:page])
       @versions = @versions.per(params[:results_per_page]) if params[:results_per_page].to_i.positive?
@@ -50,8 +50,8 @@ def index
 
     def show
       per_page = 7
-      @version = DomainVersion.find(params[:id])
-      @versions = DomainVersion.where(item_id: @version.item_id).order(created_at: :desc, id: :desc)
+      @version = Version::DomainVersion.find(params[:id])
+      @versions = Version::DomainVersion.where(item_id: @version.item_id).order(created_at: :desc, id: :desc)
       @versions_map = @versions.all.map(&:id)
 
       # what we do is calc amount of results until needed version
@@ -67,7 +67,7 @@ def show
     end
 
     def search
-      render json: DomainVersion.search_by_query(params[:q])
+      render json: Version::DomainVersion.search_by_query(params[:q])
     end
 
     def create_where_string(key, value)

diff --git a/app/controllers/registrar/base_controller.rb b/app/controllers/registrar/base_controller.rb
@@ -17,7 +17,7 @@ def current_ability
     private
 
     def check_ip_restriction
-      ip_restriction = Authorization::RestrictedIP.new(request.ip)
+      ip_restriction = Authorization::RestrictedIp.new(request.ip)
       allowed = ip_restriction.can_access_registrar_area?(current_registrar_user.registrar)
 
       return if allowed

diff --git a/app/controllers/registrar/domains_controller.rb b/app/controllers/registrar/domains_controller.rb
@@ -49,7 +49,7 @@ def index
             domain_presenters << ::DomainPresenter.new(domain: domain, view: view_context)
           end
 
-          raw_csv = Registrar::DomainListCSVPresenter.new(domains: domain_presenters,
+          raw_csv = Registrar::DomainListCsvPresenter.new(domains: domain_presenters,
                                                           view: view_context).to_s
           filename = "Domains_#{l(Time.zone.now, format: :filename)}.csv"
           send_data raw_csv, filename: filename, type: "#{Mime[:csv]}; charset=utf-8"

diff --git a/app/controllers/registrar/sessions_controller.rb b/app/controllers/registrar/sessions_controller.rb
@@ -72,7 +72,7 @@ def find_user_by_idc_and_allowed(idc)
     end
 
     def check_ip_restriction
-      ip_restriction = Authorization::RestrictedIP.new(request.ip)
+      ip_restriction = Authorization::RestrictedIp.new(request.ip)
       allowed = ip_restriction.can_access_registrar_area_sign_in_page?
 
       return if allowed

diff --git a/app/mailers/interceptors/punycode_interceptor.rb b/app/mailers/interceptors/punycode_interceptor.rb
@@ -1,4 +1,4 @@
-class PunycodeInterceptor
+class Interceptors::PunycodeInterceptor
   class << self
     def delivering_email(message)
       message.from = encode_addresses_as_punycode(message.from)
@@ -21,4 +21,4 @@ def encode_domain_part_as_punycode(domain_part)
       SimpleIDN.to_ascii(domain_part)
     end
   end
-end
+end
diff --git a/app/models/ability.rb b/app/models/ability.rb
@@ -89,8 +89,8 @@ def admin # Admin/admin_user dynamic role
     can :manage, BlockedDomain
     can :manage, ReservedDomain
     can :manage, DNS::Zone
-    can :manage, DomainVersion
-    can :manage, ContactVersion
+    can :manage, Version::DomainVersion
+    can :manage, Version::ContactVersion
     can :manage, Billing::Price
     can :manage, User
     can :manage, ApiUser

diff --git a/app/models/action.rb b/app/models/action.rb
@@ -1,5 +1,5 @@
 class Action < ApplicationRecord
-  has_paper_trail versions: { class_name: 'ActionVersion' }
+  has_paper_trail versions: { class_name: 'Version::ActionVersion' }
 
   belongs_to :user
   belongs_to :contact

diff --git a/app/models/authorization/restricted_ip.rb b/app/models/authorization/restricted_ip.rb
@@ -1,5 +1,5 @@
 module Authorization
-  class RestrictedIP
+  class RestrictedIp
     def initialize(ip)
       @ip = ip
     end

diff --git a/app/models/billing/price.rb b/app/models/billing/price.rb
@@ -1,6 +1,6 @@
 module Billing
   class Price < ApplicationRecord
-    include Concerns::Billing::Price::Expirable
+    include Billing::Price::Expirable
     include Versions
 
     belongs_to :zone, class_name: 'DNS::Zone', required: true

diff --git a/app/models/concerns/billing/price/expirable.rb b/app/models/concerns/billing/price/expirable.rb
@@ -1,4 +1,4 @@
-module Concerns::Billing::Price::Expirable
+module Billing::Price::Expirable
   extend ActiveSupport::Concern
 
   class_methods do

diff --git a/app/models/concerns/contact/archivable.rb b/app/models/concerns/contact/archivable.rb
@@ -1,68 +1,64 @@
-module Concerns
-  module Contact
-    module Archivable
-      extend ActiveSupport::Concern
+module Contact::Archivable
+  extend ActiveSupport::Concern
 
-      class_methods do
-        def archivable
-          unlinked.find_each.select(&:archivable?)
-        end
-      end
+  class_methods do
+    def archivable
+      unlinked.find_each.select(&:archivable?)
+    end
+  end
 
-      def archivable?(post: false)
-        inactive = inactive?
+  def archivable?(post: false)
+    inactive = inactive?
 
-        log("Found archivable contact id(#{id}), code (#{code})") if inactive && !post
+    log("Found archivable contact id(#{id}), code (#{code})") if inactive && !post
 
-        inactive
-      end
+    inactive
+  end
 
-      def archive(verified: false, notify: true, extra_log: false)
-        unless verified
-          raise 'Contact cannot be archived' unless archivable?(post: true)
-        end
+  def archive(verified: false, notify: true, extra_log: false)
+    unless verified
+      raise 'Contact cannot be archived' unless archivable?(post: true)
+    end
 
-        notify_registrar_about_archivation if notify
-        write_to_registrar_log if extra_log
-        destroy!
-      end
+    notify_registrar_about_archivation if notify
+    write_to_registrar_log if extra_log
+    destroy!
+  end
 
-      private
+  private
 
-      def notify_registrar_about_archivation
-        registrar.notifications.create!(
-          text: I18n.t('contact_has_been_archived',
-                       contact_code: code, orphan_months: Setting.orphans_contacts_in_months)
-        )
-      end
+  def notify_registrar_about_archivation
+    registrar.notifications.create!(
+      text: I18n.t('contact_has_been_archived',
+                   contact_code: code, orphan_months: Setting.orphans_contacts_in_months)
+    )
+  end
 
-      def inactive?
-        if DomainVersion.contact_unlinked_more_than?(contact_id: id, period: inactivity_period)
-          return true
-        end
+  def inactive?
+    if Version::DomainVersion.contact_unlinked_more_than?(contact_id: id, period: inactivity_period)
+      return true
+    end
 
-        DomainVersion.was_contact_linked?(id) ? false : created_at <= inactivity_period.ago
-      end
+    Version::DomainVersion.was_contact_linked?(id) ? false : created_at <= inactivity_period.ago
+  end
 
-      def inactivity_period
-        Setting.orphans_contacts_in_months.months
-      end
+  def inactivity_period
+    Setting.orphans_contacts_in_months.months
+  end
 
-      def log(msg)
-        @log ||= Logger.new(STDOUT)
-        @log.info(msg)
-      end
+  def log(msg)
+    @log ||= Logger.new(STDOUT)
+    @log.info(msg)
+  end
 
-      def write_to_registrar_log
-        registrar_name = registrar.accounting_customer_code
-        archive_path = ENV['contact_archivation_log_file_dir']
-        registrar_log_path = "#{archive_path}/#{registrar_name}.txt"
-        FileUtils.mkdir_p(archive_path) unless Dir.exist?(archive_path)
+  def write_to_registrar_log
+    registrar_name = registrar.accounting_customer_code
+    archive_path = ENV['contact_archivation_log_file_dir']
+    registrar_log_path = "#{archive_path}/#{registrar_name}.txt"
+    FileUtils.mkdir_p(archive_path) unless Dir.exist?(archive_path)
 
-        f = File.new(registrar_log_path, 'a+')
-        f.write("#{code}\n")
-        f.close
-      end
-    end
+    f = File.new(registrar_log_path, 'a+')
+    f.write("#{code}\n")
+    f.close
   end
 end
diff --git a/app/models/concerns/contact/disclosable.rb b/app/models/concerns/contact/disclosable.rb
@@ -1,26 +1,22 @@
-module Concerns
-  module Contact
-    module Disclosable
-      extend ActiveSupport::Concern
+module Contact::Disclosable
+  extend ActiveSupport::Concern
 
-      class_methods do
-        attr_accessor :disclosable_attributes
-      end
+  class_methods do
+    attr_accessor :disclosable_attributes
+  end
 
-      included do
-        self.disclosable_attributes = %w[name email]
-        validate :validate_disclosed_attributes
-      end
+  included do
+    self.disclosable_attributes = %w[name email]
+    validate :validate_disclosed_attributes
+  end
 
-      private
+  private
 
-      def validate_disclosed_attributes
-        return if disclosed_attributes.empty?
+  def validate_disclosed_attributes
+    return if disclosed_attributes.empty?
 
-        has_undisclosable_attributes = (disclosed_attributes - self.class.disclosable_attributes)
-                                       .any?
-        errors.add(:disclosed_attributes, :invalid) if has_undisclosable_attributes
-      end
-    end
+    has_undisclosable_attributes = (disclosed_attributes - self.class.disclosable_attributes)
+                                   .any?
+    errors.add(:disclosed_attributes, :invalid) if has_undisclosable_attributes
   end
 end
diff --git a/app/models/concerns/contact/identical.rb b/app/models/concerns/contact/identical.rb
@@ -1,4 +1,4 @@
-module Concerns::Contact::Identical
+module Contact::Identical
   extend ActiveSupport::Concern
 
   IDENTIFIABLE_ATTRIBUTES = %w[

diff --git a/app/models/concerns/domain/activatable.rb b/app/models/concerns/domain/activatable.rb
@@ -1,4 +1,4 @@
-module Concerns::Domain::Activatable
+module Domain::Activatable
   extend ActiveSupport::Concern
 
   def active?

diff --git a/app/models/concerns/domain/bulk_updatable.rb b/app/models/concerns/domain/bulk_updatable.rb
@@ -1,17 +1,13 @@
-module Concerns
-  module Domain
-    module BulkUpdatable
-      extend ActiveSupport::Concern
+module Domain::BulkUpdatable
+  extend ActiveSupport::Concern
 
-      def bulk_update_prohibited?
-        discarded? || statuses_blocks_update?
-      end
+  def bulk_update_prohibited?
+    discarded? || statuses_blocks_update?
+  end
 
-      def statuses_blocks_update?
-        prohibited_array = [DomainStatus::SERVER_UPDATE_PROHIBITED,
-                            DomainStatus::CLIENT_UPDATE_PROHIBITED]
-        prohibited_array.any? { |block_status| statuses.include?(block_status) }
-      end
-    end
+  def statuses_blocks_update?
+    prohibited_array = [DomainStatus::SERVER_UPDATE_PROHIBITED,
+                        DomainStatus::CLIENT_UPDATE_PROHIBITED]
+    prohibited_array.any? { |block_status| statuses.include?(block_status) }
   end
 end
diff --git a/app/models/concerns/domain/deletable.rb b/app/models/concerns/domain/deletable.rb
@@ -1,4 +1,4 @@
-module Concerns::Domain::Deletable
+module Domain::Deletable
   extend ActiveSupport::Concern
 
   DELETE_STATUSES = [

diff --git a/app/models/concerns/domain/discardable.rb b/app/models/concerns/domain/discardable.rb
@@ -1,4 +1,4 @@
-module Concerns::Domain::Discardable
+module Domain::Discardable
   extend ActiveSupport::Concern
 
   def keep