From 346a7528eff8aabc9618d0b20a32b36f218d8b2f Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Wed, 16 Dec 2015 15:28:50 +0100
Subject: We are using railtie, not engine

---
 actioncable/lib/action_cable/engine.rb             | 36 ----------------------
 actioncable/lib/action_cable/railtie.rb            |  1 +
 .../rails/app/templates/config/application.rb      |  2 +-
 3 files changed, 2 insertions(+), 37 deletions(-)
 delete mode 100644 actioncable/lib/action_cable/engine.rb

diff --git a/actioncable/lib/action_cable/engine.rb b/actioncable/lib/action_cable/engine.rb
deleted file mode 100644
index 6d747d6992..0000000000
--- a/actioncable/lib/action_cable/engine.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-require "rails"
-require "action_cable"
-require "action_cable/helpers/action_cable_helper"
-require "active_support/core_ext/hash/indifferent_access"
-
-module ActionCable
-  class Railtie < Rails::Engine # :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|
-      app.paths.add "config/redis/cable", with: "config/redis/cable.yml"
-
-      options = app.config.action_cable
-
-      options.allowed_request_origins ||= "http://localhost:3000" if ::Rails.env.development?
-
-      ActiveSupport.on_load(:action_cable) do
-        path = Pathname.new(paths["config/redis/cable"].existent.first)
-        self.redis = Rails.application.config_for(redis_path).with_indifferent_access
-
-        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
index a1a656f790..d4833eb9e3 100644
--- a/actioncable/lib/action_cable/railtie.rb
+++ b/actioncable/lib/action_cable/railtie.rb
@@ -1,6 +1,7 @@
 require "rails"
 require "action_cable"
 require "action_cable/helpers/action_cable_helper"
+require "active_support/core_ext/hash/indifferent_access"
 
 module ActionCable
   class Railtie < Rails::Railtie # :nodoc:
diff --git a/railties/lib/rails/generators/rails/app/templates/config/application.rb b/railties/lib/rails/generators/rails/app/templates/config/application.rb
index cb1018c3ba..d070d152c5 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/application.rb
+++ b/railties/lib/rails/generators/rails/app/templates/config/application.rb
@@ -11,7 +11,7 @@ require "active_job/railtie"
 require "action_controller/railtie"
 <%= comment_if :skip_action_mailer %>require "action_mailer/railtie"
 require "action_view/railtie"
-<%= comment_if :skip_action_cable %>require "action_cable/engine"
+<%= comment_if :skip_action_cable %>require "action_cable/railtie"
 <%= comment_if :skip_sprockets %>require "sprockets/railtie"
 <%= comment_if :skip_test %>require "rails/test_unit/railtie"
 <% end -%>
-- 
cgit v1.2.3