From 77ad4ca058c9a845257cbeb58a84cf511bae1040 Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Mon, 21 Mar 2011 18:05:56 -0500 Subject: Add sprockets task to compile assets --- railties/lib/rails/application/configuration.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'railties/lib/rails/application') diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb index c74bcbedf2..6901748d04 100644 --- a/railties/lib/rails/application/configuration.rb +++ b/railties/lib/rails/application/configuration.rb @@ -9,7 +9,8 @@ module Rails :filter_parameters, :helpers_paths, :logger, :preload_frameworks, :reload_plugins, :secret_token, :serve_static_assets, :session_options, - :time_zone, :whiny_nils + :time_zone, :whiny_nils, + :compile_assets attr_writer :log_level @@ -28,6 +29,7 @@ module Rails @log_level = nil @middleware = app_middleware @generators = app_generators + @compile_assets = [] end def compiled_asset_path -- cgit v1.2.3 From 954d73df5312f4829c96a76f1929e45597e85680 Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Mon, 28 Mar 2011 13:22:13 -0500 Subject: Add use_sprockets flag --- railties/lib/rails/application/configuration.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'railties/lib/rails/application') diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb index 6901748d04..c74bcbedf2 100644 --- a/railties/lib/rails/application/configuration.rb +++ b/railties/lib/rails/application/configuration.rb @@ -9,8 +9,7 @@ module Rails :filter_parameters, :helpers_paths, :logger, :preload_frameworks, :reload_plugins, :secret_token, :serve_static_assets, :session_options, - :time_zone, :whiny_nils, - :compile_assets + :time_zone, :whiny_nils attr_writer :log_level @@ -29,7 +28,6 @@ module Rails @log_level = nil @middleware = app_middleware @generators = app_generators - @compile_assets = [] end def compiled_asset_path -- cgit v1.2.3 From 612454e00ee4ff48c4e03f8d8daf92c2a2d3ae3f Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Tue, 29 Mar 2011 21:16:44 -0500 Subject: Move sprockets initializers back to application --- railties/lib/rails/application/configuration.rb | 5 ++++- railties/lib/rails/application/finisher.rb | 8 ++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) (limited to 'railties/lib/rails/application') diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb index c74bcbedf2..8dbc596357 100644 --- a/railties/lib/rails/application/configuration.rb +++ b/railties/lib/rails/application/configuration.rb @@ -9,7 +9,8 @@ module Rails :filter_parameters, :helpers_paths, :logger, :preload_frameworks, :reload_plugins, :secret_token, :serve_static_assets, :session_options, - :time_zone, :whiny_nils + :time_zone, :whiny_nils, + :use_sprockets, :compile_assets attr_writer :log_level @@ -28,6 +29,8 @@ module Rails @log_level = nil @middleware = app_middleware @generators = app_generators + @use_sprockets = false + @compile_assets = [] end def compiled_asset_path diff --git a/railties/lib/rails/application/finisher.rb b/railties/lib/rails/application/finisher.rb index a45b61c99c..b57af48615 100644 --- a/railties/lib/rails/application/finisher.rb +++ b/railties/lib/rails/application/finisher.rb @@ -33,6 +33,14 @@ module Rails end end + initializer :add_sprockets_route do |app| + if config.use_sprockets + app.routes.append do + mount app.assets => "/assets" + end + end + end + initializer :build_middleware_stack do build_middleware_stack end -- cgit v1.2.3 From 651d371a247b0c473fb35a62076e480d95d84a35 Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Tue, 29 Mar 2011 21:23:05 -0500 Subject: Rename option to config.asset_pipeline --- railties/lib/rails/application/configuration.rb | 4 ++-- railties/lib/rails/application/finisher.rb | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) (limited to 'railties/lib/rails/application') diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb index 8dbc596357..81127e5e5f 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, - :use_sprockets, :compile_assets + :asset_pipeline, :compile_assets attr_writer :log_level @@ -29,7 +29,7 @@ module Rails @log_level = nil @middleware = app_middleware @generators = app_generators - @use_sprockets = false + @asset_pipeline = false @compile_assets = [] end diff --git a/railties/lib/rails/application/finisher.rb b/railties/lib/rails/application/finisher.rb index b57af48615..3cfd8f5707 100644 --- a/railties/lib/rails/application/finisher.rb +++ b/railties/lib/rails/application/finisher.rb @@ -34,13 +34,19 @@ module Rails end initializer :add_sprockets_route do |app| - if config.use_sprockets + if config.asset_pipeline app.routes.append do mount app.assets => "/assets" end end end + initializer :set_sprockets_logger do |app| + if config.asset_pipeline + app.assets.logger = Rails.logger + end + end + initializer :build_middleware_stack do build_middleware_stack end -- cgit v1.2.3 From 25c0b569f5bac0cfdf2c863cabf3b528165cebca Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Tue, 29 Mar 2011 22:11:47 -0500 Subject: Precompile configured assets --- railties/lib/rails/application/configuration.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'railties/lib/rails/application') diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb index 81127e5e5f..9e87714e4f 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, - :asset_pipeline, :compile_assets + :asset_pipeline, :precompile_assets attr_writer :log_level @@ -30,7 +30,7 @@ module Rails @middleware = app_middleware @generators = app_generators @asset_pipeline = false - @compile_assets = [] + @precompile_assets = [] end def compiled_asset_path -- cgit v1.2.3 From 28fee29e383258c38649e20dc9508188010020c8 Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Wed, 30 Mar 2011 21:56:15 -0500 Subject: Unify sprockets config options --- railties/lib/rails/application/configuration.rb | 10 +++++++--- railties/lib/rails/application/finisher.rb | 7 ++++--- 2 files changed, 11 insertions(+), 6 deletions(-) (limited to 'railties/lib/rails/application') 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 -- cgit v1.2.3 From a4518517f77055cea0d9fe552d2df393140679de Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Tue, 12 Apr 2011 22:12:27 -0500 Subject: Index sprockets environment if perform caching is enabled --- railties/lib/rails/application/finisher.rb | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'railties/lib/rails/application') diff --git a/railties/lib/rails/application/finisher.rb b/railties/lib/rails/application/finisher.rb index be063e5f25..bae464a840 100644 --- a/railties/lib/rails/application/finisher.rb +++ b/railties/lib/rails/application/finisher.rb @@ -48,6 +48,12 @@ module Rails end end + initializer :index_sprockets_environment do |app| + if config.assets.enabled && config.action_controller.perform_caching + app.assets = app.assets.index + end + end + initializer :build_middleware_stack do build_middleware_stack end -- cgit v1.2.3 From 2fe70c180351e87801179e8404d1582d7da25645 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Fri, 15 Apr 2011 18:42:51 +0200 Subject: Booya, sprockets now works from Engines. --- railties/lib/rails/application/finisher.rb | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'railties/lib/rails/application') diff --git a/railties/lib/rails/application/finisher.rb b/railties/lib/rails/application/finisher.rb index bae464a840..838e50de6c 100644 --- a/railties/lib/rails/application/finisher.rb +++ b/railties/lib/rails/application/finisher.rb @@ -36,18 +36,13 @@ module Rails initializer :add_sprockets_route do |app| assets = config.assets if assets.enabled + build_asset_environment app.routes.append do mount app.assets => assets.prefix end end end - initializer :set_sprockets_logger do |app| - if config.assets.enabled - app.assets.logger = Rails.logger - end - end - initializer :index_sprockets_environment do |app| if config.assets.enabled && config.action_controller.perform_caching app.assets = app.assets.index -- cgit v1.2.3 From afc828828ffffe7edeb4648a9d2aa4731191ae21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Fri, 15 Apr 2011 19:57:52 +0200 Subject: Remove the ability for engines to serve assets from the public directory. --- railties/lib/rails/application/configuration.rb | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'railties/lib/rails/application') diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb index 4a042e0033..e5476fbe7a 100644 --- a/railties/lib/rails/application/configuration.rb +++ b/railties/lib/rails/application/configuration.rb @@ -4,13 +4,12 @@ require 'rails/engine/configuration' module Rails class Application class Configuration < ::Rails::Engine::Configuration - attr_accessor :allow_concurrency, :asset_host, :cache_classes, :cache_store, - :encoding, :consider_all_requests_local, :dependency_loading, - :filter_parameters, :helpers_paths, :logger, - :preload_frameworks, :reload_plugins, - :secret_token, :serve_static_assets, :session_options, - :time_zone, :whiny_nils, :force_ssl, - :assets + attr_accessor :allow_concurrency, :asset_host, :asset_path, :assets, + :cache_classes, :cache_store, :consider_all_requests_local, + :dependency_loading, :encoding, :filter_parameters, + :force_ssl, :helpers_paths, :logger, :preload_frameworks, + :reload_plugins, :secret_token, :serve_static_assets, + :session_options, :time_zone, :whiny_nils attr_writer :log_level @@ -63,6 +62,9 @@ module Rails paths.add "config/environment", :with => "config/environment.rb" paths.add "lib/templates" paths.add "log", :with => "log/#{Rails.env}.log" + paths.add "public" + paths.add "public/javascripts" + paths.add "public/stylesheets" paths.add "tmp" paths.add "tmp/cache" paths -- cgit v1.2.3 From 8f75c3abcde4f2ff64e855178027e1bd93976de9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Sun, 17 Apr 2011 10:51:07 +0200 Subject: Move app initializers to sprockets railtie. --- railties/lib/rails/application/finisher.rb | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) (limited to 'railties/lib/rails/application') diff --git a/railties/lib/rails/application/finisher.rb b/railties/lib/rails/application/finisher.rb index 838e50de6c..bf865ce466 100644 --- a/railties/lib/rails/application/finisher.rb +++ b/railties/lib/rails/application/finisher.rb @@ -33,22 +33,6 @@ module Rails end end - initializer :add_sprockets_route do |app| - assets = config.assets - if assets.enabled - build_asset_environment - app.routes.append do - mount app.assets => assets.prefix - end - end - end - - initializer :index_sprockets_environment do |app| - if config.assets.enabled && config.action_controller.perform_caching - app.assets = app.assets.index - end - end - initializer :build_middleware_stack do build_middleware_stack end @@ -69,6 +53,8 @@ module Rails end # Force routes to be loaded just at the end and add it to to_prepare callbacks + # This needs to be after the finisher hook to ensure routes added in the hook + # are still loaded. initializer :set_routes_reloader do |app| reloader = lambda { app.routes_reloader.execute_if_updated } reloader.call -- cgit v1.2.3