From 937f41919c6033272b40b147f7ac5e888207ac89 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Thu, 29 Jul 2010 16:23:15 +0200 Subject: Engine's assets are now served with ActionDispatch::Static --- railties/lib/rails/application.rb | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'railties/lib/rails/application.rb') diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb index 7c590b701e..c403863007 100644 --- a/railties/lib/rails/application.rb +++ b/railties/lib/rails/application.rb @@ -145,9 +145,25 @@ module Rails protected + def static_paths + @static_paths ||= begin + static_paths = ActiveSupport::OrderedHash.new + static_paths["/"] = paths.public.to_a.first + + railties.all do |railtie| + if railtie.config.respond_to?(:asset_path) && railtie.config.asset_path + public_path = railtie.config.paths.public.to_a.first + static_paths[railtie.config.asset_path % ""] = public_path if File.exists?(public_path) + end + end + + static_paths + end + end + def default_middleware_stack ActionDispatch::MiddlewareStack.new.tap do |middleware| - middleware.use ::ActionDispatch::Static, paths.public.to_a.first if config.serve_static_assets + middleware.use ::ActionDispatch::Static, static_paths if config.serve_static_assets middleware.use ::Rack::Lock if !config.allow_concurrency middleware.use ::Rack::Runtime middleware.use ::Rails::Rack::Logger -- cgit v1.2.3