Merge branch 'master' into chore/replace-Fixnum-and-Bignum-with-Integer

Author: 007lva

.travis.yml

@@ -9,16 +9,16 @@ before_install: gem install bundler -v '<2'
 rvm:
   - 2.5.3
   - 2.6.0
+  - 2.7.1
   - jruby-9.2.5.0
   - jruby-head
   - ruby-head
 
 matrix:
   include:
-    - rvm: 2.6.0
+    - rvm: 2.7.1
       script: bundle exec rake test_isolated
-  include:
-    - rvm: 2.6.0
+    - rvm: 2.7.1
       script: bundle exec rake rubocop
   allow_failures:
     - rvm: jruby-9.2.5.0

CHANGELOG.md

@@ -4,9 +4,17 @@ Get upgrade notes from Sprockets 3.x to 4.x at https://github.com/rails/sprocket
 
 ## Master
 
+- Remove remaining support for Ruby < 2.4.[#672](https://github.com/rails/sprockets/pull/672)
+
+## 4.0.2
+
+- Fix `etag` and digest path compilation that were generating string with invalid digest since 4.0.1.
+
+## 4.0.1
+
 - Fix for Ruby 2.7 keyword arguments warning in `base.rb`. [#660](https://github.com/rails/sprockets/pull/660)
 - Fix for when `x_sprockets_linecount` is missing from a source map.
-- Remove remaining support for Ruby < 2.4.[#672](https://github.com/rails/sprockets/pull/672)
+- Fix subresource integrity to match the digest of the asset.
 
 ## 4.0.0
 

lib/sprockets/asset.rb

@@ -123,13 +123,26 @@ def digest
       metadata[:digest]
     end
 
+    # Private: Return the version of the environment where the asset was generated.
+    def environment_version
+      metadata[:environment_version]
+    end
+
     # Public: Returns String hexdigest of source.
     def hexdigest
       DigestUtils.pack_hexdigest(digest)
     end
 
     # Pubic: ETag String of Asset.
-    alias_method :etag, :hexdigest
+    def etag
+      version = environment_version
+
+      if version && version != ""
+        DigestUtils.hexdigest(version + digest)
+      else
+        DigestUtils.pack_hexdigest(digest)
+      end
+    end
 
     # Public: Returns String base64 digest of source.
     def base64digest
@@ -138,7 +151,7 @@ def base64digest
 
     # Public: A "named information" URL for subresource integrity.
     def integrity
-      DigestUtils.integrity_uri(metadata[:digest])
+      DigestUtils.integrity_uri(digest)
     end
 
     # Public: Add enumerator to allow `Asset` instances to be used as Rack

lib/sprockets/exporters/base.rb

@@ -69,4 +69,3 @@ def write(filename = target)
     end
   end
 end
-

lib/sprockets/loader.rb

@@ -195,14 +195,16 @@ def load_from_unloaded(unloaded)
           source = result.delete(:data)
           metadata = result
           metadata[:charset] = source.encoding.name.downcase unless metadata.key?(:charset)
-          metadata[:digest]  = digest(self.version + source)
+          metadata[:digest]  = digest(source)
           metadata[:length]  = source.bytesize
+          metadata[:environment_version] = version
         else
           dependencies << build_file_digest_uri(unloaded.filename)
           metadata = {
             digest: file_digest(unloaded.filename),
             length: self.stat(unloaded.filename).size,
-            dependencies: dependencies
+            dependencies: dependencies,
+            environment_version: version,
           }
         end
 

lib/sprockets/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Sprockets
-  VERSION = "4.0.0"
+  VERSION = "4.0.2"
 end

test/test_asset.rb

@@ -435,6 +435,12 @@ def setup
       @asset.digest_path
   end
 
+  test "environment version" do
+    @env.version = "v1"
+
+    assert_equal "v1", @env['application.js'].environment_version
+  end
+
   test "content type" do
     assert_equal "application/javascript", @asset.content_type
   end

test/test_environment.rb

@@ -720,10 +720,64 @@ def setup
     assert_equal 2, asset.metadata[:selector_count]
   end
 
-  test "changing version changes the digest of the asset" do
-    old_asset_digest = @env["gallery.js"].hexdigest
+  test "changing version changes the digest_path of the asset" do
+    old_asset_digest = @env["gallery.js"].digest_path
     @env.version = 'v2'
-    assert old_asset_digest != @env["gallery.js"].hexdigest
+    refute_equal old_asset_digest, @env["gallery.js"].digest_path
+  end
+
+  test "changing version changes the digest_path of the asset when there is no preposessor" do
+    old_asset_digest = @env["blank.gif"].digest_path
+    @env.version = 'v2'
+    refute_equal old_asset_digest, @env["blank.gif"].digest_path
+  end
+
+  test "changing version changes the etag of the asset" do
+    old_asset_etag = @env["gallery.js"].etag
+    @env.version = 'v2'
+    new_asset_etag =  @env["gallery.js"].etag
+    refute_equal old_asset_etag, new_asset_etag
+    assert_equal old_asset_etag.size, new_asset_etag.size
+  end
+
+  test "changing version to nil does not break etag" do
+    old_asset_etag = @env["gallery.js"].etag
+    @env.version = nil
+    new_asset_etag =  @env["gallery.js"].etag
+    assert_equal old_asset_etag, new_asset_etag
+    assert_equal old_asset_etag.size, new_asset_etag.size
+  end
+
+  test "changing version does not changes the digest of the asset" do
+    old_asset_digest = @env["gallery.js"].digest
+
+    @env.version = 'v2'
+
+    assert_equal old_asset_digest, @env["gallery.js"].digest
+  end
+
+  test "changing version does not changes the hexdigest of the asset" do
+    old_asset_hexdigest = @env["gallery.js"].hexdigest
+
+    @env.version = 'v2'
+
+    assert_equal old_asset_hexdigest, @env["gallery.js"].hexdigest
+  end
+
+  test "changing version does not changes the base64digest of the asset" do
+    old_asset_base64digest = @env["gallery.js"].base64digest
+
+    @env.version = 'v2'
+
+    assert_equal old_asset_base64digest, @env["gallery.js"].base64digest
+  end
+
+  test "changing version does not changes the integrity of the asset" do
+    old_asset_integrity = @env["gallery.js"].integrity
+
+    @env.version = 'v2'
+
+    assert_equal old_asset_integrity, @env["gallery.js"].integrity
   end
 
   test "bundled asset is stale if its mtime is updated or deleted" do

test/test_manifest.rb

@@ -86,6 +86,7 @@ def teardown
   end
 
   test "compile asset" do
+    @env.version = '1.1.2'
     manifest = Sprockets::Manifest.new(@env, File.join(@dir, 'manifest.json'))
 
     digest_path = @env['application.js'].digest_path
@@ -327,6 +328,29 @@ def teardown
     assert_equal subdep_digest_path, data['assets']['gallery.js']
   end
 
+  test "recompile asset when environment version is changed" do
+    manifest = Sprockets::Manifest.new(@env, File.join(@dir, 'manifest.json'))
+
+    digest_path = @env['application.js'].digest_path
+    filename = fixture_path('default/application.coffee')
+
+    sandbox filename do
+      assert !File.exist?("#{@dir}/#{digest_path}"), Dir["#{@dir}/*"].inspect
+
+      manifest.compile('application.js')
+
+      assert File.exist?("#{@dir}/manifest.json")
+      assert File.exist?("#{@dir}/#{digest_path}")
+
+      @env.version = '1.1.3'
+      new_digest_path = @env['application.js'].digest_path
+
+      assert !File.exist?("#{@dir}/#{new_digest_path}"), Dir["#{@dir}/*"].inspect
+      manifest.compile('application.js')
+      assert File.exist?("#{@dir}/#{new_digest_path}")
+    end
+  end
+
   test "recompile asset" do
     manifest = Sprockets::Manifest.new(@env, File.join(@dir, 'manifest.json'))
 

test/test_source_maps.rb

@@ -345,7 +345,7 @@ def get_sources(map)
     filename = fixture_path('source-maps/sub/a.js')
     sandbox filename do
       expected = JSON.parse(@env.find_asset('sub/directory.js.map').source).tap do |map|
-        index = map["sections"].find_index { |s| /sub\/a\.js$/ =~ s["map"]["file"] }
+        index = map["sections"].find_index { |s| s["map"]["file"].end_with?('sub/a.js') }
         map["sections"][index]["map"]["mappings"] << ";AACA"
         map["sections"][(index+1)..-1].each do |s|
           s["offset"]["line"] += 1
@@ -391,7 +391,7 @@ def setup
     assert_equal "sass/main.css.map", asset.logical_path
     assert_equal "application/css-sourcemap+json", asset.content_type
     assert_equal [
-      "file:///#{ fixture_path('source-maps/sass/main.scss').sub(/\A\//, '') }?type=text/scss&pipeline=source"
+      "file:///#{ fixture_path('source-maps/sass/main.scss').delete_prefix('/') }?type=text/scss&pipeline=source"
     ], normalize_uris(asset.links)
 
     assert map = JSON.parse(asset.source)