Move application configuration to the application configuration object, remove railtie_name and engine_name and allow to set the configuration object.

1 files changed, 10 insertions, 2 deletions

diff --git a/actionpack/lib/action_view/railtie.rb b/actionpack/lib/action_view/railtie.rb
index 2e5d115630..9cf007cd2b 100644
--- a/actionpack/lib/action_view/railtie.rb
+++ b/actionpack/lib/action_view/railtie.rb
@@ -3,10 +3,10 @@ require "rails"
 
 module ActionView
   class Railtie < Rails::Railtie
-    railtie_name :action_view
+    config.action_view = ActiveSupport::OrderedOptions.new
 
     require "action_view/railties/log_subscriber"
-    log_subscriber ActionView::Railties::LogSubscriber.new
+    log_subscriber :action_view, ActionView::Railties::LogSubscriber.new
 
     initializer "action_view.cache_asset_timestamps" do |app|
       unless app.config.cache_classes
@@ -15,5 +15,13 @@ module ActionView
         end
       end
     end
+
+    initializer "action_view.set_configs" do |app|
+      ActionView.base_hook do
+        app.config.action_view.each do |k,v|
+          send "#{k}=", v
+        end
+      end
+    end
   end
 end
\ No newline at end of file