From 35b1185a089238922fdc489f7f7d37a72c24b2aa Mon Sep 17 00:00:00 2001
From: Krzysztof Kotlarek <kotlarek.krzysztof@gmail.com>
Date: Wed, 2 Oct 2019 14:54:08 +1000
Subject: [PATCH] FIX: Revert Demon::DemonBase back to Demon::Base (#8132)

I introduced DemonBase because I had got some conflict between `demon/base.rb` and `jobs/base.rb`, however, to not rename base class, it is possible to use regex on absolute path in Zeitwerk custom inflector.
---
 lib/demon/{demon_base.rb => base.rb} | 6 +++---
 lib/demon/rails_autospec.rb          | 4 ++--
 lib/demon/sidekiq.rb                 | 4 ++--
 lib/freedom_patches/zeitwerk.rb      | 6 +++---
 script/demon_test/parent.rb          | 2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)
 rename lib/demon/{demon_base.rb => base.rb} (97%)

diff --git a/lib/demon/demon_base.rb b/lib/demon/base.rb
similarity index 97%
rename from lib/demon/demon_base.rb
rename to lib/demon/base.rb
index 85242228638..d1626114d70 100644
--- a/lib/demon/demon_base.rb
+++ b/lib/demon/base.rb
@@ -3,7 +3,7 @@
 module Demon; end
 
 # intelligent fork based demonizer
-class Demon::DemonBase
+class Demon::Base
 
   def self.demons
     @demons
@@ -57,7 +57,7 @@ class Demon::DemonBase
   def alive?(pid = nil)
     pid ||= @pid
     if pid
-      Demon::DemonBase.alive?(pid)
+      Demon::Base.alive?(pid)
     else
       false
     end
@@ -143,7 +143,7 @@ class Demon::DemonBase
   def already_running?
     if File.exists? pid_file
       pid = File.read(pid_file).to_i
-      if Demon::DemonBase.alive?(pid)
+      if Demon::Base.alive?(pid)
         return pid
       end
     end
diff --git a/lib/demon/rails_autospec.rb b/lib/demon/rails_autospec.rb
index c48931b411b..babf5a5e7e1 100644
--- a/lib/demon/rails_autospec.rb
+++ b/lib/demon/rails_autospec.rb
@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require "demon/demon_base"
+require "demon/base"
 
-class Demon::RailsAutospec < Demon::DemonBase
+class Demon::RailsAutospec < Demon::Base
 
   def self.prefix
     "rails-autospec"
diff --git a/lib/demon/sidekiq.rb b/lib/demon/sidekiq.rb
index 666cfe63539..cd104e3c973 100644
--- a/lib/demon/sidekiq.rb
+++ b/lib/demon/sidekiq.rb
@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require "demon/demon_base"
+require "demon/base"
 
-class Demon::Sidekiq < ::Demon::DemonBase
+class Demon::Sidekiq < ::Demon::Base
 
   def self.prefix
     "sidekiq"
diff --git a/lib/freedom_patches/zeitwerk.rb b/lib/freedom_patches/zeitwerk.rb
index 12d22051ac8..4c68ede4e5d 100644
--- a/lib/freedom_patches/zeitwerk.rb
+++ b/lib/freedom_patches/zeitwerk.rb
@@ -2,7 +2,6 @@
 
 module ActiveSupport::Dependencies::ZeitwerkIntegration::Inflector
   CUSTOM_PATHS = {
-    'base' => 'Jobs',
     'canonical_url' => 'CanonicalURL',
     'clean_up_unmatched_ips' => 'CleanUpUnmatchedIPs',
     'homepage_constraint' => 'HomePageConstraint',
@@ -18,8 +17,9 @@ module ActiveSupport::Dependencies::ZeitwerkIntegration::Inflector
     'version' => 'Discourse',
   }
 
-  def self.camelize(basename, _abspath)
-    return basename.camelize if _abspath =~ /onceoff\.rb$/
+  def self.camelize(basename, abspath)
+    return basename.camelize if abspath =~ /onceoff\.rb$/
+    return 'Jobs' if abspath =~ /jobs\/base\.rb$/
     CUSTOM_PATHS.fetch(basename, basename.camelize)
   end
 end
diff --git a/script/demon_test/parent.rb b/script/demon_test/parent.rb
index 4762a015f1d..a6edd1ea548 100644
--- a/script/demon_test/parent.rb
+++ b/script/demon_test/parent.rb
@@ -4,7 +4,7 @@ require File.expand_path("../../../config/environment", __FILE__)
 
 puts "Parent is now loaded"
 
-class ForkExecDemon < Demon::DemonBase
+class ForkExecDemon < Demon::Base
   def self.prefix
     "fork-exec-child"
   end