Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Pass project instead of assetfile to middleware #121

Merged
merged 1 commit into from
Nov 2, 2012
Merged

Pass project instead of assetfile to middleware #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion lib/rake-pipeline/rails_plugin.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
Rails.configuration.after_initialize do
if defined?(RAKEP_ENABLED) && RAKEP_ENABLED
assetfile = defined?(RAKEP_ASSETFILE) ? RAKEP_ASSETFILE : 'Assetfile'
Rails.configuration.middleware.use(Rake::Pipeline::Middleware, assetfile)
project = Rake::Pipeline::Project.new assetfile

Rails.configuration.middleware.use Rake::Pipeline::Middleware, project
end
end
4 changes: 3 additions & 1 deletion lib/rake-pipeline/railtie.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ class Railtie < ::Rails::Railtie
initializer "rake-pipeline.assetfile" do |app|
if config.rake_pipeline_enabled
assetfile = File.join(Rails.root, config.rake_pipeline_assetfile)
config.app_middleware.insert ActionDispatch::Static, Rake::Pipeline::Middleware, assetfile
project = Rake::Pipeline::Project.new assetfile

config.app_middleware.insert ActionDispatch::Static, Rake::Pipeline::Middleware, project
end
end
end
Expand Down