1 files changed, 11 insertions, 24 deletions
diff --git a/lib/action_cable.rb b/lib/action_cable.rb
index de1b08f789..89ffa1fda7 100644
--- a/lib/action_cable.rb
+++ b/lib/action_cable.rb
@@ -1,34 +1,21 @@
-require 'eventmachine'
-EventMachine.epoll  if EventMachine.epoll?
-EventMachine.kqueue if EventMachine.kqueue?
-
-require 'set'
-
 require 'active_support'
-require 'active_support/json'
-require 'active_support/concern'
-require 'active_support/core_ext/hash/indifferent_access'
-require 'active_support/core_ext/module/delegation'
-require 'active_support/callbacks'
-
-require 'faye/websocket'
-require 'celluloid'
-require 'em-hiredis'
-require 'redis'
-
-require 'action_cable/engine' if defined?(Rails)
-require 'action_cable/railtie' if defined?(Rails)
-
+require 'active_support/rails'
 require 'action_cable/version'
 
 module ActionCable
-  autoload :Server, 'action_cable/server'
-  autoload :Connection, 'action_cable/connection'
-  autoload :Channel, 'action_cable/channel'
-  autoload :RemoteConnections, 'action_cable/remote_connections'
+  extend ActiveSupport::Autoload
 
   # Singleton instance of the server
   module_function def server
     @server ||= ActionCable::Server::Base.new
   end
+
+  eager_autoload do
+    autoload :Server
+    autoload :Connection
+    autoload :Channel
+    autoload :RemoteConnections
+  end
 end
+
+require 'action_cable/engine' if defined?(Rails)