Unify sprockets config options

2 files changed, 11 insertions, 6 deletions

diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index 4ec5336f6c..4a042e0033 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -10,7 +10,7 @@ module Rails
                     :preload_frameworks, :reload_plugins,
                     :secret_token, :serve_static_assets, :session_options,
                     :time_zone, :whiny_nils, :force_ssl,
-                    :asset_pipeline, :precompile_assets
+                    :assets
 
       attr_writer :log_level
 
@@ -30,8 +30,12 @@ module Rails
         @log_level                   = nil
         @middleware                  = app_middleware
         @generators                  = app_generators
-        @asset_pipeline              = false
-        @precompile_assets           = []
+
+        @assets = ActiveSupport::OrderedOptions.new
+        @assets.enabled    = false
+        @assets.paths      = []
+        @assets.precompile = []
+        @assets.prefix     = "/assets"
       end
 
       def compiled_asset_path
diff --git a/railties/lib/rails/application/finisher.rb b/railties/lib/rails/application/finisher.rb
index 3cfd8f5707..be063e5f25 100644
--- a/railties/lib/rails/application/finisher.rb
+++ b/railties/lib/rails/application/finisher.rb
@@ -34,15 +34,16 @@ module Rails
       end
 
       initializer :add_sprockets_route do |app|
-        if config.asset_pipeline
+        assets = config.assets
+        if assets.enabled
           app.routes.append do
-            mount app.assets => "/assets"
+            mount app.assets => assets.prefix
           end
         end
       end
 
       initializer :set_sprockets_logger do |app|
-        if config.asset_pipeline
+        if config.assets.enabled
           app.assets.logger = Rails.logger
         end
       end