Merge pull request #16700 from seuros/autoload

[ActiveJob] Autoload adapters
rails · Aug 26, 2014 · 14e2bbf · 14e2bbf
2 parents 2c84512 + 7e99855
commit 14e2bbf
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/activejob/lib/active_job.rb b/activejob/lib/active_job.rb
@@ -30,4 +30,5 @@ module ActiveJob
   extend ActiveSupport::Autoload
 
   autoload :Base
-end
+  autoload :QueueAdapters
+end
diff --git a/activejob/lib/active_job/queue_adapter.rb b/activejob/lib/active_job/queue_adapter.rb
@@ -17,7 +17,6 @@ def queue_adapter=(name_or_adapter)
 
     private
       def load_adapter(name)
-        require "active_job/queue_adapters/#{name}_adapter"
         "ActiveJob::QueueAdapters::#{name.to_s.camelize}Adapter".constantize
       end
   end

diff --git a/activejob/lib/active_job/queue_adapters.rb b/activejob/lib/active_job/queue_adapters.rb
@@ -0,0 +1,16 @@
+module ActiveJob
+  module QueueAdapters
+    extend ActiveSupport::Autoload
+
+    autoload :InlineAdapter
+    autoload :BackburnerAdapter
+    autoload :DelayedJobAdapter
+    autoload :QuAdapter
+    autoload :QueAdapter
+    autoload :QueueClassicAdapter
+    autoload :ResqueAdapter
+    autoload :SidekiqAdapter
+    autoload :SneakersAdapter
+    autoload :SuckerPunchAdapter
+  end
+end