sprockets 3.7.3 → 3.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8d2739c5e14edf6aa95989aef8057d65eeb1525b4fccda72ba6099a8fe94bd3
-  data.tar.gz: 42fea69a2cf60adff7848fea3c8cd7fff222703611feda467aa8c5236aed9d84
+  metadata.gz: 8824196f3f212af5ad78b5109661583431f1c7e2c8616061992ad10b1f4ffbf7
+  data.tar.gz: 29db43e310d5fb10852c1ab7e2d3408e04f6a829edc82da388ac8618af4789f8
 SHA512:
-  metadata.gz: 753ee6f089d3e281ba3eb81fe4fbd133d50065337f84c02891895de4544d2204bc884c1599781d632f290b1d407d684f473e101e5ba535f12afebc82a979cdd8
-  data.tar.gz: 9c57173eb38957dc992617903bd15b922caf20468c5952c158ffa00472c52ce6e0029011495f8b2fcd9a9148cd7b4ce3525b1749b3c9b1a982038ca9afe0e737
+  metadata.gz: 41b8112ac0d3d420e98b85749326089157c3090f93dcadd411d6304b035f5004fa622ef66ea222b40bbd3cde2400410b60efbd259fa70b2f90f23ee9062c4841
+  data.tar.gz: 267728252c1d71c2b8f513950a52d793eea54c93636cae0e6de2007e7fd25d5552a70fe5650ade766bad72d141f2b283c2d544afdd986fe61dcd274d61054102

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+**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.

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/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,7 +46,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 "file:///C:/Users/IEUser" paths
@@ -63,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
@@ -162,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
@@ -182,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/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sprockets
 version: !ruby/object:Gem::Version
-  version: 3.7.3
+  version: 3.7.5
 platform: ruby
 authors:
 - Sam Stephenson
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-28 00:00:00.000000000 Z
+date: 2024-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -346,7 +346,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: Rack-based asset packaging system