Skip to content

Commit

Permalink
Pass project instead of assetfile to middleware
Browse files Browse the repository at this point in the history
  • Loading branch information
tchak committed Nov 2, 2012
1 parent f3ce4c5 commit 2d907ad
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
4 changes: 3 additions & 1 deletion lib/rake-pipeline/rails_plugin.rb
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
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

0 comments on commit 2d907ad

Please sign in to comment.