Permalink
Browse files

Rename option to config.asset_pipeline

  • Loading branch information...
1 parent 612454e commit 651d371a247b0c473fb35a62076e480d95d84a35 @josh josh committed Mar 30, 2011
@@ -21,7 +21,7 @@ class Railtie < Rails::Railtie
paths = app.config.paths
options = app.config.action_controller
- options.use_sprockets ||= app.config.use_sprockets
+ options.use_sprockets ||= app.config.asset_pipeline
options.assets_dir ||= paths["public"].first
options.javascripts_dir ||= paths["public/javascripts"].first
options.stylesheets_dir ||= paths["public/stylesheets"].first
@@ -142,24 +142,26 @@ def assets
end
def build_asset_environment
- return nil if !config.use_sprockets
+ return unless config.asset_pipeline
require 'sprockets'
env = Sprockets::Environment.new(root.to_s)
env.static_root = root.join("public/assets")
env
end
initializer :add_sprockets_paths do |app|
- [
- "app/javascripts",
- "app/stylesheets",
- "vendor/plugins/*/app/javascripts",
- "vendor/plugins/*/app/stylesheets",
- "vendor/plugins/*/javascripts",
- "vendor/plugins/*/stylesheets"
- ].each do |pattern|
- Dir[app.root.join(pattern)].each do |dir|
- app.assets.paths << dir
+ if config.asset_pipeline
+ [
+ "app/javascripts",
+ "app/stylesheets",
+ "vendor/plugins/*/app/javascripts",
+ "vendor/plugins/*/app/stylesheets",
+ "vendor/plugins/*/javascripts",
+ "vendor/plugins/*/stylesheets"
+ ].each do |pattern|
+ Dir[app.root.join(pattern)].each do |dir|
+ app.assets.paths << dir
+ end
end
end
end
@@ -10,7 +10,7 @@ class Configuration < ::Rails::Engine::Configuration
: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 @@ def initialize(*)
@log_level = nil
@middleware = app_middleware
@generators = app_generators
- @use_sprockets = false
+ @asset_pipeline = false
@compile_assets = []
end
@@ -34,13 +34,19 @@ module Finisher
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
@@ -535,10 +535,6 @@ def load_seed
# consistently executed after all the initializers above across all engines.
end
- initializer "sprockets.logger" do
- assets.logger = Rails.logger
- end
-
rake_tasks do
next if self.is_a?(Rails::Application)

0 comments on commit 651d371

Please sign in to comment.