Merge pull request #121 from tchak/fix-railtie

Pass project instead of assetfile to middleware
livingsocial · Nov 2, 2012 · ae07958 · ae07958
2 parents f3ce4c5 + 2d907ad
commit ae07958
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/lib/rake-pipeline/rails_plugin.rb b/lib/rake-pipeline/rails_plugin.rb
@@ -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
diff --git a/lib/rake-pipeline/railtie.rb b/lib/rake-pipeline/railtie.rb
@@ -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