sprockets 4.1.1 → 4.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5f1a2b7d847a15dff3669ec28a2248484ee0831c88017fc67fee6afe7b6a6f1
-  data.tar.gz: 2714999cde7d9f9340d0d7f2a98f3e48c9b46d099e36069dd380a12f6c270c54
+  metadata.gz: 543299a5bdbb4620f7e14c346728230740474c835519d22f1c31f76110588912
+  data.tar.gz: d22cfead2059a729f6e67c990d7fa606f9cf56f9060941bea1ed977bf7fe59f3
 SHA512:
-  metadata.gz: db948451245c6a7e6cf20876368d040e6de9b3f178ab5fa0010070b9e834cd08036d449e35f3857a8443ac26fc5318ac20ab5cc16d91a4b65d8fc0f07a796939
-  data.tar.gz: 2a6e4b9dbb1f2effa1ef15a4f861c7b5cadb6384713bf3452749f8f0be1405ab319d85b23272b1dbc3bdeda7837d0ce55f0caf62273e197eb6190511f0789097
+  metadata.gz: 7e0b291f575acdf547fa11e803858f561e38ce57ef76734ce04cc2fce6cfca6516fa2f7b8c5d2390f1ff5400e1e72885c7741b4dc7f28f0956b4aad3a617eec2
+  data.tar.gz: 53e8bab09fdc3dcbd113fa33c4d29bf764ca7d1b11b176ed83d6818d6c7a822cca848f18d5ad7d1dea51e5d015a4cc53bd00e456506a8060f7ad2dbd7fd10af9

data/CHANGELOG.md

@@ -2,7 +2,23 @@
 
 Get upgrade notes from Sprockets 3.x to 4.x at https://github.com/rails/sprockets/blob/master/UPGRADING.md
 
-- Fix `Sprockets::Server` to return response headers to compatible with with Rack::Lint 2.0.
+## 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

@@ -385,10 +385,10 @@ the current file won't work, it must be a logical path.
 `link` can also be used to include manifest files from mounted Rails engines:
 
 ```
-//= link my_engine
+//= link my_engine_manifest
 ```
 
-This would find a manifest file at `my_engine/app/assets/config/my_engine.js` and include its directives.
+This would find a manifest file at `my_engine/app/assets/config/my_engine_manifest.js` and include its directives.
 
 ### link_directory
 
@@ -525,7 +525,7 @@ Generated files are cached. If you're using an `ENV` var then
 when you change then ENV var the asset will be forced to
 recompile. This behavior is only true for environment variables,
 if you are pulling a value from somewhere else, such as a database,
-must manually invalidate the cache to see the change.
+you must manually invalidate the cache to see the change.
 
 If you're using Rails, there are helpers you can use such as `asset_url`
 that will cause a recompile if the value changes.

data/lib/sprockets/asset.rb

@@ -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/cache/memory_store.rb

@@ -22,6 +22,7 @@ module Sprockets
       def initialize(max_size = DEFAULT_MAX_SIZE)
         @max_size = max_size
         @cache = {}
+        @mutex = Mutex.new
       end
 
       # Public: Retrieve value from cache.
@@ -32,12 +33,14 @@ module Sprockets
       #
       # Returns Object or nil or the value is not set.
       def get(key)
-        exists = true
-        value = @cache.delete(key) { exists = false }
-        if exists
-          @cache[key] = value
-        else
-          nil
+        @mutex.synchronize do
+          exists = true
+          value = @cache.delete(key) { exists = false }
+          if exists
+            @cache[key] = value
+          else
+            nil
+          end
         end
       end
 
@@ -50,9 +53,11 @@ module Sprockets
       #
       # Returns Object value.
       def set(key, value)
-        @cache.delete(key)
-        @cache[key] = value
-        @cache.shift if @cache.size > @max_size
+        @mutex.synchronize do
+          @cache.delete(key)
+          @cache[key] = value
+          @cache.shift if @cache.size > @max_size
+        end
         value
       end
 
@@ -60,14 +65,18 @@ module Sprockets
       #
       # Returns String.
       def inspect
-        "#<#{self.class} size=#{@cache.size}/#{@max_size}>"
+        @mutex.synchronize do
+          "#<#{self.class} size=#{@cache.size}/#{@max_size}>"
+        end
       end
 
       # Public: Clear the cache
       #
       # Returns true
       def clear(options=nil)
-        @cache.clear
+        @mutex.synchronize do
+          @cache.clear
+        end
         true
       end
     end

data/lib/sprockets/cached_environment.rb

@@ -16,11 +16,11 @@ module Sprockets
       initialize_configuration(environment)
 
       @cache   = environment.cache
