sprockets 4.2.0 → 4.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c5995147a647a6d47d625b6cc9f10586506f3832cff0070985ec9560ee3fc0d
-  data.tar.gz: 1befd6f705efbef88f05dc58b38f719f11b445f76c60a95f854a43ef8e84c21d
+  metadata.gz: e90597d41c004cb5a71036473da429c30f7fea114de88b48f8c5b0bbd1e82531
+  data.tar.gz: 496cf47db6004a4335fe2afa6e5c0c70f8322be6a57dbed5c7a4f1976717df93
 SHA512:
-  metadata.gz: 9d47aea08307515c8a0fab29615fbde5f892c91300668afd83b2739032adeb77794d4303e6ecb56c570bc784695d25304f7481fa45c4ab7bbe0727281ee7deab
-  data.tar.gz: 6d0f0b116766053d96402f5d88602374829ef9610160bd8398a093db33ceaafe31a2f2b33a8d0c615769f0bbba7c39d867db90dfded9bc5ff35d0c0ff4482e36
+  metadata.gz: d5665dc8d05a3aafbff29fe6287c9732f1b51a3dd5164a38d5ba0a289cd660a18ef061fdc3560f3f2b481da450beb5e0864279394e1f8164b859b0e15dafb531
+  data.tar.gz: 80a297f58bf9d94f4d78f21898477ffa2a7a9bf8f00d0cdb7d4a6351d0c28646cbcba97cdd491472fd329c170ca013bb9defe14fd5e43003eb1022377e396573

data/CHANGELOG.md

@@ -2,12 +2,39 @@
 
 Get upgrade notes from Sprockets 3.x to 4.x at https://github.com/rails/sprockets/blob/master/UPGRADING.md
 
