sprockets 3.7.2 → 3.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46e0f0a150aa8333d2a1d2663167b6f20c1e77db067cea7b545f75927f770807
-  data.tar.gz: 5acd5cb5c64e240dd8180e91f34620195fa1433e625ee48a132fdae58be71ba5
+  metadata.gz: 8824196f3f212af5ad78b5109661583431f1c7e2c8616061992ad10b1f4ffbf7
+  data.tar.gz: 29db43e310d5fb10852c1ab7e2d3408e04f6a829edc82da388ac8618af4789f8
 SHA512:
-  metadata.gz: 97a06eb2e0767903da7bcda387211d881f3b98d57269a8abed5045e277db5f133f381c4f8fd23fcccf45a4032c85309841abba13b9218a52b21121a5a9bfc02a
-  data.tar.gz: 1d9c8d75bab64c366473226cc61806cd64c1951a67d90cc1220c1474e6a02cc5003b2dffb1b6324abefb7e7c8b292145635ac0bed6ae947a35393d67acd3c40e
+  metadata.gz: 41b8112ac0d3d420e98b85749326089157c3090f93dcadd411d6304b035f5004fa622ef66ea222b40bbd3cde2400410b60efbd259fa70b2f90f23ee9062c4841
+  data.tar.gz: 267728252c1d71c2b8f513950a52d793eea54c93636cae0e6de2007e7fd25d5552a70fe5650ade766bad72d141f2b283c2d544afdd986fe61dcd274d61054102

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+**3.7.5** (Spet 19, 2024)
+
+* Fix `Sprockets::Base#unescape` #808.
+
+**3.7.4** (March 28, 2024)
+
+* Fix deprecated calls to the `uri` gem.
+
+**3.7.3** (March 28, 2024)
+
+* Various compatibility fixes for newer Ruby versions.
+
 **3.7.2** (June 19, 2018)
 
 * Security release for [CVE-2018-3760](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-3760).

data/lib/sprockets/directive_processor.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: false
+
 require 'set'
 require 'shellwords'
 

data/lib/sprockets/erb_processor.rb

@@ -18,7 +18,12 @@ module Sprockets
     end
 
     def call(input)
-      engine = ::ERB.new(input[:data], nil, '<>')
+      if keyword_constructor? # Ruby 2.6+
+        engine = ::ERB.new(input[:data], trim_mode: '<>')
+      else
+        engine = ::ERB.new(input[:data], nil, '<>')
+      end
+
       context = input[:environment].context_class.new(input)
       klass = (class << context; self; end)
       klass.class_eval(&@block) if @block
@@ -26,5 +31,12 @@ module Sprockets
       data = context._evaluate_template
       context.metadata.merge(data: data)
     end
+
+    private
+
+    def keyword_constructor?
+      return @keyword_constructor if defined? @keyword_constructor
+      @keyword_constructor = ::ERB.instance_method(:initialize).parameters.include?([:key, :trim_mode])
+    end
   end
 end

data/lib/sprockets/legacy.rb

@@ -154,18 +154,10 @@ module Sprockets
         end
       end
 
-      # URI.unescape is deprecated on 1.9. We need to use URI::Parser
-      # if its available.
-      if defined? URI::DEFAULT_PARSER
-        def unescape(str)
-          str = URI::DEFAULT_PARSER.unescape(str)
-          str.force_encoding(Encoding.default_internal) if Encoding.default_internal
-          str
-        end
-      else
-        def unescape(str)
-          URI.unescape(str)
-        end
+      def unescape(str)
+        str = URIUtils::URI_PARSER.unescape(str)
+        str.force_encoding(Encoding.default_internal) if Encoding.default_internal
+        str
       end
   end
 

data/lib/sprockets/mime.rb

@@ -111,17 +111,37 @@ module Sprockets
       def compute_extname_map
         graph = {}
 
+        engine_extname_permutation = []
+
+        4.times do |n|
+          config[:engines].keys.permutation(n).each do |engine_extnames|
+            engine_extname_permutation << engine_extnames
+          end
+        end
+
+        mime_exts_grouped_by_mime_type = {}
+        config[:mime_exts].each do |format_extname,format_type|
+          mime_exts_grouped_by_mime_type[format_type] ||= []
+          mime_exts_grouped_by_mime_type[format_type] << format_extname
+        end
+
         ([nil] + pipelines.keys.map(&:to_s)).each do |pipeline|
