Merge pull request #758 from lsylvester/rack-3-support

Rack 3 support

Author: rafaelfranca

CHANGELOG.md

@@ -1,3 +1,5 @@
+* Add support for Rack 3.0. Headers set by sprockets will now be lower case. [#758](https://github.com/rails/sprockets/pull/758)
+
 **3.7.5** (Sept 19, 2024)
 
 * Fix `Sprockets::Base#unescape` #808.

lib/sprockets/server.rb

@@ -139,30 +139,30 @@ def not_modified_response(env, etag)
       # Returns a 403 Forbidden response tuple
       def forbidden_response(env)
         if head_request?(env)
-          [ 403, { "Content-Type" => "text/plain", "Content-Length" => "0" }, [] ]
+          [ 403, { "content-type" => "text/plain", "content-length" => "0" }, [] ]
         else
-          [ 403, { "Content-Type" => "text/plain", "Content-Length" => "9" }, [ "Forbidden" ] ]
+          [ 403, { "content-type" => "text/plain", "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, { "content-type" => "text/plain", "content-length" => "0", "x-cascade" => "pass" }, [] ]
         else
-          [ 404, { "Content-Type" => "text/plain", "Content-Length" => "9", "X-Cascade" => "pass" }, [ "Not found" ] ]
+          [ 404, { "content-type" => "text/plain", "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, { "content-type" => "text/plain", "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, { "content-type" => "text/plain", "content-length" => "0", "x-cascade" => "pass" }, [] ]
         else
-          [ 412, { "Content-Type" => "text/plain", "Content-Length" => "19", "X-Cascade" => "pass" }, [ "Precondition Failed" ] ]
+          [ 412, { "content-type" => "text/plain", "content-length" => "19", "x-cascade" => "pass" }, [ "Precondition Failed" ] ]
         end
       end
 
@@ -171,7 +171,7 @@ def precondition_failed_response(env)
       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, { "content-type" => "application/javascript", "content-length" => body.bytesize.to_s }, [ body ] ]
       end
 
       # Returns a CSS response that hides all elements on the page and
@@ -224,7 +224,7 @@ def css_exception_response(exception)
           }
         CSS
 
-        [ 200, { "Content-Type" => "text/css; charset=utf-8", "Content-Length" => body.bytesize.to_s }, [ body ] ]
+        [ 200, { "content-type" => "text/css; charset=utf-8", "content-length" => body.bytesize.to_s }, [ body ] ]
       end
 
       # Escape special characters for use inside a CSS content("...") string
@@ -245,18 +245,18 @@ def cache_headers(env, etag)
         headers = {}
 
         # Set caching headers
-        headers["Cache-Control"] = "public"
-        headers["ETag"]          = %("#{etag}")
+        headers["cache-control"] = "public"
+        headers["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"
+          headers["cache-control"] += ", max-age=31536000"
 
         # Otherwise set `must-revalidate` since the asset could be modified.
         else
-          headers["Cache-Control"] += ", must-revalidate"
-          headers["Vary"] = "Accept-Encoding"
+          headers["cache-control"] += ", must-revalidate"
+          headers["vary"] = "Accept-Encoding"
         end
 
         headers
@@ -266,15 +266,15 @@ def headers(env, asset, length)
         headers = {}
 
         # Set content length header
-        headers["Content-Length"] = length.to_s
+        headers["content-length"] = length.to_s
 
         # Set content type header
         if type = asset.content_type
           # Set charset param for text/* mime types
           if type.start_with?("text/") && asset.charset
             type += "; charset=#{asset.charset}"
           end
-          headers["Content-Type"] = type
+          headers["content-type"] = type
         end
 
         headers.merge(cache_headers(env, asset.etag))

sprockets.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.executables = ["sprockets"]
 
   s.add_dependency "base64"
-  s.add_dependency "rack",            "> 1", "< 3"
+  s.add_dependency "rack",            ">= 2.2.4", "< 4"
   s.add_dependency "concurrent-ruby", "~> 1.0"
 
   s.add_development_dependency "closure-compiler", "~> 1.1"
@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "execjs", "~> 2.0"
   s.add_development_dependency "minitest", "~> 5.0"
   s.add_development_dependency "nokogiri", "~> 1.3"
-  s.add_development_dependency "rack-test", "~> 0.6"
+  s.add_development_dependency "rack-test", "~> 2.0.0"
   s.add_development_dependency "rake"
   s.add_development_dependency "sass", "~> 3.1"
   s.add_development_dependency "uglifier", "~> 2.3"

test/sprockets_test.rb

@@ -2,6 +2,7 @@
 require "sprockets"
 require "sprockets/environment"
 require "fileutils"
+require "rack/lint"
 
 old_verbose, $VERBOSE = $VERBOSE, false
 Encoding.default_external = 'UTF-8'
@@ -205,4 +206,3 @@ def self.silence(&block)
     end
   end
 end
-