+## 4.4.0
+
+- Implement `ignore_mtime` option. [#831](https://github.com/rails/sprockets/pull/832)
+- Allow disabling cache limits. [#831](https://github.com/rails/sprockets/pull/831)
+
+## 4.3.0
+
+- Fixed compatibility with `json` 3+.
+- Do not set variable `GZip#mtime` but do always set `File#mtime`. [#821](https://github.com/rails/sprockets/pull/821)
+
+## 4.2.2
+
+- Added missing dependency on `logger`. [#813](https://github.com/rails/sprockets/pull/813)
+- Fix `URI::RFC3986_PARSER` warnings. [#812](https://github.com/rails/sprockets/pull/812)
+- Removed dependency on `base64`. [#810](https://github.com/rails/sprockets/pull/810)
+
+## 4.2.1
+
+- Fix for precompile issues when multiple extensions map to the same MIME type (eg. `.jpeg` / `.jpg`). [#781](https://github.com/rails/sprockets/pull/781)
+- Fix `application/css-sourcemap+json` charset [#764](https://github.com/rails/sprockets/pull/764)
+- Fix compatibility with Rack 2 applications. [#790](https://github.com/rails/sprockets/pull/790)
+
 ## 4.2.0
 
 - Rack 3 compatibility. [#758](https://github.com/rails/sprockets/pull/758)
 - Fix thread safety of `Sprockets::CachedEnvironment` and `Sprockets::Cache::MemoryStore`. [#771](https://github.com/rails/sprockets/pull/771)
 - Add support for Rack 3.0. Headers set by sprockets will now be lower case. [#758](https://github.com/rails/sprockets/pull/758)
 - Make `Sprockets::Utils.module_include` thread safe on JRuby. [#759](https://github.com/rails/sprockets/pull/759)
+- Fix typo in `asset.rb` file. [#768](https://github.com/rails/sprockets/pull/768)
+
+## 4.1.1
+
+- Fix `Sprockets::Server` to return response headers to be compatible with Rack::Lint 2.0.
 
 ## 4.1.0
 

data/README.md

@@ -44,7 +44,7 @@ If you want to work on Sprockets or better understand how it works read [How Spr
 
 You can interact with Sprockets primarily through directives and file extensions. This section covers how to use each of these things, and the defaults that ship with Sprockets.
 
-Since you are likely using Sprockets through another framework (such as the [the Rails asset pipeline](http://guides.rubyonrails.org/asset_pipeline.html)), there will be configuration options you can toggle that will change behavior such as what directories or files get compiled. For that documentation you should see your framework's documentation.
+Since you are likely using Sprockets through another framework (such as the [Rails asset pipeline](http://guides.rubyonrails.org/asset_pipeline.html)), there will be configuration options you can toggle that will change behavior such as what directories or files get compiled. For that documentation you should see your framework's documentation.
 
 #### Accessing Assets
 
@@ -119,7 +119,7 @@ Here is a list of the available directives:
 - [`link_directory`](#link_directory) - Make target directory compile and be publicly available without adding contents to current
 - [`link_tree`](#link_tree) - Make target tree compile and be publicly available without adding contents to current
 - [`depend_on`](#depend_on) - Recompile current file if target has changed
-- [`depend_on_directory`](#depend_on_directory) - Recompile current file if any files in target directory has changed
+- [`depend_on_directory`](#depend_on_directory) - Recompile current file if any files in target directory have changed
 - [`stub`](#stub) - Ignore target file
 
 You can see what each of these does below.
@@ -150,7 +150,7 @@ When "asking" for a compiled file, you always ask for the extension you want. Fo
 asset_path("application.css")
 ```
 
-Sprockets understands that `application.scss.erb` will compile down to a `application.css`. Ask for what you need, not what you have.
+Sprockets understands that `application.scss.erb` will compile down to an `application.css`. Ask for what you need, not what you have.
 
 If this isn't working like you expect, make sure you didn't typo an extension, and make sure the file is on a "load path" (see framework docs for adding new load paths).
 
@@ -174,7 +174,7 @@ beta.js
 jquery.js
 ```
 
-Then `alpha.js` will be loaded before either of the other two. This can be a problem if `alpha.js` uses jquery. For this reason it is not recommend to use `require_directory` with files that are ordering dependent. You can either require individual files manually:
+Then `alpha.js` will be loaded before either of the other two. This can be a problem if `alpha.js` uses jquery. For this reason it is not recommended to use `require_directory` with files that are ordering dependent. You can either require individual files manually:
 
 ```js
 //= require jquery
@@ -253,7 +253,7 @@ Directives take a path or a path to a file. Paths for directive can be relative
 //= require ../foo.js
 ```
 
-This would load the file up one directory and named `foo.js`. However this isn't required if `foo.js` is on one of Sprocket's load paths. You can simply use
+This would load a file named `foo.js` from one directory up. However this isn't required if `foo.js` is on one of Sprocket's load paths. You can simply use
 
 ```js
 //= require foo.js
@@ -396,7 +396,7 @@ This would find a manifest file at `my_engine/app/assets/config/my_engine_manife
 
 Files in subdirectories will not be linked (Compare to [link_tree](#link_tree)).
 
-The *path* argument to `link_directory` is _not_ a logical path (it does not use the asset load paths), but is a path relative to the file the `link_directory` directive is found in, and can use `..` to  . For instance, you might want:
+The *path* argument to `link_directory` is _not_ a logical path (it does not use the asset load paths), but is a path relative to the file the `link_directory` directive is found in, and can use `..` to reference parent directories. For instance, you might want:
 
 ```js
 //= link_directory ../stylesheets
@@ -426,7 +426,7 @@ Example:
 //= link_tree ./path/to/folder
 ```
 
-Like `link_directory`, the argument is path relative to the current file, it is *not* a 'logical path' tresolved against load paths.
+Like `link_directory`, the argument is a path relative to the current file, it is *not* a 'logical path' resolved against load paths.
 
 
 As with `link_directory`, you can also specify a second argument -- separated by a space --  so any extra files not matching the content-type specified will be ignored:
@@ -469,7 +469,7 @@ asset's cache in response to a change in multiple files in a single directory.
 
 All paths are relative to your declaration and must begin with `./`
 
-Also, your must include these directories in your [load path](guides/building_an_asset_processing_framework.md#the-load-path).
+Also, you must include these directories in your [load path](guides/building_an_asset_processing_framework.md#the-load-path).
 
 **Example:**
 
@@ -488,8 +488,8 @@ B
 ```
 // ./file.js.erb
 //= depend_on_directory ./data
-var a = '<% File.read('data/a.data') %>'
-var b = '<% File.read('data/b.data') %>'
+var a = '<%= File.read("data/a.data") %>'
+var b = '<%= File.read("data/b.data") %>'
 ```
 
 Would produce:
@@ -514,7 +514,7 @@ Sprockets provides an ERB engine for preprocessing assets using
 embedded Ruby code. Append `.erb` to a CSS or JavaScript asset's
 filename to enable the ERB engine.
 
-For example if you have an `app/application/javascripts/app_name.js.erb`
+For example if you have an `app/assets/javascripts/app_name.js.erb`
 you could have this in the template
 
 ```js
@@ -559,7 +559,7 @@ Sprockets supports both Sass syntaxes. For the original
 whitespace-sensitive syntax, use the extension `.sass`. For the
 new SCSS syntax, use the extension `.scss`.
 
-In Rails if you have `app/application/stylesheets/foo.scss` it can
+In Rails if you have `app/assets/stylesheets/foo.scss` it can
 be referenced with `<%= asset_path("foo.css") %>`. When referencing
 an asset in Rails, always specify the extension you want. Sprockets will
 convert `foo.scss` to `foo.css`.
@@ -580,7 +580,7 @@ on your system to invoke it.
 To write JavaScript assets with CoffeeScript, use the extension
 `.coffee`.
 
-In Rails if you have `app/application/javascripts/foo.coffee` it can
+In Rails if you have `app/assets/javascripts/foo.coffee` it can
 be referenced with `<%= asset_path("foo.js") %>`. When referencing
 an asset in Rails, always specify the extension you want. Sprockets will
 convert `foo.coffee` to `foo.js`.

data/lib/sprockets/asset.rb

@@ -97,7 +97,7 @@ module Sprockets
       if @source
         @source
       else
-        # File is read everytime to avoid memory bloat of large binary files
+        # File is read every time to avoid memory bloat of large binary files
         File.binread(filename)
       end
     end
@@ -137,7 +137,7 @@ module Sprockets
       DigestUtils.pack_hexdigest(digest)
     end
 
-    # Pubic: ETag String of Asset.
+    # Public: ETag String of Asset.
     def etag
       version = environment_version
 

data/lib/sprockets/base.rb

@@ -55,6 +55,13 @@ module Sprockets
     end
     alias_method :index, :cached
 
+    # By default sprockets tries to quickly revalidate the cache for a source file
+    # by comparing its last modified time.
+    # This is efficient in development, but in some CI or producton environments
+    # where the source files are restored from version control, the last modified time
+    # tend to be somewhat random, and checking it is just needless overhead.
+    attr_accessor :ignore_mtime
+
     # Internal: Compute digest for path.
     #
     # path - String filename or directory path.
@@ -62,14 +69,18 @@ module Sprockets
     # Returns a String digest or nil.
     def file_digest(path)
       if stat = self.stat(path)
-        # Caveat: Digests are cached by the path's current mtime. Its possible
-        # for a files contents to have changed and its mtime to have been
-        # negligently reset thus appearing as if the file hasn't changed on
-        # disk. Also, the mtime is only read to the nearest second. It's
-        # also possible the file was updated more than once in a given second.
-        key = UnloadedAsset.new(path, self).file_digest_key(stat.mtime.to_i)
-        cache.fetch(key) do
+        if ignore_mtime
           self.stat_digest(path, stat)
+        else
+          # Caveat: Digests are cached by the path's current mtime. Its possible
+          # for a files contents to have changed and its mtime to have been
+          # negligently reset thus appearing as if the file hasn't changed on
+          # disk. Also, the mtime is only read to the nearest second. It's
+          # also possible the file was updated more than once in a given second.
+          key = UnloadedAsset.new(path, self).file_digest_key(stat.mtime.to_i)
+          cache.fetch(key) do
+            self.stat_digest(path, stat)
+          end
         end
       end
     end

data/lib/sprockets/bower.rb

@@ -46,7 +46,7 @@ module Sprockets
     #
     # Returns nothing.
     def read_bower_main(dirname, filename)
-      bower = JSON.parse(File.read(filename), create_additions: false)
+      bower = JSON.parse(File.read(filename))
 
       case bower['main']
       when String

data/lib/sprockets/cache/file_store.rb

@@ -36,13 +36,13 @@ module Sprockets
       #
       # root     - A String path to a directory to persist cached values to.
       # max_size - A Integer of the maximum size the store will hold (in bytes).
-      #            (default: 25MB).
+      #            (default: 25MB). Can be set to +false+ for no limit.
       # logger   - The logger to which some info will be printed.
       #            (default logger level is FATAL and won't output anything).
       def initialize(root, max_size = DEFAULT_MAX_SIZE, logger = self.class.default_logger)
         @root     = root
         @max_size = max_size
-        @gc_size  = max_size * 0.75
+        @gc_size  = max_size * 0.75 if max_size
         @logger   = logger
       end
 
@@ -111,11 +111,13 @@ module Sprockets
         # Write data
         PathUtils.atomic_write(path) do |f|
           f.write(raw)
-          @size = size + f.size unless exists
+          if defined?(@size) && !exists
+            @size += f.size
+          end
         end
 
         # GC if necessary
-        gc! if size > @max_size
+        gc! if @max_size && size > @max_size
 
         value
       end

data/lib/sprockets/cache/memory_store.rb

@@ -18,7 +18,7 @@ module Sprockets
       # Public: Initialize the cache store.
       #
       # max_size - A Integer of the maximum number of keys the store will hold.
-      #            (default: 1000).
+      #            (default: 1000). Can be set to +false+ for no limit.
       def initialize(max_size = DEFAULT_MAX_SIZE)
         @max_size = max_size
         @cache = {}
@@ -56,7 +56,7 @@ module Sprockets
         @mutex.synchronize do
           @cache.delete(key)
           @cache[key] = value
-          @cache.shift if @cache.size > @max_size
+          @cache.shift if @max_size && @cache.size > @max_size
         end
         value
       end

data/lib/sprockets/compressing.rb

@@ -106,7 +106,7 @@ module Sprockets
     #
     #     environment.gzip = false
     #
-    # To enable set to a truthy value. By default zlib wil
+    # To enable set to a truthy value. By default zlib will
     # be used to gzip assets. If you have the Zopfli gem
     # installed you can specify the zopfli algorithm to be used
     # instead:

data/lib/sprockets/encoding_utils.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'base64'
 require 'stringio'
 require 'zlib'
 
@@ -51,6 +50,8 @@ module Sprockets
       Marshal.load(marshaled)
     end
 
+    GZIP_MTIME = RUBY_VERSION >= "2.7" ? 0 : 1
+
     # Public: Use gzip to compress data.
     #
     # str - String data
@@ -59,7 +60,7 @@ module Sprockets
     def gzip(str)
       io = StringIO.new
       gz = Zlib::GzipWriter.new(io, Zlib::BEST_COMPRESSION)
-      gz.mtime = 1
+      gz.mtime = Sprockets::EncodingUtils::GZIP_MTIME
       gz << str
       gz.finish
       io.string
@@ -71,7 +72,7 @@ module Sprockets
     #
     # Returns a encoded String
     def base64(str)
-      Base64.strict_encode64(str)
+      [str].pack("m0")
     end
 
 

data/lib/sprockets/loader.rb

@@ -165,7 +165,9 @@ module Sprockets
         end
 
         if type = unloaded.params[:type]
-          logical_path += config[:mime_types][type][:extensions].first
+          extensions = config[:mime_types][type][:extensions]
+          extension = extensions.include?(extname) ? extname : extensions.first
+          logical_path += extension
         end
 
         if type != file_type && !config[:transformers][file_type][type]
@@ -177,7 +179,7 @@ module Sprockets
         processors_dep_uri = build_processors_uri(type, file_type, pipeline)
         dependencies = config[:dependencies] + [processors_dep_uri]
 
-        # Read into memory and process if theres a processor pipeline
+        # Read into memory and process if there's a processor pipeline
         if processors.any?
           result = call_processors(processors, {
             environment: self,

data/lib/sprockets/manifest.rb

@@ -120,14 +120,14 @@ module Sprockets
       return to_enum(__method__, *args) unless block_given?
 
       environment = self.environment.cached
-      promises = args.flatten.map do |path|
-        Concurrent::Promise.execute(executor: executor) do
+      futures = args.flatten.map do |path|
+        Concurrent::Promises.future_on(executor) do
           environment.find_all_linked_assets(path).to_a
         end
       end
 
-      promises.each do |promise|
-        promise.value!.each(&block)
+      futures.each do |future|
+        future.value!.each(&block)
       end
 
       nil
@@ -188,15 +188,15 @@ module Sprockets
 
         filenames << asset.filename
 
-        promise      = nil
+        future = nil
         exporters_for_asset(asset) do |exporter|
           next if exporter.skip?(logger)
 
-          if promise.nil?
-            promise = Concurrent::Promise.new(executor: executor) { exporter.call }
-            concurrent_exporters << promise.execute
+          if future.nil?
+            future = Concurrent::Promises.future_on(executor) { exporter.call }
+            concurrent_exporters << future
           else
-            concurrent_exporters << promise.then { exporter.call }
+            concurrent_exporters << future.then { exporter.call }
           end
         end
       end
@@ -315,7 +315,7 @@ module Sprockets
       end
 
       def json_decode(obj)
-        JSON.parse(obj, create_additions: false)
+        JSON.parse(obj)
       end
 
       def json_encode(obj)

data/lib/sprockets/npm.rb

@@ -37,7 +37,7 @@ module Sprockets
     #
     # Returns nothing.
     def read_package_directives(dirname, filename)
-      package = JSON.parse(File.read(filename), create_additions: false)
+      package = JSON.parse(File.read(filename))
 
       case package['main']
       when String

data/lib/sprockets/path_dependency_utils.rb

@@ -18,7 +18,7 @@ module Sprockets
   # The returned dependency set can be passed to resolve_dependencies(deps)
   # to check if the returned result is still fresh. In this case, entry always
   # returns a single path, but multiple calls should accumulate dependencies
-  # into a single set thats saved off and checked later.
+  # into a single set that's saved off and checked later.
   #
   #     resolve_dependencies(deps)
   #     # => "\x01\x02\x03"

data/lib/sprockets/path_utils.rb

@@ -91,6 +91,8 @@ module Sprockets
       SEPARATOR_PATTERN = "#{Regexp.quote(File::SEPARATOR)}"
     end
 
+    RELATIVE_PATH_PATTERN = /^\.\.?($|#{SEPARATOR_PATTERN})/
+
     # Public: Check if path is explicitly relative.
     # Starts with "./" or "../".
     #
@@ -98,7 +100,7 @@ module Sprockets
     #
     # Returns true if path is relative, otherwise false.
     def relative_path?(path)
-      path.match?(/^\.\.?($|#{SEPARATOR_PATTERN})/) ? true : false
+      path.match?(RELATIVE_PATH_PATTERN) ? true : false
     end
 
     # Public: Get relative path from `start` to `dest`.

data/lib/sprockets/server.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require 'set'
 require 'time'
-require 'rack/utils'
+require 'rack'
 
 module Sprockets
   # `Server` is a concern mixed into `Environment` and
@@ -11,6 +11,16 @@ module Sprockets
     # Supported HTTP request methods.
     ALLOWED_REQUEST_METHODS = ['GET', 'HEAD'].to_set.freeze
 
+    # :stopdoc:
+    if Gem::Version.new(Rack::RELEASE) < Gem::Version.new("3")
+      X_CASCADE = "X-Cascade"
+      VARY = "Vary"
+    else
+      X_CASCADE = "x-cascade"
+      VARY = "vary"
+    end
+    # :startdoc:
+
     # `call` implements the Rack 1.x specification which accepts an
     # `env` Hash and returns a three item tuple with the status code,
     # headers, and body.
@@ -148,39 +158,39 @@ module Sprockets
       # Returns a 400 Forbidden response tuple
       def bad_request_response(env)
         if head_request?(env)
-          [ 400, { "content-type" => "text/plain", "content-length" => "0" }, [] ]
+          [ 400, { Rack::CONTENT_TYPE => "text/plain", Rack::CONTENT_LENGTH => "0" }, [] ]
         else
-          [ 400, { "content-type" => "text/plain", "content-length" => "11" }, [ "Bad Request" ] ]
+          [ 400, { Rack::CONTENT_TYPE => "text/plain", Rack::CONTENT_LENGTH => "11" }, [ "Bad Request" ] ]
         end
       end
 
       # Returns a 403 Forbidden response tuple
       def forbidden_response(env)
         if head_request?(env)
-          [ 403, { "content-type" => "text/plain", "content-length" => "0" }, [] ]
+          [ 403, { Rack::CONTENT_TYPE => "text/plain", Rack::CONTENT_LENGTH => "0" }, [] ]
         else
-          [ 403, { "content-type" => "text/plain", "content-length" => "9" }, [ "Forbidden" ] ]
+          [ 403, { Rack::CONTENT_TYPE => "text/plain", Rack::CONTENT_LENGTH => "9" }, [ "Forbidden" ] ]
         end
       end
 
       # Returns a 404 Not Found response tuple
       def not_found_response(env)
         if head_request?(env)
-          [ 404, { "content-type" => "text/plain", "content-length" => "0", "x-cascade" => "pass" }, [] ]
+          [ 404, { Rack::CONTENT_TYPE => "text/plain", Rack::CONTENT_LENGTH => "0", X_CASCADE => "pass" }, [] ]
         else
-          [ 404, { "content-type" => "text/plain", "content-length" => "9", "x-cascade" => "pass" }, [ "Not found" ] ]
+          [ 404, { Rack::CONTENT_TYPE => "text/plain", Rack::CONTENT_LENGTH => "9", X_CASCADE => "pass" }, [ "Not found" ] ]
         end
       end
 
       def method_not_allowed_response
-        [ 405, { "content-type" => "text/plain", "content-length" => "18" }, [ "Method Not Allowed" ] ]
+        [ 405, { Rack::CONTENT_TYPE => "text/plain", Rack::CONTENT_LENGTH => "18" }, [ "Method Not Allowed" ] ]
       end
 
       def precondition_failed_response(env)
         if head_request?(env)
-          [ 412, { "content-type" => "text/plain", "content-length" => "0", "x-cascade" => "pass" }, [] ]
+          [ 412, { Rack::CONTENT_TYPE => "text/plain", Rack::CONTENT_LENGTH => "0", X_CASCADE => "pass" }, [] ]
         else
-          [ 412, { "content-type" => "text/plain", "content-length" => "19", "x-cascade" => "pass" }, [ "Precondition Failed" ] ]
+          [ 412, { Rack::CONTENT_TYPE => "text/plain", Rack::CONTENT_LENGTH => "19", X_CASCADE => "pass" }, [ "Precondition Failed" ] ]
         end
       end
 
@@ -189,7 +199,7 @@ module Sprockets
       def javascript_exception_response(exception)
         err  = "#{exception.class.name}: #{exception.message}\n  (in #{exception.backtrace[0]})"
         body = "throw Error(#{err.inspect})"
-        [ 200, { "content-type" => "application/javascript", "content-length" => body.bytesize.to_s }, [ body ] ]
+        [ 200, { Rack::CONTENT_TYPE => "application/javascript", Rack::CONTENT_LENGTH => body.bytesize.to_s }, [ body ] ]
       end
 
       # Returns a CSS response that hides all elements on the page and
@@ -242,7 +252,7 @@ module Sprockets
           }
         CSS
 
-        [ 200, { "content-type" => "text/css; charset=utf-8", "content-length" => body.bytesize.to_s }, [ body ] ]
+        [ 200, { Rack::CONTENT_TYPE => "text/css; charset=utf-8", Rack::CONTENT_LENGTH => body.bytesize.to_s }, [ body ] ]
       end
 
       # Escape special characters for use inside a CSS content("...") string
@@ -258,18 +268,18 @@ module Sprockets
         headers = {}
 
         # Set caching headers
-        headers["cache-control"] = +"public"
-        headers["etag"]          = %("#{etag}")
+        headers[Rack::CACHE_CONTROL] = +"public"
+        headers[Rack::ETAG]          = %("#{etag}")
 
         # If the request url contains a fingerprint, set a long
         # expires on the response
         if path_fingerprint(env["PATH_INFO"])
-          headers["cache-control"] << ", max-age=31536000, immutable"
+          headers[Rack::CACHE_CONTROL] << ", max-age=31536000, immutable"
 
         # Otherwise set `must-revalidate` since the asset could be modified.
         else
-          headers["cache-control"] << ", must-revalidate"
-          headers["vary"] = "Accept-Encoding"
+          headers[Rack::CACHE_CONTROL] << ", must-revalidate"
+          headers[VARY] = "Accept-Encoding"
         end
 
         headers
@@ -279,7 +289,7 @@ module Sprockets
         headers = {}
 
         # Set content length header
-        headers["content-length"] = length.to_s
+        headers[Rack::CONTENT_LENGTH] = length.to_s
 
         # Set content type header
         if type = asset.content_type
@@ -287,7 +297,7 @@ module Sprockets
           if type.start_with?("text/") && asset.charset
             type += "; charset=#{asset.charset}"
           end
-          headers["content-type"] = type
+          headers[Rack::CONTENT_TYPE] = type
         end
 
         headers.merge(cache_headers(env, asset.etag))

data/lib/sprockets/uri_utils.rb

@@ -21,6 +21,9 @@ module Sprockets
   module URIUtils
     extend self
 
+    URI_PARSER = defined?(URI::RFC2396_PARSER) ? URI::RFC2396_PARSER : URI::Generic::DEFAULT_PARSER
+    private_constant :URI_PARSER
+
     # Internal: Parse URI into component parts.
     #
     # uri - String uri
@@ -45,7 +48,7 @@ module Sprockets
     def split_file_uri(uri)
       scheme, _, host, _, _, path, _, query, _ = URI.split(uri)
 
-      path = URI::Generic::DEFAULT_PARSER.unescape(path)
+      path = URI_PARSER.unescape(path)
       path.force_encoding(Encoding::UTF_8)
 
       # Hack for parsing Windows "/C:/Users/IEUser" paths
@@ -63,7 +66,7 @@ module Sprockets
       str = +"#{scheme}://"
       str << host if host
       path = "/#{path}" unless path.start_with?("/".freeze)
-      str << URI::Generic::DEFAULT_PARSER.escape(path)
+      str << URI_PARSER.escape(path)
       str << "?#{query}" if query
       str
     end
@@ -162,7 +165,7 @@ module Sprockets
         when Integer
           query << "#{key}=#{value}"
         when String, Symbol
-          query << "#{key}=#{URI::Generic::DEFAULT_PARSER.escape(value.to_s)}"
+          query << "#{key}=#{URI_PARSER.escape(value.to_s)}"
         when TrueClass
           query << "#{key}"
         when FalseClass, NilClass
@@ -182,7 +185,7 @@ module Sprockets
     def parse_uri_query_params(query)
       query.to_s.split('&'.freeze).reduce({}) do |h, p|
         k, v = p.split('='.freeze, 2)
-        v = URI::Generic::DEFAULT_PARSER.unescape(v) if v
+        v = URI_PARSER.unescape(v) if v
         h[k.to_sym] = v || true
         h
       end

data/lib/sprockets/utils/gzip.rb

@@ -10,13 +10,15 @@ module Sprockets
       # writes contents to the `file` passed in. Sets `mtime` of
       # written file to passed in `mtime`
       module ZlibArchiver
-        def self.call(file, source, mtime)
+        MTIME = RUBY_VERSION >= "2.7" ? 0 : 1
+
+        def self.call(file, source)
           gz = Zlib::GzipWriter.new(file, Zlib::BEST_COMPRESSION)
-          gz.mtime = mtime
+          gz.mtime = MTIME
           gz.write(source)
           gz.close
 
-          File.utime(mtime, mtime, file.path)
+          nil
         end
       end
 
@@ -28,8 +30,8 @@ module Sprockets
       # writes contents to the `file` passed in. Sets `mtime` of
       # written file to passed in `mtime`
       module ZopfliArchiver
-        def self.call(file, source, mtime)
-          compressed_source = Autoload::Zopfli.deflate(source, format: :gzip, mtime: mtime)
+        def self.call(file, source)
+          compressed_source = Autoload::Zopfli.deflate(source, format: :gzip)
           file.write(compressed_source)
           file.close
 
@@ -49,7 +51,7 @@ module Sprockets
 
       # What non-text mime types should we compress? This list comes from:
       # https://www.fastly.com/blog/new-gzip-settings-and-deciding-what-compress
-      COMPRESSABLE_MIME_TYPES = {
+      COMPRESSIBLE_MIME_TYPES = {
         "application/vnd.ms-fontobject" => true,
         "application/x-font-opentype" => true,
         "application/x-font-ttf" => true,
@@ -71,7 +73,7 @@ module Sprockets
         # can be compressed.
         #
         # We also check against our list of non-text compressible mime types
-        @charset || COMPRESSABLE_MIME_TYPES.include?(@content_type)
+        @charset || COMPRESSIBLE_MIME_TYPES.include?(@content_type)
       end
 
       # Private: Opposite of `can_compress?`.
@@ -90,7 +92,8 @@ module Sprockets
       # Returns nothing.
       def compress(file, target)
         mtime = Sprockets::PathUtils.stat(target).mtime
-        archiver.call(file, source, mtime)
+        archiver.call(file, source)
+        File.utime(mtime, mtime, file.path)
 
         nil
       end

data/lib/sprockets/version.rb

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

data/lib/sprockets.rb

@@ -91,7 +91,7 @@ module Sprockets
 
   require 'sprockets/source_map_processor'
   register_mime_type 'application/js-sourcemap+json', extensions: ['.js.map'], charset: :unicode
-  register_mime_type 'application/css-sourcemap+json', extensions: ['.css.map']
+  register_mime_type 'application/css-sourcemap+json', extensions: ['.css.map'], charset: :unicode
   register_transformer 'application/javascript', 'application/js-sourcemap+json', SourceMapProcessor
   register_transformer 'text/css', 'application/css-sourcemap+json', SourceMapProcessor
 

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sprockets
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.4.0
 platform: ruby
 authors:
 - Sam Stephenson
 - Joshua Peek
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-20 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -37,14 +36,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: m
   requirement: !ruby/object:Gem::Requirement
@@ -233,14 +246,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.2'
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
@@ -423,7 +436,6 @@ homepage: https://github.com/rails/sprockets
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -438,8 +450,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key:
+rubygems_version: 4.0.16
 specification_version: 4
 summary: Rack-based asset packaging system
 test_files: []