config.assets.manifest:

- fix Rake task
- fix config.assets.compile = false case
- add additional test cases related to config.assets.manifest option

Author: johnnyshields

lib/sprockets/rails/task.rb

@@ -37,6 +37,14 @@ def assets
         end
       end
 
+      def manifest
+        if app
+          Sprockets::Manifest.new(index, output, app.config.assets.manifest)
+        else
+          super
+        end
+      end
+
       def cache_path
         if app
           "#{app.config.root}/tmp/cache/assets"

lib/sprockets/railtie.rb

@@ -66,7 +66,7 @@ def configure(&block)
     config.after_initialize do |app|
       config = app.config
 
-      manifest_path = config.assets.manifest || File.join(config.paths['public'].first, config.assets.prefix)
+      manifest_assets_path = File.join(config.paths['public'].first, config.assets.prefix)
 
       # Configuration options that should invalidate
       # the Sprockets cache when changed.
@@ -99,9 +99,9 @@ def configure(&block)
 
         if config.assets.compile
           self.assets_environment = app.assets
-          self.assets_manifest    = Sprockets::Manifest.new(app.assets, manifest_path)
+          self.assets_manifest    = Sprockets::Manifest.new(app.assets, manifest_assets_path, config.assets.manifest)
         else
-          self.assets_manifest = Sprockets::Manifest.new(manifest_path)
+          self.assets_manifest = Sprockets::Manifest.new(manifest_assets_path, config.assets.manifest)
         end
       end
 

test/test_railtie.rb

@@ -184,7 +184,8 @@ def test_manifest_path
     end
     app.initialize!
 
-    assert_match %r{config/foo/manifest-.*.json}, ActionView::Base.assets_manifest.path
+    assert_match %r{config/foo/manifest-.*\.json$}, ActionView::Base.assets_manifest.path
+    assert_match %r{public/assets$}, ActionView::Base.assets_manifest.dir
   end
 
   def test_manifest_path_respects_rails_public_path
@@ -193,6 +194,7 @@ def test_manifest_path_respects_rails_public_path
     end
     app.initialize!
 
-    assert_match %r{test_public/assets/manifest-.*.json}, ActionView::Base.assets_manifest.path
+    assert_match %r{test_public/assets/manifest-.*\.json$}, ActionView::Base.assets_manifest.path
+    assert_match %r{test_public/assets$}, ActionView::Base.assets_manifest.dir
   end
 end

test/test_task.rb

@@ -16,9 +16,10 @@ def setup
     @assets = Sprockets::Environment.new
     @assets.append_path FIXTURES_PATH
 
-    @dir = File.join(Dir::tmpdir, 'rails/task')
+    @dir = File.join(Dir::tmpdir, 'rails', 'task')
 
-    @manifest = Sprockets::Manifest.new(@assets, @dir)
+    @manifest_dir = File.join(Dir::tmpdir, 'rails', 'manifest')
+    @manifest = Sprockets::Manifest.new(@assets, @dir, @manifest_dir)
 
     @environment_ran = false
     # Stub Rails environment task
@@ -39,6 +40,9 @@ def teardown
 
     FileUtils.rm_rf(@dir)
     assert Dir["#{@dir}/*"].empty?
+
+    FileUtils.rm_rf(@manifest_dir)
+    assert Dir["#{@manifest_dir}/*"].empty?
   end
 
   def test_precompile
@@ -49,6 +53,26 @@ def test_precompile
 
     @rake['assets:precompile'].invoke
 
+    assert @environment_ran
+    assert Dir["#{@manifest_dir}/manifest-*.json"].first
+    assert File.exist?("#{@dir}/#{digest_path}")
+  end
+
+  def test_precompile_without_manifest
+    Sprockets::Rails::Task.new do |t|
+      t.environment = @assets
+      t.manifest    = Sprockets::Manifest.new(@assets, @dir, nil)
+      t.assets      = ['foo.js', 'foo-modified.js']
+      t.log_level   = :fatal
+    end
+
+    assert !@environment_ran
+
+    digest_path = @assets['foo.js'].digest_path
+    assert !File.exist?("#{@dir}/#{digest_path}")
+
+    @rake['assets:precompile'].invoke
+
     assert @environment_ran
     assert Dir["#{@dir}/manifest-*.json"].first
     assert File.exist?("#{@dir}/#{digest_path}")