-      @stats   = {}
-      @entries = {}
-      @uris    = {}
-      @processor_cache_keys = {}
-      @resolved_dependencies = {}
+      @stats   = Concurrent::Map.new
+      @entries = Concurrent::Map.new
+      @uris    = Concurrent::Map.new
+      @processor_cache_keys = Concurrent::Map.new
+      @resolved_dependencies = Concurrent::Map.new
     end
 
     # No-op return self as cached environment.
@@ -31,27 +31,27 @@ module Sprockets
 
     # Internal: Cache Environment#entries
     def entries(path)
-      @entries.fetch(path){ @entries[path] = super(path) }
+      @entries.fetch_or_store(path) { super(path) }
     end
 
     # Internal: Cache Environment#stat
     def stat(path)
-      @stats.fetch(path){ @stats[path] = super(path) }
+      @stats.fetch_or_store(path) { super(path) }
     end
 
     # Internal: Cache Environment#load
     def load(uri)
-      @uris.fetch(uri){ @uris[uri] = super(uri) }
+      @uris.fetch_or_store(uri) { super(uri) }
     end
 
     # Internal: Cache Environment#processor_cache_key
     def processor_cache_key(str)
-      @processor_cache_keys.fetch(str){ @processor_cache_keys[str] = super(str) }
+      @processor_cache_keys.fetch_or_store(str) { super(str) }
     end
 
     # Internal: Cache Environment#resolve_dependency
     def resolve_dependency(str)
-      @resolved_dependencies.fetch(str){ @resolved_dependencies[str] = super(str) }
+      @resolved_dependencies.fetch_or_store(str) { super(str) }
     end
 
     private

data/lib/sprockets/exporting.rb

@@ -28,11 +28,11 @@ module Sprockets
 
     # Public: Remove Exporting processor `klass` for `mime_type`.
     #
-    #     environment.unregister_exporter '*/*', Sprockets::Exporters::Zlib
+    #     environment.unregister_exporter '*/*', Sprockets::Exporters::ZlibExporter
     #
     # Can be called without a mime type
     #
-    #     environment.unregister_exporter Sprockets::Exporters::Zlib
+    #     environment.unregister_exporter Sprockets::Exporters::ZlibExporter
     #
     # Does not remove any exporters that depend on `klass`.
     def unregister_exporter(mime_types, exporter = nil)

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]

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

@@ -53,7 +53,7 @@ module Sprockets
         path = path[1..-1]
       end
 
-      [scheme, host, path, query]
+      [scheme, host || '', path, query]
     end
 
     # Internal: Join file: URI component parts into String.

data/lib/sprockets/utils.rb

@@ -118,33 +118,38 @@ module Sprockets
       buf
     end
 
+    MODULE_INCLUDE_MUTEX = Mutex.new
+    private_constant :MODULE_INCLUDE_MUTEX
+
     # Internal: Inject into target module for the duration of the block.
     #
     # mod - Module
     #
     # Returns result of block.
     def module_include(base, mod)
-      old_methods = {}
+      MODULE_INCLUDE_MUTEX.synchronize do
+        old_methods = {}
 
-      mod.instance_methods.each do |sym|
-        old_methods[sym] = base.instance_method(sym) if base.method_defined?(sym)
-      end
+        mod.instance_methods.each do |sym|
+          old_methods[sym] = base.instance_method(sym) if base.method_defined?(sym)
+        end
 
-      mod.instance_methods.each do |sym|
-        method = mod.instance_method(sym)
-        if base.method_defined?(sym)
-          base.send(:alias_method, sym, sym)
+        mod.instance_methods.each do |sym|
+          method = mod.instance_method(sym)
+          if base.method_defined?(sym)
+            base.send(:alias_method, sym, sym)
+          end
+          base.send(:define_method, sym, method)
         end
-        base.send(:define_method, sym, method)
-      end
 
-      yield
-    ensure
-      mod.instance_methods.each do |sym|
-        base.send(:undef_method, sym) if base.method_defined?(sym)
-      end
-      old_methods.each do |sym, method|
-        base.send(:define_method, sym, method)
+        yield
+      ensure
+        mod.instance_methods.each do |sym|
+          base.send(:undef_method, sym) if base.method_defined?(sym)
+        end
+        old_methods.each do |sym, method|
+          base.send(:define_method, sym, method)
+        end
       end
     end
 

data/lib/sprockets/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Sprockets
-  VERSION = "4.1.1"
+  VERSION = "4.2.1"
 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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sprockets
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 4.2.1
 platform: ruby
 authors:
 - Sam Stephenson
@@ -9,28 +9,28 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-27 00:00:00.000000000 Z
+date: 2023-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: 2.2.4
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: 2.2.4
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -219,14 +219,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: 2.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -438,7 +438,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: Rack-based asset packaging system