propshaft 1.3.0 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88560fd134482bd4d44518bde9a6813be01d538f16409be833e36664a3c998bc
-  data.tar.gz: df495a737f633966e4aa8f7837400353ec2bc9166142e38a94b7d50350c2e092
+  metadata.gz: 0af7543452f4437073078df954e65042b511768cc9d78a4ff4087630aaf6b175
+  data.tar.gz: 9d3ae071b57446b1878d43746bb645a07c216bcedab845f87a12c10a370956ea
 SHA512:
-  metadata.gz: f27ba3bd99cbbaeb643f466c8d37051a988809c1415ccdec2eff5577506eeeed8f4c772167e8afe461b349bb4b4e75aa22bedde7c256d023796929296d1c00e1
-  data.tar.gz: 571d8052e3b16c7d779c55433d27c268f0ceb387213ca4b0220a200dc30885e15accc855075e4fbcf95ea71c887ff071bfa25caaa8330f0e9a5c87c33c10076f
+  metadata.gz: e7a5df6e8efe41b65f60ca3551ecfd1835ec6a0107bee39a999d9f5e99331bb0066c2dad2b9d6c1e252383112a9355c2c19db86143855a2c906875a54349bebb
+  data.tar.gz: aaf3ac3f1dbd6b493c340860fc97fe35e93ee4807693f92c21c1abe7952f0653489fe72f57c54368933f2fc3781d915f34ee8b1e7e0b84d72f753a632c222e1d

data/lib/propshaft/asset.rb

@@ -5,6 +5,8 @@ require "action_dispatch/http/mime_type"
 class Propshaft::Asset
   attr_reader :path, :logical_path, :load_path
 
+  CONTENT_TYPES_WITH_UTF8_CHARSET = [ Mime::Type.lookup("text/html"), Mime::Type.lookup("text/css") ]
+
   class << self
     def extract_path_and_digest(digested_path)
       digest = digested_path[/-([0-9a-zA-Z]{7,128})\.(?!digested)([^.]|.map)+\z/, 1]
@@ -27,7 +29,15 @@ class Propshaft::Asset
   end
 
   def content_type
-    Mime::Type.lookup_by_extension(logical_path.extname.from(1))
+    @content_type ||= Mime::Type.lookup_by_extension(logical_path.extname.from(1))
+  end
+
+  def content_type_with_charset
+    if content_type.in? CONTENT_TYPES_WITH_UTF8_CHARSET
+      "#{content_type}; charset=utf-8"
+    else
+      content_type
+    end
   end
 
   def length

data/lib/propshaft/railtie.rb

@@ -66,7 +66,7 @@ module Propshaft
     initializer "propshaft.assets_middleware", group: :all do |app|
       app.assets = Propshaft::Assembly.new(app.config.assets)
       if config.assets.server
-        app.middleware.insert_after ::ActionDispatch::Static, Propshaft::Server, app.assets
+        app.middleware.insert_before ::ActionDispatch::Executor, Propshaft::Server, app.assets
       end
     end
 

data/lib/propshaft/server.rb

@@ -23,7 +23,7 @@ class Propshaft::Server
           200,
           {
             Rack::CONTENT_LENGTH  => compiled_content.length.to_s,
-            Rack::CONTENT_TYPE    => asset.content_type.to_s,
+            Rack::CONTENT_TYPE    => asset.content_type_with_charset.to_s,
             VARY                  => "Accept-Encoding",
             Rack::ETAG            => "\"#{asset.digest}\"",
             Rack::CACHE_CONTROL   => "public, max-age=31536000, immutable"

data/lib/propshaft/version.rb

@@ -1,3 +1,3 @@
 module Propshaft
-  VERSION = "1.3.0"
+  VERSION = "1.3.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: propshaft
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.2
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -99,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Deliver assets for Rails.
 test_files: []