From a8db0328a5452130b87b568b66fbd125eb10d45d Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Tue, 15 Dec 2015 13:10:27 +0100
Subject: Switch from engine to railtie

---
 actioncable/lib/action_cable/engine.rb  | 30 ------------------------------
 actioncable/lib/action_cable/railtie.rb | 30 ++++++++++++++++++++++++++++++
 railties/lib/rails/all.rb               |  2 +-
 3 files changed, 31 insertions(+), 31 deletions(-)
 delete mode 100644 actioncable/lib/action_cable/engine.rb
 create mode 100644 actioncable/lib/action_cable/railtie.rb

diff --git a/actioncable/lib/action_cable/engine.rb b/actioncable/lib/action_cable/engine.rb
deleted file mode 100644
index 071dcd73e4..0000000000
--- a/actioncable/lib/action_cable/engine.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-require 'rails/engine'
-require 'action_cable'
-require 'active_support/ordered_options'
-require 'action_cable/helpers/action_cable_helper'
-
-module ActionCable
-  class Engine < ::Rails::Engine
-    config.action_cable = ActiveSupport::OrderedOptions.new
-
-    initializer "action_cable.helpers" do
-      ActiveSupport.on_load(:action_view) do
-        include ActionCable::Helpers::ActionCableHelper
-      end
-    end
-
-    initializer "action_cable.logger" do
-      ActiveSupport.on_load(:action_cable) { self.logger ||= ::Rails.logger }
-    end
-
-    initializer "action_cable.set_configs" do |app|
-      options = app.config.action_cable
-
-      options.allowed_request_origins ||= "http://localhost:3000" if ::Rails.env.development?
-
-      ActiveSupport.on_load(:action_cable) do
-        options.each { |k,v| send("#{k}=", v) }
-      end
-    end
-  end
-end
diff --git a/actioncable/lib/action_cable/railtie.rb b/actioncable/lib/action_cable/railtie.rb
new file mode 100644
index 0000000000..a1a656f790
--- /dev/null
+++ b/actioncable/lib/action_cable/railtie.rb
@@ -0,0 +1,30 @@
+require "rails"
+require "action_cable"
+require "action_cable/helpers/action_cable_helper"
+
+module ActionCable
+  class Railtie < Rails::Railtie # :nodoc:
+    config.action_cable = ActiveSupport::OrderedOptions.new
+    config.eager_load_namespaces << ActionCable
+
+    initializer "action_cable.helpers" do
+      ActiveSupport.on_load(:action_view) do
+        include ActionCable::Helpers::ActionCableHelper
+      end
+    end
+
+    initializer "action_cable.logger" do
+      ActiveSupport.on_load(:action_cable) { self.logger ||= ::Rails.logger }
+    end
+
+    initializer "action_cable.set_configs" do |app|
+      options = app.config.action_cable
+
+      options.allowed_request_origins ||= "http://localhost:3000" if ::Rails.env.development?
+
+      ActiveSupport.on_load(:action_cable) do
+        options.each { |k,v| send("#{k}=", v) }
+      end
+    end
+  end
+end
diff --git a/railties/lib/rails/all.rb b/railties/lib/rails/all.rb
index 11f4d5c4bc..959c003e00 100644
--- a/railties/lib/rails/all.rb
+++ b/railties/lib/rails/all.rb
@@ -6,7 +6,7 @@ require "rails"
   action_view/railtie
   action_mailer/railtie
   active_job/railtie
-  action_cable/engine
+  action_cable/railtie
   rails/test_unit/railtie
   sprockets/railtie
 ).each do |railtie|
-- 
cgit v1.2.3