Only append custom version if given

Author: josh

lib/sprockets/railtie.rb

@@ -19,7 +19,7 @@ def assets
       return @assets if defined? @assets
 
       @assets = Sprockets::Environment.new(root.to_s) do |env|
-        env.version = ::Rails.env + "-#{config.assets.version}"
+        env.version = ::Rails.env
 
         path = "#{config.root}/tmp/cache/assets/#{::Rails.env}"
         env.cache = Sprockets::Cache::FileStore.new(path)
@@ -50,7 +50,7 @@ def configure(&block)
     config.assets.paths      = []
     config.assets.prefix     = "/assets"
     config.assets.precompile = [LOOSE_APP_ASSETS, /(?:\/|\\|\A)application\.(css|js)$/]
-    config.assets.version    = ''
+    config.assets.version    = ""
     config.assets.debug      = false
     config.assets.compile    = true
     config.assets.digest     = false
@@ -71,6 +71,10 @@ def configure(&block)
 
       manifest_path = File.join(app.root, 'public', config.assets.prefix)
 
+      unless config.assets.version.blank?
+        app.assets.version += "-#{config.assets.version}"
+      end
+
       # Copy config.assets.paths to Sprockets
       config.assets.paths.each do |path|
         app.assets.append_path path

test/test_railtie.rb

@@ -48,7 +48,7 @@ def test_defaults
     assert_kind_of Sprockets::Environment, env
 
     assert_equal ROOT, env.root
-    assert_equal "test-", env.version
+    assert_equal "test", env.version
     assert env.cache
     assert_equal [], env.paths
     assert_nil env.js_compressor
@@ -99,6 +99,16 @@ def test_compressors
     assert_equal Sprockets::SassCompressor, env.css_compressor
   end
 
+  def test_version
+    app.configure do
+      config.assets.version = 'v2'
+    end
+    app.initialize!
+
+    assert env = app.assets
+    assert_equal "test-v2", env.version
+  end
+
   def test_configure
     app.configure do
       config.assets.configure do |env|