-          pipeline_extname = ".#{pipeline}" if pipeline
-          ([[nil, nil]] + config[:mime_exts].to_a).each do |format_extname, format_type|
-            4.times do |n|
-              config[:engines].keys.permutation(n).each do |engine_extnames|
+          pipeline_extname = pipeline ? ".#{pipeline}" : ''.freeze
+          engine_extname_permutation.each do |engine_extnames|
+            mime_exts_grouped_by_mime_type.each do |format_type, format_extnames|
+              type = format_type
+              value = [type, engine_extnames, pipeline]
+              format_extnames.each do |format_extname|
                 key = "#{pipeline_extname}#{format_extname}#{engine_extnames.join}"
-                type = format_type || config[:engine_mime_types][engine_extnames.first]
-                graph[key] = {type: type, engines: engine_extnames, pipeline: pipeline}
+                graph[key] = value
+              end
+              if format_type == config[:engine_mime_types][engine_extnames.first]
+                key =  "#{pipeline_extname}#{engine_extnames.join}"
+                graph[key] = value
               end
             end
           end
+          graph[pipeline_extname] = [nil, [], pipeline]
         end
 
         graph

data/lib/sprockets/resolve.rb

@@ -202,7 +202,7 @@ module Sprockets
 
         if extname
           path = path.chomp(extname)
-          type, engines, pipeline = value.values_at(:type, :engines, :pipeline)
+          type, engines, pipeline = value
         end
 
         return path, type, engines, pipeline

data/lib/sprockets/server.rb

@@ -251,11 +251,11 @@ module Sprockets
         # 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["Cache-Control"] += ", must-revalidate"
           headers["Vary"] = "Accept-Encoding"
         end
 

data/lib/sprockets/uri_utils.rb

@@ -20,6 +20,8 @@ module Sprockets
   module URIUtils
     extend self
 
+    URI_PARSER = defined?(URI::RFC2396_PARSER) ? URI::RFC2396_PARSER : URI::RFC2396_Parser.new
+
     # Internal: Parse URI into component parts.
     #
     # uri - String uri
@@ -44,12 +46,15 @@ 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 "file:///C:/Users/IEUser" paths
       path.gsub!(/^\/([a-zA-Z]:)/, '\1'.freeze)
 
+      host = nil if host && host.empty?
+      query = nil if query && query.empty?
+
       [scheme, host, path, query]
     end
 
@@ -60,7 +65,7 @@ module Sprockets
       str = "#{scheme}://"
       str << host if host
       path = "/#{path}" unless path.start_with?("/")
-      str << URI::Generic::DEFAULT_PARSER.escape(path)
+      str << URI_PARSER.escape(path)
       str << "?#{query}" if query
       str
     end
@@ -159,7 +164,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
@@ -179,7 +184,7 @@ module Sprockets
     def parse_uri_query_params(query)
       query.to_s.split('&').reduce({}) do |h, p|
         k, v = p.split('=', 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.rb

@@ -102,6 +102,7 @@ module Sprockets
     #
     # Returns buf String.
     def concat_javascript_sources(buf, source)
+      buf = +buf
       if source.bytesize > 0
         buf << source
 

data/lib/sprockets/version.rb

@@ -1,3 +1,3 @@
 module Sprockets
-  VERSION = "3.7.2"
+  VERSION = "3.7.5"
 end

data/lib/sprockets.rb

@@ -105,7 +105,7 @@ module Sprockets
   register_bundle_processor 'application/javascript', Bundle
   register_bundle_processor 'text/css', Bundle
 
-  register_bundle_metadata_reducer '*/*', :data, proc { "" }, :concat
+  register_bundle_metadata_reducer '*/*', :data, proc { "" }, :+
   register_bundle_metadata_reducer 'application/javascript', :data, proc { "" }, Utils.method(:concat_javascript_sources)
   register_bundle_metadata_reducer '*/*', :links, :+
 

metadata

@@ -1,16 +1,30 @@
 --- !ruby/object:Gem::Specification
 name: sprockets
 version: !ruby/object:Gem::Version
-  version: 3.7.2
+  version: 3.7.5
 platform: ruby
 authors:
 - Sam Stephenson
 - Joshua Peek
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-06-19 00:00:00.000000000 Z
+date: 2024-09-19 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: base64
+  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: rack
   requirement: !ruby/object:Gem::Requirement
@@ -175,16 +189,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
@@ -317,7 +331,7 @@ homepage: https://github.com/rails/sprockets
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -332,9 +346,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: sprockets
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.5.11
+signing_key:
 specification_version: 4
 summary: Rack-based asset packaging system
 test_files: []